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 2019/09/25 06:55:00 UTC
[camel] branch CAMEL-13949 created (now 1cf223d)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch CAMEL-13949
in repository https://gitbox.apache.org/repos/asf/camel.git.
at 1cf223d CAMEL-13949: Better splitup between camel-core and camel-core-engine.
This branch includes the following new commits:
new 74a3388 CAMEL-13949: Better splitup between camel-core and camel-core-engine.
new 24bbbae CAMEL-13949: Better splitup between camel-core and camel-core-engine.
new aa6b961 CAMEL-13949: Better splitup between camel-core and camel-core-engine.
new 8ea5981 CAMEL-13949: Better splitup between camel-core and camel-core-engine.
new dd059e1 CAMEL-13949: Better splitup between camel-core and camel-core-engine.
new 997f0dc CAMEL-13949: Better splitup between camel-core and camel-core-engine.
new 1a033f9 CAMEL-13949: Better splitup between camel-core and camel-core-engine.
new 1cf223d CAMEL-13949: Better splitup between camel-core and camel-core-engine.
The 8 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.
[camel] 02/08: CAMEL-13949: Better splitup between camel-core and
camel-core-engine.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch CAMEL-13949
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 24bbbaecfb80dfde8d9274f11374a768bff5ae6e
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Sep 25 06:04:41 2019 +0200
CAMEL-13949: Better splitup between camel-core and camel-core-engine.
---
components/camel-blueprint/pom.xml | 2 +-
components/camel-spring/pom.xml | 4 ++--
core/camel-cloud/pom.xml | 4 ++++
core/camel-core-engine/pom.xml | 7 +++++++
core/camel-core-osgi/pom.xml | 5 +++--
core/camel-core-xml/pom.xml | 4 ----
core/camel-core/pom.xml | 1 -
7 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/components/camel-blueprint/pom.xml b/components/camel-blueprint/pom.xml
index 1265978..2a3a65d 100644
--- a/components/camel-blueprint/pom.xml
+++ b/components/camel-blueprint/pom.xml
@@ -382,7 +382,7 @@
<include name="org/apache/camel/core/xml/*.java"/>
<include name="org/apache/camel/core/xml/util/**/*.java"/>
</fileset>
- <fileset dir="${basedir}/../../core/camel-core/src/main/java">
+ <fileset dir="${basedir}/../../core/camel-core-engine/src/main/java">
<include name="org/apache/camel/model/**/*.java"/>
<include name="org/apache/camel/ExchangePattern.java"/>
<include name="org/apache/camel/LoggingLevel.java"/>
diff --git a/components/camel-spring/pom.xml b/components/camel-spring/pom.xml
index 12d7c68..25d3eb1 100644
--- a/components/camel-spring/pom.xml
+++ b/components/camel-spring/pom.xml
@@ -421,7 +421,7 @@
<include name="org/apache/camel/core/xml/*.java"/>
<include name="org/apache/camel/core/xml/util/**/*.java"/>
</fileset>
- <fileset dir="${basedir}/../../core/camel-core/src/main/java">
+ <fileset dir="${basedir}/../../core/camel-core-engine/src/main/java">
<include name="org/apache/camel/model/**/*.java"/>
<include name="org/apache/camel/ExchangePattern.java"/>
<include name="org/apache/camel/LoggingLevel.java"/>
@@ -612,7 +612,7 @@
<link>http://download.oracle.com/javase/7/docs/api/</link>
<link>http://download.oracle.com/javaee/7/api/</link>
<link>http://static.springsource.org/spring/docs/${spring-version}/javadoc-api/</link>
- <link>http://camel.apache.org/maven/current/camel-core/apidocs/</link>
+ <link>http://camel.apache.org/maven/current/camel-core-engine/apidocs/</link>
</links>
<linksource>true</linksource>
<maxmemory>256m</maxmemory>
diff --git a/core/camel-cloud/pom.xml b/core/camel-cloud/pom.xml
index 608e97d..a69dd56 100644
--- a/core/camel-cloud/pom.xml
+++ b/core/camel-cloud/pom.xml
@@ -56,6 +56,10 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-core-engine</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-caffeine-lrucache</artifactId>
+ </dependency>
<!-- testing -->
<dependency>
diff --git a/core/camel-core-engine/pom.xml b/core/camel-core-engine/pom.xml
index d29527c..0b07d17 100644
--- a/core/camel-core-engine/pom.xml
+++ b/core/camel-core-engine/pom.xml
@@ -89,6 +89,13 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-util-json</artifactId>
</dependency>
+
+ <!-- uses the properties component -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-properties</artifactId>
+ </dependency>
+
</dependencies>
<build>
diff --git a/core/camel-core-osgi/pom.xml b/core/camel-core-osgi/pom.xml
index 6f134de..d4fe325 100644
--- a/core/camel-core-osgi/pom.xml
+++ b/core/camel-core-osgi/pom.xml
@@ -31,7 +31,7 @@
<packaging>jar</packaging>
<name>Camel :: Core OSGi</name>
- <description>Using Camel with OSGi</description>
+ <description>Camel Core OSGi support</description>
<properties>
<camel.osgi.import>
@@ -49,11 +49,12 @@
<dependencies>
- <!-- core required: org.apache.camel.impl, org.apache.camel.impl.converter -->
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core-engine</artifactId>
</dependency>
+
+ <!-- osgi -->
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.cmpn</artifactId>
diff --git a/core/camel-core-xml/pom.xml b/core/camel-core-xml/pom.xml
index 3ec9765..40daddd 100644
--- a/core/camel-core-xml/pom.xml
+++ b/core/camel-core-xml/pom.xml
@@ -36,10 +36,6 @@
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>spi-annotations</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-core-engine</artifactId>
</dependency>
diff --git a/core/camel-core/pom.xml b/core/camel-core/pom.xml
index 5a2eafd..3fc9bcc 100644
--- a/core/camel-core/pom.xml
+++ b/core/camel-core/pom.xml
@@ -36,7 +36,6 @@
<dependencies>
- <!-- required dependencies by camel-core -->
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core-engine</artifactId>
[camel] 04/08: CAMEL-13949: Better splitup between camel-core and
camel-core-engine.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch CAMEL-13949
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8ea5981180fccb1b0d868cdab12a2ac45434d980
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Sep 25 06:30:19 2019 +0200
CAMEL-13949: Better splitup between camel-core and camel-core-engine.
---
docs/gulpfile.js | 4 ++--
docs/user-manual/modules/ROOT/pages/aggregate-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/batch-config-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/bean-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/choice-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/circuitBreaker-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/claimCheck-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/content-based-router-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/content-filter-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/convertBodyTo-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/customLoadBalancer-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/delay-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/dynamic-router.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/dynamicRouter-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/enrich-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/eventDrivenConsumer-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/failover-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/filter-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/from-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/hystrix-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/hystrixConfiguration-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/idempotentConsumer-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/inOnly-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/inOut-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/loadBalance-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/log-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/loop-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/marshal-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/multicast-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/onFallback-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/otherwise-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/pipeline-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/pollEnrich-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/process-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/random-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/recipientList-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/removeHeader-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/removeHeaders-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/removeProperties-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/removeProperty-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/requestReply-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/resequence-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/rollback-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/roundRobin-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/routingSlip-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/saga-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/sample-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/script-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/serviceCall-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/setBody-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/setHeader-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/setOutHeader-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/setProperty-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/sort-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/split-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/step-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/sticky-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/stop-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/stream-config-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/threads-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/throttle-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/to-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/toD-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/topic-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/transform-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/unmarshal-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/validate-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/weighted-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/when-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/wireTap-eip.adoc | 2 +-
70 files changed, 71 insertions(+), 71 deletions(-)
diff --git a/docs/gulpfile.js b/docs/gulpfile.js
index 935a19c..9445b0c 100644
--- a/docs/gulpfile.js
+++ b/docs/gulpfile.js
@@ -80,7 +80,7 @@ function deleteUserManualSymlinks() {
}
function createUserManualSymlinks() {
- return src(['../core/camel-base/src/main/docs/*.adoc', '../core/camel-core/src/main/docs/eips/*.adoc'])
+ return src(['../core/camel-base/src/main/docs/*.adoc', '../core/camel-core-engine/src/main/docs/eips/*.adoc'])
// Antora disabled symlinks, there is an issue open
// https://gitlab.com/antora/antora/issues/188
// to reinstate symlink support, until that's resolved
@@ -146,7 +146,7 @@ function createUserManualNav() {
return ` ** xref:${filepath}[${title}]`;
}
}))
- .pipe(inject(src('../core/camel-core/src/main/docs/eips/*.adoc').pipe(sort()), {
+ .pipe(inject(src('../core/camel-core-engine/src/main/docs/eips/*.adoc').pipe(sort()), {
removeTags: true,
name: 'eips',
transform: (filename, file) => {
diff --git a/docs/user-manual/modules/ROOT/pages/aggregate-eip.adoc b/docs/user-manual/modules/ROOT/pages/aggregate-eip.adoc
index 1f81487..3693493 100644
--- a/docs/user-manual/modules/ROOT/pages/aggregate-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/aggregate-eip.adoc
@@ -1,6 +1,6 @@
[[aggregate-eip]]
= Aggregate EIP
-:page-source: core/camel-core/src/main/docs/eips/aggregate-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/aggregate-eip.adoc
The
http://www.enterpriseintegrationpatterns.com/Aggregator.html[Aggregator]
diff --git a/docs/user-manual/modules/ROOT/pages/batch-config-eip.adoc b/docs/user-manual/modules/ROOT/pages/batch-config-eip.adoc
index e705379..4da0466 100644
--- a/docs/user-manual/modules/ROOT/pages/batch-config-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/batch-config-eip.adoc
@@ -1,6 +1,6 @@
[[batch-config-eip]]
= Batch-config EIP
-:page-source: core/camel-core/src/main/docs/eips/batch-config-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/batch-config-eip.adoc
Batch-processing resequence EIP
diff --git a/docs/user-manual/modules/ROOT/pages/bean-eip.adoc b/docs/user-manual/modules/ROOT/pages/bean-eip.adoc
index 720cd6d..ddb5e4b 100644
--- a/docs/user-manual/modules/ROOT/pages/bean-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/bean-eip.adoc
@@ -1,6 +1,6 @@
[[bean-eip]]
= Bean EIP
-:page-source: core/camel-core/src/main/docs/eips/bean-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/bean-eip.adoc
The Bean EIP binds beans to Camel message exchanges.
diff --git a/docs/user-manual/modules/ROOT/pages/choice-eip.adoc b/docs/user-manual/modules/ROOT/pages/choice-eip.adoc
index 12896e1..f9ef7fe 100644
--- a/docs/user-manual/modules/ROOT/pages/choice-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/choice-eip.adoc
@@ -1,6 +1,6 @@
[[choice-eip]]
= Choice EIP
-:page-source: core/camel-core/src/main/docs/eips/choice-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/choice-eip.adoc
The
http://www.enterpriseintegrationpatterns.com/ContentBasedRouter.html[Content
diff --git a/docs/user-manual/modules/ROOT/pages/circuitBreaker-eip.adoc b/docs/user-manual/modules/ROOT/pages/circuitBreaker-eip.adoc
index 1c0fcad..f68c55d 100644
--- a/docs/user-manual/modules/ROOT/pages/circuitBreaker-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/circuitBreaker-eip.adoc
@@ -1,6 +1,6 @@
[[circuitBreaker-eip]]
= Circuit Breaker EIP (deprecated)
-:page-source: core/camel-core/src/main/docs/eips/circuitBreaker-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/circuitBreaker-eip.adoc
The Circuit Breaker load balancer is a stateful pattern that monitors all calls for certain exceptions. Initially the Circuit Breaker is in closed state and passes all messages. If there are failures and the threshold is reached, it moves to open state and rejects all calls until halfOpenAfter timeout is reached. After this timeout is reached, if there is a new call, it will pass and if the result is success the Circuit Breaker will move to closed state, or to open state if there was an error.
When the circuit breaker is closed, it will throw a `java.util.concurrent.RejectedExecutionException`. This can then be caught to provide an alternate path for processing exchanges.
diff --git a/docs/user-manual/modules/ROOT/pages/claimCheck-eip.adoc b/docs/user-manual/modules/ROOT/pages/claimCheck-eip.adoc
index 2d11f71..63aea41 100644
--- a/docs/user-manual/modules/ROOT/pages/claimCheck-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/claimCheck-eip.adoc
@@ -1,6 +1,6 @@
[[claimCheck-eip]]
= Claim Check EIP
-:page-source: core/camel-core/src/main/docs/eips/claimCheck-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/claimCheck-eip.adoc
*Available as of Camel 2.21*
diff --git a/docs/user-manual/modules/ROOT/pages/content-based-router-eip.adoc b/docs/user-manual/modules/ROOT/pages/content-based-router-eip.adoc
index 222de92..761ac92 100644
--- a/docs/user-manual/modules/ROOT/pages/content-based-router-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/content-based-router-eip.adoc
@@ -1,6 +1,6 @@
[[contentBasedRouter-eip]]
= Content Based Router
-:page-source: core/camel-core/src/main/docs/eips/content-based-router-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/content-based-router-eip.adoc
The
http://www.enterpriseintegrationpatterns.com/ContentBasedRouter.html[Content
diff --git a/docs/user-manual/modules/ROOT/pages/content-filter-eip.adoc b/docs/user-manual/modules/ROOT/pages/content-filter-eip.adoc
index ce4aa3e..b3cdb81 100644
--- a/docs/user-manual/modules/ROOT/pages/content-filter-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/content-filter-eip.adoc
@@ -1,6 +1,6 @@
[[ContentFilter-eip]]
= Content Filter
-:page-source: core/camel-core/src/main/docs/eips/content-filter-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/content-filter-eip.adoc
Camel supports the
http://www.enterpriseintegrationpatterns.com/ContentFilter.html[Content
diff --git a/docs/user-manual/modules/ROOT/pages/convertBodyTo-eip.adoc b/docs/user-manual/modules/ROOT/pages/convertBodyTo-eip.adoc
index 2f21ff1..f075792 100644
--- a/docs/user-manual/modules/ROOT/pages/convertBodyTo-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/convertBodyTo-eip.adoc
@@ -1,6 +1,6 @@
[[convertBodyTo-eip]]
= Convert Body To EIP
-:page-source: core/camel-core/src/main/docs/eips/convertBodyTo-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/convertBodyTo-eip.adoc
The ConvertBodyTo EIP allows you to transform your body to a different type.
diff --git a/docs/user-manual/modules/ROOT/pages/customLoadBalancer-eip.adoc b/docs/user-manual/modules/ROOT/pages/customLoadBalancer-eip.adoc
index efa57da..50d413e 100644
--- a/docs/user-manual/modules/ROOT/pages/customLoadBalancer-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/customLoadBalancer-eip.adoc
@@ -1,6 +1,6 @@
[[customLoadBalancer-eip]]
= Custom Load Balancer EIP
-:page-source: core/camel-core/src/main/docs/eips/customLoadBalancer-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/customLoadBalancer-eip.adoc
This EIP allows you to use your own Load Balancer implementation
diff --git a/docs/user-manual/modules/ROOT/pages/delay-eip.adoc b/docs/user-manual/modules/ROOT/pages/delay-eip.adoc
index 3791ede..293c6d3 100644
--- a/docs/user-manual/modules/ROOT/pages/delay-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/delay-eip.adoc
@@ -1,6 +1,6 @@
[[delay-eip]]
= Delay EIP
-:page-source: core/camel-core/src/main/docs/eips/delay-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/delay-eip.adoc
The Delayer Pattern allows you to delay the delivery of messages to some destination.
== Options
diff --git a/docs/user-manual/modules/ROOT/pages/dynamic-router.adoc b/docs/user-manual/modules/ROOT/pages/dynamic-router.adoc
index 886f5c5..bbd3a2b 100644
--- a/docs/user-manual/modules/ROOT/pages/dynamic-router.adoc
+++ b/docs/user-manual/modules/ROOT/pages/dynamic-router.adoc
@@ -1,6 +1,6 @@
[[DynamicRouter-DynamicRouter]]
= Dynamic Router
-:page-source: core/camel-core/src/main/docs/eips/dynamic-router.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/dynamic-router.adoc
The
http://www.enterpriseintegrationpatterns.com/DynamicRouter.html[Dynamic
diff --git a/docs/user-manual/modules/ROOT/pages/dynamicRouter-eip.adoc b/docs/user-manual/modules/ROOT/pages/dynamicRouter-eip.adoc
index e20c0e4..56b940b 100644
--- a/docs/user-manual/modules/ROOT/pages/dynamicRouter-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/dynamicRouter-eip.adoc
@@ -1,6 +1,6 @@
[[dynamicRouter-eip]]
= Dynamic Router EIP
-:page-source: core/camel-core/src/main/docs/eips/dynamicRouter-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/dynamicRouter-eip.adoc
The http://www.enterpriseintegrationpatterns.com/DynamicRouter.html[Dynamic Router] from the xref:enterprise-integration-patterns.adoc[EIP patterns] allows you to route messages while avoiding the dependency of the router on all possible destinations while maintaining its efficiency.
diff --git a/docs/user-manual/modules/ROOT/pages/enrich-eip.adoc b/docs/user-manual/modules/ROOT/pages/enrich-eip.adoc
index 9babdc9..05c0127 100644
--- a/docs/user-manual/modules/ROOT/pages/enrich-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/enrich-eip.adoc
@@ -1,6 +1,6 @@
[[enrich-eip]]
= Enrich EIP
-:page-source: core/camel-core/src/main/docs/eips/enrich-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/enrich-eip.adoc
Camel supports the Content Enricher from the EIP patterns using a Message Translator, an arbitrary Processor in the routing logic, or using the enrich DSL element to enrich the message.
diff --git a/docs/user-manual/modules/ROOT/pages/eventDrivenConsumer-eip.adoc b/docs/user-manual/modules/ROOT/pages/eventDrivenConsumer-eip.adoc
index 977f4f0..af93dbd 100644
--- a/docs/user-manual/modules/ROOT/pages/eventDrivenConsumer-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/eventDrivenConsumer-eip.adoc
@@ -1,6 +1,6 @@
[[eventDrivenConsumer-eip]]
= Event Driven Consumer
-:page-source: core/camel-core/src/main/docs/eips/eventDrivenConsumer-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/eventDrivenConsumer-eip.adoc
Camel supports the
http://www.enterpriseintegrationpatterns.com/EventDrivenConsumer.html[Event Driven Consumer]
diff --git a/docs/user-manual/modules/ROOT/pages/failover-eip.adoc b/docs/user-manual/modules/ROOT/pages/failover-eip.adoc
index 34ac6a6..0b66117 100644
--- a/docs/user-manual/modules/ROOT/pages/failover-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/failover-eip.adoc
@@ -1,6 +1,6 @@
[[failover-eip]]
= Failover EIP
-:page-source: core/camel-core/src/main/docs/eips/failover-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/failover-eip.adoc
Failover Load Balancer, with this policy in case of failures the exchange will be tried on the next endpoint.
diff --git a/docs/user-manual/modules/ROOT/pages/filter-eip.adoc b/docs/user-manual/modules/ROOT/pages/filter-eip.adoc
index 26d31c2..87508ad 100644
--- a/docs/user-manual/modules/ROOT/pages/filter-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/filter-eip.adoc
@@ -1,6 +1,6 @@
[[filter-eip]]
= Filter EIP
-:page-source: core/camel-core/src/main/docs/eips/filter-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/filter-eip.adoc
The http://www.enterpriseintegrationpatterns.com/Filter.html[Message
Filter] from the xref:enterprise-integration-patterns.adoc[EIP patterns]
diff --git a/docs/user-manual/modules/ROOT/pages/from-eip.adoc b/docs/user-manual/modules/ROOT/pages/from-eip.adoc
index 0f55fe9..255ed88 100644
--- a/docs/user-manual/modules/ROOT/pages/from-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/from-eip.adoc
@@ -1,6 +1,6 @@
[[from-eip]]
= From EIP
-:page-source: core/camel-core/src/main/docs/eips/from-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/from-eip.adoc
Starting point for a Camel route that starts a route with a given endpoint. The endpoint can be from one of the many Camel https://github.com/apache/camel/tree/master/components[Components]. The component creates Camel exchanges from their respective sources and puts them into the route.
== Options
diff --git a/docs/user-manual/modules/ROOT/pages/hystrix-eip.adoc b/docs/user-manual/modules/ROOT/pages/hystrix-eip.adoc
index 92a168b..cb3fe18 100644
--- a/docs/user-manual/modules/ROOT/pages/hystrix-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/hystrix-eip.adoc
@@ -1,6 +1,6 @@
[[hystrix-eip]]
= Hystrix EIP
-:page-source: core/camel-core/src/main/docs/eips/hystrix-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/hystrix-eip.adoc
*Available as of Camel 2.18*
diff --git a/docs/user-manual/modules/ROOT/pages/hystrixConfiguration-eip.adoc b/docs/user-manual/modules/ROOT/pages/hystrixConfiguration-eip.adoc
index d90a10f..1e294e8 100644
--- a/docs/user-manual/modules/ROOT/pages/hystrixConfiguration-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/hystrixConfiguration-eip.adoc
@@ -1,6 +1,6 @@
[[hystrixConfiguration-eip]]
= Hystrix Configuration EIP
-:page-source: core/camel-core/src/main/docs/eips/hystrixConfiguration-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/hystrixConfiguration-eip.adoc
// eip options: START
diff --git a/docs/user-manual/modules/ROOT/pages/idempotentConsumer-eip.adoc b/docs/user-manual/modules/ROOT/pages/idempotentConsumer-eip.adoc
index dfa9f7e..cc379e1 100644
--- a/docs/user-manual/modules/ROOT/pages/idempotentConsumer-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/idempotentConsumer-eip.adoc
@@ -1,6 +1,6 @@
[[idempotentConsumer-eip]]
= Idempotent Consumer EIP
-:page-source: core/camel-core/src/main/docs/eips/idempotentConsumer-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/idempotentConsumer-eip.adoc
The
http://www.enterpriseintegrationpatterns.com/IdempotentReceiver.html[Idempotent
diff --git a/docs/user-manual/modules/ROOT/pages/inOnly-eip.adoc b/docs/user-manual/modules/ROOT/pages/inOnly-eip.adoc
index f7947bb..b359088 100644
--- a/docs/user-manual/modules/ROOT/pages/inOnly-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/inOnly-eip.adoc
@@ -1,6 +1,6 @@
[[inOnly-eip]]
= In Only EIP
-:page-source: core/camel-core/src/main/docs/eips/inOnly-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/inOnly-eip.adoc
The *inOnly:* EIP define an InOnly ExchangePattern.
diff --git a/docs/user-manual/modules/ROOT/pages/inOut-eip.adoc b/docs/user-manual/modules/ROOT/pages/inOut-eip.adoc
index 9377b5f..ff1b4ec 100644
--- a/docs/user-manual/modules/ROOT/pages/inOut-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/inOut-eip.adoc
@@ -1,6 +1,6 @@
[[inOut-eip]]
= In Out EIP
-:page-source: core/camel-core/src/main/docs/eips/inOut-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/inOut-eip.adoc
The *inOut:* EIP define an InOut ExchangePattern.
diff --git a/docs/user-manual/modules/ROOT/pages/loadBalance-eip.adoc b/docs/user-manual/modules/ROOT/pages/loadBalance-eip.adoc
index 8449291..104aa79 100644
--- a/docs/user-manual/modules/ROOT/pages/loadBalance-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/loadBalance-eip.adoc
@@ -1,6 +1,6 @@
[[loadBalance-eip]]
= Load Balance EIP
-:page-source: core/camel-core/src/main/docs/eips/loadBalance-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/loadBalance-eip.adoc
The Load Balancer Pattern allows you to delegate to one of a number of endpoints using a variety of different load balancing policies.
diff --git a/docs/user-manual/modules/ROOT/pages/log-eip.adoc b/docs/user-manual/modules/ROOT/pages/log-eip.adoc
index d3d3de0..77fe6a8 100644
--- a/docs/user-manual/modules/ROOT/pages/log-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/log-eip.adoc
@@ -1,6 +1,6 @@
[[log-eip]]
= Log EIP
-:page-source: core/camel-core/src/main/docs/eips/log-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/log-eip.adoc
How can I log the processing of a xref:message.adoc[Message]?
diff --git a/docs/user-manual/modules/ROOT/pages/loop-eip.adoc b/docs/user-manual/modules/ROOT/pages/loop-eip.adoc
index 886198d..e3a35ad 100644
--- a/docs/user-manual/modules/ROOT/pages/loop-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/loop-eip.adoc
@@ -1,6 +1,6 @@
[[loop-eip]]
= Loop EIP
-:page-source: core/camel-core/src/main/docs/eips/loop-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/loop-eip.adoc
The Loop allows for processing a message a number of times, possibly in a different way for each iteration. Useful mostly during testing.
diff --git a/docs/user-manual/modules/ROOT/pages/marshal-eip.adoc b/docs/user-manual/modules/ROOT/pages/marshal-eip.adoc
index 7572c02..4dd8a18 100644
--- a/docs/user-manual/modules/ROOT/pages/marshal-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/marshal-eip.adoc
@@ -1,6 +1,6 @@
[[marshal-eip]]
= Marshal EIP
-:page-source: core/camel-core/src/main/docs/eips/marshal-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/marshal-eip.adoc
Marshalling is the opposite of unmarshalling, where a bean is marshalled into some binary or textual format for transmission over some transport via a Camel xref:components::index.adoc[Components]. Marshalling is used in the same way as unmarshalling above; in the xref:dsl.adoc[DSL] you can use a DataFormat instance, you can configure the DataFormat dynamically using the DSL or you can refer to a named instance of the format in the xref:registry.adoc[Registry].
diff --git a/docs/user-manual/modules/ROOT/pages/multicast-eip.adoc b/docs/user-manual/modules/ROOT/pages/multicast-eip.adoc
index 126bba8..ea556b4 100644
--- a/docs/user-manual/modules/ROOT/pages/multicast-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/multicast-eip.adoc
@@ -1,6 +1,6 @@
[[multicast-eip]]
= Multicast EIP
-:page-source: core/camel-core/src/main/docs/eips/multicast-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/multicast-eip.adoc
The Multicast EIP allows to route the same message to a number of endpoints
and process them in a different way. The main difference between the
diff --git a/docs/user-manual/modules/ROOT/pages/onFallback-eip.adoc b/docs/user-manual/modules/ROOT/pages/onFallback-eip.adoc
index 1484d76..94b7d21 100644
--- a/docs/user-manual/modules/ROOT/pages/onFallback-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/onFallback-eip.adoc
@@ -1,6 +1,6 @@
[[onFallback-eip]]
= On Fallback EIP
-:page-source: core/camel-core/src/main/docs/eips/onFallback-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/onFallback-eip.adoc
If you are using *onFallback* then that is intended to be local processing only where you can do a message transformation or call a bean or something as the fallback. If you need to call an external service over the network then you should use *onFallbackViaNetwork* that runs in another independent *HystrixCommand* that uses its own thread pool to not exhaust the first command.
Configuring Hystrix Example
diff --git a/docs/user-manual/modules/ROOT/pages/otherwise-eip.adoc b/docs/user-manual/modules/ROOT/pages/otherwise-eip.adoc
index 55fd286..312be74 100644
--- a/docs/user-manual/modules/ROOT/pages/otherwise-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/otherwise-eip.adoc
@@ -1,6 +1,6 @@
[[otherwise-eip]]
= Otherwise EIP
-:page-source: core/camel-core/src/main/docs/eips/otherwise-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/otherwise-eip.adoc
The Otherwise EIP is related to http://www.enterpriseintegrationpatterns.com/ContentBasedRouter.html[Content
Based Router] from the xref:enterprise-integration-patterns.adoc[EIP
diff --git a/docs/user-manual/modules/ROOT/pages/pipeline-eip.adoc b/docs/user-manual/modules/ROOT/pages/pipeline-eip.adoc
index da8af8c..e0c1cbd 100644
--- a/docs/user-manual/modules/ROOT/pages/pipeline-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/pipeline-eip.adoc
@@ -1,6 +1,6 @@
[[pipeline-eip]]
= Pipeline EIP
-:page-source: core/camel-core/src/main/docs/eips/pipeline-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/pipeline-eip.adoc
Camel supports the http://www.enterpriseintegrationpatterns.com/PipesAndFilters.html[Pipes and Filters] from the xref:enterprise-integration-patterns.adoc[EIP patterns] in various ways.
diff --git a/docs/user-manual/modules/ROOT/pages/pollEnrich-eip.adoc b/docs/user-manual/modules/ROOT/pages/pollEnrich-eip.adoc
index 8486c7d..65f6987 100644
--- a/docs/user-manual/modules/ROOT/pages/pollEnrich-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/pollEnrich-eip.adoc
@@ -1,6 +1,6 @@
[[pollEnrich-eip]]
= Poll Enrich EIP
-:page-source: core/camel-core/src/main/docs/eips/pollEnrich-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/pollEnrich-eip.adoc
Camel comes with flavor `pollEnrich` as a choice of content enricher in the DSL.
The other one is `enrich`
diff --git a/docs/user-manual/modules/ROOT/pages/process-eip.adoc b/docs/user-manual/modules/ROOT/pages/process-eip.adoc
index 24254c8..6b4c3c6 100644
--- a/docs/user-manual/modules/ROOT/pages/process-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/process-eip.adoc
@@ -1,6 +1,6 @@
[[process-eip]]
= Process EIP
-:page-source: core/camel-core/src/main/docs/eips/process-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/process-eip.adoc
The http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/Processor.html[Processor] interface is used to implement consumers of message exchanges or to implement a xref:message-translator.adoc[Message Translator]
diff --git a/docs/user-manual/modules/ROOT/pages/random-eip.adoc b/docs/user-manual/modules/ROOT/pages/random-eip.adoc
index 623ae8f..87cdfa4 100644
--- a/docs/user-manual/modules/ROOT/pages/random-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/random-eip.adoc
@@ -1,6 +1,6 @@
[[random-eip]]
= Random EIP
-:page-source: core/camel-core/src/main/docs/eips/random-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/random-eip.adoc
// eip options: START
diff --git a/docs/user-manual/modules/ROOT/pages/recipientList-eip.adoc b/docs/user-manual/modules/ROOT/pages/recipientList-eip.adoc
index 9396e14..6dd9541 100644
--- a/docs/user-manual/modules/ROOT/pages/recipientList-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/recipientList-eip.adoc
@@ -1,6 +1,6 @@
[[recipientList-eip]]
= Recipient List EIP
-:page-source: core/camel-core/src/main/docs/eips/recipientList-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/recipientList-eip.adoc
The http://www.enterpriseintegrationpatterns.com/RecipientList.html[Recipient List] from the EIP patterns allows you to route messages to a number of dynamically specified recipients.
image::eip/RecipientList.gif[image]
diff --git a/docs/user-manual/modules/ROOT/pages/removeHeader-eip.adoc b/docs/user-manual/modules/ROOT/pages/removeHeader-eip.adoc
index 4386aa3..f74d815 100644
--- a/docs/user-manual/modules/ROOT/pages/removeHeader-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/removeHeader-eip.adoc
@@ -1,6 +1,6 @@
[[removeHeader-eip]]
= Remove Header EIP
-:page-source: core/camel-core/src/main/docs/eips/removeHeader-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/removeHeader-eip.adoc
The Remove Header EIP allows you to remove an header from your exchange.
== Options
diff --git a/docs/user-manual/modules/ROOT/pages/removeHeaders-eip.adoc b/docs/user-manual/modules/ROOT/pages/removeHeaders-eip.adoc
index b7b1a0f..7caf885 100644
--- a/docs/user-manual/modules/ROOT/pages/removeHeaders-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/removeHeaders-eip.adoc
@@ -1,6 +1,6 @@
[[removeHeaders-eip]]
= Remove Headers EIP
-:page-source: core/camel-core/src/main/docs/eips/removeHeaders-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/removeHeaders-eip.adoc
The Remove Headers EIP allows you to remove headers from your exchange.
== Options
diff --git a/docs/user-manual/modules/ROOT/pages/removeProperties-eip.adoc b/docs/user-manual/modules/ROOT/pages/removeProperties-eip.adoc
index db37969..5365855 100644
--- a/docs/user-manual/modules/ROOT/pages/removeProperties-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/removeProperties-eip.adoc
@@ -1,6 +1,6 @@
[[removeProperties-eip]]
= Remove Properties EIP
-:page-source: core/camel-core/src/main/docs/eips/removeProperties-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/removeProperties-eip.adoc
The RemoveProperties EIP allows you to remove Properties from you exchange.
diff --git a/docs/user-manual/modules/ROOT/pages/removeProperty-eip.adoc b/docs/user-manual/modules/ROOT/pages/removeProperty-eip.adoc
index 1dc21d6..34dd5e1 100644
--- a/docs/user-manual/modules/ROOT/pages/removeProperty-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/removeProperty-eip.adoc
@@ -1,6 +1,6 @@
[[removeProperty-eip]]
= Remove Property EIP
-:page-source: core/camel-core/src/main/docs/eips/removeProperty-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/removeProperty-eip.adoc
The RemoveProperty EIP allows you to remove a Property from your exchange.
diff --git a/docs/user-manual/modules/ROOT/pages/requestReply-eip.adoc b/docs/user-manual/modules/ROOT/pages/requestReply-eip.adoc
index 28f85f2..61ea9ac 100644
--- a/docs/user-manual/modules/ROOT/pages/requestReply-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/requestReply-eip.adoc
@@ -1,6 +1,6 @@
[[requestReply-eip]]
= Request Reply
-:page-source: core/camel-core/src/main/docs/eips/requestReply-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/requestReply-eip.adoc
Camel supports the
http://www.enterpriseintegrationpatterns.com/RequestReply.html[Request
diff --git a/docs/user-manual/modules/ROOT/pages/resequence-eip.adoc b/docs/user-manual/modules/ROOT/pages/resequence-eip.adoc
index 327b5d5..c3acb5d 100644
--- a/docs/user-manual/modules/ROOT/pages/resequence-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/resequence-eip.adoc
@@ -1,6 +1,6 @@
[[resequence-eip]]
= Resequence EIP
-:page-source: core/camel-core/src/main/docs/eips/resequence-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/resequence-eip.adoc
The http://www.enterpriseintegrationpatterns.com/Resequencer.html[Resequencer] from the https://camel.apache.org/enterprise-integration-patterns.html[EIP patterns] allows you to reorganise messages based on some comparator. +
By default in Camel we use an Expression to create the comparator; so that you can compare by a message header or the body or a piece of a message etc.
diff --git a/docs/user-manual/modules/ROOT/pages/rollback-eip.adoc b/docs/user-manual/modules/ROOT/pages/rollback-eip.adoc
index 7b90f26..8db1a0d 100644
--- a/docs/user-manual/modules/ROOT/pages/rollback-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/rollback-eip.adoc
@@ -1,6 +1,6 @@
[[rollback-eip]]
= Rollback EIP
-:page-source: core/camel-core/src/main/docs/eips/rollback-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/rollback-eip.adoc
Rollback might be needed if there is a transaction or transactional pieces in your design.
Camel recommends supporting the
diff --git a/docs/user-manual/modules/ROOT/pages/roundRobin-eip.adoc b/docs/user-manual/modules/ROOT/pages/roundRobin-eip.adoc
index a93222a..c988416 100644
--- a/docs/user-manual/modules/ROOT/pages/roundRobin-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/roundRobin-eip.adoc
@@ -1,6 +1,6 @@
[[roundRobin-eip]]
= Round Robin EIP
-:page-source: core/camel-core/src/main/docs/eips/roundRobin-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/roundRobin-eip.adoc
Round Robin Load Balancer. With this Load Balancing policy, a random endpoint is selected for each exchange.
diff --git a/docs/user-manual/modules/ROOT/pages/routingSlip-eip.adoc b/docs/user-manual/modules/ROOT/pages/routingSlip-eip.adoc
index 7d08e30..d6cb1ed 100644
--- a/docs/user-manual/modules/ROOT/pages/routingSlip-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/routingSlip-eip.adoc
@@ -1,6 +1,6 @@
[[routingSlip-eip]]
= Routing Slip EIP
-:page-source: core/camel-core/src/main/docs/eips/routingSlip-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/routingSlip-eip.adoc
The Routing Slip from the https://camel.apache.org/enterprise-integration-patterns.html[EIP patterns] allows you to route a message consecutively through a series of processing steps where the sequence of steps is not known at design time and can vary for each message.
image::eip/RoutingTableSimple.gif[image]
diff --git a/docs/user-manual/modules/ROOT/pages/saga-eip.adoc b/docs/user-manual/modules/ROOT/pages/saga-eip.adoc
index 6d19617..c351909 100644
--- a/docs/user-manual/modules/ROOT/pages/saga-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/saga-eip.adoc
@@ -1,6 +1,6 @@
[[saga-eip]]
= Saga EIP
-:page-source: core/camel-core/src/main/docs/eips/saga-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/saga-eip.adoc
*Available as of Camel 2.21*
diff --git a/docs/user-manual/modules/ROOT/pages/sample-eip.adoc b/docs/user-manual/modules/ROOT/pages/sample-eip.adoc
index 7f5f29f..d5f6d2c 100644
--- a/docs/user-manual/modules/ROOT/pages/sample-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/sample-eip.adoc
@@ -1,6 +1,6 @@
[[sample-eip]]
= Sample EIP
-:page-source: core/camel-core/src/main/docs/eips/sample-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/sample-eip.adoc
*Available as of Camel 2.1*
A sampling throttler allows you to extract a sample of the exchanges from the traffic through a route. +
diff --git a/docs/user-manual/modules/ROOT/pages/script-eip.adoc b/docs/user-manual/modules/ROOT/pages/script-eip.adoc
index 0c09702..a28712c 100644
--- a/docs/user-manual/modules/ROOT/pages/script-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/script-eip.adoc
@@ -1,6 +1,6 @@
[[script-eip]]
= Script EIP
-:page-source: core/camel-core/src/main/docs/eips/script-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/script-eip.adoc
*Available as of Camel 2.16*
Is used to execute a script which does not change the message (by default).
diff --git a/docs/user-manual/modules/ROOT/pages/serviceCall-eip.adoc b/docs/user-manual/modules/ROOT/pages/serviceCall-eip.adoc
index d6dc7fa..34c86a5 100644
--- a/docs/user-manual/modules/ROOT/pages/serviceCall-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/serviceCall-eip.adoc
@@ -1,6 +1,6 @@
[[serviceCall-eip]]
= Service Call EIP
-:page-source: core/camel-core/src/main/docs/eips/serviceCall-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/serviceCall-eip.adoc
*Available as of Camel 2.18*
The Service Call EIP allows to call remote services in a distributed system.
diff --git a/docs/user-manual/modules/ROOT/pages/setBody-eip.adoc b/docs/user-manual/modules/ROOT/pages/setBody-eip.adoc
index b4d6a04..12e789c 100644
--- a/docs/user-manual/modules/ROOT/pages/setBody-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/setBody-eip.adoc
@@ -1,6 +1,6 @@
[[setBody-eip]]
= Set Body EIP
-:page-source: core/camel-core/src/main/docs/eips/setBody-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/setBody-eip.adoc
The SetBody EIP allows you to set the body of your exchange.
diff --git a/docs/user-manual/modules/ROOT/pages/setHeader-eip.adoc b/docs/user-manual/modules/ROOT/pages/setHeader-eip.adoc
index c397876..fdee774 100644
--- a/docs/user-manual/modules/ROOT/pages/setHeader-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/setHeader-eip.adoc
@@ -1,6 +1,6 @@
[[setHeader-eip]]
= Set Header EIP
-:page-source: core/camel-core/src/main/docs/eips/setHeader-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/setHeader-eip.adoc
The SetHeader EIP allows you to set and header on your exchange.
diff --git a/docs/user-manual/modules/ROOT/pages/setOutHeader-eip.adoc b/docs/user-manual/modules/ROOT/pages/setOutHeader-eip.adoc
index abce93e..afb1ad9 100644
--- a/docs/user-manual/modules/ROOT/pages/setOutHeader-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/setOutHeader-eip.adoc
@@ -1,6 +1,6 @@
[[setOutHeader-eip]]
= Set Out Header EIP (deprecated)
-:page-source: core/camel-core/src/main/docs/eips/setOutHeader-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/setOutHeader-eip.adoc
== Set Header EIP
This EIP is deprecated.
diff --git a/docs/user-manual/modules/ROOT/pages/setProperty-eip.adoc b/docs/user-manual/modules/ROOT/pages/setProperty-eip.adoc
index 4f123f2..b71a9a1 100644
--- a/docs/user-manual/modules/ROOT/pages/setProperty-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/setProperty-eip.adoc
@@ -1,6 +1,6 @@
[[setProperty-eip]]
= Set Property EIP
-:page-source: core/camel-core/src/main/docs/eips/setProperty-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/setProperty-eip.adoc
The SetProperty EIP allows you to set a property on your exchange.
diff --git a/docs/user-manual/modules/ROOT/pages/sort-eip.adoc b/docs/user-manual/modules/ROOT/pages/sort-eip.adoc
index 7258822..660cc64 100644
--- a/docs/user-manual/modules/ROOT/pages/sort-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/sort-eip.adoc
@@ -1,6 +1,6 @@
[[sort-eip]]
= Sort EIP
-:page-source: core/camel-core/src/main/docs/eips/sort-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/sort-eip.adoc
Sort can be used to sort a message. Imagine you consume text files and before processing each file you want to be sure the content is sorted.
diff --git a/docs/user-manual/modules/ROOT/pages/split-eip.adoc b/docs/user-manual/modules/ROOT/pages/split-eip.adoc
index 9818c39..cb72e3b 100644
--- a/docs/user-manual/modules/ROOT/pages/split-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/split-eip.adoc
@@ -1,6 +1,6 @@
[[split-eip]]
= Split EIP
-:page-source: core/camel-core/src/main/docs/eips/split-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/split-eip.adoc
The http://www.enterpriseintegrationpatterns.com/patterns/messaging/Sequencer.html[Splitter] from the xref:enterprise-integration-patterns.adoc[EIP patterns] allows you split a message into a number of pieces and process them individually.
diff --git a/docs/user-manual/modules/ROOT/pages/step-eip.adoc b/docs/user-manual/modules/ROOT/pages/step-eip.adoc
index e823cfd..c056051 100644
--- a/docs/user-manual/modules/ROOT/pages/step-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/step-eip.adoc
@@ -1,6 +1,6 @@
[[step-eip]]
= Step EIP
-:page-source: core/camel-core/src/main/docs/eips/step-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/step-eip.adoc
Camel supports the http://www.enterpriseintegrationpatterns.com/PipesAndFilters.html[Pipes and Filters] from the xref:enterprise-integration-patterns.adoc[EIP patterns] in various ways.
diff --git a/docs/user-manual/modules/ROOT/pages/sticky-eip.adoc b/docs/user-manual/modules/ROOT/pages/sticky-eip.adoc
index 39347b6..802bca6 100644
--- a/docs/user-manual/modules/ROOT/pages/sticky-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/sticky-eip.adoc
@@ -1,6 +1,6 @@
[[sticky-eip]]
= Sticky EIP
-:page-source: core/camel-core/src/main/docs/eips/sticky-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/sticky-eip.adoc
Sticky Load Balancer. Sticky load balancing uses an Expression to calculate a correlation key to perform the sticky load balancing.
diff --git a/docs/user-manual/modules/ROOT/pages/stop-eip.adoc b/docs/user-manual/modules/ROOT/pages/stop-eip.adoc
index ebb5de8..b84253b 100644
--- a/docs/user-manual/modules/ROOT/pages/stop-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/stop-eip.adoc
@@ -1,6 +1,6 @@
[[stop-eip]]
= Stop EIP
-:page-source: core/camel-core/src/main/docs/eips/stop-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/stop-eip.adoc
The Stop EIP stops the processing of the current message
== Options
diff --git a/docs/user-manual/modules/ROOT/pages/stream-config-eip.adoc b/docs/user-manual/modules/ROOT/pages/stream-config-eip.adoc
index db64e55..d89f680 100644
--- a/docs/user-manual/modules/ROOT/pages/stream-config-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/stream-config-eip.adoc
@@ -1,6 +1,6 @@
[[stream-config-eip]]
= Stream-config EIP
-:page-source: core/camel-core/src/main/docs/eips/stream-config-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/stream-config-eip.adoc
Stream-processing resequence EIP
diff --git a/docs/user-manual/modules/ROOT/pages/threads-eip.adoc b/docs/user-manual/modules/ROOT/pages/threads-eip.adoc
index 24ab0c6..8111615 100644
--- a/docs/user-manual/modules/ROOT/pages/threads-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/threads-eip.adoc
@@ -1,6 +1,6 @@
[[threads-eip]]
= Threads EIP
-:page-source: core/camel-core/src/main/docs/eips/threads-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/threads-eip.adoc
The Threads Pattern allows you to introduce a thread pool into a route.
== Options
diff --git a/docs/user-manual/modules/ROOT/pages/throttle-eip.adoc b/docs/user-manual/modules/ROOT/pages/throttle-eip.adoc
index 251b37c..f2c8198 100644
--- a/docs/user-manual/modules/ROOT/pages/throttle-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/throttle-eip.adoc
@@ -1,6 +1,6 @@
[[throttle-eip]]
= Throttle EIP
-:page-source: core/camel-core/src/main/docs/eips/throttle-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/throttle-eip.adoc
The Throttler Pattern allows you to ensure that a specific endpoint does not get overloaded, or that we don't exceed an agreed SLA with some external service.
diff --git a/docs/user-manual/modules/ROOT/pages/to-eip.adoc b/docs/user-manual/modules/ROOT/pages/to-eip.adoc
index d4bd761..1cd0da7 100644
--- a/docs/user-manual/modules/ROOT/pages/to-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/to-eip.adoc
@@ -1,6 +1,6 @@
[[to-eip]]
= To EIP
-:page-source: core/camel-core/src/main/docs/eips/to-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/to-eip.adoc
See message related documentation
diff --git a/docs/user-manual/modules/ROOT/pages/toD-eip.adoc b/docs/user-manual/modules/ROOT/pages/toD-eip.adoc
index 7182644..583ec82 100644
--- a/docs/user-manual/modules/ROOT/pages/toD-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/toD-eip.adoc
@@ -1,6 +1,6 @@
[[toD-eip]]
= To D EIP
-:page-source: core/camel-core/src/main/docs/eips/toD-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/toD-eip.adoc
There is a new `.toD` / `<toD>` that allows to send a message to a dynamic
computed xref:endpoint.adoc[Endpoint] using one or
diff --git a/docs/user-manual/modules/ROOT/pages/topic-eip.adoc b/docs/user-manual/modules/ROOT/pages/topic-eip.adoc
index e7624fb..5234588 100644
--- a/docs/user-manual/modules/ROOT/pages/topic-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/topic-eip.adoc
@@ -1,6 +1,6 @@
[[topic-eip]]
= Topic EIP
-:page-source: core/camel-core/src/main/docs/eips/topic-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/topic-eip.adoc
Topic Load Balancer, with this policy you'll get a Topic behavior by sending to all destinations.
diff --git a/docs/user-manual/modules/ROOT/pages/transform-eip.adoc b/docs/user-manual/modules/ROOT/pages/transform-eip.adoc
index 3e7ba8c..b0dd75f 100644
--- a/docs/user-manual/modules/ROOT/pages/transform-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/transform-eip.adoc
@@ -1,6 +1,6 @@
[[transform-eip]]
= Transform EIP
-:page-source: core/camel-core/src/main/docs/eips/transform-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/transform-eip.adoc
See below for details
diff --git a/docs/user-manual/modules/ROOT/pages/unmarshal-eip.adoc b/docs/user-manual/modules/ROOT/pages/unmarshal-eip.adoc
index 8204421..038b0a3 100644
--- a/docs/user-manual/modules/ROOT/pages/unmarshal-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/unmarshal-eip.adoc
@@ -1,6 +1,6 @@
[[unmarshal-eip]]
= Unmarshal EIP
-:page-source: core/camel-core/src/main/docs/eips/unmarshal-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/unmarshal-eip.adoc
If you receive a message from one of the Camel xref:components::index.adoc[Components] such as xref:components::file-component.adoc[File], xref:components::http-component.adoc[HTTP] or xref:components::jms-component.adoc[JMS] you often want to unmarshal the payload into some bean so that you can process it using some xref:bean-integration.adoc[Bean Integration] or perform xref:predicate.adoc[Predicate] evaluation and so forth. To do this use the *unmarshal* word in the xref:dsl.adoc[DSL] [...]
diff --git a/docs/user-manual/modules/ROOT/pages/validate-eip.adoc b/docs/user-manual/modules/ROOT/pages/validate-eip.adoc
index 2b61335..8ca6e55 100644
--- a/docs/user-manual/modules/ROOT/pages/validate-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/validate-eip.adoc
@@ -1,6 +1,6 @@
[[validate-eip]]
= Validate EIP
-:page-source: core/camel-core/src/main/docs/eips/validate-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/validate-eip.adoc
*Available as of Camel 2.3* +
Validate uses an expression or predicates to validate the contents of a message.
diff --git a/docs/user-manual/modules/ROOT/pages/weighted-eip.adoc b/docs/user-manual/modules/ROOT/pages/weighted-eip.adoc
index 5177078..3fe0610 100644
--- a/docs/user-manual/modules/ROOT/pages/weighted-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/weighted-eip.adoc
@@ -1,6 +1,6 @@
[[weighted-eip]]
= Weighted EIP
-:page-source: core/camel-core/src/main/docs/eips/weighted-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/weighted-eip.adoc
Weighted Load Balancer, with this policy in case of failures the exchange will be tried on the next endpoint.
diff --git a/docs/user-manual/modules/ROOT/pages/when-eip.adoc b/docs/user-manual/modules/ROOT/pages/when-eip.adoc
index f76144d..646f63a 100644
--- a/docs/user-manual/modules/ROOT/pages/when-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/when-eip.adoc
@@ -1,6 +1,6 @@
[[when-eip]]
= When EIP
-:page-source: core/camel-core/src/main/docs/eips/when-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/when-eip.adoc
The When EIP is related to http://www.enterpriseintegrationpatterns.com/ContentBasedRouter.html[Content
Based Router] from the xref:enterprise-integration-patterns.adoc[EIP
diff --git a/docs/user-manual/modules/ROOT/pages/wireTap-eip.adoc b/docs/user-manual/modules/ROOT/pages/wireTap-eip.adoc
index f545234..6bbfc8c 100644
--- a/docs/user-manual/modules/ROOT/pages/wireTap-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/wireTap-eip.adoc
@@ -1,6 +1,6 @@
[[wireTap-eip]]
= Wire Tap EIP
-:page-source: core/camel-core/src/main/docs/eips/wireTap-eip.adoc
+:page-source: core/camel-core-engine/src/main/docs/eips/wireTap-eip.adoc
http://www.enterpriseintegrationpatterns.com/WireTap.html[Wire Tap]
(from the xref:enterprise-integration-patterns.adoc[EIP patterns])
[camel] 05/08: CAMEL-13949: Better splitup between camel-core and
camel-core-engine.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch CAMEL-13949
in repository https://gitbox.apache.org/repos/asf/camel.git
commit dd059e12c06567518a634dd1b5381c9a3f5a183d
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Sep 25 07:03:20 2019 +0200
CAMEL-13949: Better splitup between camel-core and camel-core-engine.
---
.../camel/component/xslt/XsltIncludeClasspathDotInDirectoryTest.java | 2 ++
1 file changed, 2 insertions(+)
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/xslt/XsltIncludeClasspathDotInDirectoryTest.java b/core/camel-core/src/test/java/org/apache/camel/component/xslt/XsltIncludeClasspathDotInDirectoryTest.java
index 278ade2..6d99e8d 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/xslt/XsltIncludeClasspathDotInDirectoryTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/xslt/XsltIncludeClasspathDotInDirectoryTest.java
@@ -24,11 +24,13 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.util.FileUtil;
import org.junit.After;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
/**
*
*/
+@Ignore
public class XsltIncludeClasspathDotInDirectoryTest extends ContextTestSupport {
@Override
[camel] 06/08: CAMEL-13949: Better splitup between camel-core and
camel-core-engine.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch CAMEL-13949
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 997f0dcd30c2bf0741c9b46e469f5168b4db65b5
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Sep 25 07:20:00 2019 +0200
CAMEL-13949: Better splitup between camel-core and camel-core-engine.
---
components/camel-spring/pom.xml | 7 +-
.../camel/spring/SpringMDCWithBreadcrumbTest.xml | 2 +-
.../impl/cloud/ServiceCallConfigurationTest.java | 1 -
.../apache/camel/builder/AdviceWithBuilder.java | 0
.../camel/builder/AdviceWithRouteBuilder.java | 0
.../org/apache/camel/builder/AdviceWithTask.java | 0
.../org/apache/camel/builder/AdviceWithTasks.java | 0
.../camel/builder/AggregationStrategies.java | 0
.../camel/builder/AggregationStrategyClause.java | 0
.../org/apache/camel/builder/Builder.java | 0
.../org/apache/camel/builder/BuilderSupport.java | 0
.../org/apache/camel/builder/DataFormatClause.java | 0
.../camel/builder/DeadLetterChannelBuilder.java | 0
.../camel/builder/DefaultErrorHandlerBuilder.java | 0
.../camel/builder/EndpointConsumerBuilder.java | 0
.../camel/builder/EndpointProducerBuilder.java | 0
.../org/apache/camel/builder/EnrichClause.java | 0
.../apache/camel/builder/ErrorHandlerBuilder.java | 0
.../camel/builder/ErrorHandlerBuilderRef.java | 0
.../camel/builder/ErrorHandlerBuilderSupport.java | 0
.../org/apache/camel/builder/ExchangeBuilder.java | 0
.../apache/camel/builder/ExpressionBuilder.java | 0
.../org/apache/camel/builder/ExpressionClause.java | 0
.../camel/builder/ExpressionClauseSupport.java | 0
.../camel/builder/FlexibleAggregationStrategy.java | 0
.../camel/builder/NoErrorHandlerBuilder.java | 0
.../org/apache/camel/builder/NotifyBuilder.java | 0
.../org/apache/camel/builder/PredicateBuilder.java | 0
.../org/apache/camel/builder/PredicateClause.java | 0
.../org/apache/camel/builder/ProcessClause.java | 0
.../org/apache/camel/builder/ProxyBuilder.java | 0
.../org/apache/camel/builder/RouteBuilder.java | 0
.../org/apache/camel/builder/SimpleBuilder.java | 0
.../apache/camel/builder/ThreadPoolBuilder.java | 0
.../camel/builder/ThreadPoolProfileBuilder.java | 0
.../apache/camel/builder/TransformerBuilder.java | 0
.../org/apache/camel/builder/ValidatorBuilder.java | 0
.../org/apache/camel/builder/ValueBuilder.java | 0
.../org/apache/camel/builder/package.html | 0
.../camel/impl/AbstractModelCamelContext.java | 0
.../org/apache/camel/impl/DefaultCamelContext.java | 0
.../camel/impl/DefaultExecutorServiceManager.java | 0
.../org/apache/camel/impl/DefaultModel.java | 0
.../camel/impl/DefaultModelJAXBContextFactory.java | 0
.../org/apache/camel/impl/JndiRegistry.java | 0
.../org/apache/camel/impl/RouteIdFactory.java | 0
.../org/apache/camel/impl/RouteService.java | 0
.../impl/cluster/ClusteredRouteConfiguration.java | 0
.../impl/cluster/ClusteredRouteController.java | 0
.../camel/impl/cluster/ClusteredRouteFilter.java | 0
.../camel/impl/cluster/ClusteredRouteFilters.java | 0
.../camel/impl/cluster/ClusteredRoutePolicy.java | 0
.../impl/cluster/ClusteredRoutePolicyFactory.java | 0
.../org/apache/camel/impl/cluster/package.html | 0
.../{java => }/org/apache/camel/impl/package.html | 0
.../apache/camel/model/AdviceWithDefinition.java | 0
.../apache/camel/model/AggregateDefinition.java | 0
.../org/apache/camel/model/BeanDefinition.java | 0
.../{java => }/org/apache/camel/model/Block.java | 0
.../org/apache/camel/model/CatchDefinition.java | 0
.../org/apache/camel/model/ChoiceDefinition.java | 0
.../apache/camel/model/ClaimCheckDefinition.java | 0
.../apache/camel/model/ClaimCheckOperation.java | 0
.../org/apache/camel/model/Constants.java | 0
.../apache/camel/model/ContextScanDefinition.java | 0
.../apache/camel/model/ConvertBodyDefinition.java | 0
.../apache/camel/model/DataFormatDefinition.java | 0
.../DefinitionPropertyPlaceholderConfigurer.java | 0
.../org/apache/camel/model/DelayDefinition.java | 0
.../apache/camel/model/DescriptionDefinition.java | 0
.../camel/model/DynamicRouterDefinition.java | 0
.../camel/model/EndpointRequiredDefinition.java | 0
.../org/apache/camel/model/EnrichDefinition.java | 0
.../model/ExecutorServiceAwareDefinition.java | 0
.../org/apache/camel/model/ExpressionNode.java | 0
.../apache/camel/model/ExpressionNodeHelper.java | 0
.../model/ExpressionSubElementDefinition.java | 0
.../org/apache/camel/model/FilterDefinition.java | 0
.../org/apache/camel/model/FinallyDefinition.java | 0
.../org/apache/camel/model/FromDefinition.java | 0
.../apache/camel/model/GlobalOptionDefinition.java | 0
.../camel/model/GlobalOptionsDefinition.java | 0
.../camel/model/HystrixConfigurationCommon.java | 0
.../model/HystrixConfigurationDefinition.java | 0
.../org/apache/camel/model/HystrixDefinition.java | 0
.../camel/model/IdempotentConsumerDefinition.java | 0
.../org/apache/camel/model/IdentifiedType.java | 0
.../org/apache/camel/model/InOnlyDefinition.java | 0
.../org/apache/camel/model/InOutDefinition.java | 0
.../apache/camel/model/InputTypeDefinition.java | 0
.../apache/camel/model/InterceptDefinition.java | 0
.../camel/model/InterceptFromDefinition.java | 0
.../model/InterceptSendToEndpointDefinition.java | 0
.../apache/camel/model/LoadBalanceDefinition.java | 0
.../apache/camel/model/LoadBalancerDefinition.java | 0
.../org/apache/camel/model/LogDefinition.java | 0
.../org/apache/camel/model/LoopDefinition.java | 0
.../org/apache/camel/model/MarshalDefinition.java | 0
.../{java => }/org/apache/camel/model/Model.java | 0
.../org/apache/camel/model/ModelCamelContext.java | 0
.../org/apache/camel/model/ModelHelper.java | 0
.../apache/camel/model/MulticastDefinition.java | 0
.../org/apache/camel/model/NoOutputDefinition.java | 0
.../apache/camel/model/OnCompletionDefinition.java | 0
.../org/apache/camel/model/OnCompletionMode.java | 0
.../apache/camel/model/OnExceptionDefinition.java | 0
.../apache/camel/model/OnFallbackDefinition.java | 0
.../model/OptimisticLockRetryPolicyDefinition.java | 0
.../camel/model/OptionalIdentifiedDefinition.java | 0
.../apache/camel/model/OtherAttributesAware.java | 0
.../apache/camel/model/OtherwiseDefinition.java | 0
.../org/apache/camel/model/OutputDefinition.java | 0
.../apache/camel/model/OutputExpressionNode.java | 0
.../org/apache/camel/model/OutputNode.java | 0
.../apache/camel/model/OutputTypeDefinition.java | 0
.../apache/camel/model/PackageScanDefinition.java | 0
.../org/apache/camel/model/PipelineDefinition.java | 0
.../org/apache/camel/model/PolicyDefinition.java | 0
.../apache/camel/model/PollEnrichDefinition.java | 0
.../org/apache/camel/model/ProcessDefinition.java | 0
.../apache/camel/model/ProcessorDefinition.java | 0
.../camel/model/ProcessorDefinitionHelper.java | 0
.../org/apache/camel/model/PropertyDefinition.java | 0
.../apache/camel/model/PropertyDefinitions.java | 0
.../camel/model/PropertyDescriptionsAdapter.java | 0
.../camel/model/RecipientListDefinition.java | 0
.../camel/model/RedeliveryPolicyDefinition.java | 0
.../apache/camel/model/RemoveHeaderDefinition.java | 0
.../camel/model/RemoveHeadersDefinition.java | 0
.../camel/model/RemovePropertiesDefinition.java | 0
.../camel/model/RemovePropertyDefinition.java | 0
.../apache/camel/model/ResequenceDefinition.java | 0
.../camel/model/RestContextRefDefinition.java | 0
.../model/RestContextRefDefinitionHelper.java | 0
.../org/apache/camel/model/RollbackDefinition.java | 0
.../apache/camel/model/RouteBuilderDefinition.java | 0
.../org/apache/camel/model/RouteContainer.java | 0
.../camel/model/RouteContextRefDefinition.java | 0
.../model/RouteContextRefDefinitionHelper.java | 0
.../org/apache/camel/model/RouteDefinition.java | 0
.../apache/camel/model/RouteDefinitionHelper.java | 0
.../org/apache/camel/model/RouteFilters.java | 0
.../org/apache/camel/model/RoutesDefinition.java | 0
.../apache/camel/model/RoutingSlipDefinition.java | 0
.../camel/model/SagaActionUriDefinition.java | 0
.../org/apache/camel/model/SagaCompletionMode.java | 0
.../org/apache/camel/model/SagaDefinition.java | 0
.../apache/camel/model/SagaOptionDefinition.java | 0
.../org/apache/camel/model/SagaPropagation.java | 0
.../org/apache/camel/model/SamplingDefinition.java | 0
.../org/apache/camel/model/ScriptDefinition.java | 0
.../org/apache/camel/model/SendDefinition.java | 0
.../org/apache/camel/model/SetBodyDefinition.java | 0
.../camel/model/SetExchangePatternDefinition.java | 0
.../apache/camel/model/SetHeaderDefinition.java | 0
.../apache/camel/model/SetPropertyDefinition.java | 0
.../org/apache/camel/model/SortDefinition.java | 0
.../org/apache/camel/model/SplitDefinition.java | 0
.../org/apache/camel/model/StepDefinition.java | 0
.../org/apache/camel/model/StopDefinition.java | 0
.../camel/model/ThreadPoolProfileDefinition.java | 0
.../org/apache/camel/model/ThreadsDefinition.java | 0
.../org/apache/camel/model/ThrottleDefinition.java | 0
.../camel/model/ThrowExceptionDefinition.java | 0
.../org/apache/camel/model/TimeUnitAdapter.java | 0
.../org/apache/camel/model/ToDefinition.java | 0
.../apache/camel/model/ToDynamicDefinition.java | 0
.../apache/camel/model/TransactedDefinition.java | 0
.../apache/camel/model/TransformDefinition.java | 0
.../org/apache/camel/model/TryDefinition.java | 0
.../apache/camel/model/UnmarshalDefinition.java | 0
.../org/apache/camel/model/ValidateDefinition.java | 0
.../org/apache/camel/model/WhenDefinition.java | 0
.../model/WhenSkipSendToEndpointDefinition.java | 0
.../org/apache/camel/model/WireTapDefinition.java | 0
...klistServiceCallServiceFilterConfiguration.java | 0
...ngServiceCallServiceDiscoveryConfiguration.java | 0
...edServiceCallServiceDiscoveryConfiguration.java | 0
...binedServiceCallServiceFilterConfiguration.java | 0
...ulServiceCallServiceDiscoveryConfiguration.java | 0
...ustomServiceCallServiceFilterConfiguration.java | 0
...erviceCallServiceLoadBalancerConfiguration.java | 0
...nsServiceCallServiceDiscoveryConfiguration.java | 0
...cdServiceCallServiceDiscoveryConfiguration.java | 0
...althyServiceCallServiceFilterConfiguration.java | 0
...esServiceCallServiceDiscoveryConfiguration.java | 0
...roughServiceCallServiceFilterConfiguration.java | 0
...erviceCallServiceLoadBalancerConfiguration.java | 0
.../cloud/ServiceCallConfigurationDefinition.java | 0
.../camel/model/cloud/ServiceCallDefinition.java | 0
.../cloud/ServiceCallDefinitionConstants.java | 0
.../cloud/ServiceCallExpressionConfiguration.java | 0
.../ServiceCallServiceChooserConfiguration.java | 0
.../ServiceCallServiceDiscoveryConfiguration.java | 0
.../ServiceCallServiceFilterConfiguration.java | 0
...erviceCallServiceLoadBalancerConfiguration.java | 0
...icServiceCallServiceDiscoveryConfiguration.java | 0
...erServiceCallServiceDiscoveryConfiguration.java | 0
.../org/apache/camel/model/cloud/package-info.java | 0
.../camel/model/config/BatchResequencerConfig.java | 0
.../camel/model/config/ResequencerConfig.java | 0
.../model/config/StreamResequencerConfig.java | 0
.../apache/camel/model/config/package-info.java | 0
.../camel/model/dataformat/ASN1DataFormat.java | 0
.../camel/model/dataformat/Any23DataFormat.java | 0
.../apache/camel/model/dataformat/Any23Type.java | 0
.../camel/model/dataformat/AvroDataFormat.java | 0
.../camel/model/dataformat/BarcodeDataFormat.java | 0
.../camel/model/dataformat/Base64DataFormat.java | 0
.../camel/model/dataformat/BeanioDataFormat.java | 0
.../camel/model/dataformat/BindyDataFormat.java | 0
.../apache/camel/model/dataformat/BindyType.java | 0
.../camel/model/dataformat/CBORDataFormat.java | 0
.../camel/model/dataformat/CryptoDataFormat.java | 0
.../camel/model/dataformat/CsvDataFormat.java | 886 ++++++++++-----------
.../camel/model/dataformat/CustomDataFormat.java | 0
.../model/dataformat/DataFormatsDefinition.java | 0
.../camel/model/dataformat/FhirDataformat.java | 0
.../camel/model/dataformat/FhirJsonDataFormat.java | 0
.../camel/model/dataformat/FhirXmlDataFormat.java | 0
.../camel/model/dataformat/FlatpackDataFormat.java | 0
.../camel/model/dataformat/GrokDataFormat.java | 0
.../camel/model/dataformat/GzipDataFormat.java | 0
.../camel/model/dataformat/HL7DataFormat.java | 0
.../camel/model/dataformat/IcalDataFormat.java | 0
.../model/dataformat/JacksonXMLDataFormat.java | 0
.../camel/model/dataformat/JaxbDataFormat.java | 0
.../camel/model/dataformat/JsonApiDataFormat.java | 0
.../camel/model/dataformat/JsonDataFormat.java | 0
.../apache/camel/model/dataformat/JsonLibrary.java | 0
.../camel/model/dataformat/LZFDataFormat.java | 0
.../model/dataformat/MimeMultipartDataFormat.java | 0
.../camel/model/dataformat/PGPDataFormat.java | 0
.../camel/model/dataformat/ProtobufDataFormat.java | 0
.../camel/model/dataformat/RssDataFormat.java | 0
.../camel/model/dataformat/SoapJaxbDataFormat.java | 0
.../camel/model/dataformat/SyslogDataFormat.java | 0
.../camel/model/dataformat/TarFileDataFormat.java | 0
.../camel/model/dataformat/ThriftDataFormat.java | 0
.../model/dataformat/TidyMarkupDataFormat.java | 0
.../dataformat/UniVocityAbstractDataFormat.java | 522 ++++++------
.../model/dataformat/UniVocityCsvDataFormat.java | 188 ++---
.../dataformat/UniVocityFixedWidthDataFormat.java | 168 ++--
.../camel/model/dataformat/UniVocityHeader.java | 120 +--
.../model/dataformat/UniVocityTsvDataFormat.java | 106 +--
.../model/dataformat/XMLSecurityDataFormat.java | 0
.../camel/model/dataformat/XStreamDataFormat.java | 0
.../camel/model/dataformat/XmlRpcDataFormat.java | 0
.../camel/model/dataformat/YAMLDataFormat.java | 0
.../apache/camel/model/dataformat/YAMLLibrary.java | 0
.../model/dataformat/YAMLTypeFilterDefinition.java | 0
.../camel/model/dataformat/YAMLTypeFilterType.java | 0
.../model/dataformat/ZipDeflaterDataFormat.java | 0
.../camel/model/dataformat/ZipFileDataFormat.java | 0
.../camel/model/dataformat/package-info.java | 0
.../camel/model/language/ConstantExpression.java | 0
.../model/language/ExchangePropertyExpression.java | 0
.../camel/model/language/ExpressionDefinition.java | 0
.../camel/model/language/GroovyExpression.java | 0
.../camel/model/language/HeaderExpression.java | 0
.../camel/model/language/Hl7TerserExpression.java | 0
.../camel/model/language/JsonPathExpression.java | 0
.../camel/model/language/LanguageExpression.java | 0
.../camel/model/language/MethodCallExpression.java | 0
.../camel/model/language/MvelExpression.java | 0
.../model/language/NamespaceAwareExpression.java | 0
.../camel/model/language/OgnlExpression.java | 0
.../apache/camel/model/language/RefExpression.java | 0
.../camel/model/language/SimpleExpression.java | 0
.../camel/model/language/SpELExpression.java | 0
.../camel/model/language/TokenizerExpression.java | 0
.../model/language/XMLTokenizerExpression.java | 0
.../camel/model/language/XPathExpression.java | 0
.../camel/model/language/XQueryExpression.java | 0
.../apache/camel/model/language/package-info.java | 0
.../loadbalancer/CustomLoadBalancerDefinition.java | 0
.../FailoverLoadBalancerDefinition.java | 0
.../loadbalancer/RandomLoadBalancerDefinition.java | 0
.../RoundRobinLoadBalancerDefinition.java | 0
.../loadbalancer/StickyLoadBalancerDefinition.java | 0
.../loadbalancer/TopicLoadBalancerDefinition.java | 0
.../WeightedLoadBalancerDefinition.java | 0
.../camel/model/loadbalancer/package-info.java | 0
.../org/apache/camel/model/package-info.java | 0
.../apache/camel/model/rest/CollectionFormat.java | 0
.../camel/model/rest/DeleteVerbDefinition.java | 0
.../apache/camel/model/rest/GetVerbDefinition.java | 0
.../camel/model/rest/HeadVerbDefinition.java | 0
.../camel/model/rest/PatchVerbDefinition.java | 0
.../camel/model/rest/PostVerbDefinition.java | 0
.../apache/camel/model/rest/PutVerbDefinition.java | 0
.../camel/model/rest/RestBindingDefinition.java | 0
.../apache/camel/model/rest/RestBindingMode.java | 0
.../model/rest/RestConfigurationDefinition.java | 0
.../org/apache/camel/model/rest/RestConstants.java | 0
.../org/apache/camel/model/rest/RestContainer.java | 0
.../apache/camel/model/rest/RestDefinition.java | 0
.../camel/model/rest/RestHostNameResolver.java | 0
.../model/rest/RestOperationParamDefinition.java | 0
.../RestOperationResponseHeaderDefinition.java | 0
.../rest/RestOperationResponseMsgDefinition.java | 0
.../org/apache/camel/model/rest/RestParamType.java | 0
.../camel/model/rest/RestPropertyDefinition.java | 0
.../camel/model/rest/RestSecuritiesDefinition.java | 0
.../camel/model/rest/RestSecurityApiKey.java | 0
.../camel/model/rest/RestSecurityBasicAuth.java | 0
.../camel/model/rest/RestSecurityDefinition.java | 0
.../camel/model/rest/RestSecurityOAuth2.java | 0
.../apache/camel/model/rest/RestsDefinition.java | 0
.../camel/model/rest/SecurityDefinition.java | 0
.../apache/camel/model/rest/VerbDefinition.java | 0
.../org/apache/camel/model/rest/package-info.java | 0
.../transformer/CustomTransformerDefinition.java | 0
.../DataFormatTransformerDefinition.java | 0
.../transformer/EndpointTransformerDefinition.java | 0
.../model/transformer/TransformerDefinition.java | 0
.../model/transformer/TransformersDefinition.java | 0
.../camel/model/transformer/package-info.java | 0
.../model/validator/CustomValidatorDefinition.java | 0
.../validator/EndpointValidatorDefinition.java | 0
.../validator/PredicateValidatorDefinition.java | 0
.../camel/model/validator/ValidatorDefinition.java | 0
.../model/validator/ValidatorsDefinition.java | 0
.../apache/camel/model/validator/package-info.java | 0
.../org/apache/camel/reifier/AggregateReifier.java | 0
.../org/apache/camel/reifier/BeanReifier.java | 0
.../org/apache/camel/reifier/CatchReifier.java | 0
.../org/apache/camel/reifier/ChoiceReifier.java | 0
.../apache/camel/reifier/ClaimCheckReifier.java | 0
.../apache/camel/reifier/ConvertBodyReifier.java | 0
.../org/apache/camel/reifier/DelayReifier.java | 0
.../apache/camel/reifier/DynamicRouterReifier.java | 0
.../org/apache/camel/reifier/EnrichReifier.java | 0
.../apache/camel/reifier/ExpressionReifier.java | 0
.../org/apache/camel/reifier/FilterReifier.java | 0
.../org/apache/camel/reifier/FinallyReifier.java | 0
.../org/apache/camel/reifier/HystrixReifier.java | 0
.../camel/reifier/IdempotentConsumerReifier.java | 0
.../apache/camel/reifier/InterceptFromReifier.java | 0
.../org/apache/camel/reifier/InterceptReifier.java | 0
.../reifier/InterceptSendToEndpointReifier.java | 0
.../apache/camel/reifier/LoadBalanceReifier.java | 0
.../org/apache/camel/reifier/LogReifier.java | 0
.../org/apache/camel/reifier/LoopReifier.java | 0
.../org/apache/camel/reifier/MarshalReifier.java | 0
.../org/apache/camel/reifier/MulticastReifier.java | 0
.../apache/camel/reifier/OnCompletionReifier.java | 0
.../apache/camel/reifier/OnExceptionReifier.java | 0
.../apache/camel/reifier/OnFallbackReifier.java | 0
.../org/apache/camel/reifier/OtherwiseReifier.java | 0
.../org/apache/camel/reifier/PipelineReifier.java | 0
.../org/apache/camel/reifier/PolicyReifier.java | 0
.../apache/camel/reifier/PollEnrichReifier.java | 0
.../org/apache/camel/reifier/ProcessReifier.java | 0
.../org/apache/camel/reifier/ProcessorReifier.java | 0
.../apache/camel/reifier/RecipientListReifier.java | 0
.../apache/camel/reifier/RemoveHeaderReifier.java | 0
.../apache/camel/reifier/RemoveHeadersReifier.java | 0
.../camel/reifier/RemovePropertiesReifier.java | 0
.../camel/reifier/RemovePropertyReifier.java | 0
.../apache/camel/reifier/ResequenceReifier.java | 0
.../org/apache/camel/reifier/RollbackReifier.java | 0
.../org/apache/camel/reifier/RouteReifier.java | 0
.../apache/camel/reifier/RoutingSlipReifier.java | 0
.../org/apache/camel/reifier/SagaReifier.java | 0
.../org/apache/camel/reifier/SamplingReifier.java | 0
.../org/apache/camel/reifier/ScriptReifier.java | 0
.../org/apache/camel/reifier/SendReifier.java | 0
.../apache/camel/reifier/ServiceCallReifier.java | 0
.../org/apache/camel/reifier/SetBodyReifier.java | 0
.../camel/reifier/SetExchangePatternReifier.java | 0
.../org/apache/camel/reifier/SetHeaderReifier.java | 0
.../apache/camel/reifier/SetPropertyReifier.java | 0
.../org/apache/camel/reifier/SortReifier.java | 0
.../org/apache/camel/reifier/SplitReifier.java | 0
.../org/apache/camel/reifier/StepReifier.java | 0
.../org/apache/camel/reifier/StopReifier.java | 0
.../org/apache/camel/reifier/ThreadsReifier.java | 0
.../org/apache/camel/reifier/ThrottleReifier.java | 0
.../camel/reifier/ThrowExceptionReifier.java | 0
.../org/apache/camel/reifier/ToDynamicReifier.java | 0
.../apache/camel/reifier/TransactedReifier.java | 0
.../org/apache/camel/reifier/TransformReifier.java | 0
.../org/apache/camel/reifier/TryReifier.java | 0
.../org/apache/camel/reifier/UnmarshalReifier.java | 0
.../org/apache/camel/reifier/ValidateReifier.java | 0
.../org/apache/camel/reifier/WhenReifier.java | 0
.../reifier/WhenSkipSendToEndpointReifier.java | 0
.../org/apache/camel/reifier/WireTapReifier.java | 0
.../reifier/dataformat/ASN1DataFormatReifier.java | 0
.../reifier/dataformat/Any23DataFormatReifier.java | 0
.../reifier/dataformat/AvroDataFormatReifier.java | 0
.../dataformat/BarcodeDataFormatReifier.java | 0
.../dataformat/Base64DataFormatReifier.java | 0
.../dataformat/BeanioDataFormatReifier.java | 0
.../reifier/dataformat/BindyDataFormatReifier.java | 0
.../reifier/dataformat/CBORDataFormatReifier.java | 0
.../dataformat/CryptoDataFormatReifier.java | 0
.../reifier/dataformat/CsvDataFormatReifier.java | 0
.../dataformat/CustomDataFormatReifier.java | 0
.../reifier/dataformat/DataFormatReifier.java | 0
.../reifier/dataformat/FhirDataFormatReifier.java | 0
.../dataformat/FhirJsonDataFormatReifier.java | 0
.../dataformat/FhirXmlDataFormatReifier.java | 0
.../dataformat/FlatpackDataFormatReifier.java | 0
.../reifier/dataformat/GrokDataFormatReifier.java | 78 +-
.../reifier/dataformat/GzipDataFormatReifier.java | 0
.../reifier/dataformat/HL7DataFormatReifier.java | 0
.../reifier/dataformat/IcalDataFormatReifier.java | 0
.../dataformat/JacksonXMLDataFormatReifier.java | 0
.../reifier/dataformat/JaxbDataFormatReifier.java | 0
.../dataformat/JsonApiDataFormatReifier.java | 0
.../reifier/dataformat/JsonDataFormatReifier.java | 0
.../reifier/dataformat/LZFDataFormatReifier.java | 0
.../dataformat/MimeMultipartDataFormatReifier.java | 0
.../reifier/dataformat/PGPDataFormatReifier.java | 0
.../dataformat/ProtobufDataFormatReifier.java | 0
.../reifier/dataformat/RssDataFormatReifier.java | 0
.../dataformat/SoapJaxbDataFormatReifier.java | 0
.../dataformat/SyslogDataFormatReifier.java | 0
.../dataformat/TarFileDataFormatReifier.java | 0
.../dataformat/ThriftDataFormatReifier.java | 0
.../dataformat/TidyMarkupDataFormatReifier.java | 0
.../UniVocityAbstractDataFormatReifier.java | 0
.../dataformat/UniVocityCsvDataFormatReifier.java | 0
.../UniVocityFixedWidthDataFormatReifier.java | 0
.../dataformat/UniVocityTsvDataFormatReifier.java | 0
.../dataformat/XMLSecurityDataFormatReifier.java | 0
.../dataformat/XStreamDataFormatReifier.java | 0
.../dataformat/XmlRpcDataFormatReifier.java | 0
.../reifier/dataformat/YAMLDataFormatReifier.java | 0
.../reifier/dataformat/ZipDataFormatReifier.java | 0
.../dataformat/ZipFileDataFormatReifier.java | 0
.../errorhandler/DeadLetterChannelReifier.java | 0
.../errorhandler/DefaultErrorHandlerReifier.java | 0
.../errorhandler/ErrorHandlerRefReifier.java | 0
.../reifier/errorhandler/ErrorHandlerReifier.java | 0
.../errorhandler/NoErrorHandlerReifier.java | 0
.../loadbalancer/CustomLoadBalancerReifier.java | 0
.../loadbalancer/FailoverLoadBalancerReifier.java | 0
.../reifier/loadbalancer/LoadBalancerReifier.java | 0
.../loadbalancer/RandomLoadBalancerReifier.java | 0
.../RoundRobinLoadBalancerReifier.java | 0
.../loadbalancer/StickyLoadBalancerReifier.java | 0
.../loadbalancer/TopicLoadBalancerReifier.java | 0
.../loadbalancer/WeightedLoadBalancerReifier.java | 0
.../camel/reifier/rest/RestBindingReifier.java | 0
.../transformer/CustomTransformeReifier.java | 0
.../transformer/DataFormatTransformeReifier.java | 0
.../transformer/EndpointTransformeReifier.java | 0
.../reifier/transformer/TransformerReifier.java | 0
.../reifier/validator/CustomValidatorReifier.java | 0
.../validator/EndpointValidatorReifier.java | 0
.../validator/PredicateValidatorReifier.java | 0
.../camel/reifier/validator/ValidatorReifier.java | 0
.../endpoint/dsl/AhcEndpointBuilderFactory.java | 2 +-
.../endpoint/dsl/AtomEndpointBuilderFactory.java | 1 -
.../dsl/AtomixMultiMapEndpointBuilderFactory.java | 1 -
.../endpoint/dsl/BeanEndpointBuilderFactory.java | 2 +-
.../dsl/BeanValidatorEndpointBuilderFactory.java | 2 +-
.../endpoint/dsl/BonitaEndpointBuilderFactory.java | 1 -
.../endpoint/dsl/CMEndpointBuilderFactory.java | 2 +-
.../dsl/ChatScriptEndpointBuilderFactory.java | 2 +-
.../endpoint/dsl/ChunkEndpointBuilderFactory.java | 2 +-
.../endpoint/dsl/CinderEndpointBuilderFactory.java | 2 +-
.../endpoint/dsl/ClassEndpointBuilderFactory.java | 2 +-
.../dsl/ControlBusEndpointBuilderFactory.java | 1 -
.../dsl/CryptoCmsEndpointBuilderFactory.java | 2 +-
.../endpoint/dsl/CwEndpointBuilderFactory.java | 2 +-
.../dsl/DataFormatEndpointBuilderFactory.java | 2 +-
.../dsl/DataSetTestEndpointBuilderFactory.java | 2 +-
.../endpoint/dsl/DdbEndpointBuilderFactory.java | 2 +-
.../dsl/DdbStreamEndpointBuilderFactory.java | 1 -
.../dsl/DebeziumEndpointBuilderFactory.java | 1 -
.../dsl/DigitalOceanEndpointBuilderFactory.java | 2 +-
.../DigitalSignatureEndpointBuilderFactory.java | 2 +-
.../endpoint/dsl/DnsEndpointBuilderFactory.java | 2 +-
.../endpoint/dsl/DozerEndpointBuilderFactory.java | 2 +-
.../endpoint/dsl/DrillEndpointBuilderFactory.java | 2 +-
.../endpoint/dsl/EC2EndpointBuilderFactory.java | 2 +-
.../endpoint/dsl/ECSEndpointBuilderFactory.java | 2 +-
.../endpoint/dsl/EKSEndpointBuilderFactory.java | 2 +-
.../dsl/ElasticsearchEndpointBuilderFactory.java | 2 +-
.../endpoint/dsl/ExecEndpointBuilderFactory.java | 2 +-
.../dsl/FileWatchEndpointBuilderFactory.java | 1 -
.../endpoint/dsl/FlinkEndpointBuilderFactory.java | 2 +-
.../endpoint/dsl/FopEndpointBuilderFactory.java | 2 +-
.../dsl/FreemarkerEndpointBuilderFactory.java | 2 +-
.../dsl/GangliaEndpointBuilderFactory.java | 2 +-
.../dsl/GeoCoderEndpointBuilderFactory.java | 2 +-
.../endpoint/dsl/GlanceEndpointBuilderFactory.java | 2 +-
.../dsl/GoogleBigQueryEndpointBuilderFactory.java | 2 +-
.../GoogleBigQuerySQLEndpointBuilderFactory.java | 2 +-
...GoogleCalendarStreamEndpointBuilderFactory.java | 1 -
.../GoogleMailStreamEndpointBuilderFactory.java | 1 -
.../GoogleSheetsStreamEndpointBuilderFactory.java | 1 -
.../endpoint/dsl/GrapeEndpointBuilderFactory.java | 2 +-
...azelcastAtomicnumberEndpointBuilderFactory.java | 2 +-
.../HazelcastInstanceEndpointBuilderFactory.java | 1 -
.../HazelcastRingbufferEndpointBuilderFactory.java | 2 +-
.../endpoint/dsl/HttpEndpointBuilderFactory.java | 2 +-
.../endpoint/dsl/IAMEndpointBuilderFactory.java | 2 +-
.../endpoint/dsl/IPFSEndpointBuilderFactory.java | 2 +-
.../dsl/IgniteComputeEndpointBuilderFactory.java | 2 +-
.../dsl/IgniteEventsEndpointBuilderFactory.java | 1 -
.../dsl/IgniteIdGenEndpointBuilderFactory.java | 2 +-
.../dsl/IgniteQueueEndpointBuilderFactory.java | 2 +-
.../dsl/IgniteSetEndpointBuilderFactory.java | 2 +-
.../dsl/InfluxDbEndpointBuilderFactory.java | 2 +-
.../endpoint/dsl/JMXEndpointBuilderFactory.java | 1 -
.../endpoint/dsl/JdbcEndpointBuilderFactory.java | 2 +-
.../dsl/JettyHttpEndpointBuilder9Factory.java | 1 -
.../endpoint/dsl/JingEndpointBuilderFactory.java | 2 +-
.../endpoint/dsl/JoltEndpointBuilderFactory.java | 2 +-
.../dsl/JsonValidatorEndpointBuilderFactory.java | 2 +-
.../endpoint/dsl/KMSEndpointBuilderFactory.java | 2 +-
.../dsl/KeystoneEndpointBuilderFactory.java | 2 +-
.../dsl/KinesisFirehoseEndpointBuilderFactory.java | 2 +-
...KubernetesConfigMapsEndpointBuilderFactory.java | 2 +-
...sistentVolumesClaimsEndpointBuilderFactory.java | 2 +-
...tesPersistentVolumesEndpointBuilderFactory.java | 2 +-
...rnetesResourcesQuotaEndpointBuilderFactory.java | 2 +-
.../KubernetesSecretsEndpointBuilderFactory.java | 2 +-
...netesServiceAccountsEndpointBuilderFactory.java | 2 +-
.../endpoint/dsl/LambdaEndpointBuilderFactory.java | 2 +-
.../dsl/LanguageEndpointBuilderFactory.java | 2 +-
.../endpoint/dsl/LdapEndpointBuilderFactory.java | 2 +-
.../endpoint/dsl/LdifEndpointBuilderFactory.java | 2 +-
.../endpoint/dsl/LogEndpointBuilderFactory.java | 2 +-
.../endpoint/dsl/LuceneEndpointBuilderFactory.java | 2 +-
.../dsl/LumberjackEndpointBuilderFactory.java | 1 -
.../endpoint/dsl/MQEndpointBuilderFactory.java | 2 +-
.../endpoint/dsl/MSKEndpointBuilderFactory.java | 2 +-
.../endpoint/dsl/MasterEndpointBuilderFactory.java | 1 -
.../dsl/MetricsEndpointBuilderFactory.java | 2 +-
.../MicroProfileMetricsEndpointBuilderFactory.java | 2 +-
.../dsl/MicrometerEndpointBuilderFactory.java | 2 +-
.../endpoint/dsl/MockEndpointBuilderFactory.java | 2 +-
.../endpoint/dsl/MsvEndpointBuilderFactory.java | 2 +-
.../dsl/MustacheEndpointBuilderFactory.java | 2 +-
.../endpoint/dsl/MvelEndpointBuilderFactory.java | 2 +-
.../dsl/MyBatisBeanEndpointBuilderFactory.java | 2 +-
.../endpoint/dsl/NagiosEndpointBuilderFactory.java | 2 +-
.../dsl/NetWeaverEndpointBuilderFactory.java | 2 +-
.../dsl/NeutronEndpointBuilderFactory.java | 2 +-
.../endpoint/dsl/NovaEndpointBuilderFactory.java | 2 +-
...penshiftBuildConfigsEndpointBuilderFactory.java | 2 +-
.../dsl/OpenshiftBuildsEndpointBuilderFactory.java | 2 +-
.../dsl/PaxLoggingEndpointBuilderFactory.java | 1 -
.../endpoint/dsl/PdfEndpointBuilderFactory.java | 2 +-
.../PgReplicationSlotEndpointBuilderFactory.java | 1 -
.../dsl/PrinterEndpointBuilderFactory.java | 2 +-
.../endpoint/dsl/QuartzEndpointBuilderFactory.java | 1 -
.../dsl/RestApiEndpointBuilderFactory.java | 1 -
.../dsl/RestSwaggerEndpointBuilderFactory.java | 2 +-
.../endpoint/dsl/RssEndpointBuilderFactory.java | 1 -
.../endpoint/dsl/SagaEndpointBuilderFactory.java | 2 +-
.../dsl/SchedulerEndpointBuilderFactory.java | 1 -
.../dsl/SchematronEndpointBuilderFactory.java | 2 +-
.../endpoint/dsl/ScpEndpointBuilderFactory.java | 1 -
.../endpoint/dsl/SdbEndpointBuilderFactory.java | 2 +-
.../dsl/ServiceEndpointBuilderFactory.java | 1 -
.../dsl/ServiceNowEndpointBuilderFactory.java | 2 +-
.../dsl/ServletEndpointBuilderFactory.java | 1 -
.../endpoint/dsl/SesEndpointBuilderFactory.java | 2 +-
.../dsl/SjmsBatchEndpointBuilderFactory.java | 1 -
.../endpoint/dsl/SnsEndpointBuilderFactory.java | 2 +-
.../endpoint/dsl/SolrEndpointBuilderFactory.java | 2 +-
.../endpoint/dsl/SparkEndpointBuilderFactory.java | 1 -
.../dsl/SpringBatchEndpointBuilderFactory.java | 2 +-
.../dsl/SpringLdapEndpointBuilderFactory.java | 2 +-
.../dsl/SqlStoredEndpointBuilderFactory.java | 2 +-
.../endpoint/dsl/StAXEndpointBuilderFactory.java | 2 +-
.../dsl/StringTemplateEndpointBuilderFactory.java | 2 +-
.../endpoint/dsl/SwiftEndpointBuilderFactory.java | 2 +-
.../endpoint/dsl/TikaEndpointBuilderFactory.java | 2 +-
.../endpoint/dsl/TimerEndpointBuilderFactory.java | 1 -
.../dsl/TranslateEndpointBuilderFactory.java | 2 +-
.../dsl/ValidatorEndpointBuilderFactory.java | 2 +-
.../dsl/VelocityEndpointBuilderFactory.java | 2 +-
.../dsl/WebhookEndpointBuilderFactory.java | 1 -
.../dsl/XChangeEndpointBuilderFactory.java | 2 +-
.../endpoint/dsl/XJEndpointBuilderFactory.java | 2 +-
.../dsl/XmlSignatureEndpointBuilderFactory.java | 2 +-
.../endpoint/dsl/XsltEndpointBuilderFactory.java | 2 +-
.../dsl/ZooKeeperMasterEndpointBuilderFactory.java | 1 -
.../endpoint/ProcessorDefinitionDslTest.java | 2 -
.../management/BacklogTracerStreamCachingTest.java | 1 -
.../management/CamelChoiceWithManagementTest.java | 2 -
.../management/ExceptionWithManagementTest.java | 2 -
.../camel/management/ManagedCustomPolicyTest.java | 1 -
.../management/ManagedErrorHandlerOptionsTest.java | 2 -
.../ManagedErrorHandlerRedeliveryTest.java | 2 -
.../ManagedFailoverLoadBalancerTest.java | 2 -
.../management/ManagedFileIdempotentClearTest.java | 2 -
.../ManagedFileIdempotentConsumerTest.java | 2 -
.../management/ManagedInflightRepositoryTest.java | 2 -
.../management/ManagedInflightStatisticsTest.java | 2 -
.../management/ManagedInlinedProcessorTest.java | 2 -
.../ManagedMemoryIdempotentClearTest.java | 2 -
.../ManagedMemoryIdempotentConsumerTest.java | 2 -
.../management/ManagedRedeliverRouteOnlyTest.java | 2 -
.../camel/management/ManagedRedeliverTest.java | 2 -
.../management/ManagedRouteAddFromRouteTest.java | 2 -
.../ManagedRouteDirectWhileIssueLeakTest.java | 2 -
.../camel/management/ManagedThrottlerTest.java | 2 -
.../management/MultiInstanceProcessorTest.java | 2 -
.../apache/camel/processor/NoErrorHandlerTest.java | 2 -
.../ReduceStacksNeededDuringRoutingTest.java | 2 -
.../processor/async/AsyncEndpointWithJMXTest.java | 2 -
610 files changed, 1140 insertions(+), 1216 deletions(-)
diff --git a/components/camel-spring/pom.xml b/components/camel-spring/pom.xml
index 25d3eb1..5780b2a 100644
--- a/components/camel-spring/pom.xml
+++ b/components/camel-spring/pom.xml
@@ -421,16 +421,17 @@
<include name="org/apache/camel/core/xml/*.java"/>
<include name="org/apache/camel/core/xml/util/**/*.java"/>
</fileset>
- <fileset dir="${basedir}/../../core/camel-core-engine/src/main/java">
- <include name="org/apache/camel/model/**/*.java"/>
+ <fileset dir="${basedir}/../../core/camel-api/src/main/java">
<include name="org/apache/camel/ExchangePattern.java"/>
<include name="org/apache/camel/LoggingLevel.java"/>
<include name="org/apache/camel/ManagementStatisticsLevel.java"/>
<include name="org/apache/camel/ShutdownRoute.java"/>
<include name="org/apache/camel/ShutdownRunningTask.java"/>
<include name="org/apache/camel/WaitForTaskToComplete.java"/>
+ </fileset>
+ <fileset dir="${basedir}/../../core/camel-core-engine/src/main/java">
+ <include name="org/apache/camel/model/**/*.java"/>
<include name="org/apache/camel/package-info.java"/>
- <exclude name="org/apache/camel/model/endpoint/*.java"/>
</fileset>
<fileset dir="${basedir}/../../core/camel-util/src/main/java">
<include name="org/apache/camel/concurrent/ThreadPoolRejectedPolicy.java"/>
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/SpringMDCWithBreadcrumbTest.xml b/components/camel-spring/src/test/resources/org/apache/camel/spring/SpringMDCWithBreadcrumbTest.xml
index c05fb3e..37bf054 100644
--- a/components/camel-spring/src/test/resources/org/apache/camel/spring/SpringMDCWithBreadcrumbTest.xml
+++ b/components/camel-spring/src/test/resources/org/apache/camel/spring/SpringMDCWithBreadcrumbTest.xml
@@ -32,7 +32,7 @@
<route id="route-a">
<from uri="direct:a"/>
<process ref="processorA"/>
- <to uri="log:foo"/>
+ <to uri="log:foo" pattern="InOnly"/>
<to uri="direct:b"/>
</route>
diff --git a/core/camel-cloud/src/test/java/org/apache/camel/impl/cloud/ServiceCallConfigurationTest.java b/core/camel-cloud/src/test/java/org/apache/camel/impl/cloud/ServiceCallConfigurationTest.java
index 8644bb9..8c71e23 100644
--- a/core/camel-cloud/src/test/java/org/apache/camel/impl/cloud/ServiceCallConfigurationTest.java
+++ b/core/camel-cloud/src/test/java/org/apache/camel/impl/cloud/ServiceCallConfigurationTest.java
@@ -30,7 +30,6 @@ import org.apache.camel.model.cloud.ServiceCallConfigurationDefinition;
import org.apache.camel.model.cloud.ServiceCallDefinitionConstants;
import org.apache.camel.model.cloud.ServiceCallExpressionConfiguration;
import org.apache.camel.model.language.SimpleExpression;
-import org.apache.camel.processor.Pipeline;
import org.apache.camel.processor.channel.DefaultChannel;
import org.junit.Assert;
import org.junit.Test;
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/AdviceWithBuilder.java b/core/camel-core-engine/src/main/java/org/apache/camel/builder/AdviceWithBuilder.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/builder/AdviceWithBuilder.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/builder/AdviceWithBuilder.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/AdviceWithRouteBuilder.java b/core/camel-core-engine/src/main/java/org/apache/camel/builder/AdviceWithRouteBuilder.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/builder/AdviceWithRouteBuilder.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/builder/AdviceWithRouteBuilder.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/AdviceWithTask.java b/core/camel-core-engine/src/main/java/org/apache/camel/builder/AdviceWithTask.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/builder/AdviceWithTask.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/builder/AdviceWithTask.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/AdviceWithTasks.java b/core/camel-core-engine/src/main/java/org/apache/camel/builder/AdviceWithTasks.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/builder/AdviceWithTasks.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/builder/AdviceWithTasks.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/AggregationStrategies.java b/core/camel-core-engine/src/main/java/org/apache/camel/builder/AggregationStrategies.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/builder/AggregationStrategies.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/builder/AggregationStrategies.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/AggregationStrategyClause.java b/core/camel-core-engine/src/main/java/org/apache/camel/builder/AggregationStrategyClause.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/builder/AggregationStrategyClause.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/builder/AggregationStrategyClause.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/Builder.java b/core/camel-core-engine/src/main/java/org/apache/camel/builder/Builder.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/builder/Builder.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/builder/Builder.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/BuilderSupport.java b/core/camel-core-engine/src/main/java/org/apache/camel/builder/BuilderSupport.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/builder/BuilderSupport.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/builder/BuilderSupport.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/DataFormatClause.java b/core/camel-core-engine/src/main/java/org/apache/camel/builder/DataFormatClause.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/builder/DataFormatClause.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/builder/DataFormatClause.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/DeadLetterChannelBuilder.java b/core/camel-core-engine/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/builder/DeadLetterChannelBuilder.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java b/core/camel-core-engine/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/EndpointConsumerBuilder.java b/core/camel-core-engine/src/main/java/org/apache/camel/builder/EndpointConsumerBuilder.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/builder/EndpointConsumerBuilder.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/builder/EndpointConsumerBuilder.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/EndpointProducerBuilder.java b/core/camel-core-engine/src/main/java/org/apache/camel/builder/EndpointProducerBuilder.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/builder/EndpointProducerBuilder.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/builder/EndpointProducerBuilder.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/EnrichClause.java b/core/camel-core-engine/src/main/java/org/apache/camel/builder/EnrichClause.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/builder/EnrichClause.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/builder/EnrichClause.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/ErrorHandlerBuilder.java b/core/camel-core-engine/src/main/java/org/apache/camel/builder/ErrorHandlerBuilder.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/builder/ErrorHandlerBuilder.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/builder/ErrorHandlerBuilder.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java b/core/camel-core-engine/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java b/core/camel-core-engine/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/ExchangeBuilder.java b/core/camel-core-engine/src/main/java/org/apache/camel/builder/ExchangeBuilder.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/builder/ExchangeBuilder.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/builder/ExchangeBuilder.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/ExpressionBuilder.java b/core/camel-core-engine/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/builder/ExpressionBuilder.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/ExpressionClause.java b/core/camel-core-engine/src/main/java/org/apache/camel/builder/ExpressionClause.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/builder/ExpressionClause.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/builder/ExpressionClause.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/ExpressionClauseSupport.java b/core/camel-core-engine/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/builder/ExpressionClauseSupport.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/FlexibleAggregationStrategy.java b/core/camel-core-engine/src/main/java/org/apache/camel/builder/FlexibleAggregationStrategy.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/builder/FlexibleAggregationStrategy.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/builder/FlexibleAggregationStrategy.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/NoErrorHandlerBuilder.java b/core/camel-core-engine/src/main/java/org/apache/camel/builder/NoErrorHandlerBuilder.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/builder/NoErrorHandlerBuilder.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/builder/NoErrorHandlerBuilder.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/NotifyBuilder.java b/core/camel-core-engine/src/main/java/org/apache/camel/builder/NotifyBuilder.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/builder/NotifyBuilder.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/builder/NotifyBuilder.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/PredicateBuilder.java b/core/camel-core-engine/src/main/java/org/apache/camel/builder/PredicateBuilder.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/builder/PredicateBuilder.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/builder/PredicateBuilder.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/PredicateClause.java b/core/camel-core-engine/src/main/java/org/apache/camel/builder/PredicateClause.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/builder/PredicateClause.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/builder/PredicateClause.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/ProcessClause.java b/core/camel-core-engine/src/main/java/org/apache/camel/builder/ProcessClause.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/builder/ProcessClause.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/builder/ProcessClause.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/ProxyBuilder.java b/core/camel-core-engine/src/main/java/org/apache/camel/builder/ProxyBuilder.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/builder/ProxyBuilder.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/builder/ProxyBuilder.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/RouteBuilder.java b/core/camel-core-engine/src/main/java/org/apache/camel/builder/RouteBuilder.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/builder/RouteBuilder.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/builder/RouteBuilder.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/SimpleBuilder.java b/core/camel-core-engine/src/main/java/org/apache/camel/builder/SimpleBuilder.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/builder/SimpleBuilder.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/builder/SimpleBuilder.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/ThreadPoolBuilder.java b/core/camel-core-engine/src/main/java/org/apache/camel/builder/ThreadPoolBuilder.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/builder/ThreadPoolBuilder.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/builder/ThreadPoolBuilder.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/ThreadPoolProfileBuilder.java b/core/camel-core-engine/src/main/java/org/apache/camel/builder/ThreadPoolProfileBuilder.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/builder/ThreadPoolProfileBuilder.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/builder/ThreadPoolProfileBuilder.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/TransformerBuilder.java b/core/camel-core-engine/src/main/java/org/apache/camel/builder/TransformerBuilder.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/builder/TransformerBuilder.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/builder/TransformerBuilder.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/ValidatorBuilder.java b/core/camel-core-engine/src/main/java/org/apache/camel/builder/ValidatorBuilder.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/builder/ValidatorBuilder.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/builder/ValidatorBuilder.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/ValueBuilder.java b/core/camel-core-engine/src/main/java/org/apache/camel/builder/ValueBuilder.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/builder/ValueBuilder.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/builder/ValueBuilder.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/package.html b/core/camel-core-engine/src/main/java/org/apache/camel/builder/package.html
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/builder/package.html
rename to core/camel-core-engine/src/main/java/org/apache/camel/builder/package.html
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/impl/AbstractModelCamelContext.java b/core/camel-core-engine/src/main/java/org/apache/camel/impl/AbstractModelCamelContext.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/impl/AbstractModelCamelContext.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/impl/AbstractModelCamelContext.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/impl/DefaultCamelContext.java b/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/impl/DefaultCamelContext.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/impl/DefaultExecutorServiceManager.java b/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultExecutorServiceManager.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/impl/DefaultExecutorServiceManager.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultExecutorServiceManager.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/impl/DefaultModel.java b/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultModel.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/impl/DefaultModel.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultModel.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/impl/DefaultModelJAXBContextFactory.java b/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultModelJAXBContextFactory.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/impl/DefaultModelJAXBContextFactory.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultModelJAXBContextFactory.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/impl/JndiRegistry.java b/core/camel-core-engine/src/main/java/org/apache/camel/impl/JndiRegistry.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/impl/JndiRegistry.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/impl/JndiRegistry.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/impl/RouteIdFactory.java b/core/camel-core-engine/src/main/java/org/apache/camel/impl/RouteIdFactory.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/impl/RouteIdFactory.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/impl/RouteIdFactory.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/impl/RouteService.java b/core/camel-core-engine/src/main/java/org/apache/camel/impl/RouteService.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/impl/RouteService.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/impl/RouteService.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/impl/cluster/ClusteredRouteConfiguration.java b/core/camel-core-engine/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteConfiguration.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/impl/cluster/ClusteredRouteConfiguration.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteConfiguration.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/impl/cluster/ClusteredRouteController.java b/core/camel-core-engine/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteController.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/impl/cluster/ClusteredRouteController.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteController.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/impl/cluster/ClusteredRouteFilter.java b/core/camel-core-engine/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteFilter.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/impl/cluster/ClusteredRouteFilter.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteFilter.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/impl/cluster/ClusteredRouteFilters.java b/core/camel-core-engine/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteFilters.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/impl/cluster/ClusteredRouteFilters.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteFilters.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/impl/cluster/ClusteredRoutePolicy.java b/core/camel-core-engine/src/main/java/org/apache/camel/impl/cluster/ClusteredRoutePolicy.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/impl/cluster/ClusteredRoutePolicy.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/impl/cluster/ClusteredRoutePolicy.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/impl/cluster/ClusteredRoutePolicyFactory.java b/core/camel-core-engine/src/main/java/org/apache/camel/impl/cluster/ClusteredRoutePolicyFactory.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/impl/cluster/ClusteredRoutePolicyFactory.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/impl/cluster/ClusteredRoutePolicyFactory.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/impl/cluster/package.html b/core/camel-core-engine/src/main/java/org/apache/camel/impl/cluster/package.html
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/impl/cluster/package.html
rename to core/camel-core-engine/src/main/java/org/apache/camel/impl/cluster/package.html
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/impl/package.html b/core/camel-core-engine/src/main/java/org/apache/camel/impl/package.html
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/impl/package.html
rename to core/camel-core-engine/src/main/java/org/apache/camel/impl/package.html
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/AdviceWithDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/AdviceWithDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/AdviceWithDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/AdviceWithDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/AggregateDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/AggregateDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/AggregateDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/AggregateDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/BeanDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/BeanDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/BeanDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/BeanDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/Block.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/Block.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/Block.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/Block.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/CatchDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/CatchDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/CatchDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/CatchDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/ChoiceDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/ChoiceDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/ChoiceDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/ChoiceDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/ClaimCheckDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/ClaimCheckDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/ClaimCheckDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/ClaimCheckDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/ClaimCheckOperation.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/ClaimCheckOperation.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/ClaimCheckOperation.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/ClaimCheckOperation.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/Constants.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/Constants.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/Constants.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/Constants.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/ContextScanDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/ContextScanDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/ContextScanDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/ContextScanDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/ConvertBodyDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/ConvertBodyDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/ConvertBodyDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/ConvertBodyDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/DataFormatDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/DataFormatDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/DataFormatDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/DataFormatDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/DefinitionPropertyPlaceholderConfigurer.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/DefinitionPropertyPlaceholderConfigurer.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/DefinitionPropertyPlaceholderConfigurer.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/DefinitionPropertyPlaceholderConfigurer.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/DelayDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/DelayDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/DelayDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/DelayDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/DescriptionDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/DescriptionDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/DescriptionDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/DescriptionDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/DynamicRouterDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/DynamicRouterDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/DynamicRouterDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/DynamicRouterDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/EndpointRequiredDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/EndpointRequiredDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/EndpointRequiredDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/EndpointRequiredDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/EnrichDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/EnrichDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/EnrichDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/EnrichDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/ExecutorServiceAwareDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/ExecutorServiceAwareDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/ExecutorServiceAwareDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/ExecutorServiceAwareDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/ExpressionNode.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/ExpressionNode.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/ExpressionNode.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/ExpressionNode.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/ExpressionNodeHelper.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/ExpressionNodeHelper.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/ExpressionNodeHelper.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/ExpressionNodeHelper.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/ExpressionSubElementDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/ExpressionSubElementDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/ExpressionSubElementDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/ExpressionSubElementDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/FilterDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/FilterDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/FilterDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/FilterDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/FinallyDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/FinallyDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/FinallyDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/FinallyDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/FromDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/FromDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/FromDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/FromDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/GlobalOptionDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/GlobalOptionDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/GlobalOptionDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/GlobalOptionDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/GlobalOptionsDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/GlobalOptionsDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/GlobalOptionsDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/GlobalOptionsDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/HystrixConfigurationCommon.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/HystrixConfigurationCommon.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/HystrixConfigurationCommon.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/HystrixConfigurationCommon.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/HystrixConfigurationDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/HystrixConfigurationDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/HystrixConfigurationDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/HystrixConfigurationDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/HystrixDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/HystrixDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/HystrixDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/HystrixDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/IdempotentConsumerDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/IdempotentConsumerDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/IdempotentConsumerDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/IdempotentConsumerDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/IdentifiedType.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/IdentifiedType.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/IdentifiedType.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/IdentifiedType.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/InOnlyDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/InOnlyDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/InOnlyDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/InOnlyDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/InOutDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/InOutDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/InOutDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/InOutDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/InputTypeDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/InputTypeDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/InputTypeDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/InputTypeDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/InterceptDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/InterceptDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/InterceptDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/InterceptDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/InterceptFromDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/InterceptFromDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/InterceptFromDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/InterceptFromDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/LoadBalanceDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/LoadBalanceDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/LoadBalancerDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/LoadBalancerDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/LoadBalancerDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/LoadBalancerDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/LogDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/LogDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/LogDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/LogDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/LoopDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/LoopDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/LoopDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/LoopDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/MarshalDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/MarshalDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/MarshalDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/MarshalDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/Model.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/Model.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/Model.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/Model.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/ModelCamelContext.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/ModelCamelContext.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/ModelCamelContext.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/ModelCamelContext.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/ModelHelper.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/ModelHelper.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/ModelHelper.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/ModelHelper.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/MulticastDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/MulticastDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/MulticastDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/MulticastDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/NoOutputDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/NoOutputDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/NoOutputDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/NoOutputDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/OnCompletionDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/OnCompletionDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/OnCompletionDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/OnCompletionDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/OnCompletionMode.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/OnCompletionMode.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/OnCompletionMode.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/OnCompletionMode.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/OnExceptionDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/OnExceptionDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/OnExceptionDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/OnExceptionDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/OnFallbackDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/OnFallbackDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/OnFallbackDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/OnFallbackDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/OptimisticLockRetryPolicyDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/OptimisticLockRetryPolicyDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/OptimisticLockRetryPolicyDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/OptimisticLockRetryPolicyDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/OptionalIdentifiedDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/OptionalIdentifiedDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/OptionalIdentifiedDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/OptionalIdentifiedDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/OtherAttributesAware.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/OtherAttributesAware.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/OtherAttributesAware.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/OtherAttributesAware.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/OtherwiseDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/OtherwiseDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/OtherwiseDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/OtherwiseDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/OutputDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/OutputDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/OutputDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/OutputDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/OutputExpressionNode.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/OutputExpressionNode.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/OutputExpressionNode.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/OutputExpressionNode.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/OutputNode.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/OutputNode.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/OutputNode.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/OutputNode.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/OutputTypeDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/OutputTypeDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/OutputTypeDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/OutputTypeDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/PackageScanDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/PackageScanDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/PackageScanDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/PackageScanDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/PipelineDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/PipelineDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/PipelineDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/PipelineDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/PolicyDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/PolicyDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/PolicyDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/PolicyDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/PollEnrichDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/PollEnrichDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/PollEnrichDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/PollEnrichDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/ProcessDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/ProcessDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/ProcessDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/ProcessDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/ProcessorDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/ProcessorDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/ProcessorDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/ProcessorDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/ProcessorDefinitionHelper.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/ProcessorDefinitionHelper.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/PropertyDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/PropertyDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/PropertyDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/PropertyDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/PropertyDefinitions.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/PropertyDefinitions.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/PropertyDefinitions.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/PropertyDefinitions.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/PropertyDescriptionsAdapter.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/PropertyDescriptionsAdapter.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/PropertyDescriptionsAdapter.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/PropertyDescriptionsAdapter.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/RecipientListDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/RecipientListDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/RecipientListDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/RecipientListDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/RedeliveryPolicyDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/RedeliveryPolicyDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/RedeliveryPolicyDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/RedeliveryPolicyDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/RemoveHeaderDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/RemoveHeaderDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/RemoveHeaderDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/RemoveHeaderDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/RemoveHeadersDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/RemoveHeadersDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/RemoveHeadersDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/RemoveHeadersDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/RemovePropertiesDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/RemovePropertiesDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/RemovePropertiesDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/RemovePropertiesDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/RemovePropertyDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/RemovePropertyDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/RemovePropertyDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/RemovePropertyDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/ResequenceDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/ResequenceDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/ResequenceDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/ResequenceDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/RestContextRefDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/RestContextRefDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/RestContextRefDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/RestContextRefDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/RestContextRefDefinitionHelper.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/RestContextRefDefinitionHelper.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/RestContextRefDefinitionHelper.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/RestContextRefDefinitionHelper.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/RollbackDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/RollbackDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/RollbackDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/RollbackDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/RouteBuilderDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/RouteBuilderDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/RouteBuilderDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/RouteBuilderDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/RouteContainer.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/RouteContainer.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/RouteContainer.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/RouteContainer.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/RouteContextRefDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/RouteContextRefDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/RouteContextRefDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/RouteContextRefDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/RouteContextRefDefinitionHelper.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/RouteContextRefDefinitionHelper.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/RouteContextRefDefinitionHelper.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/RouteContextRefDefinitionHelper.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/RouteDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/RouteDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/RouteDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/RouteDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/RouteDefinitionHelper.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/RouteDefinitionHelper.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/RouteDefinitionHelper.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/RouteDefinitionHelper.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/RouteFilters.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/RouteFilters.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/RouteFilters.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/RouteFilters.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/RoutesDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/RoutesDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/RoutesDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/RoutesDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/RoutingSlipDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/RoutingSlipDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/RoutingSlipDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/RoutingSlipDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/SagaActionUriDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/SagaActionUriDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/SagaActionUriDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/SagaActionUriDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/SagaCompletionMode.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/SagaCompletionMode.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/SagaCompletionMode.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/SagaCompletionMode.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/SagaDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/SagaDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/SagaDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/SagaDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/SagaOptionDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/SagaOptionDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/SagaOptionDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/SagaOptionDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/SagaPropagation.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/SagaPropagation.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/SagaPropagation.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/SagaPropagation.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/SamplingDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/SamplingDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/SamplingDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/SamplingDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/ScriptDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/ScriptDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/ScriptDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/ScriptDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/SendDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/SendDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/SendDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/SendDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/SetBodyDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/SetBodyDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/SetBodyDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/SetBodyDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/SetExchangePatternDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/SetExchangePatternDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/SetExchangePatternDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/SetExchangePatternDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/SetHeaderDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/SetHeaderDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/SetHeaderDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/SetHeaderDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/SetPropertyDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/SetPropertyDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/SetPropertyDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/SetPropertyDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/SortDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/SortDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/SortDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/SortDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/SplitDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/SplitDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/SplitDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/SplitDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/StepDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/StepDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/StepDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/StepDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/StopDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/StopDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/StopDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/StopDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/ThreadPoolProfileDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/ThreadPoolProfileDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/ThreadPoolProfileDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/ThreadPoolProfileDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/ThreadsDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/ThreadsDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/ThreadsDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/ThreadsDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/ThrottleDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/ThrottleDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/ThrottleDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/ThrottleDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/ThrowExceptionDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/ThrowExceptionDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/ThrowExceptionDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/ThrowExceptionDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/TimeUnitAdapter.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/TimeUnitAdapter.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/TimeUnitAdapter.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/TimeUnitAdapter.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/ToDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/ToDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/ToDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/ToDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/ToDynamicDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/ToDynamicDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/ToDynamicDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/ToDynamicDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/TransactedDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/TransactedDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/TransactedDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/TransactedDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/TransformDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/TransformDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/TransformDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/TransformDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/TryDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/TryDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/TryDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/TryDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/UnmarshalDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/UnmarshalDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/UnmarshalDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/UnmarshalDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/ValidateDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/ValidateDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/ValidateDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/ValidateDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/WhenDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/WhenDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/WhenDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/WhenDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/WhenSkipSendToEndpointDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/WhenSkipSendToEndpointDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/WhenSkipSendToEndpointDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/WhenSkipSendToEndpointDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/WireTapDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/WireTapDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/WireTapDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/WireTapDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/BlacklistServiceCallServiceFilterConfiguration.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/BlacklistServiceCallServiceFilterConfiguration.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/BlacklistServiceCallServiceFilterConfiguration.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/BlacklistServiceCallServiceFilterConfiguration.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/CachingServiceCallServiceDiscoveryConfiguration.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/CachingServiceCallServiceDiscoveryConfiguration.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/CachingServiceCallServiceDiscoveryConfiguration.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/CachingServiceCallServiceDiscoveryConfiguration.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/CombinedServiceCallServiceDiscoveryConfiguration.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/CombinedServiceCallServiceDiscoveryConfiguration.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/CombinedServiceCallServiceDiscoveryConfiguration.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/CombinedServiceCallServiceDiscoveryConfiguration.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/CombinedServiceCallServiceFilterConfiguration.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/CombinedServiceCallServiceFilterConfiguration.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/CombinedServiceCallServiceFilterConfiguration.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/CombinedServiceCallServiceFilterConfiguration.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/ConsulServiceCallServiceDiscoveryConfiguration.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/ConsulServiceCallServiceDiscoveryConfiguration.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/ConsulServiceCallServiceDiscoveryConfiguration.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/ConsulServiceCallServiceDiscoveryConfiguration.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/CustomServiceCallServiceFilterConfiguration.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/CustomServiceCallServiceFilterConfiguration.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/CustomServiceCallServiceFilterConfiguration.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/CustomServiceCallServiceFilterConfiguration.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/DefaultServiceCallServiceLoadBalancerConfiguration.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/DefaultServiceCallServiceLoadBalancerConfiguration.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/DefaultServiceCallServiceLoadBalancerConfiguration.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/DefaultServiceCallServiceLoadBalancerConfiguration.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/DnsServiceCallServiceDiscoveryConfiguration.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/DnsServiceCallServiceDiscoveryConfiguration.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/DnsServiceCallServiceDiscoveryConfiguration.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/DnsServiceCallServiceDiscoveryConfiguration.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/EtcdServiceCallServiceDiscoveryConfiguration.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/EtcdServiceCallServiceDiscoveryConfiguration.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/EtcdServiceCallServiceDiscoveryConfiguration.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/EtcdServiceCallServiceDiscoveryConfiguration.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/HealthyServiceCallServiceFilterConfiguration.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/HealthyServiceCallServiceFilterConfiguration.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/HealthyServiceCallServiceFilterConfiguration.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/HealthyServiceCallServiceFilterConfiguration.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/KubernetesServiceCallServiceDiscoveryConfiguration.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/KubernetesServiceCallServiceDiscoveryConfiguration.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/KubernetesServiceCallServiceDiscoveryConfiguration.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/KubernetesServiceCallServiceDiscoveryConfiguration.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/PassThroughServiceCallServiceFilterConfiguration.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/PassThroughServiceCallServiceFilterConfiguration.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/PassThroughServiceCallServiceFilterConfiguration.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/PassThroughServiceCallServiceFilterConfiguration.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/RibbonServiceCallServiceLoadBalancerConfiguration.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/RibbonServiceCallServiceLoadBalancerConfiguration.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/RibbonServiceCallServiceLoadBalancerConfiguration.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/RibbonServiceCallServiceLoadBalancerConfiguration.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/ServiceCallConfigurationDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/ServiceCallConfigurationDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/ServiceCallConfigurationDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/ServiceCallConfigurationDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/ServiceCallDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/ServiceCallDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/ServiceCallDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/ServiceCallDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/ServiceCallDefinitionConstants.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/ServiceCallDefinitionConstants.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/ServiceCallDefinitionConstants.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/ServiceCallDefinitionConstants.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/ServiceCallExpressionConfiguration.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/ServiceCallExpressionConfiguration.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/ServiceCallExpressionConfiguration.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/ServiceCallExpressionConfiguration.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/ServiceCallServiceChooserConfiguration.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceChooserConfiguration.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/ServiceCallServiceChooserConfiguration.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceChooserConfiguration.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/ServiceCallServiceDiscoveryConfiguration.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceDiscoveryConfiguration.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/ServiceCallServiceDiscoveryConfiguration.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceDiscoveryConfiguration.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/ServiceCallServiceFilterConfiguration.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceFilterConfiguration.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/ServiceCallServiceFilterConfiguration.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceFilterConfiguration.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/ServiceCallServiceLoadBalancerConfiguration.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceLoadBalancerConfiguration.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/ServiceCallServiceLoadBalancerConfiguration.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceLoadBalancerConfiguration.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/StaticServiceCallServiceDiscoveryConfiguration.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/StaticServiceCallServiceDiscoveryConfiguration.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/StaticServiceCallServiceDiscoveryConfiguration.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/StaticServiceCallServiceDiscoveryConfiguration.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/ZooKeeperServiceCallServiceDiscoveryConfiguration.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/ZooKeeperServiceCallServiceDiscoveryConfiguration.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/ZooKeeperServiceCallServiceDiscoveryConfiguration.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/ZooKeeperServiceCallServiceDiscoveryConfiguration.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/package-info.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/package-info.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/package-info.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/package-info.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/config/BatchResequencerConfig.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/config/BatchResequencerConfig.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/config/BatchResequencerConfig.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/config/BatchResequencerConfig.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/config/ResequencerConfig.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/config/ResequencerConfig.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/config/ResequencerConfig.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/config/ResequencerConfig.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/config/StreamResequencerConfig.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/config/StreamResequencerConfig.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/config/StreamResequencerConfig.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/config/StreamResequencerConfig.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/config/package-info.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/config/package-info.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/config/package-info.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/config/package-info.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/ASN1DataFormat.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/ASN1DataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/ASN1DataFormat.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/ASN1DataFormat.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/Any23DataFormat.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/Any23DataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/Any23DataFormat.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/Any23DataFormat.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/Any23Type.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/Any23Type.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/Any23Type.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/Any23Type.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/AvroDataFormat.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/AvroDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/AvroDataFormat.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/AvroDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/BarcodeDataFormat.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/BarcodeDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/BarcodeDataFormat.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/BarcodeDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/Base64DataFormat.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/Base64DataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/Base64DataFormat.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/Base64DataFormat.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/BeanioDataFormat.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/BeanioDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/BeanioDataFormat.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/BeanioDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/BindyDataFormat.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/BindyDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/BindyDataFormat.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/BindyDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/BindyType.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/BindyType.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/BindyType.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/BindyType.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/CBORDataFormat.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/CBORDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/CBORDataFormat.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/CBORDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/CryptoDataFormat.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/CryptoDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/CryptoDataFormat.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/CryptoDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/CsvDataFormat.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java
similarity index 96%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/CsvDataFormat.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java
index 11ba978..f13a106 100644
--- a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/CsvDataFormat.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java
@@ -1,443 +1,443 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.model.dataformat;
-
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.apache.camel.model.DataFormatDefinition;
-import org.apache.camel.spi.Metadata;
-
-/**
- * The CSV data format is used for handling CSV payloads.
- */
-@Metadata(firstVersion = "1.3.0", label = "dataformat,transformation,csv", title = "CSV")
-@XmlRootElement(name = "csv")
-@XmlAccessorType(XmlAccessType.FIELD)
-public class CsvDataFormat extends DataFormatDefinition {
- // Format options
- @XmlAttribute
- @Metadata(label = "advanced")
- private String formatRef;
- @XmlAttribute
- @Metadata(enums = "DEFAULT,EXCEL,INFORMIX_UNLOAD,INFORMIX_UNLOAD_CSV,MYSQL,RFC4180")
- private String formatName;
- @XmlAttribute
- private Boolean commentMarkerDisabled;
- @XmlAttribute
- private String commentMarker;
- @XmlAttribute
- private String delimiter;
- @XmlAttribute
- private Boolean escapeDisabled;
- @XmlAttribute
- private String escape;
- @XmlAttribute
- private Boolean headerDisabled;
- @XmlElement
- private List<String> header;
- @XmlAttribute
- private Boolean allowMissingColumnNames;
- @XmlAttribute
- private Boolean ignoreEmptyLines;
- @XmlAttribute
- private Boolean ignoreSurroundingSpaces;
- @XmlAttribute
- private Boolean nullStringDisabled;
- @XmlAttribute
- private String nullString;
- @XmlAttribute
- private Boolean quoteDisabled;
- @XmlAttribute
- private String quote;
- @XmlAttribute
- private String recordSeparatorDisabled;
- @XmlAttribute
- private String recordSeparator;
- @XmlAttribute
- private Boolean skipHeaderRecord;
- @XmlAttribute
- private String quoteMode;
- @XmlAttribute
- private Boolean ignoreHeaderCase;
- @XmlAttribute
- private Boolean trim;
- @XmlAttribute
- private Boolean trailingDelimiter;
- @XmlAttribute
- @Metadata(label = "advanced")
- private String marshallerFactoryRef;
-
- // Unmarshall options
- @XmlAttribute
- private Boolean lazyLoad;
- @XmlAttribute
- private Boolean useMaps;
- @XmlAttribute
- private Boolean useOrderedMaps;
- @XmlAttribute
- private String recordConverterRef;
-
- public CsvDataFormat() {
- super("csv");
- }
-
- public CsvDataFormat(String delimiter) {
- this();
- setDelimiter(delimiter);
- }
-
- public CsvDataFormat(boolean lazyLoad) {
- this();
- setLazyLoad(lazyLoad);
- }
-
- /**
- * Sets the implementation of the CsvMarshallerFactory interface which is
- * able to customize marshalling/unmarshalling behavior by extending
- * CsvMarshaller or creating it from scratch.
- *
- * @param marshallerFactoryRef the <code>CsvMarshallerFactory</code>
- * reference.
- */
- public void setMarshallerFactoryRef(String marshallerFactoryRef) {
- this.marshallerFactoryRef = marshallerFactoryRef;
- }
-
- /**
- * Returns the <code>CsvMarshallerFactory</code> reference.
- *
- * @return the <code>CsvMarshallerFactory</code> or <code>null</code> if
- * none has been specified.
- */
- public String getMarshallerFactoryRef() {
- return marshallerFactoryRef;
- }
-
- public String getFormatRef() {
- return formatRef;
- }
-
- /**
- * The reference format to use, it will be updated with the other format
- * options, the default value is CSVFormat.DEFAULT
- */
- public void setFormatRef(String formatRef) {
- this.formatRef = formatRef;
- }
-
- public String getFormatName() {
- return formatName;
- }
-
- /**
- * The name of the format to use, the default value is CSVFormat.DEFAULT
- */
- public void setFormatName(String formatName) {
- this.formatName = formatName;
- }
-
- public Boolean getCommentMarkerDisabled() {
- return commentMarkerDisabled;
- }
-
- /**
- * Disables the comment marker of the reference format.
- */
- public void setCommentMarkerDisabled(Boolean commentMarkerDisabled) {
- this.commentMarkerDisabled = commentMarkerDisabled;
- }
-
- public String getCommentMarker() {
- return commentMarker;
- }
-
- /**
- * Sets the comment marker of the reference format.
- */
- public void setCommentMarker(String commentMarker) {
- this.commentMarker = commentMarker;
- }
-
- public String getDelimiter() {
- return delimiter;
- }
-
- /**
- * Sets the delimiter to use.
- * <p/>
- * The default value is , (comma)
- */
- public void setDelimiter(String delimiter) {
- this.delimiter = delimiter;
- }
-
- public Boolean getEscapeDisabled() {
- return escapeDisabled;
- }
-
- /**
- * Use for disabling using escape character
- */
- public void setEscapeDisabled(Boolean escapeDisabled) {
- this.escapeDisabled = escapeDisabled;
- }
-
- public String getEscape() {
- return escape;
- }
-
- /**
- * Sets the escape character to use
- */
- public void setEscape(String escape) {
- this.escape = escape;
- }
-
- /**
- * Use for disabling headers
- */
- public Boolean getHeaderDisabled() {
- return headerDisabled;
- }
-
- public void setHeaderDisabled(Boolean headerDisabled) {
- this.headerDisabled = headerDisabled;
- }
-
- public List<String> getHeader() {
- return header;
- }
-
- /**
- * To configure the CSV headers
- */
- public void setHeader(List<String> header) {
- this.header = header;
- }
-
- public Boolean getAllowMissingColumnNames() {
- return allowMissingColumnNames;
- }
-
- /**
- * Whether to allow missing column names.
- */
- public void setAllowMissingColumnNames(Boolean allowMissingColumnNames) {
- this.allowMissingColumnNames = allowMissingColumnNames;
- }
-
- public Boolean getIgnoreEmptyLines() {
- return ignoreEmptyLines;
- }
-
- /**
- * Whether to ignore empty lines.
- */
- public void setIgnoreEmptyLines(Boolean ignoreEmptyLines) {
- this.ignoreEmptyLines = ignoreEmptyLines;
- }
-
- public Boolean getIgnoreSurroundingSpaces() {
- return ignoreSurroundingSpaces;
- }
-
- /**
- * Whether to ignore surrounding spaces
- */
- public void setIgnoreSurroundingSpaces(Boolean ignoreSurroundingSpaces) {
- this.ignoreSurroundingSpaces = ignoreSurroundingSpaces;
- }
-
- public Boolean getNullStringDisabled() {
- return nullStringDisabled;
- }
-
- /**
- * Used to disable null strings
- */
- public void setNullStringDisabled(Boolean nullStringDisabled) {
- this.nullStringDisabled = nullStringDisabled;
- }
-
- public String getNullString() {
- return nullString;
- }
-
- /**
- * Sets the null string
- */
- public void setNullString(String nullString) {
- this.nullString = nullString;
- }
-
- public Boolean getQuoteDisabled() {
- return quoteDisabled;
- }
-
- /**
- * Used to disable quotes
- */
- public void setQuoteDisabled(Boolean quoteDisabled) {
- this.quoteDisabled = quoteDisabled;
- }
-
- public String getQuote() {
- return quote;
- }
-
- /**
- * Sets the quote which by default is "
- */
- public void setQuote(String quote) {
- this.quote = quote;
- }
-
- public String getRecordSeparatorDisabled() {
- return recordSeparatorDisabled;
- }
-
- /**
- * Used for disabling record separator
- */
- public void setRecordSeparatorDisabled(String recordSeparatorDisabled) {
- this.recordSeparatorDisabled = recordSeparatorDisabled;
- }
-
- public String getRecordSeparator() {
- return recordSeparator;
- }
-
- /**
- * Sets the record separator (aka new line) which by default is new line
- * characters (CRLF)
- */
- public void setRecordSeparator(String recordSeparator) {
- this.recordSeparator = recordSeparator;
- }
-
- public Boolean getSkipHeaderRecord() {
- return skipHeaderRecord;
- }
-
- /**
- * Whether to skip the header record in the output
- */
- public void setSkipHeaderRecord(Boolean skipHeaderRecord) {
- this.skipHeaderRecord = skipHeaderRecord;
- }
-
- public String getQuoteMode() {
- return quoteMode;
- }
-
- /**
- * Sets the quote mode
- */
- public void setQuoteMode(String quoteMode) {
- this.quoteMode = quoteMode;
- }
-
- public Boolean getLazyLoad() {
- return lazyLoad;
- }
-
- /**
- * Whether the unmarshalling should produce an iterator that reads the lines
- * on the fly or if all the lines must be read at one.
- */
- public void setLazyLoad(Boolean lazyLoad) {
- this.lazyLoad = lazyLoad;
- }
-
- public Boolean getUseMaps() {
- return useMaps;
- }
-
- /**
- * Whether the unmarshalling should produce maps (HashMap)for the lines
- * values instead of lists. It requires to have header (either defined or
- * collected).
- */
- public void setUseMaps(Boolean useMaps) {
- this.useMaps = useMaps;
- }
-
- public Boolean getUseOrderedMaps() {
- return useOrderedMaps;
- }
-
- /**
- * Whether the unmarshalling should produce ordered maps (LinkedHashMap) for
- * the lines values instead of lists. It requires to have header (either
- * defined or collected).
- */
- public void setUseOrderedMaps(Boolean useOrderedMaps) {
- this.useOrderedMaps = useOrderedMaps;
- }
-
- public String getRecordConverterRef() {
- return recordConverterRef;
- }
-
- /**
- * Refers to a custom <tt>CsvRecordConverter</tt> to lookup from the
- * registry to use.
- */
- public void setRecordConverterRef(String recordConverterRef) {
- this.recordConverterRef = recordConverterRef;
- }
-
- /**
- * Sets whether or not to trim leading and trailing blanks.
- */
- public void setTrim(Boolean trim) {
- this.trim = trim;
- }
-
- public Boolean getTrim() {
- return trim;
- }
-
- /**
- * Sets whether or not to ignore case when accessing header names.
- */
- public void setIgnoreHeaderCase(Boolean ignoreHeaderCase) {
- this.ignoreHeaderCase = ignoreHeaderCase;
- }
-
- public Boolean getIgnoreHeaderCase() {
- return ignoreHeaderCase;
- }
-
- /**
- * Sets whether or not to add a trailing delimiter.
- */
- public void setTrailingDelimiter(Boolean trailingDelimiter) {
- this.trailingDelimiter = trailingDelimiter;
- }
-
- public Boolean getTrailingDelimiter() {
- return trailingDelimiter;
- }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.model.dataformat;
+
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.apache.camel.model.DataFormatDefinition;
+import org.apache.camel.spi.Metadata;
+
+/**
+ * The CSV data format is used for handling CSV payloads.
+ */
+@Metadata(firstVersion = "1.3.0", label = "dataformat,transformation,csv", title = "CSV")
+@XmlRootElement(name = "csv")
+@XmlAccessorType(XmlAccessType.FIELD)
+public class CsvDataFormat extends DataFormatDefinition {
+ // Format options
+ @XmlAttribute
+ @Metadata(label = "advanced")
+ private String formatRef;
+ @XmlAttribute
+ @Metadata(enums = "DEFAULT,EXCEL,INFORMIX_UNLOAD,INFORMIX_UNLOAD_CSV,MYSQL,RFC4180")
+ private String formatName;
+ @XmlAttribute
+ private Boolean commentMarkerDisabled;
+ @XmlAttribute
+ private String commentMarker;
+ @XmlAttribute
+ private String delimiter;
+ @XmlAttribute
+ private Boolean escapeDisabled;
+ @XmlAttribute
+ private String escape;
+ @XmlAttribute
+ private Boolean headerDisabled;
+ @XmlElement
+ private List<String> header;
+ @XmlAttribute
+ private Boolean allowMissingColumnNames;
+ @XmlAttribute
+ private Boolean ignoreEmptyLines;
+ @XmlAttribute
+ private Boolean ignoreSurroundingSpaces;
+ @XmlAttribute
+ private Boolean nullStringDisabled;
+ @XmlAttribute
+ private String nullString;
+ @XmlAttribute
+ private Boolean quoteDisabled;
+ @XmlAttribute
+ private String quote;
+ @XmlAttribute
+ private String recordSeparatorDisabled;
+ @XmlAttribute
+ private String recordSeparator;
+ @XmlAttribute
+ private Boolean skipHeaderRecord;
+ @XmlAttribute
+ private String quoteMode;
+ @XmlAttribute
+ private Boolean ignoreHeaderCase;
+ @XmlAttribute
+ private Boolean trim;
+ @XmlAttribute
+ private Boolean trailingDelimiter;
+ @XmlAttribute
+ @Metadata(label = "advanced")
+ private String marshallerFactoryRef;
+
+ // Unmarshall options
+ @XmlAttribute
+ private Boolean lazyLoad;
+ @XmlAttribute
+ private Boolean useMaps;
+ @XmlAttribute
+ private Boolean useOrderedMaps;
+ @XmlAttribute
+ private String recordConverterRef;
+
+ public CsvDataFormat() {
+ super("csv");
+ }
+
+ public CsvDataFormat(String delimiter) {
+ this();
+ setDelimiter(delimiter);
+ }
+
+ public CsvDataFormat(boolean lazyLoad) {
+ this();
+ setLazyLoad(lazyLoad);
+ }
+
+ /**
+ * Sets the implementation of the CsvMarshallerFactory interface which is
+ * able to customize marshalling/unmarshalling behavior by extending
+ * CsvMarshaller or creating it from scratch.
+ *
+ * @param marshallerFactoryRef the <code>CsvMarshallerFactory</code>
+ * reference.
+ */
+ public void setMarshallerFactoryRef(String marshallerFactoryRef) {
+ this.marshallerFactoryRef = marshallerFactoryRef;
+ }
+
+ /**
+ * Returns the <code>CsvMarshallerFactory</code> reference.
+ *
+ * @return the <code>CsvMarshallerFactory</code> or <code>null</code> if
+ * none has been specified.
+ */
+ public String getMarshallerFactoryRef() {
+ return marshallerFactoryRef;
+ }
+
+ public String getFormatRef() {
+ return formatRef;
+ }
+
+ /**
+ * The reference format to use, it will be updated with the other format
+ * options, the default value is CSVFormat.DEFAULT
+ */
+ public void setFormatRef(String formatRef) {
+ this.formatRef = formatRef;
+ }
+
+ public String getFormatName() {
+ return formatName;
+ }
+
+ /**
+ * The name of the format to use, the default value is CSVFormat.DEFAULT
+ */
+ public void setFormatName(String formatName) {
+ this.formatName = formatName;
+ }
+
+ public Boolean getCommentMarkerDisabled() {
+ return commentMarkerDisabled;
+ }
+
+ /**
+ * Disables the comment marker of the reference format.
+ */
+ public void setCommentMarkerDisabled(Boolean commentMarkerDisabled) {
+ this.commentMarkerDisabled = commentMarkerDisabled;
+ }
+
+ public String getCommentMarker() {
+ return commentMarker;
+ }
+
+ /**
+ * Sets the comment marker of the reference format.
+ */
+ public void setCommentMarker(String commentMarker) {
+ this.commentMarker = commentMarker;
+ }
+
+ public String getDelimiter() {
+ return delimiter;
+ }
+
+ /**
+ * Sets the delimiter to use.
+ * <p/>
+ * The default value is , (comma)
+ */
+ public void setDelimiter(String delimiter) {
+ this.delimiter = delimiter;
+ }
+
+ public Boolean getEscapeDisabled() {
+ return escapeDisabled;
+ }
+
+ /**
+ * Use for disabling using escape character
+ */
+ public void setEscapeDisabled(Boolean escapeDisabled) {
+ this.escapeDisabled = escapeDisabled;
+ }
+
+ public String getEscape() {
+ return escape;
+ }
+
+ /**
+ * Sets the escape character to use
+ */
+ public void setEscape(String escape) {
+ this.escape = escape;
+ }
+
+ /**
+ * Use for disabling headers
+ */
+ public Boolean getHeaderDisabled() {
+ return headerDisabled;
+ }
+
+ public void setHeaderDisabled(Boolean headerDisabled) {
+ this.headerDisabled = headerDisabled;
+ }
+
+ public List<String> getHeader() {
+ return header;
+ }
+
+ /**
+ * To configure the CSV headers
+ */
+ public void setHeader(List<String> header) {
+ this.header = header;
+ }
+
+ public Boolean getAllowMissingColumnNames() {
+ return allowMissingColumnNames;
+ }
+
+ /**
+ * Whether to allow missing column names.
+ */
+ public void setAllowMissingColumnNames(Boolean allowMissingColumnNames) {
+ this.allowMissingColumnNames = allowMissingColumnNames;
+ }
+
+ public Boolean getIgnoreEmptyLines() {
+ return ignoreEmptyLines;
+ }
+
+ /**
+ * Whether to ignore empty lines.
+ */
+ public void setIgnoreEmptyLines(Boolean ignoreEmptyLines) {
+ this.ignoreEmptyLines = ignoreEmptyLines;
+ }
+
+ public Boolean getIgnoreSurroundingSpaces() {
+ return ignoreSurroundingSpaces;
+ }
+
+ /**
+ * Whether to ignore surrounding spaces
+ */
+ public void setIgnoreSurroundingSpaces(Boolean ignoreSurroundingSpaces) {
+ this.ignoreSurroundingSpaces = ignoreSurroundingSpaces;
+ }
+
+ public Boolean getNullStringDisabled() {
+ return nullStringDisabled;
+ }
+
+ /**
+ * Used to disable null strings
+ */
+ public void setNullStringDisabled(Boolean nullStringDisabled) {
+ this.nullStringDisabled = nullStringDisabled;
+ }
+
+ public String getNullString() {
+ return nullString;
+ }
+
+ /**
+ * Sets the null string
+ */
+ public void setNullString(String nullString) {
+ this.nullString = nullString;
+ }
+
+ public Boolean getQuoteDisabled() {
+ return quoteDisabled;
+ }
+
+ /**
+ * Used to disable quotes
+ */
+ public void setQuoteDisabled(Boolean quoteDisabled) {
+ this.quoteDisabled = quoteDisabled;
+ }
+
+ public String getQuote() {
+ return quote;
+ }
+
+ /**
+ * Sets the quote which by default is "
+ */
+ public void setQuote(String quote) {
+ this.quote = quote;
+ }
+
+ public String getRecordSeparatorDisabled() {
+ return recordSeparatorDisabled;
+ }
+
+ /**
+ * Used for disabling record separator
+ */
+ public void setRecordSeparatorDisabled(String recordSeparatorDisabled) {
+ this.recordSeparatorDisabled = recordSeparatorDisabled;
+ }
+
+ public String getRecordSeparator() {
+ return recordSeparator;
+ }
+
+ /**
+ * Sets the record separator (aka new line) which by default is new line
+ * characters (CRLF)
+ */
+ public void setRecordSeparator(String recordSeparator) {
+ this.recordSeparator = recordSeparator;
+ }
+
+ public Boolean getSkipHeaderRecord() {
+ return skipHeaderRecord;
+ }
+
+ /**
+ * Whether to skip the header record in the output
+ */
+ public void setSkipHeaderRecord(Boolean skipHeaderRecord) {
+ this.skipHeaderRecord = skipHeaderRecord;
+ }
+
+ public String getQuoteMode() {
+ return quoteMode;
+ }
+
+ /**
+ * Sets the quote mode
+ */
+ public void setQuoteMode(String quoteMode) {
+ this.quoteMode = quoteMode;
+ }
+
+ public Boolean getLazyLoad() {
+ return lazyLoad;
+ }
+
+ /**
+ * Whether the unmarshalling should produce an iterator that reads the lines
+ * on the fly or if all the lines must be read at one.
+ */
+ public void setLazyLoad(Boolean lazyLoad) {
+ this.lazyLoad = lazyLoad;
+ }
+
+ public Boolean getUseMaps() {
+ return useMaps;
+ }
+
+ /**
+ * Whether the unmarshalling should produce maps (HashMap)for the lines
+ * values instead of lists. It requires to have header (either defined or
+ * collected).
+ */
+ public void setUseMaps(Boolean useMaps) {
+ this.useMaps = useMaps;
+ }
+
+ public Boolean getUseOrderedMaps() {
+ return useOrderedMaps;
+ }
+
+ /**
+ * Whether the unmarshalling should produce ordered maps (LinkedHashMap) for
+ * the lines values instead of lists. It requires to have header (either
+ * defined or collected).
+ */
+ public void setUseOrderedMaps(Boolean useOrderedMaps) {
+ this.useOrderedMaps = useOrderedMaps;
+ }
+
+ public String getRecordConverterRef() {
+ return recordConverterRef;
+ }
+
+ /**
+ * Refers to a custom <tt>CsvRecordConverter</tt> to lookup from the
+ * registry to use.
+ */
+ public void setRecordConverterRef(String recordConverterRef) {
+ this.recordConverterRef = recordConverterRef;
+ }
+
+ /**
+ * Sets whether or not to trim leading and trailing blanks.
+ */
+ public void setTrim(Boolean trim) {
+ this.trim = trim;
+ }
+
+ public Boolean getTrim() {
+ return trim;
+ }
+
+ /**
+ * Sets whether or not to ignore case when accessing header names.
+ */
+ public void setIgnoreHeaderCase(Boolean ignoreHeaderCase) {
+ this.ignoreHeaderCase = ignoreHeaderCase;
+ }
+
+ public Boolean getIgnoreHeaderCase() {
+ return ignoreHeaderCase;
+ }
+
+ /**
+ * Sets whether or not to add a trailing delimiter.
+ */
+ public void setTrailingDelimiter(Boolean trailingDelimiter) {
+ this.trailingDelimiter = trailingDelimiter;
+ }
+
+ public Boolean getTrailingDelimiter() {
+ return trailingDelimiter;
+ }
+
+}
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/CustomDataFormat.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/CustomDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/CustomDataFormat.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/CustomDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/FhirDataformat.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/FhirDataformat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/FhirDataformat.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/FhirDataformat.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/FhirJsonDataFormat.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/FhirJsonDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/FhirJsonDataFormat.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/FhirJsonDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/FhirXmlDataFormat.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/FhirXmlDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/FhirXmlDataFormat.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/FhirXmlDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/FlatpackDataFormat.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/FlatpackDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/FlatpackDataFormat.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/FlatpackDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/GrokDataFormat.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/GrokDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/GrokDataFormat.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/GrokDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/GzipDataFormat.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/GzipDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/GzipDataFormat.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/GzipDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/HL7DataFormat.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/HL7DataFormat.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/IcalDataFormat.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/IcalDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/IcalDataFormat.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/IcalDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/JacksonXMLDataFormat.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/JacksonXMLDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/JacksonXMLDataFormat.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/JacksonXMLDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/JaxbDataFormat.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/JaxbDataFormat.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/JsonApiDataFormat.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/JsonApiDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/JsonApiDataFormat.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/JsonApiDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/JsonDataFormat.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/JsonDataFormat.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/JsonLibrary.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/JsonLibrary.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/JsonLibrary.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/JsonLibrary.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/LZFDataFormat.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/LZFDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/LZFDataFormat.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/LZFDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/MimeMultipartDataFormat.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/MimeMultipartDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/MimeMultipartDataFormat.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/MimeMultipartDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/PGPDataFormat.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/PGPDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/PGPDataFormat.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/PGPDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/ProtobufDataFormat.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/ProtobufDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/ProtobufDataFormat.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/ProtobufDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/RssDataFormat.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/RssDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/RssDataFormat.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/RssDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/SoapJaxbDataFormat.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/SoapJaxbDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/SoapJaxbDataFormat.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/SoapJaxbDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/SyslogDataFormat.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/SyslogDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/SyslogDataFormat.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/SyslogDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/TarFileDataFormat.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/TarFileDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/TarFileDataFormat.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/TarFileDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/ThriftDataFormat.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/ThriftDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/ThriftDataFormat.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/ThriftDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/TidyMarkupDataFormat.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/TidyMarkupDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/TidyMarkupDataFormat.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/TidyMarkupDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/UniVocityAbstractDataFormat.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/UniVocityAbstractDataFormat.java
similarity index 96%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/UniVocityAbstractDataFormat.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/UniVocityAbstractDataFormat.java
index dec37e6..5af6caa 100644
--- a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/UniVocityAbstractDataFormat.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/UniVocityAbstractDataFormat.java
@@ -1,261 +1,261 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.model.dataformat;
-
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElementRef;
-
-import org.apache.camel.model.DataFormatDefinition;
-import org.apache.camel.spi.Metadata;
-
-/**
- * Represents the common parts of all uniVocity
- * {@link org.apache.camel.spi.DataFormat} parsers.
- */
-@Metadata(label = "dataformat,transformation,csv", title = "uniVocity")
-@XmlAccessorType(XmlAccessType.FIELD)
-public abstract class UniVocityAbstractDataFormat extends DataFormatDefinition {
-
- @XmlAttribute
- protected String nullValue;
- @XmlAttribute
- @Metadata(defaultValue = "true")
- protected Boolean skipEmptyLines;
- @XmlAttribute
- @Metadata(defaultValue = "true")
- protected Boolean ignoreTrailingWhitespaces;
- @XmlAttribute
- @Metadata(defaultValue = "true")
- protected Boolean ignoreLeadingWhitespaces;
- @XmlAttribute
- protected Boolean headersDisabled;
- @XmlElementRef
- protected List<UniVocityHeader> headers;
- @XmlAttribute
- protected Boolean headerExtractionEnabled;
- @XmlAttribute
- protected Integer numberOfRecordsToRead;
- @XmlAttribute
- protected String emptyValue;
- @XmlAttribute
- protected String lineSeparator;
- @XmlAttribute
- @Metadata(defaultValue = "\\n")
- protected String normalizedLineSeparator;
- @XmlAttribute
- @Metadata(defaultValue = "#")
- protected String comment;
- @XmlAttribute
- protected Boolean lazyLoad;
- @XmlAttribute
- protected Boolean asMap;
-
- protected UniVocityAbstractDataFormat() {
- // This constructor is needed by jaxb for schema generation
- }
-
- protected UniVocityAbstractDataFormat(String dataFormatName) {
- super(dataFormatName);
- }
-
- public String getNullValue() {
- return nullValue;
- }
-
- /**
- * The string representation of a null value.
- * <p/>
- * The default value is null
- */
- public void setNullValue(String nullValue) {
- this.nullValue = nullValue;
- }
-
- public Boolean getSkipEmptyLines() {
- return skipEmptyLines;
- }
-
- /**
- * Whether or not the empty lines must be ignored.
- * <p/>
- * The default value is true
- */
- public void setSkipEmptyLines(Boolean skipEmptyLines) {
- this.skipEmptyLines = skipEmptyLines;
- }
-
- public Boolean getIgnoreTrailingWhitespaces() {
- return ignoreTrailingWhitespaces;
- }
-
- /**
- * Whether or not the trailing white spaces must ignored.
- * <p/>
- * The default value is true
- */
- public void setIgnoreTrailingWhitespaces(Boolean ignoreTrailingWhitespaces) {
- this.ignoreTrailingWhitespaces = ignoreTrailingWhitespaces;
- }
-
- public Boolean getIgnoreLeadingWhitespaces() {
- return ignoreLeadingWhitespaces;
- }
-
- /**
- * Whether or not the leading white spaces must be ignored.
- * <p/>
- * The default value is true
- */
- public void setIgnoreLeadingWhitespaces(Boolean ignoreLeadingWhitespaces) {
- this.ignoreLeadingWhitespaces = ignoreLeadingWhitespaces;
- }
-
- public Boolean getHeadersDisabled() {
- return headersDisabled;
- }
-
- /**
- * Whether or not the headers are disabled. When defined, this option
- * explicitly sets the headers as null which indicates that there is no
- * header.
- * <p/>
- * The default value is false
- */
- public void setHeadersDisabled(Boolean headersDisabled) {
- this.headersDisabled = headersDisabled;
- }
-
- public List<UniVocityHeader> getHeaders() {
- return headers;
- }
-
- /**
- * The headers to use.
- */
- public void setHeaders(List<UniVocityHeader> headers) {
- this.headers = headers;
- }
-
- public Boolean getHeaderExtractionEnabled() {
- return headerExtractionEnabled;
- }
-
- /**
- * Whether or not the header must be read in the first line of the test
- * document
- * <p/>
- * The default value is false
- */
- public void setHeaderExtractionEnabled(Boolean headerExtractionEnabled) {
- this.headerExtractionEnabled = headerExtractionEnabled;
- }
-
- public Integer getNumberOfRecordsToRead() {
- return numberOfRecordsToRead;
- }
-
- /**
- * The maximum number of record to read.
- */
- public void setNumberOfRecordsToRead(Integer numberOfRecordsToRead) {
- this.numberOfRecordsToRead = numberOfRecordsToRead;
- }
-
- public String getEmptyValue() {
- return emptyValue;
- }
-
- /**
- * The String representation of an empty value
- */
- public void setEmptyValue(String emptyValue) {
- this.emptyValue = emptyValue;
- }
-
- public String getLineSeparator() {
- return lineSeparator;
- }
-
- /**
- * The line separator of the files
- * <p/>
- * The default value is to use the JVM platform line separator
- */
- public void setLineSeparator(String lineSeparator) {
- this.lineSeparator = lineSeparator;
- }
-
- public String getNormalizedLineSeparator() {
- return normalizedLineSeparator;
- }
-
- /**
- * The normalized line separator of the files
- * <p/>
- * The default value is a new line character.
- */
- public void setNormalizedLineSeparator(String normalizedLineSeparator) {
- this.normalizedLineSeparator = normalizedLineSeparator;
- }
-
- public String getComment() {
- return comment;
- }
-
- /**
- * The comment symbol.
- * <p/>
- * The default value is #
- */
- public void setComment(String comment) {
- this.comment = comment;
- }
-
- public Boolean getLazyLoad() {
- return lazyLoad;
- }
-
- /**
- * Whether the unmarshalling should produce an iterator that reads the lines
- * on the fly or if all the lines must be read at one.
- * <p/>
- * The default value is false
- */
- public void setLazyLoad(Boolean lazyLoad) {
- this.lazyLoad = lazyLoad;
- }
-
- public Boolean getAsMap() {
- return asMap;
- }
-
- /**
- * Whether the unmarshalling should produce maps for the lines values
- * instead of lists. It requires to have header (either defined or
- * collected).
- * <p/>
- * The default value is false
- */
- public void setAsMap(Boolean asMap) {
- this.asMap = asMap;
- }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.model.dataformat;
+
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElementRef;
+
+import org.apache.camel.model.DataFormatDefinition;
+import org.apache.camel.spi.Metadata;
+
+/**
+ * Represents the common parts of all uniVocity
+ * {@link org.apache.camel.spi.DataFormat} parsers.
+ */
+@Metadata(label = "dataformat,transformation,csv", title = "uniVocity")
+@XmlAccessorType(XmlAccessType.FIELD)
+public abstract class UniVocityAbstractDataFormat extends DataFormatDefinition {
+
+ @XmlAttribute
+ protected String nullValue;
+ @XmlAttribute
+ @Metadata(defaultValue = "true")
+ protected Boolean skipEmptyLines;
+ @XmlAttribute
+ @Metadata(defaultValue = "true")
+ protected Boolean ignoreTrailingWhitespaces;
+ @XmlAttribute
+ @Metadata(defaultValue = "true")
+ protected Boolean ignoreLeadingWhitespaces;
+ @XmlAttribute
+ protected Boolean headersDisabled;
+ @XmlElementRef
+ protected List<UniVocityHeader> headers;
+ @XmlAttribute
+ protected Boolean headerExtractionEnabled;
+ @XmlAttribute
+ protected Integer numberOfRecordsToRead;
+ @XmlAttribute
+ protected String emptyValue;
+ @XmlAttribute
+ protected String lineSeparator;
+ @XmlAttribute
+ @Metadata(defaultValue = "\\n")
+ protected String normalizedLineSeparator;
+ @XmlAttribute
+ @Metadata(defaultValue = "#")
+ protected String comment;
+ @XmlAttribute
+ protected Boolean lazyLoad;
+ @XmlAttribute
+ protected Boolean asMap;
+
+ protected UniVocityAbstractDataFormat() {
+ // This constructor is needed by jaxb for schema generation
+ }
+
+ protected UniVocityAbstractDataFormat(String dataFormatName) {
+ super(dataFormatName);
+ }
+
+ public String getNullValue() {
+ return nullValue;
+ }
+
+ /**
+ * The string representation of a null value.
+ * <p/>
+ * The default value is null
+ */
+ public void setNullValue(String nullValue) {
+ this.nullValue = nullValue;
+ }
+
+ public Boolean getSkipEmptyLines() {
+ return skipEmptyLines;
+ }
+
+ /**
+ * Whether or not the empty lines must be ignored.
+ * <p/>
+ * The default value is true
+ */
+ public void setSkipEmptyLines(Boolean skipEmptyLines) {
+ this.skipEmptyLines = skipEmptyLines;
+ }
+
+ public Boolean getIgnoreTrailingWhitespaces() {
+ return ignoreTrailingWhitespaces;
+ }
+
+ /**
+ * Whether or not the trailing white spaces must ignored.
+ * <p/>
+ * The default value is true
+ */
+ public void setIgnoreTrailingWhitespaces(Boolean ignoreTrailingWhitespaces) {
+ this.ignoreTrailingWhitespaces = ignoreTrailingWhitespaces;
+ }
+
+ public Boolean getIgnoreLeadingWhitespaces() {
+ return ignoreLeadingWhitespaces;
+ }
+
+ /**
+ * Whether or not the leading white spaces must be ignored.
+ * <p/>
+ * The default value is true
+ */
+ public void setIgnoreLeadingWhitespaces(Boolean ignoreLeadingWhitespaces) {
+ this.ignoreLeadingWhitespaces = ignoreLeadingWhitespaces;
+ }
+
+ public Boolean getHeadersDisabled() {
+ return headersDisabled;
+ }
+
+ /**
+ * Whether or not the headers are disabled. When defined, this option
+ * explicitly sets the headers as null which indicates that there is no
+ * header.
+ * <p/>
+ * The default value is false
+ */
+ public void setHeadersDisabled(Boolean headersDisabled) {
+ this.headersDisabled = headersDisabled;
+ }
+
+ public List<UniVocityHeader> getHeaders() {
+ return headers;
+ }
+
+ /**
+ * The headers to use.
+ */
+ public void setHeaders(List<UniVocityHeader> headers) {
+ this.headers = headers;
+ }
+
+ public Boolean getHeaderExtractionEnabled() {
+ return headerExtractionEnabled;
+ }
+
+ /**
+ * Whether or not the header must be read in the first line of the test
+ * document
+ * <p/>
+ * The default value is false
+ */
+ public void setHeaderExtractionEnabled(Boolean headerExtractionEnabled) {
+ this.headerExtractionEnabled = headerExtractionEnabled;
+ }
+
+ public Integer getNumberOfRecordsToRead() {
+ return numberOfRecordsToRead;
+ }
+
+ /**
+ * The maximum number of record to read.
+ */
+ public void setNumberOfRecordsToRead(Integer numberOfRecordsToRead) {
+ this.numberOfRecordsToRead = numberOfRecordsToRead;
+ }
+
+ public String getEmptyValue() {
+ return emptyValue;
+ }
+
+ /**
+ * The String representation of an empty value
+ */
+ public void setEmptyValue(String emptyValue) {
+ this.emptyValue = emptyValue;
+ }
+
+ public String getLineSeparator() {
+ return lineSeparator;
+ }
+
+ /**
+ * The line separator of the files
+ * <p/>
+ * The default value is to use the JVM platform line separator
+ */
+ public void setLineSeparator(String lineSeparator) {
+ this.lineSeparator = lineSeparator;
+ }
+
+ public String getNormalizedLineSeparator() {
+ return normalizedLineSeparator;
+ }
+
+ /**
+ * The normalized line separator of the files
+ * <p/>
+ * The default value is a new line character.
+ */
+ public void setNormalizedLineSeparator(String normalizedLineSeparator) {
+ this.normalizedLineSeparator = normalizedLineSeparator;
+ }
+
+ public String getComment() {
+ return comment;
+ }
+
+ /**
+ * The comment symbol.
+ * <p/>
+ * The default value is #
+ */
+ public void setComment(String comment) {
+ this.comment = comment;
+ }
+
+ public Boolean getLazyLoad() {
+ return lazyLoad;
+ }
+
+ /**
+ * Whether the unmarshalling should produce an iterator that reads the lines
+ * on the fly or if all the lines must be read at one.
+ * <p/>
+ * The default value is false
+ */
+ public void setLazyLoad(Boolean lazyLoad) {
+ this.lazyLoad = lazyLoad;
+ }
+
+ public Boolean getAsMap() {
+ return asMap;
+ }
+
+ /**
+ * Whether the unmarshalling should produce maps for the lines values
+ * instead of lists. It requires to have header (either defined or
+ * collected).
+ * <p/>
+ * The default value is false
+ */
+ public void setAsMap(Boolean asMap) {
+ this.asMap = asMap;
+ }
+
+}
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/UniVocityCsvDataFormat.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/UniVocityCsvDataFormat.java
similarity index 96%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/UniVocityCsvDataFormat.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/UniVocityCsvDataFormat.java
index 981b33c..61ef82d 100644
--- a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/UniVocityCsvDataFormat.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/UniVocityCsvDataFormat.java
@@ -1,94 +1,94 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.model.dataformat;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.apache.camel.spi.Metadata;
-
-/**
- * The uniVocity CSV data format is used for working with CSV (Comma Separated
- * Values) flat payloads.
- */
-@Metadata(firstVersion = "2.15.0", label = "dataformat,transformation,csv", title = "uniVocity CSV")
-@XmlRootElement(name = "univocity-csv")
-@XmlAccessorType(XmlAccessType.FIELD)
-public class UniVocityCsvDataFormat extends UniVocityAbstractDataFormat {
- @XmlAttribute
- private Boolean quoteAllFields;
- @XmlAttribute
- @Metadata(defaultValue = "\"")
- private String quote;
- @XmlAttribute
- @Metadata(defaultValue = "\"")
- private String quoteEscape;
- @XmlAttribute
- @Metadata(defaultValue = ",")
- private String delimiter;
-
- public UniVocityCsvDataFormat() {
- super("univocity-csv");
- }
-
- public Boolean getQuoteAllFields() {
- return quoteAllFields;
- }
-
- /**
- * Whether or not all values must be quoted when writing them.
- */
- public void setQuoteAllFields(Boolean quoteAllFields) {
- this.quoteAllFields = quoteAllFields;
- }
-
- public String getQuote() {
- return quote;
- }
-
- /**
- * The quote symbol.
- */
- public void setQuote(String quote) {
- this.quote = quote;
- }
-
- public String getQuoteEscape() {
- return quoteEscape;
- }
-
- /**
- * The quote escape symbol
- */
- public void setQuoteEscape(String quoteEscape) {
- this.quoteEscape = quoteEscape;
- }
-
- public String getDelimiter() {
- return delimiter;
- }
-
- /**
- * The delimiter of values
- */
- public void setDelimiter(String delimiter) {
- this.delimiter = delimiter;
- }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.model.dataformat;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.apache.camel.spi.Metadata;
+
+/**
+ * The uniVocity CSV data format is used for working with CSV (Comma Separated
+ * Values) flat payloads.
+ */
+@Metadata(firstVersion = "2.15.0", label = "dataformat,transformation,csv", title = "uniVocity CSV")
+@XmlRootElement(name = "univocity-csv")
+@XmlAccessorType(XmlAccessType.FIELD)
+public class UniVocityCsvDataFormat extends UniVocityAbstractDataFormat {
+ @XmlAttribute
+ private Boolean quoteAllFields;
+ @XmlAttribute
+ @Metadata(defaultValue = "\"")
+ private String quote;
+ @XmlAttribute
+ @Metadata(defaultValue = "\"")
+ private String quoteEscape;
+ @XmlAttribute
+ @Metadata(defaultValue = ",")
+ private String delimiter;
+
+ public UniVocityCsvDataFormat() {
+ super("univocity-csv");
+ }
+
+ public Boolean getQuoteAllFields() {
+ return quoteAllFields;
+ }
+
+ /**
+ * Whether or not all values must be quoted when writing them.
+ */
+ public void setQuoteAllFields(Boolean quoteAllFields) {
+ this.quoteAllFields = quoteAllFields;
+ }
+
+ public String getQuote() {
+ return quote;
+ }
+
+ /**
+ * The quote symbol.
+ */
+ public void setQuote(String quote) {
+ this.quote = quote;
+ }
+
+ public String getQuoteEscape() {
+ return quoteEscape;
+ }
+
+ /**
+ * The quote escape symbol
+ */
+ public void setQuoteEscape(String quoteEscape) {
+ this.quoteEscape = quoteEscape;
+ }
+
+ public String getDelimiter() {
+ return delimiter;
+ }
+
+ /**
+ * The delimiter of values
+ */
+ public void setDelimiter(String delimiter) {
+ this.delimiter = delimiter;
+ }
+
+}
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/UniVocityFixedWidthDataFormat.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/UniVocityFixedWidthDataFormat.java
similarity index 97%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/UniVocityFixedWidthDataFormat.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/UniVocityFixedWidthDataFormat.java
index bbf1eb8..b35eca0 100644
--- a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/UniVocityFixedWidthDataFormat.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/UniVocityFixedWidthDataFormat.java
@@ -1,84 +1,84 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.model.dataformat;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.apache.camel.spi.Metadata;
-
-/**
- * The uniVocity Fixed Length data format is used for working with fixed length
- * flat payloads.
- */
-@Metadata(firstVersion = "2.15.0", label = "dataformat,transformation,csv", title = "uniVocity Fixed Length")
-@XmlRootElement(name = "univocity-fixed")
-@XmlAccessorType(XmlAccessType.FIELD)
-public class UniVocityFixedWidthDataFormat extends UniVocityAbstractDataFormat {
- @XmlAttribute
- private Boolean skipTrailingCharsUntilNewline;
- @XmlAttribute
- private Boolean recordEndsOnNewline;
- @XmlAttribute
- private String padding;
-
- public UniVocityFixedWidthDataFormat() {
- super("univocity-fixed");
- }
-
- public Boolean getSkipTrailingCharsUntilNewline() {
- return skipTrailingCharsUntilNewline;
- }
-
- /**
- * Whether or not the trailing characters until new line must be ignored.
- * <p/>
- * The default value is false
- */
- public void setSkipTrailingCharsUntilNewline(Boolean skipTrailingCharsUntilNewline) {
- this.skipTrailingCharsUntilNewline = skipTrailingCharsUntilNewline;
- }
-
- public Boolean getRecordEndsOnNewline() {
- return recordEndsOnNewline;
- }
-
- /**
- * Whether or not the record ends on new line.
- * <p/>
- * The default value is false
- */
- public void setRecordEndsOnNewline(Boolean recordEndsOnNewline) {
- this.recordEndsOnNewline = recordEndsOnNewline;
- }
-
- public String getPadding() {
- return padding;
- }
-
- /**
- * The padding character.
- * <p/>
- * The default value is a space
- */
- public void setPadding(String padding) {
- this.padding = padding;
- }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.model.dataformat;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.apache.camel.spi.Metadata;
+
+/**
+ * The uniVocity Fixed Length data format is used for working with fixed length
+ * flat payloads.
+ */
+@Metadata(firstVersion = "2.15.0", label = "dataformat,transformation,csv", title = "uniVocity Fixed Length")
+@XmlRootElement(name = "univocity-fixed")
+@XmlAccessorType(XmlAccessType.FIELD)
+public class UniVocityFixedWidthDataFormat extends UniVocityAbstractDataFormat {
+ @XmlAttribute
+ private Boolean skipTrailingCharsUntilNewline;
+ @XmlAttribute
+ private Boolean recordEndsOnNewline;
+ @XmlAttribute
+ private String padding;
+
+ public UniVocityFixedWidthDataFormat() {
+ super("univocity-fixed");
+ }
+
+ public Boolean getSkipTrailingCharsUntilNewline() {
+ return skipTrailingCharsUntilNewline;
+ }
+
+ /**
+ * Whether or not the trailing characters until new line must be ignored.
+ * <p/>
+ * The default value is false
+ */
+ public void setSkipTrailingCharsUntilNewline(Boolean skipTrailingCharsUntilNewline) {
+ this.skipTrailingCharsUntilNewline = skipTrailingCharsUntilNewline;
+ }
+
+ public Boolean getRecordEndsOnNewline() {
+ return recordEndsOnNewline;
+ }
+
+ /**
+ * Whether or not the record ends on new line.
+ * <p/>
+ * The default value is false
+ */
+ public void setRecordEndsOnNewline(Boolean recordEndsOnNewline) {
+ this.recordEndsOnNewline = recordEndsOnNewline;
+ }
+
+ public String getPadding() {
+ return padding;
+ }
+
+ /**
+ * The padding character.
+ * <p/>
+ * The default value is a space
+ */
+ public void setPadding(String padding) {
+ this.padding = padding;
+ }
+
+}
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/UniVocityHeader.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/UniVocityHeader.java
similarity index 96%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/UniVocityHeader.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/UniVocityHeader.java
index 1cb556c..dff7715 100644
--- a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/UniVocityHeader.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/UniVocityHeader.java
@@ -1,60 +1,60 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.model.dataformat;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlValue;
-
-import org.apache.camel.spi.Metadata;
-
-/**
- * To configure headers for UniVocity data formats.
- */
-@Metadata(label = "dataformat,transformation,csv", title = "uniVocity Header")
-@XmlRootElement(name = "univocity-header")
-@XmlAccessorType(XmlAccessType.FIELD)
-public class UniVocityHeader {
- @XmlValue
- private String name;
- @XmlAttribute
- private Integer length;
-
- public String getName() {
- return name;
- }
-
- /**
- * Header name
- */
- public void setName(String name) {
- this.name = name;
- }
-
- public Integer getLength() {
- return length;
- }
-
- /**
- * Header length
- */
- public void setLength(Integer length) {
- this.length = length;
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.model.dataformat;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlValue;
+
+import org.apache.camel.spi.Metadata;
+
+/**
+ * To configure headers for UniVocity data formats.
+ */
+@Metadata(label = "dataformat,transformation,csv", title = "uniVocity Header")
+@XmlRootElement(name = "univocity-header")
+@XmlAccessorType(XmlAccessType.FIELD)
+public class UniVocityHeader {
+ @XmlValue
+ private String name;
+ @XmlAttribute
+ private Integer length;
+
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * Header name
+ */
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public Integer getLength() {
+ return length;
+ }
+
+ /**
+ * Header length
+ */
+ public void setLength(Integer length) {
+ this.length = length;
+ }
+}
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/UniVocityTsvDataFormat.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/UniVocityTsvDataFormat.java
similarity index 97%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/UniVocityTsvDataFormat.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/UniVocityTsvDataFormat.java
index 9e111ef..721bb40 100644
--- a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/UniVocityTsvDataFormat.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/UniVocityTsvDataFormat.java
@@ -1,53 +1,53 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.model.dataformat;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.apache.camel.spi.Metadata;
-
-/**
- * The uniVocity TSV data format is used for working with TSV (Tabular Separated
- * Values) flat payloads.
- */
-@Metadata(firstVersion = "2.15.0", label = "dataformat,transformation,csv", title = "uniVocity TSV")
-@XmlRootElement(name = "univocity-tsv")
-@XmlAccessorType(XmlAccessType.FIELD)
-public class UniVocityTsvDataFormat extends UniVocityAbstractDataFormat {
- @XmlAttribute
- @Metadata(defaultValue = "\\")
- private String escapeChar;
-
- public UniVocityTsvDataFormat() {
- super("univocity-tsv");
- }
-
- public String getEscapeChar() {
- return escapeChar;
- }
-
- /**
- * The escape character.
- */
- public void setEscapeChar(String escapeChar) {
- this.escapeChar = escapeChar;
- }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.model.dataformat;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.apache.camel.spi.Metadata;
+
+/**
+ * The uniVocity TSV data format is used for working with TSV (Tabular Separated
+ * Values) flat payloads.
+ */
+@Metadata(firstVersion = "2.15.0", label = "dataformat,transformation,csv", title = "uniVocity TSV")
+@XmlRootElement(name = "univocity-tsv")
+@XmlAccessorType(XmlAccessType.FIELD)
+public class UniVocityTsvDataFormat extends UniVocityAbstractDataFormat {
+ @XmlAttribute
+ @Metadata(defaultValue = "\\")
+ private String escapeChar;
+
+ public UniVocityTsvDataFormat() {
+ super("univocity-tsv");
+ }
+
+ public String getEscapeChar() {
+ return escapeChar;
+ }
+
+ /**
+ * The escape character.
+ */
+ public void setEscapeChar(String escapeChar) {
+ this.escapeChar = escapeChar;
+ }
+
+}
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/XMLSecurityDataFormat.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/XMLSecurityDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/XMLSecurityDataFormat.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/XMLSecurityDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/XStreamDataFormat.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/XStreamDataFormat.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/XmlRpcDataFormat.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/XmlRpcDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/XmlRpcDataFormat.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/XmlRpcDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/YAMLDataFormat.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/YAMLDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/YAMLDataFormat.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/YAMLDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/YAMLLibrary.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/YAMLLibrary.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/YAMLLibrary.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/YAMLLibrary.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/YAMLTypeFilterDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/YAMLTypeFilterDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/YAMLTypeFilterDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/YAMLTypeFilterDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/YAMLTypeFilterType.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/YAMLTypeFilterType.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/YAMLTypeFilterType.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/YAMLTypeFilterType.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/ZipDeflaterDataFormat.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/ZipDeflaterDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/ZipDeflaterDataFormat.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/ZipDeflaterDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/ZipFileDataFormat.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/ZipFileDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/ZipFileDataFormat.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/ZipFileDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/package-info.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/package-info.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/package-info.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/package-info.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/ConstantExpression.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/language/ConstantExpression.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/ConstantExpression.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/language/ConstantExpression.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/ExchangePropertyExpression.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/language/ExchangePropertyExpression.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/ExchangePropertyExpression.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/language/ExchangePropertyExpression.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/ExpressionDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/language/ExpressionDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/ExpressionDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/language/ExpressionDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/GroovyExpression.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/language/GroovyExpression.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/GroovyExpression.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/language/GroovyExpression.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/HeaderExpression.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/language/HeaderExpression.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/HeaderExpression.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/language/HeaderExpression.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/Hl7TerserExpression.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/language/Hl7TerserExpression.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/Hl7TerserExpression.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/language/Hl7TerserExpression.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/JsonPathExpression.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/language/JsonPathExpression.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/JsonPathExpression.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/language/JsonPathExpression.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/LanguageExpression.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/language/LanguageExpression.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/LanguageExpression.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/language/LanguageExpression.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/MethodCallExpression.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/language/MethodCallExpression.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/MethodCallExpression.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/language/MethodCallExpression.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/MvelExpression.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/language/MvelExpression.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/MvelExpression.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/language/MvelExpression.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/NamespaceAwareExpression.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/language/NamespaceAwareExpression.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/NamespaceAwareExpression.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/language/NamespaceAwareExpression.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/OgnlExpression.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/language/OgnlExpression.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/OgnlExpression.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/language/OgnlExpression.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/RefExpression.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/language/RefExpression.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/RefExpression.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/language/RefExpression.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/SimpleExpression.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/language/SimpleExpression.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/SimpleExpression.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/language/SimpleExpression.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/SpELExpression.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/language/SpELExpression.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/SpELExpression.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/language/SpELExpression.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/TokenizerExpression.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/language/TokenizerExpression.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/TokenizerExpression.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/language/TokenizerExpression.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/XMLTokenizerExpression.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/language/XMLTokenizerExpression.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/XMLTokenizerExpression.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/language/XMLTokenizerExpression.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/XPathExpression.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/language/XPathExpression.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/XPathExpression.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/language/XPathExpression.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/XQueryExpression.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/language/XQueryExpression.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/XQueryExpression.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/language/XQueryExpression.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/package-info.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/language/package-info.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/package-info.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/language/package-info.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/loadbalancer/CustomLoadBalancerDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/loadbalancer/CustomLoadBalancerDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/loadbalancer/CustomLoadBalancerDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/loadbalancer/CustomLoadBalancerDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/loadbalancer/FailoverLoadBalancerDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/loadbalancer/FailoverLoadBalancerDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/loadbalancer/FailoverLoadBalancerDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/loadbalancer/FailoverLoadBalancerDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/loadbalancer/RandomLoadBalancerDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/loadbalancer/RandomLoadBalancerDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/loadbalancer/RandomLoadBalancerDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/loadbalancer/RandomLoadBalancerDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/loadbalancer/RoundRobinLoadBalancerDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/loadbalancer/RoundRobinLoadBalancerDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/loadbalancer/RoundRobinLoadBalancerDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/loadbalancer/RoundRobinLoadBalancerDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/loadbalancer/StickyLoadBalancerDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/loadbalancer/StickyLoadBalancerDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/loadbalancer/StickyLoadBalancerDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/loadbalancer/StickyLoadBalancerDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/loadbalancer/TopicLoadBalancerDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/loadbalancer/TopicLoadBalancerDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/loadbalancer/TopicLoadBalancerDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/loadbalancer/TopicLoadBalancerDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/loadbalancer/WeightedLoadBalancerDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/loadbalancer/WeightedLoadBalancerDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/loadbalancer/WeightedLoadBalancerDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/loadbalancer/WeightedLoadBalancerDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/loadbalancer/package-info.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/loadbalancer/package-info.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/loadbalancer/package-info.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/loadbalancer/package-info.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/package-info.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/package-info.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/package-info.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/package-info.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/CollectionFormat.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/rest/CollectionFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/CollectionFormat.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/rest/CollectionFormat.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/DeleteVerbDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/rest/DeleteVerbDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/DeleteVerbDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/rest/DeleteVerbDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/GetVerbDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/rest/GetVerbDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/GetVerbDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/rest/GetVerbDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/HeadVerbDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/rest/HeadVerbDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/HeadVerbDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/rest/HeadVerbDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/PatchVerbDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/rest/PatchVerbDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/PatchVerbDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/rest/PatchVerbDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/PostVerbDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/rest/PostVerbDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/PostVerbDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/rest/PostVerbDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/PutVerbDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/rest/PutVerbDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/PutVerbDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/rest/PutVerbDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestBindingDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestBindingDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestBindingDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestBindingDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestBindingMode.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestBindingMode.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestBindingMode.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestBindingMode.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestConfigurationDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestConfigurationDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestConfigurationDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestConfigurationDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestConstants.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestConstants.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestConstants.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestConstants.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestContainer.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestContainer.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestContainer.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestContainer.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestHostNameResolver.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestHostNameResolver.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestHostNameResolver.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestHostNameResolver.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestOperationParamDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestOperationParamDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestOperationParamDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestOperationParamDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestOperationResponseHeaderDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestOperationResponseHeaderDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestOperationResponseHeaderDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestOperationResponseHeaderDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestOperationResponseMsgDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestOperationResponseMsgDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestOperationResponseMsgDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestOperationResponseMsgDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestParamType.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestParamType.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestParamType.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestParamType.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestPropertyDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestPropertyDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestPropertyDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestPropertyDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestSecuritiesDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestSecuritiesDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestSecuritiesDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestSecuritiesDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestSecurityApiKey.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestSecurityApiKey.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestSecurityApiKey.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestSecurityApiKey.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestSecurityBasicAuth.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestSecurityBasicAuth.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestSecurityBasicAuth.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestSecurityBasicAuth.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestSecurityDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestSecurityDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestSecurityDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestSecurityDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestSecurityOAuth2.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestSecurityOAuth2.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestSecurityOAuth2.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestSecurityOAuth2.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestsDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestsDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestsDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestsDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/SecurityDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/rest/SecurityDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/SecurityDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/rest/SecurityDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/VerbDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/rest/VerbDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/VerbDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/rest/VerbDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/package-info.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/rest/package-info.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/package-info.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/rest/package-info.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/transformer/CustomTransformerDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/transformer/CustomTransformerDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/transformer/CustomTransformerDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/transformer/CustomTransformerDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/transformer/DataFormatTransformerDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/transformer/DataFormatTransformerDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/transformer/DataFormatTransformerDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/transformer/DataFormatTransformerDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/transformer/EndpointTransformerDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/transformer/EndpointTransformerDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/transformer/EndpointTransformerDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/transformer/EndpointTransformerDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/transformer/TransformerDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/transformer/TransformerDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/transformer/TransformerDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/transformer/TransformerDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/transformer/TransformersDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/transformer/TransformersDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/transformer/TransformersDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/transformer/TransformersDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/transformer/package-info.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/transformer/package-info.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/transformer/package-info.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/transformer/package-info.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/validator/CustomValidatorDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/validator/CustomValidatorDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/validator/CustomValidatorDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/validator/CustomValidatorDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/validator/EndpointValidatorDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/validator/EndpointValidatorDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/validator/EndpointValidatorDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/validator/EndpointValidatorDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/validator/PredicateValidatorDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/validator/PredicateValidatorDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/validator/PredicateValidatorDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/validator/PredicateValidatorDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/validator/ValidatorDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/validator/ValidatorDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/validator/ValidatorDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/validator/ValidatorDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/validator/ValidatorsDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/validator/ValidatorsDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/validator/ValidatorsDefinition.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/validator/ValidatorsDefinition.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/model/validator/package-info.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/validator/package-info.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/model/validator/package-info.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/model/validator/package-info.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/AggregateReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/AggregateReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/AggregateReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/AggregateReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/BeanReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/BeanReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/BeanReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/BeanReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/CatchReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/CatchReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/CatchReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/CatchReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/ChoiceReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/ChoiceReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/ChoiceReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/ChoiceReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/ClaimCheckReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/ClaimCheckReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/ClaimCheckReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/ClaimCheckReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/ConvertBodyReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/ConvertBodyReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/ConvertBodyReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/ConvertBodyReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/DelayReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/DelayReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/DelayReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/DelayReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/DynamicRouterReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/DynamicRouterReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/DynamicRouterReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/DynamicRouterReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/EnrichReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/EnrichReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/EnrichReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/EnrichReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/ExpressionReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/ExpressionReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/ExpressionReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/ExpressionReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/FilterReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/FilterReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/FilterReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/FilterReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/FinallyReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/FinallyReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/FinallyReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/FinallyReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/HystrixReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/HystrixReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/HystrixReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/HystrixReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/IdempotentConsumerReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/IdempotentConsumerReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/IdempotentConsumerReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/IdempotentConsumerReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/InterceptFromReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/InterceptFromReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/InterceptFromReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/InterceptFromReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/InterceptReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/InterceptReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/InterceptReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/InterceptReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/InterceptSendToEndpointReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/InterceptSendToEndpointReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/InterceptSendToEndpointReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/InterceptSendToEndpointReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/LoadBalanceReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/LoadBalanceReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/LoadBalanceReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/LoadBalanceReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/LogReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/LogReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/LogReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/LogReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/LoopReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/LoopReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/LoopReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/LoopReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/MarshalReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/MarshalReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/MarshalReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/MarshalReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/MulticastReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/MulticastReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/MulticastReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/MulticastReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/OnCompletionReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/OnCompletionReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/OnCompletionReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/OnCompletionReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/OnExceptionReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/OnExceptionReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/OnExceptionReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/OnExceptionReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/OnFallbackReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/OnFallbackReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/OnFallbackReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/OnFallbackReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/OtherwiseReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/OtherwiseReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/OtherwiseReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/OtherwiseReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/PipelineReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/PipelineReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/PipelineReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/PipelineReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/PolicyReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/PolicyReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/PolicyReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/PolicyReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/PollEnrichReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/PollEnrichReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/PollEnrichReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/PollEnrichReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/ProcessReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/ProcessReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/ProcessReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/ProcessReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/ProcessorReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/ProcessorReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/ProcessorReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/ProcessorReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/RecipientListReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/RecipientListReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/RecipientListReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/RecipientListReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/RemoveHeaderReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/RemoveHeaderReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/RemoveHeaderReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/RemoveHeaderReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/RemoveHeadersReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/RemoveHeadersReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/RemoveHeadersReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/RemoveHeadersReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/RemovePropertiesReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/RemovePropertiesReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/RemovePropertiesReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/RemovePropertiesReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/RemovePropertyReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/RemovePropertyReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/RemovePropertyReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/RemovePropertyReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/ResequenceReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/ResequenceReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/ResequenceReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/ResequenceReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/RollbackReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/RollbackReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/RollbackReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/RollbackReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/RouteReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/RouteReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/RouteReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/RouteReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/RoutingSlipReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/RoutingSlipReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/RoutingSlipReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/RoutingSlipReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/SagaReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/SagaReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/SagaReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/SagaReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/SamplingReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/SamplingReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/SamplingReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/SamplingReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/ScriptReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/ScriptReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/ScriptReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/ScriptReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/SendReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/SendReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/SendReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/SendReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/ServiceCallReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/ServiceCallReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/ServiceCallReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/ServiceCallReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/SetBodyReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/SetBodyReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/SetBodyReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/SetBodyReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/SetExchangePatternReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/SetExchangePatternReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/SetExchangePatternReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/SetExchangePatternReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/SetHeaderReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/SetHeaderReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/SetHeaderReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/SetHeaderReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/SetPropertyReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/SetPropertyReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/SetPropertyReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/SetPropertyReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/SortReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/SortReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/SortReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/SortReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/SplitReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/SplitReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/SplitReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/SplitReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/StepReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/StepReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/StepReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/StepReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/StopReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/StopReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/StopReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/StopReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/ThreadsReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/ThreadsReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/ThreadsReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/ThreadsReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/ThrottleReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/ThrottleReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/ThrottleReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/ThrottleReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/ThrowExceptionReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/ThrowExceptionReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/ThrowExceptionReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/ThrowExceptionReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/ToDynamicReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/ToDynamicReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/ToDynamicReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/ToDynamicReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/TransactedReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/TransactedReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/TransactedReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/TransactedReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/TransformReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/TransformReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/TransformReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/TransformReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/TryReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/TryReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/TryReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/TryReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/UnmarshalReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/UnmarshalReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/UnmarshalReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/UnmarshalReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/ValidateReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/ValidateReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/ValidateReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/ValidateReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/WhenReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/WhenReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/WhenReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/WhenReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/WhenSkipSendToEndpointReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/WhenSkipSendToEndpointReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/WhenSkipSendToEndpointReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/WhenSkipSendToEndpointReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/WireTapReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/WireTapReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/WireTapReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/WireTapReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/ASN1DataFormatReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/ASN1DataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/ASN1DataFormatReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/ASN1DataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/Any23DataFormatReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/Any23DataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/Any23DataFormatReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/Any23DataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/AvroDataFormatReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/AvroDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/AvroDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/AvroDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/BarcodeDataFormatReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/BarcodeDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/BarcodeDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/BarcodeDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/Base64DataFormatReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/Base64DataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/Base64DataFormatReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/Base64DataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/BeanioDataFormatReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/BeanioDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/BeanioDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/BeanioDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/BindyDataFormatReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/BindyDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/BindyDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/BindyDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/CBORDataFormatReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/CBORDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/CBORDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/CBORDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/CryptoDataFormatReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/CryptoDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/CryptoDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/CryptoDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/CsvDataFormatReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/CsvDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/CsvDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/CsvDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/CustomDataFormatReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/CustomDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/CustomDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/CustomDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/DataFormatReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/DataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/DataFormatReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/DataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/FhirDataFormatReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/FhirDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/FhirDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/FhirDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/FhirJsonDataFormatReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/FhirJsonDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/FhirJsonDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/FhirJsonDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/FhirXmlDataFormatReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/FhirXmlDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/FhirXmlDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/FhirXmlDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/FlatpackDataFormatReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/FlatpackDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/FlatpackDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/FlatpackDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/GrokDataFormatReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/GrokDataFormatReifier.java
similarity index 97%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/GrokDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/GrokDataFormatReifier.java
index e69aede..6d31fe0 100644
--- a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/GrokDataFormatReifier.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/GrokDataFormatReifier.java
@@ -1,39 +1,39 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.reifier.dataformat;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.model.DataFormatDefinition;
-import org.apache.camel.model.dataformat.GrokDataFormat;
-import org.apache.camel.spi.DataFormat;
-import org.apache.camel.util.ObjectHelper;
-
-public class GrokDataFormatReifier extends DataFormatReifier<GrokDataFormat> {
-
- public GrokDataFormatReifier(DataFormatDefinition definition) {
- super((GrokDataFormat)definition);
- }
-
- @Override
- protected void configureDataFormat(DataFormat dataFormat, CamelContext camelContext) {
- ObjectHelper.notNull(definition.getPattern(), "pattern");
- setProperty(camelContext, dataFormat, "pattern", definition.getPattern());
- setProperty(camelContext, dataFormat, "flattened", definition.isFlattened());
- setProperty(camelContext, dataFormat, "allowMultipleMatchesPerLine", definition.isAllowMultipleMatchesPerLine());
- setProperty(camelContext, dataFormat, "namedOnly", definition.isNamedOnly());
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.reifier.dataformat;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.model.DataFormatDefinition;
+import org.apache.camel.model.dataformat.GrokDataFormat;
+import org.apache.camel.spi.DataFormat;
+import org.apache.camel.util.ObjectHelper;
+
+public class GrokDataFormatReifier extends DataFormatReifier<GrokDataFormat> {
+
+ public GrokDataFormatReifier(DataFormatDefinition definition) {
+ super((GrokDataFormat)definition);
+ }
+
+ @Override
+ protected void configureDataFormat(DataFormat dataFormat, CamelContext camelContext) {
+ ObjectHelper.notNull(definition.getPattern(), "pattern");
+ setProperty(camelContext, dataFormat, "pattern", definition.getPattern());
+ setProperty(camelContext, dataFormat, "flattened", definition.isFlattened());
+ setProperty(camelContext, dataFormat, "allowMultipleMatchesPerLine", definition.isAllowMultipleMatchesPerLine());
+ setProperty(camelContext, dataFormat, "namedOnly", definition.isNamedOnly());
+ }
+}
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/GzipDataFormatReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/GzipDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/GzipDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/GzipDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/HL7DataFormatReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/HL7DataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/HL7DataFormatReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/HL7DataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/IcalDataFormatReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/IcalDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/IcalDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/IcalDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/JacksonXMLDataFormatReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/JacksonXMLDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/JacksonXMLDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/JacksonXMLDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/JaxbDataFormatReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/JaxbDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/JaxbDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/JaxbDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/JsonApiDataFormatReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/JsonApiDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/JsonApiDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/JsonApiDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/JsonDataFormatReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/JsonDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/JsonDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/JsonDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/LZFDataFormatReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/LZFDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/LZFDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/LZFDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/MimeMultipartDataFormatReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/MimeMultipartDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/MimeMultipartDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/MimeMultipartDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/PGPDataFormatReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/PGPDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/PGPDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/PGPDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/ProtobufDataFormatReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/ProtobufDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/ProtobufDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/ProtobufDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/RssDataFormatReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/RssDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/RssDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/RssDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/SoapJaxbDataFormatReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/SoapJaxbDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/SoapJaxbDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/SoapJaxbDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/SyslogDataFormatReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/SyslogDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/SyslogDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/SyslogDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/TarFileDataFormatReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/TarFileDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/TarFileDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/TarFileDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/ThriftDataFormatReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/ThriftDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/ThriftDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/ThriftDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/TidyMarkupDataFormatReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/TidyMarkupDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/TidyMarkupDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/TidyMarkupDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/UniVocityAbstractDataFormatReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/UniVocityAbstractDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/UniVocityAbstractDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/UniVocityAbstractDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/UniVocityCsvDataFormatReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/UniVocityCsvDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/UniVocityCsvDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/UniVocityCsvDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/UniVocityFixedWidthDataFormatReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/UniVocityFixedWidthDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/UniVocityFixedWidthDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/UniVocityFixedWidthDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/UniVocityTsvDataFormatReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/UniVocityTsvDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/UniVocityTsvDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/UniVocityTsvDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/XMLSecurityDataFormatReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/XMLSecurityDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/XMLSecurityDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/XMLSecurityDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/XStreamDataFormatReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/XStreamDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/XStreamDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/XStreamDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/XmlRpcDataFormatReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/XmlRpcDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/XmlRpcDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/XmlRpcDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/YAMLDataFormatReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/YAMLDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/YAMLDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/YAMLDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/ZipDataFormatReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/ZipDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/ZipDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/ZipDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/ZipFileDataFormatReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/ZipFileDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/ZipFileDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/ZipFileDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/errorhandler/DeadLetterChannelReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/errorhandler/DeadLetterChannelReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/errorhandler/DeadLetterChannelReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/errorhandler/DeadLetterChannelReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/errorhandler/DefaultErrorHandlerReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/errorhandler/DefaultErrorHandlerReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/errorhandler/DefaultErrorHandlerReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/errorhandler/DefaultErrorHandlerReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/errorhandler/ErrorHandlerRefReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerRefReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/errorhandler/ErrorHandlerRefReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerRefReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/errorhandler/ErrorHandlerReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/errorhandler/ErrorHandlerReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/errorhandler/NoErrorHandlerReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/errorhandler/NoErrorHandlerReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/errorhandler/NoErrorHandlerReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/errorhandler/NoErrorHandlerReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/loadbalancer/CustomLoadBalancerReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/loadbalancer/CustomLoadBalancerReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/loadbalancer/CustomLoadBalancerReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/loadbalancer/CustomLoadBalancerReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/loadbalancer/FailoverLoadBalancerReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/loadbalancer/FailoverLoadBalancerReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/loadbalancer/FailoverLoadBalancerReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/loadbalancer/FailoverLoadBalancerReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/loadbalancer/LoadBalancerReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/loadbalancer/LoadBalancerReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/loadbalancer/LoadBalancerReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/loadbalancer/LoadBalancerReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/loadbalancer/RandomLoadBalancerReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/loadbalancer/RandomLoadBalancerReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/loadbalancer/RandomLoadBalancerReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/loadbalancer/RandomLoadBalancerReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/loadbalancer/RoundRobinLoadBalancerReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/loadbalancer/RoundRobinLoadBalancerReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/loadbalancer/RoundRobinLoadBalancerReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/loadbalancer/RoundRobinLoadBalancerReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/loadbalancer/StickyLoadBalancerReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/loadbalancer/StickyLoadBalancerReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/loadbalancer/StickyLoadBalancerReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/loadbalancer/StickyLoadBalancerReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/loadbalancer/TopicLoadBalancerReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/loadbalancer/TopicLoadBalancerReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/loadbalancer/TopicLoadBalancerReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/loadbalancer/TopicLoadBalancerReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/loadbalancer/WeightedLoadBalancerReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/loadbalancer/WeightedLoadBalancerReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/loadbalancer/WeightedLoadBalancerReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/loadbalancer/WeightedLoadBalancerReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/rest/RestBindingReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/rest/RestBindingReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/rest/RestBindingReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/rest/RestBindingReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/transformer/CustomTransformeReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/transformer/CustomTransformeReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/transformer/CustomTransformeReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/transformer/CustomTransformeReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/transformer/DataFormatTransformeReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/transformer/DataFormatTransformeReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/transformer/DataFormatTransformeReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/transformer/DataFormatTransformeReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/transformer/EndpointTransformeReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/transformer/EndpointTransformeReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/transformer/EndpointTransformeReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/transformer/EndpointTransformeReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/transformer/TransformerReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/transformer/TransformerReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/transformer/TransformerReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/transformer/TransformerReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/validator/CustomValidatorReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/validator/CustomValidatorReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/validator/CustomValidatorReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/validator/CustomValidatorReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/validator/EndpointValidatorReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/validator/EndpointValidatorReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/validator/EndpointValidatorReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/validator/EndpointValidatorReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/validator/PredicateValidatorReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/validator/PredicateValidatorReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/validator/PredicateValidatorReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/validator/PredicateValidatorReifier.java
diff --git a/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/validator/ValidatorReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/validator/ValidatorReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/validator/ValidatorReifier.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/reifier/validator/ValidatorReifier.java
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AhcEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AhcEndpointBuilderFactory.java
index 1a588aa..189c911 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AhcEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AhcEndpointBuilderFactory.java
@@ -18,7 +18,7 @@ package org.apache.camel.builder.endpoint.dsl;
import java.util.Map;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
import org.apache.camel.spi.HeaderFilterStrategy;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AtomEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AtomEndpointBuilderFactory.java
index 96d4d59..5750778 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AtomEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AtomEndpointBuilderFactory.java
@@ -19,7 +19,6 @@ package org.apache.camel.builder.endpoint.dsl;
import java.util.Date;
import javax.annotation.Generated;
import org.apache.camel.builder.EndpointConsumerBuilder;
-import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
/**
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AtomixMultiMapEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AtomixMultiMapEndpointBuilderFactory.java
index 20b0f5b..344eeda 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AtomixMultiMapEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AtomixMultiMapEndpointBuilderFactory.java
@@ -21,7 +21,6 @@ import java.util.Map;
import java.util.Properties;
import javax.annotation.Generated;
import org.apache.camel.builder.EndpointConsumerBuilder;
-import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
/**
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/BeanEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/BeanEndpointBuilderFactory.java
index 290b902..f491e50 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/BeanEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/BeanEndpointBuilderFactory.java
@@ -18,7 +18,7 @@ package org.apache.camel.builder.endpoint.dsl;
import java.util.Map;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/BeanValidatorEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/BeanValidatorEndpointBuilderFactory.java
index 0680c54..fc1b242 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/BeanValidatorEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/BeanValidatorEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/BonitaEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/BonitaEndpointBuilderFactory.java
index f7b81e9..6c879f9 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/BonitaEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/BonitaEndpointBuilderFactory.java
@@ -18,7 +18,6 @@ package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
import org.apache.camel.builder.EndpointConsumerBuilder;
-import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
/**
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CMEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CMEndpointBuilderFactory.java
index 9cbaa39..9d5c220 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CMEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CMEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ChatScriptEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ChatScriptEndpointBuilderFactory.java
index 1bc7e16..5319f34 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ChatScriptEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ChatScriptEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ChunkEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ChunkEndpointBuilderFactory.java
index a7f0c4a..8e58227 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ChunkEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ChunkEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CinderEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CinderEndpointBuilderFactory.java
index b4217f6..b25a43e 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CinderEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CinderEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ClassEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ClassEndpointBuilderFactory.java
index 05be816..007edf7 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ClassEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ClassEndpointBuilderFactory.java
@@ -18,7 +18,7 @@ package org.apache.camel.builder.endpoint.dsl;
import java.util.Map;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ControlBusEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ControlBusEndpointBuilderFactory.java
index 3647d63..17e9d25 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ControlBusEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ControlBusEndpointBuilderFactory.java
@@ -18,7 +18,6 @@ package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
import org.apache.camel.LoggingLevel;
-import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CryptoCmsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CryptoCmsEndpointBuilderFactory.java
index 47b370d..faa8180 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CryptoCmsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CryptoCmsEndpointBuilderFactory.java
@@ -19,7 +19,7 @@ package org.apache.camel.builder.endpoint.dsl;
import java.security.KeyStore;
import java.util.List;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CwEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CwEndpointBuilderFactory.java
index 761822b..720d63c 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CwEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CwEndpointBuilderFactory.java
@@ -18,7 +18,7 @@ package org.apache.camel.builder.endpoint.dsl;
import java.util.Date;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DataFormatEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DataFormatEndpointBuilderFactory.java
index cc5791c..7a2eba7 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DataFormatEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DataFormatEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DataSetTestEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DataSetTestEndpointBuilderFactory.java
index 69f57c4..75863c0 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DataSetTestEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DataSetTestEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DdbEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DdbEndpointBuilderFactory.java
index 902ee0e..80aee30 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DdbEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DdbEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DdbStreamEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DdbStreamEndpointBuilderFactory.java
index 20cb484..928465a 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DdbStreamEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DdbStreamEndpointBuilderFactory.java
@@ -18,7 +18,6 @@ package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
import org.apache.camel.builder.EndpointConsumerBuilder;
-import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
/**
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DebeziumEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DebeziumEndpointBuilderFactory.java
index bd4ae72..428a2c9 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DebeziumEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DebeziumEndpointBuilderFactory.java
@@ -18,7 +18,6 @@ package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
import org.apache.camel.builder.EndpointConsumerBuilder;
-import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
/**
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DigitalOceanEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DigitalOceanEndpointBuilderFactory.java
index 856e881..2ae4479 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DigitalOceanEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DigitalOceanEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DigitalSignatureEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DigitalSignatureEndpointBuilderFactory.java
index 2a6e797..6a56e35 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DigitalSignatureEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DigitalSignatureEndpointBuilderFactory.java
@@ -22,7 +22,7 @@ import java.security.PublicKey;
import java.security.SecureRandom;
import java.security.cert.Certificate;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DnsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DnsEndpointBuilderFactory.java
index eb0595e..c8abd2d 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DnsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DnsEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DozerEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DozerEndpointBuilderFactory.java
index d078feb..0e3b50a 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DozerEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DozerEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DrillEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DrillEndpointBuilderFactory.java
index 433eca9..7188e8a 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DrillEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DrillEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/EC2EndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/EC2EndpointBuilderFactory.java
index bdd1001..274b27d 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/EC2EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/EC2EndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ECSEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ECSEndpointBuilderFactory.java
index e85370a..e5290cc 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ECSEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ECSEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/EKSEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/EKSEndpointBuilderFactory.java
index 6060ff3..217d8a8 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/EKSEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/EKSEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ElasticsearchEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ElasticsearchEndpointBuilderFactory.java
index f07c32d..6376562 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ElasticsearchEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ElasticsearchEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ExecEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ExecEndpointBuilderFactory.java
index 1e849e8..6608802 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ExecEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ExecEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FileWatchEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FileWatchEndpointBuilderFactory.java
index 3201b9e..34b90fb 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FileWatchEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FileWatchEndpointBuilderFactory.java
@@ -18,7 +18,6 @@ package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
import org.apache.camel.builder.EndpointConsumerBuilder;
-import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
/**
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FlinkEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FlinkEndpointBuilderFactory.java
index 7a5b3b9..cd28031 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FlinkEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FlinkEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FopEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FopEndpointBuilderFactory.java
index b801d02..3c2437d 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FopEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FopEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FreemarkerEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FreemarkerEndpointBuilderFactory.java
index b51d7a9..33ac974 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FreemarkerEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FreemarkerEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GangliaEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GangliaEndpointBuilderFactory.java
index b685e2f..2813f50 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GangliaEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GangliaEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GeoCoderEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GeoCoderEndpointBuilderFactory.java
index 4a4b5c0..8962761 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GeoCoderEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GeoCoderEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GlanceEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GlanceEndpointBuilderFactory.java
index 220e407..fb142f1 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GlanceEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GlanceEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleBigQueryEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleBigQueryEndpointBuilderFactory.java
index 351b903..8b0bd5f 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleBigQueryEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleBigQueryEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleBigQuerySQLEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleBigQuerySQLEndpointBuilderFactory.java
index 0967f61..9e8f88e 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleBigQuerySQLEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleBigQuerySQLEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleCalendarStreamEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleCalendarStreamEndpointBuilderFactory.java
index 1677cb0..4e2b021 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleCalendarStreamEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleCalendarStreamEndpointBuilderFactory.java
@@ -19,7 +19,6 @@ package org.apache.camel.builder.endpoint.dsl;
import java.util.List;
import javax.annotation.Generated;
import org.apache.camel.builder.EndpointConsumerBuilder;
-import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
/**
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleMailStreamEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleMailStreamEndpointBuilderFactory.java
index e012ddf..1c88b9a 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleMailStreamEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleMailStreamEndpointBuilderFactory.java
@@ -18,7 +18,6 @@ package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
import org.apache.camel.builder.EndpointConsumerBuilder;
-import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
/**
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleSheetsStreamEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleSheetsStreamEndpointBuilderFactory.java
index 5de22ed..4334497 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleSheetsStreamEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleSheetsStreamEndpointBuilderFactory.java
@@ -19,7 +19,6 @@ package org.apache.camel.builder.endpoint.dsl;
import java.util.List;
import javax.annotation.Generated;
import org.apache.camel.builder.EndpointConsumerBuilder;
-import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
/**
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GrapeEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GrapeEndpointBuilderFactory.java
index cae6097..e8f7f75 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GrapeEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GrapeEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastAtomicnumberEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastAtomicnumberEndpointBuilderFactory.java
index 0bd6998..d9d9a5d 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastAtomicnumberEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastAtomicnumberEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastInstanceEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastInstanceEndpointBuilderFactory.java
index f03c451..36ceb8a 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastInstanceEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastInstanceEndpointBuilderFactory.java
@@ -18,7 +18,6 @@ package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
import org.apache.camel.builder.EndpointConsumerBuilder;
-import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
/**
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastRingbufferEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastRingbufferEndpointBuilderFactory.java
index e5dbcd5..4b314f4 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastRingbufferEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastRingbufferEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HttpEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HttpEndpointBuilderFactory.java
index 0d7a654..472bf1a 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HttpEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HttpEndpointBuilderFactory.java
@@ -18,7 +18,7 @@ package org.apache.camel.builder.endpoint.dsl;
import java.util.Map;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
import org.apache.camel.spi.HeaderFilterStrategy;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IAMEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IAMEndpointBuilderFactory.java
index 62e26f9..d641412 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IAMEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IAMEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IPFSEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IPFSEndpointBuilderFactory.java
index d7cdf9d..07def28 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IPFSEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IPFSEndpointBuilderFactory.java
@@ -18,7 +18,7 @@ package org.apache.camel.builder.endpoint.dsl;
import java.nio.file.Path;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteComputeEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteComputeEndpointBuilderFactory.java
index 80826d9..0e41a15 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteComputeEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteComputeEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteEventsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteEventsEndpointBuilderFactory.java
index cc2a442..61b66c3 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteEventsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteEventsEndpointBuilderFactory.java
@@ -18,7 +18,6 @@ package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
import org.apache.camel.builder.EndpointConsumerBuilder;
-import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
/**
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteIdGenEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteIdGenEndpointBuilderFactory.java
index b9afb6b..b9513d5 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteIdGenEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteIdGenEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteQueueEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteQueueEndpointBuilderFactory.java
index 11fdde8..4547c15 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteQueueEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteQueueEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteSetEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteSetEndpointBuilderFactory.java
index 2fff757..87d4123 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteSetEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteSetEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/InfluxDbEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/InfluxDbEndpointBuilderFactory.java
index 0f5df42..15b7c06 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/InfluxDbEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/InfluxDbEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JMXEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JMXEndpointBuilderFactory.java
index 6ebbd68..97aa884 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JMXEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JMXEndpointBuilderFactory.java
@@ -20,7 +20,6 @@ import java.util.Map;
import java.util.concurrent.ExecutorService;
import javax.annotation.Generated;
import org.apache.camel.builder.EndpointConsumerBuilder;
-import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
/**
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JdbcEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JdbcEndpointBuilderFactory.java
index 34527bc..4266c06 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JdbcEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JdbcEndpointBuilderFactory.java
@@ -18,7 +18,7 @@ package org.apache.camel.builder.endpoint.dsl;
import java.util.Map;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JettyHttpEndpointBuilder9Factory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JettyHttpEndpointBuilder9Factory.java
index af7ac26..9810ef9 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JettyHttpEndpointBuilder9Factory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JettyHttpEndpointBuilder9Factory.java
@@ -18,7 +18,6 @@ package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
import org.apache.camel.builder.EndpointConsumerBuilder;
-import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
import org.apache.camel.spi.HeaderFilterStrategy;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JingEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JingEndpointBuilderFactory.java
index 0eb29c4..abb8a0d 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JingEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JingEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JoltEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JoltEndpointBuilderFactory.java
index 9044162..9d47418 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JoltEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JoltEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JsonValidatorEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JsonValidatorEndpointBuilderFactory.java
index e4191f7..548c4eb 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JsonValidatorEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JsonValidatorEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KMSEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KMSEndpointBuilderFactory.java
index ef10e98..152354a 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KMSEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KMSEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KeystoneEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KeystoneEndpointBuilderFactory.java
index 29bddaa..c3d8cc1 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KeystoneEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KeystoneEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KinesisFirehoseEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KinesisFirehoseEndpointBuilderFactory.java
index d497e93..f58b60d 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KinesisFirehoseEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KinesisFirehoseEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesConfigMapsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesConfigMapsEndpointBuilderFactory.java
index 68df2c5..052214d 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesConfigMapsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesConfigMapsEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesPersistentVolumesClaimsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesPersistentVolumesClaimsEndpointBuilderFactory.java
index a1c3647..27d76f8 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesPersistentVolumesClaimsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesPersistentVolumesClaimsEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesPersistentVolumesEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesPersistentVolumesEndpointBuilderFactory.java
index d968ecd..f13f78d 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesPersistentVolumesEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesPersistentVolumesEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesResourcesQuotaEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesResourcesQuotaEndpointBuilderFactory.java
index 42dc61c..9f61f88 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesResourcesQuotaEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesResourcesQuotaEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesSecretsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesSecretsEndpointBuilderFactory.java
index 5e766a6..f0dd621 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesSecretsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesSecretsEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesServiceAccountsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesServiceAccountsEndpointBuilderFactory.java
index 801999c..ea5ef7f 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesServiceAccountsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesServiceAccountsEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LambdaEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LambdaEndpointBuilderFactory.java
index 67158dc..6b1bb47 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LambdaEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LambdaEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LanguageEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LanguageEndpointBuilderFactory.java
index e49aceb..174d157 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LanguageEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LanguageEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LdapEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LdapEndpointBuilderFactory.java
index f91917b..1d3bafd 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LdapEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LdapEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LdifEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LdifEndpointBuilderFactory.java
index d4efeb3..39f4c93 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LdifEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LdifEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LogEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LogEndpointBuilderFactory.java
index fb276d8..aba75d2 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LogEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LogEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
import org.apache.camel.spi.ExchangeFormatter;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LuceneEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LuceneEndpointBuilderFactory.java
index a48800f..9977329 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LuceneEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LuceneEndpointBuilderFactory.java
@@ -18,7 +18,7 @@ package org.apache.camel.builder.endpoint.dsl;
import java.io.File;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LumberjackEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LumberjackEndpointBuilderFactory.java
index 827524a..9db8fe8 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LumberjackEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LumberjackEndpointBuilderFactory.java
@@ -18,7 +18,6 @@ package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
import org.apache.camel.builder.EndpointConsumerBuilder;
-import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
/**
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MQEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MQEndpointBuilderFactory.java
index 5428ab3..0eda0f8 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MQEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MQEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MSKEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MSKEndpointBuilderFactory.java
index d3b72a0..b6cfc7f 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MSKEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MSKEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MasterEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MasterEndpointBuilderFactory.java
index 1bf48c9..480f368 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MasterEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MasterEndpointBuilderFactory.java
@@ -18,7 +18,6 @@ package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
import org.apache.camel.builder.EndpointConsumerBuilder;
-import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
/**
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MetricsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MetricsEndpointBuilderFactory.java
index 7571407..7bcd32d 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MetricsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MetricsEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MicroProfileMetricsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MicroProfileMetricsEndpointBuilderFactory.java
index 8d4818f..3b455b4 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MicroProfileMetricsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MicroProfileMetricsEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MicrometerEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MicrometerEndpointBuilderFactory.java
index 88bf46f..8c2b286 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MicrometerEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MicrometerEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MockEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MockEndpointBuilderFactory.java
index d28cb89..76e543c 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MockEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MockEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MsvEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MsvEndpointBuilderFactory.java
index 807fb4d1..2f3528e 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MsvEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MsvEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MustacheEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MustacheEndpointBuilderFactory.java
index efe5c53..bd2de8b 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MustacheEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MustacheEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MvelEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MvelEndpointBuilderFactory.java
index b198a90..701b874 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MvelEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MvelEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MyBatisBeanEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MyBatisBeanEndpointBuilderFactory.java
index 7eb43e9..9dd0051 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MyBatisBeanEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MyBatisBeanEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NagiosEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NagiosEndpointBuilderFactory.java
index 09ed26b..e8a25d6 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NagiosEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NagiosEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NetWeaverEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NetWeaverEndpointBuilderFactory.java
index b78a9d8..869f4f5 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NetWeaverEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NetWeaverEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NeutronEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NeutronEndpointBuilderFactory.java
index 24f0aca..7537929 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NeutronEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NeutronEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NovaEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NovaEndpointBuilderFactory.java
index 2310329..6f9f2a2 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NovaEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NovaEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/OpenshiftBuildConfigsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/OpenshiftBuildConfigsEndpointBuilderFactory.java
index 06cb22d..328b324 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/OpenshiftBuildConfigsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/OpenshiftBuildConfigsEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/OpenshiftBuildsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/OpenshiftBuildsEndpointBuilderFactory.java
index 39af23e..2fab1ab 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/OpenshiftBuildsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/OpenshiftBuildsEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PaxLoggingEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PaxLoggingEndpointBuilderFactory.java
index c375322..bf4afa6 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PaxLoggingEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PaxLoggingEndpointBuilderFactory.java
@@ -18,7 +18,6 @@ package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
import org.apache.camel.builder.EndpointConsumerBuilder;
-import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
/**
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PdfEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PdfEndpointBuilderFactory.java
index 3410f92..6562789 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PdfEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PdfEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PgReplicationSlotEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PgReplicationSlotEndpointBuilderFactory.java
index 856d2dc..34f82e9 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PgReplicationSlotEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PgReplicationSlotEndpointBuilderFactory.java
@@ -19,7 +19,6 @@ package org.apache.camel.builder.endpoint.dsl;
import java.util.Map;
import javax.annotation.Generated;
import org.apache.camel.builder.EndpointConsumerBuilder;
-import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
/**
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PrinterEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PrinterEndpointBuilderFactory.java
index 4c337d9..51f7967 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PrinterEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PrinterEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/QuartzEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/QuartzEndpointBuilderFactory.java
index c59c222..93626a5 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/QuartzEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/QuartzEndpointBuilderFactory.java
@@ -19,7 +19,6 @@ package org.apache.camel.builder.endpoint.dsl;
import java.util.Map;
import javax.annotation.Generated;
import org.apache.camel.builder.EndpointConsumerBuilder;
-import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
/**
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RestApiEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RestApiEndpointBuilderFactory.java
index 4c1885d..386e083 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RestApiEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RestApiEndpointBuilderFactory.java
@@ -18,7 +18,6 @@ package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
import org.apache.camel.builder.EndpointConsumerBuilder;
-import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
/**
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RestSwaggerEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RestSwaggerEndpointBuilderFactory.java
index ec1c1b2..423683a 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RestSwaggerEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RestSwaggerEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RssEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RssEndpointBuilderFactory.java
index 2fcc4cb..b221d77 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RssEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RssEndpointBuilderFactory.java
@@ -19,7 +19,6 @@ package org.apache.camel.builder.endpoint.dsl;
import java.util.Date;
import javax.annotation.Generated;
import org.apache.camel.builder.EndpointConsumerBuilder;
-import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
/**
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SagaEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SagaEndpointBuilderFactory.java
index 8c7f106..ccf1a1a 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SagaEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SagaEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SchedulerEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SchedulerEndpointBuilderFactory.java
index 40ea2e4..a1621f1 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SchedulerEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SchedulerEndpointBuilderFactory.java
@@ -18,7 +18,6 @@ package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
import org.apache.camel.builder.EndpointConsumerBuilder;
-import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
/**
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SchematronEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SchematronEndpointBuilderFactory.java
index 4e6f32f..ad6fe07 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SchematronEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SchematronEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ScpEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ScpEndpointBuilderFactory.java
index 3fbef0d..96b0ab9 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ScpEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ScpEndpointBuilderFactory.java
@@ -18,7 +18,6 @@ package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
import org.apache.camel.Expression;
-import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SdbEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SdbEndpointBuilderFactory.java
index 46b4e83..1fbbd33 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SdbEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SdbEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ServiceEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ServiceEndpointBuilderFactory.java
index df922e7..a477efb 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ServiceEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ServiceEndpointBuilderFactory.java
@@ -18,7 +18,6 @@ package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
import org.apache.camel.builder.EndpointConsumerBuilder;
-import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
/**
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ServiceNowEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ServiceNowEndpointBuilderFactory.java
index 5a0d093..f30bfc0 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ServiceNowEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ServiceNowEndpointBuilderFactory.java
@@ -18,7 +18,7 @@ package org.apache.camel.builder.endpoint.dsl;
import java.util.Map;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ServletEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ServletEndpointBuilderFactory.java
index 27d4eb7..04dc2b7 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ServletEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ServletEndpointBuilderFactory.java
@@ -18,7 +18,6 @@ package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
import org.apache.camel.builder.EndpointConsumerBuilder;
-import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
import org.apache.camel.spi.HeaderFilterStrategy;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SesEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SesEndpointBuilderFactory.java
index 431c5e7..fd67cc4 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SesEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SesEndpointBuilderFactory.java
@@ -18,7 +18,7 @@ package org.apache.camel.builder.endpoint.dsl;
import java.util.List;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SjmsBatchEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SjmsBatchEndpointBuilderFactory.java
index 9ba130b..a04f4cc 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SjmsBatchEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SjmsBatchEndpointBuilderFactory.java
@@ -21,7 +21,6 @@ import javax.annotation.Generated;
import org.apache.camel.AggregationStrategy;
import org.apache.camel.Predicate;
import org.apache.camel.builder.EndpointConsumerBuilder;
-import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
import org.apache.camel.spi.HeaderFilterStrategy;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SnsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SnsEndpointBuilderFactory.java
index efa3a78..dcd952c 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SnsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SnsEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
import org.apache.camel.spi.HeaderFilterStrategy;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SolrEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SolrEndpointBuilderFactory.java
index 06e8a77..b868baf 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SolrEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SolrEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SparkEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SparkEndpointBuilderFactory.java
index 7034409..543f029 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SparkEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SparkEndpointBuilderFactory.java
@@ -18,7 +18,6 @@ package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
import org.apache.camel.builder.EndpointConsumerBuilder;
-import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
/**
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SpringBatchEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SpringBatchEndpointBuilderFactory.java
index 30a5739..cecba6f 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SpringBatchEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SpringBatchEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SpringLdapEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SpringLdapEndpointBuilderFactory.java
index 4f2e50a..7bd3a01 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SpringLdapEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SpringLdapEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SqlStoredEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SqlStoredEndpointBuilderFactory.java
index b452b25..ebaf655 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SqlStoredEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SqlStoredEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/StAXEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/StAXEndpointBuilderFactory.java
index 9a00f2b..431bb6d 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/StAXEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/StAXEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/StringTemplateEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/StringTemplateEndpointBuilderFactory.java
index aef5ba6..1c71783 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/StringTemplateEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/StringTemplateEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SwiftEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SwiftEndpointBuilderFactory.java
index 5d9b7b7..7f66439 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SwiftEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SwiftEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TikaEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TikaEndpointBuilderFactory.java
index fb2f66f..e8a1fb3 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TikaEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TikaEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TimerEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TimerEndpointBuilderFactory.java
index ca7aaed..803047a 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TimerEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TimerEndpointBuilderFactory.java
@@ -20,7 +20,6 @@ import java.util.Date;
import java.util.Timer;
import javax.annotation.Generated;
import org.apache.camel.builder.EndpointConsumerBuilder;
-import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
/**
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TranslateEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TranslateEndpointBuilderFactory.java
index 3eff8bc..794ec22 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TranslateEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TranslateEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ValidatorEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ValidatorEndpointBuilderFactory.java
index 5e47dd3..a8acdaa 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ValidatorEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ValidatorEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/VelocityEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/VelocityEndpointBuilderFactory.java
index 3d434ca..c3038bc 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/VelocityEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/VelocityEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/WebhookEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/WebhookEndpointBuilderFactory.java
index 969b5a6..fd72151 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/WebhookEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/WebhookEndpointBuilderFactory.java
@@ -18,7 +18,6 @@ package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
import org.apache.camel.builder.EndpointConsumerBuilder;
-import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
/**
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/XChangeEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/XChangeEndpointBuilderFactory.java
index 7ac7368..9cdb65b 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/XChangeEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/XChangeEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/XJEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/XJEndpointBuilderFactory.java
index 008410a..b8d8ecf 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/XJEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/XJEndpointBuilderFactory.java
@@ -18,7 +18,7 @@ package org.apache.camel.builder.endpoint.dsl;
import java.util.List;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/XmlSignatureEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/XmlSignatureEndpointBuilderFactory.java
index 177aad5..e000d4d 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/XmlSignatureEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/XmlSignatureEndpointBuilderFactory.java
@@ -19,7 +19,7 @@ package org.apache.camel.builder.endpoint.dsl;
import java.util.List;
import java.util.Map;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/XsltEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/XsltEndpointBuilderFactory.java
index ab6bf65..582373b 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/XsltEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/XsltEndpointBuilderFactory.java
@@ -18,7 +18,7 @@ package org.apache.camel.builder.endpoint.dsl;
import java.util.List;
import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
+
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ZooKeeperMasterEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ZooKeeperMasterEndpointBuilderFactory.java
index 1acb195..b5faad9 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ZooKeeperMasterEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ZooKeeperMasterEndpointBuilderFactory.java
@@ -18,7 +18,6 @@ package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
import org.apache.camel.builder.EndpointConsumerBuilder;
-import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
/**
diff --git a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/ProcessorDefinitionDslTest.java b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/ProcessorDefinitionDslTest.java
index 7247031..a49317b 100644
--- a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/ProcessorDefinitionDslTest.java
+++ b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/ProcessorDefinitionDslTest.java
@@ -17,8 +17,6 @@
package org.apache.camel.builder.endpoint;
import org.apache.camel.ContextTestSupport;
-import org.apache.camel.ResolveEndpointFailedException;
-import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/BacklogTracerStreamCachingTest.java b/core/camel-management/src/test/java/org/apache/camel/management/BacklogTracerStreamCachingTest.java
index ef35807..e4143b2 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/BacklogTracerStreamCachingTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/BacklogTracerStreamCachingTest.java
@@ -24,7 +24,6 @@ import javax.management.MBeanServer;
import javax.management.ObjectName;
import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
import org.apache.camel.api.management.mbean.BacklogTracerEventMessage;
import org.apache.camel.builder.RouteBuilder;
import org.junit.Test;
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/CamelChoiceWithManagementTest.java b/core/camel-management/src/test/java/org/apache/camel/management/CamelChoiceWithManagementTest.java
index 18b5e64..7027b54 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/CamelChoiceWithManagementTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/CamelChoiceWithManagementTest.java
@@ -17,8 +17,6 @@
package org.apache.camel.management;
import org.apache.camel.ContextTestSupport;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Before;
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ExceptionWithManagementTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ExceptionWithManagementTest.java
index 3440335..905ee54 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ExceptionWithManagementTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ExceptionWithManagementTest.java
@@ -17,9 +17,7 @@
package org.apache.camel.management;
import org.apache.camel.ContextTestSupport;
-import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
-import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedCustomPolicyTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedCustomPolicyTest.java
index 5f029b0..d45c54b 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedCustomPolicyTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedCustomPolicyTest.java
@@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicInteger;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.apache.camel.Exchange;
import org.apache.camel.NamedNode;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedErrorHandlerOptionsTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedErrorHandlerOptionsTest.java
index 1e12306..93875e0 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedErrorHandlerOptionsTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedErrorHandlerOptionsTest.java
@@ -23,9 +23,7 @@ import javax.management.MBeanServer;
import javax.management.ObjectName;
import org.apache.camel.CamelExecutionException;
-import org.apache.camel.Exchange;
import org.apache.camel.LoggingLevel;
-import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedErrorHandlerRedeliveryTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedErrorHandlerRedeliveryTest.java
index 7d7764f..3fffe82 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedErrorHandlerRedeliveryTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedErrorHandlerRedeliveryTest.java
@@ -23,9 +23,7 @@ import javax.management.MBeanServer;
import javax.management.ObjectName;
import org.apache.camel.CamelExecutionException;
-import org.apache.camel.Exchange;
import org.apache.camel.LoggingLevel;
-import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedFailoverLoadBalancerTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedFailoverLoadBalancerTest.java
index 7509514..7bdf804 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedFailoverLoadBalancerTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedFailoverLoadBalancerTest.java
@@ -23,8 +23,6 @@ import javax.management.MBeanServer;
import javax.management.ObjectName;
import javax.management.openmbean.TabularData;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
import org.apache.camel.ServiceStatus;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedFileIdempotentClearTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedFileIdempotentClearTest.java
index a6b84a7..d8b94fc 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedFileIdempotentClearTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedFileIdempotentClearTest.java
@@ -23,9 +23,7 @@ import javax.management.MBeanServer;
import javax.management.ObjectName;
import org.apache.camel.Endpoint;
-import org.apache.camel.Exchange;
import org.apache.camel.Message;
-import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.IdempotentRepository;
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedFileIdempotentConsumerTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedFileIdempotentConsumerTest.java
index e6b1677..1a933a6 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedFileIdempotentConsumerTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedFileIdempotentConsumerTest.java
@@ -23,9 +23,7 @@ import javax.management.MBeanServer;
import javax.management.ObjectName;
import org.apache.camel.Endpoint;
-import org.apache.camel.Exchange;
import org.apache.camel.Message;
-import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.IdempotentRepository;
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedInflightRepositoryTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedInflightRepositoryTest.java
index 88a53ac..cfaa7f8 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedInflightRepositoryTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedInflightRepositoryTest.java
@@ -20,8 +20,6 @@ import javax.management.MBeanServer;
import javax.management.ObjectName;
import javax.management.openmbean.TabularData;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.junit.Test;
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedInflightStatisticsTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedInflightStatisticsTest.java
index e7f7839..fb57e92 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedInflightStatisticsTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedInflightStatisticsTest.java
@@ -24,8 +24,6 @@ import java.util.concurrent.TimeUnit;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedInlinedProcessorTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedInlinedProcessorTest.java
index 79325c1..32fa8db 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedInlinedProcessorTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedInlinedProcessorTest.java
@@ -19,8 +19,6 @@ package org.apache.camel.management;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
import org.apache.camel.api.management.ManagedCamelContext;
import org.apache.camel.api.management.mbean.ManagedProcessorMBean;
import org.apache.camel.builder.RouteBuilder;
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedMemoryIdempotentClearTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedMemoryIdempotentClearTest.java
index 1add2a6..265640c 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedMemoryIdempotentClearTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedMemoryIdempotentClearTest.java
@@ -22,9 +22,7 @@ import javax.management.MBeanServer;
import javax.management.ObjectName;
import org.apache.camel.Endpoint;
-import org.apache.camel.Exchange;
import org.apache.camel.Message;
-import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.IdempotentRepository;
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedMemoryIdempotentConsumerTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedMemoryIdempotentConsumerTest.java
index 8704484..c715c3d 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedMemoryIdempotentConsumerTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedMemoryIdempotentConsumerTest.java
@@ -22,9 +22,7 @@ import javax.management.MBeanServer;
import javax.management.ObjectName;
import org.apache.camel.Endpoint;
-import org.apache.camel.Exchange;
import org.apache.camel.Message;
-import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.IdempotentRepository;
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedRedeliverRouteOnlyTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedRedeliverRouteOnlyTest.java
index 2d5d28f..e5c7c0d 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedRedeliverRouteOnlyTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedRedeliverRouteOnlyTest.java
@@ -19,9 +19,7 @@ package org.apache.camel.management;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.apache.camel.Exchange;
import org.apache.camel.ManagementStatisticsLevel;
-import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.junit.Test;
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedRedeliverTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedRedeliverTest.java
index 00aab02..a08c9fe 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedRedeliverTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedRedeliverTest.java
@@ -19,8 +19,6 @@ package org.apache.camel.management;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteAddFromRouteTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteAddFromRouteTest.java
index 372afab..867f218 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteAddFromRouteTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteAddFromRouteTest.java
@@ -19,8 +19,6 @@ package org.apache.camel.management;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
import org.apache.camel.ServiceStatus;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteDirectWhileIssueLeakTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteDirectWhileIssueLeakTest.java
index a06814c..b3d9918 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteDirectWhileIssueLeakTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteDirectWhileIssueLeakTest.java
@@ -21,8 +21,6 @@ import java.util.Set;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.junit.Test;
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedThrottlerTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedThrottlerTest.java
index 1eb49bb..bcdb98e 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedThrottlerTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedThrottlerTest.java
@@ -27,8 +27,6 @@ import javax.management.Attribute;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/MultiInstanceProcessorTest.java b/core/camel-management/src/test/java/org/apache/camel/management/MultiInstanceProcessorTest.java
index cb31599..e85a249 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/MultiInstanceProcessorTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/MultiInstanceProcessorTest.java
@@ -20,8 +20,6 @@ import java.util.Set;
import javax.management.ObjectName;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
diff --git a/core/camel-management/src/test/java/org/apache/camel/processor/NoErrorHandlerTest.java b/core/camel-management/src/test/java/org/apache/camel/processor/NoErrorHandlerTest.java
index a764bc0..f011b54 100644
--- a/core/camel-management/src/test/java/org/apache/camel/processor/NoErrorHandlerTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/processor/NoErrorHandlerTest.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.processor;
import org.apache.camel.ContextTestSupport;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Before;
diff --git a/core/camel-management/src/test/java/org/apache/camel/processor/ReduceStacksNeededDuringRoutingTest.java b/core/camel-management/src/test/java/org/apache/camel/processor/ReduceStacksNeededDuringRoutingTest.java
index 8acd2d1..0f33188 100644
--- a/core/camel-management/src/test/java/org/apache/camel/processor/ReduceStacksNeededDuringRoutingTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/processor/ReduceStacksNeededDuringRoutingTest.java
@@ -17,8 +17,6 @@
package org.apache.camel.processor;
import org.apache.camel.ContextTestSupport;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
diff --git a/core/camel-management/src/test/java/org/apache/camel/processor/async/AsyncEndpointWithJMXTest.java b/core/camel-management/src/test/java/org/apache/camel/processor/async/AsyncEndpointWithJMXTest.java
index 552c4a5..d697603 100644
--- a/core/camel-management/src/test/java/org/apache/camel/processor/async/AsyncEndpointWithJMXTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/processor/async/AsyncEndpointWithJMXTest.java
@@ -17,8 +17,6 @@
package org.apache.camel.processor.async;
import org.apache.camel.ContextTestSupport;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.junit.Test;
[camel] 03/08: CAMEL-13949: Better splitup between camel-core and
camel-core-engine.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch CAMEL-13949
in repository https://gitbox.apache.org/repos/asf/camel.git
commit aa6b96113813563a72df40693dbc662c6a0021fd
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Sep 25 06:22:18 2019 +0200
CAMEL-13949: Better splitup between camel-core and camel-core-engine.
---
platforms/karaf/features/src/main/resources/features.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 3caca5f..151528a 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -44,14 +44,15 @@
<feature name='camel-core' version='${project.version}' start-level='50'>
<feature version='${servicemix-specs-version}'>xml-specs-api</feature>
<bundle dependency='true'>mvn:com.github.ben-manes.caffeine/caffeine/${caffeine-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.camel/camel-util-json/${project.version}</bundle>
<bundle>mvn:org.apache.camel/spi-annotations/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-api/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-management-api/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-util/${project.version}</bundle>
+ <bundle>mvn:org.apache.camel/camel-util-json/${project.version}</bundle>
<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-engine/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-core/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-core-osgi/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-cloud/${project.version}</bundle>
[camel] 08/08: CAMEL-13949: Better splitup between camel-core and
camel-core-engine.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch CAMEL-13949
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 1cf223df988ecdb4cc160b38d68a004355c83931
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Sep 25 07:49:54 2019 +0200
CAMEL-13949: Better splitup between camel-core and camel-core-engine.
---
.../apache/camel/builder/endpoint/dsl/AhcEndpointBuilderFactory.java | 2 +-
.../apache/camel/builder/endpoint/dsl/AtomEndpointBuilderFactory.java | 1 +
.../builder/endpoint/dsl/AtomixMultiMapEndpointBuilderFactory.java | 1 +
.../apache/camel/builder/endpoint/dsl/BeanEndpointBuilderFactory.java | 2 +-
.../camel/builder/endpoint/dsl/BeanValidatorEndpointBuilderFactory.java | 2 +-
.../apache/camel/builder/endpoint/dsl/BonitaEndpointBuilderFactory.java | 1 +
.../org/apache/camel/builder/endpoint/dsl/CMEndpointBuilderFactory.java | 2 +-
.../camel/builder/endpoint/dsl/ChatScriptEndpointBuilderFactory.java | 2 +-
.../apache/camel/builder/endpoint/dsl/ChunkEndpointBuilderFactory.java | 2 +-
.../apache/camel/builder/endpoint/dsl/CinderEndpointBuilderFactory.java | 2 +-
.../apache/camel/builder/endpoint/dsl/ClassEndpointBuilderFactory.java | 2 +-
.../camel/builder/endpoint/dsl/ControlBusEndpointBuilderFactory.java | 1 +
.../camel/builder/endpoint/dsl/CryptoCmsEndpointBuilderFactory.java | 2 +-
.../org/apache/camel/builder/endpoint/dsl/CwEndpointBuilderFactory.java | 2 +-
.../camel/builder/endpoint/dsl/DataFormatEndpointBuilderFactory.java | 2 +-
.../camel/builder/endpoint/dsl/DataSetTestEndpointBuilderFactory.java | 2 +-
.../apache/camel/builder/endpoint/dsl/DdbEndpointBuilderFactory.java | 2 +-
.../camel/builder/endpoint/dsl/DdbStreamEndpointBuilderFactory.java | 1 +
.../camel/builder/endpoint/dsl/DebeziumEndpointBuilderFactory.java | 1 +
.../camel/builder/endpoint/dsl/DigitalOceanEndpointBuilderFactory.java | 2 +-
.../builder/endpoint/dsl/DigitalSignatureEndpointBuilderFactory.java | 2 +-
.../apache/camel/builder/endpoint/dsl/DnsEndpointBuilderFactory.java | 2 +-
.../apache/camel/builder/endpoint/dsl/DozerEndpointBuilderFactory.java | 2 +-
.../apache/camel/builder/endpoint/dsl/DrillEndpointBuilderFactory.java | 2 +-
.../apache/camel/builder/endpoint/dsl/EC2EndpointBuilderFactory.java | 2 +-
.../apache/camel/builder/endpoint/dsl/ECSEndpointBuilderFactory.java | 2 +-
.../apache/camel/builder/endpoint/dsl/EKSEndpointBuilderFactory.java | 2 +-
.../camel/builder/endpoint/dsl/ElasticsearchEndpointBuilderFactory.java | 2 +-
.../apache/camel/builder/endpoint/dsl/ExecEndpointBuilderFactory.java | 2 +-
.../camel/builder/endpoint/dsl/FileWatchEndpointBuilderFactory.java | 1 +
.../apache/camel/builder/endpoint/dsl/FlinkEndpointBuilderFactory.java | 2 +-
.../apache/camel/builder/endpoint/dsl/FopEndpointBuilderFactory.java | 2 +-
.../camel/builder/endpoint/dsl/FreemarkerEndpointBuilderFactory.java | 2 +-
.../camel/builder/endpoint/dsl/GangliaEndpointBuilderFactory.java | 2 +-
.../camel/builder/endpoint/dsl/GeoCoderEndpointBuilderFactory.java | 2 +-
.../apache/camel/builder/endpoint/dsl/GlanceEndpointBuilderFactory.java | 2 +-
.../builder/endpoint/dsl/GoogleBigQueryEndpointBuilderFactory.java | 2 +-
.../builder/endpoint/dsl/GoogleBigQuerySQLEndpointBuilderFactory.java | 2 +-
.../endpoint/dsl/GoogleCalendarStreamEndpointBuilderFactory.java | 1 +
.../builder/endpoint/dsl/GoogleMailStreamEndpointBuilderFactory.java | 1 +
.../builder/endpoint/dsl/GoogleSheetsStreamEndpointBuilderFactory.java | 1 +
.../apache/camel/builder/endpoint/dsl/GrapeEndpointBuilderFactory.java | 2 +-
.../endpoint/dsl/HazelcastAtomicnumberEndpointBuilderFactory.java | 2 +-
.../builder/endpoint/dsl/HazelcastInstanceEndpointBuilderFactory.java | 1 +
.../builder/endpoint/dsl/HazelcastRingbufferEndpointBuilderFactory.java | 2 +-
.../apache/camel/builder/endpoint/dsl/HttpEndpointBuilderFactory.java | 2 +-
.../apache/camel/builder/endpoint/dsl/IAMEndpointBuilderFactory.java | 2 +-
.../apache/camel/builder/endpoint/dsl/IPFSEndpointBuilderFactory.java | 2 +-
.../camel/builder/endpoint/dsl/IgniteComputeEndpointBuilderFactory.java | 2 +-
.../camel/builder/endpoint/dsl/IgniteEventsEndpointBuilderFactory.java | 1 +
.../camel/builder/endpoint/dsl/IgniteIdGenEndpointBuilderFactory.java | 2 +-
.../camel/builder/endpoint/dsl/IgniteQueueEndpointBuilderFactory.java | 2 +-
.../camel/builder/endpoint/dsl/IgniteSetEndpointBuilderFactory.java | 2 +-
.../camel/builder/endpoint/dsl/InfluxDbEndpointBuilderFactory.java | 2 +-
.../apache/camel/builder/endpoint/dsl/JMXEndpointBuilderFactory.java | 1 +
.../apache/camel/builder/endpoint/dsl/JdbcEndpointBuilderFactory.java | 2 +-
.../camel/builder/endpoint/dsl/JettyHttpEndpointBuilder9Factory.java | 1 +
.../apache/camel/builder/endpoint/dsl/JingEndpointBuilderFactory.java | 2 +-
.../apache/camel/builder/endpoint/dsl/JoltEndpointBuilderFactory.java | 2 +-
.../camel/builder/endpoint/dsl/JsonValidatorEndpointBuilderFactory.java | 2 +-
.../apache/camel/builder/endpoint/dsl/KMSEndpointBuilderFactory.java | 2 +-
.../camel/builder/endpoint/dsl/KeystoneEndpointBuilderFactory.java | 2 +-
.../builder/endpoint/dsl/KinesisFirehoseEndpointBuilderFactory.java | 2 +-
.../endpoint/dsl/KubernetesConfigMapsEndpointBuilderFactory.java | 2 +-
.../dsl/KubernetesPersistentVolumesClaimsEndpointBuilderFactory.java | 2 +-
.../endpoint/dsl/KubernetesPersistentVolumesEndpointBuilderFactory.java | 2 +-
.../endpoint/dsl/KubernetesResourcesQuotaEndpointBuilderFactory.java | 2 +-
.../builder/endpoint/dsl/KubernetesSecretsEndpointBuilderFactory.java | 2 +-
.../endpoint/dsl/KubernetesServiceAccountsEndpointBuilderFactory.java | 2 +-
.../apache/camel/builder/endpoint/dsl/LambdaEndpointBuilderFactory.java | 2 +-
.../camel/builder/endpoint/dsl/LanguageEndpointBuilderFactory.java | 2 +-
.../apache/camel/builder/endpoint/dsl/LdapEndpointBuilderFactory.java | 2 +-
.../apache/camel/builder/endpoint/dsl/LdifEndpointBuilderFactory.java | 2 +-
.../apache/camel/builder/endpoint/dsl/LogEndpointBuilderFactory.java | 2 +-
.../apache/camel/builder/endpoint/dsl/LuceneEndpointBuilderFactory.java | 2 +-
.../camel/builder/endpoint/dsl/LumberjackEndpointBuilderFactory.java | 1 +
.../org/apache/camel/builder/endpoint/dsl/MQEndpointBuilderFactory.java | 2 +-
.../apache/camel/builder/endpoint/dsl/MSKEndpointBuilderFactory.java | 2 +-
.../apache/camel/builder/endpoint/dsl/MasterEndpointBuilderFactory.java | 1 +
.../camel/builder/endpoint/dsl/MetricsEndpointBuilderFactory.java | 2 +-
.../builder/endpoint/dsl/MicroProfileMetricsEndpointBuilderFactory.java | 2 +-
.../camel/builder/endpoint/dsl/MicrometerEndpointBuilderFactory.java | 2 +-
.../apache/camel/builder/endpoint/dsl/MockEndpointBuilderFactory.java | 2 +-
.../apache/camel/builder/endpoint/dsl/MsvEndpointBuilderFactory.java | 2 +-
.../camel/builder/endpoint/dsl/MustacheEndpointBuilderFactory.java | 2 +-
.../apache/camel/builder/endpoint/dsl/MvelEndpointBuilderFactory.java | 2 +-
.../camel/builder/endpoint/dsl/MyBatisBeanEndpointBuilderFactory.java | 2 +-
.../apache/camel/builder/endpoint/dsl/NagiosEndpointBuilderFactory.java | 2 +-
.../camel/builder/endpoint/dsl/NetWeaverEndpointBuilderFactory.java | 2 +-
.../camel/builder/endpoint/dsl/NeutronEndpointBuilderFactory.java | 2 +-
.../apache/camel/builder/endpoint/dsl/NovaEndpointBuilderFactory.java | 2 +-
.../endpoint/dsl/OpenshiftBuildConfigsEndpointBuilderFactory.java | 2 +-
.../builder/endpoint/dsl/OpenshiftBuildsEndpointBuilderFactory.java | 2 +-
.../camel/builder/endpoint/dsl/PaxLoggingEndpointBuilderFactory.java | 1 +
.../apache/camel/builder/endpoint/dsl/PdfEndpointBuilderFactory.java | 2 +-
.../builder/endpoint/dsl/PgReplicationSlotEndpointBuilderFactory.java | 1 +
.../camel/builder/endpoint/dsl/PrinterEndpointBuilderFactory.java | 2 +-
.../apache/camel/builder/endpoint/dsl/QuartzEndpointBuilderFactory.java | 1 +
.../camel/builder/endpoint/dsl/RestApiEndpointBuilderFactory.java | 1 +
.../camel/builder/endpoint/dsl/RestSwaggerEndpointBuilderFactory.java | 2 +-
.../apache/camel/builder/endpoint/dsl/RssEndpointBuilderFactory.java | 1 +
.../apache/camel/builder/endpoint/dsl/SagaEndpointBuilderFactory.java | 2 +-
.../camel/builder/endpoint/dsl/SchedulerEndpointBuilderFactory.java | 1 +
.../camel/builder/endpoint/dsl/SchematronEndpointBuilderFactory.java | 2 +-
.../apache/camel/builder/endpoint/dsl/ScpEndpointBuilderFactory.java | 1 +
.../apache/camel/builder/endpoint/dsl/SdbEndpointBuilderFactory.java | 2 +-
.../camel/builder/endpoint/dsl/ServiceEndpointBuilderFactory.java | 1 +
.../camel/builder/endpoint/dsl/ServiceNowEndpointBuilderFactory.java | 2 +-
.../camel/builder/endpoint/dsl/ServletEndpointBuilderFactory.java | 1 +
.../apache/camel/builder/endpoint/dsl/SesEndpointBuilderFactory.java | 2 +-
.../camel/builder/endpoint/dsl/SjmsBatchEndpointBuilderFactory.java | 1 +
.../apache/camel/builder/endpoint/dsl/SnsEndpointBuilderFactory.java | 2 +-
.../apache/camel/builder/endpoint/dsl/SolrEndpointBuilderFactory.java | 2 +-
.../apache/camel/builder/endpoint/dsl/SparkEndpointBuilderFactory.java | 1 +
.../camel/builder/endpoint/dsl/SpringBatchEndpointBuilderFactory.java | 2 +-
.../camel/builder/endpoint/dsl/SpringLdapEndpointBuilderFactory.java | 2 +-
.../camel/builder/endpoint/dsl/SqlStoredEndpointBuilderFactory.java | 2 +-
.../apache/camel/builder/endpoint/dsl/StAXEndpointBuilderFactory.java | 2 +-
.../builder/endpoint/dsl/StringTemplateEndpointBuilderFactory.java | 2 +-
.../apache/camel/builder/endpoint/dsl/SwiftEndpointBuilderFactory.java | 2 +-
.../apache/camel/builder/endpoint/dsl/TikaEndpointBuilderFactory.java | 2 +-
.../apache/camel/builder/endpoint/dsl/TimerEndpointBuilderFactory.java | 1 +
.../camel/builder/endpoint/dsl/TranslateEndpointBuilderFactory.java | 2 +-
.../camel/builder/endpoint/dsl/ValidatorEndpointBuilderFactory.java | 2 +-
.../camel/builder/endpoint/dsl/VelocityEndpointBuilderFactory.java | 2 +-
.../camel/builder/endpoint/dsl/WebhookEndpointBuilderFactory.java | 1 +
.../camel/builder/endpoint/dsl/XChangeEndpointBuilderFactory.java | 2 +-
.../org/apache/camel/builder/endpoint/dsl/XJEndpointBuilderFactory.java | 2 +-
.../camel/builder/endpoint/dsl/XmlSignatureEndpointBuilderFactory.java | 2 +-
.../apache/camel/builder/endpoint/dsl/XsltEndpointBuilderFactory.java | 2 +-
.../builder/endpoint/dsl/ZooKeeperMasterEndpointBuilderFactory.java | 1 +
131 files changed, 131 insertions(+), 101 deletions(-)
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AhcEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AhcEndpointBuilderFactory.java
index 189c911..1a588aa 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AhcEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AhcEndpointBuilderFactory.java
@@ -18,7 +18,7 @@ package org.apache.camel.builder.endpoint.dsl;
import java.util.Map;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
import org.apache.camel.spi.HeaderFilterStrategy;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AtomEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AtomEndpointBuilderFactory.java
index 5750778..96d4d59 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AtomEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AtomEndpointBuilderFactory.java
@@ -19,6 +19,7 @@ package org.apache.camel.builder.endpoint.dsl;
import java.util.Date;
import javax.annotation.Generated;
import org.apache.camel.builder.EndpointConsumerBuilder;
+import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
/**
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AtomixMultiMapEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AtomixMultiMapEndpointBuilderFactory.java
index 344eeda..20b0f5b 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AtomixMultiMapEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AtomixMultiMapEndpointBuilderFactory.java
@@ -21,6 +21,7 @@ import java.util.Map;
import java.util.Properties;
import javax.annotation.Generated;
import org.apache.camel.builder.EndpointConsumerBuilder;
+import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
/**
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/BeanEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/BeanEndpointBuilderFactory.java
index f491e50..290b902 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/BeanEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/BeanEndpointBuilderFactory.java
@@ -18,7 +18,7 @@ package org.apache.camel.builder.endpoint.dsl;
import java.util.Map;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/BeanValidatorEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/BeanValidatorEndpointBuilderFactory.java
index fc1b242..0680c54 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/BeanValidatorEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/BeanValidatorEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/BonitaEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/BonitaEndpointBuilderFactory.java
index 6c879f9..f7b81e9 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/BonitaEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/BonitaEndpointBuilderFactory.java
@@ -18,6 +18,7 @@ package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
import org.apache.camel.builder.EndpointConsumerBuilder;
+import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
/**
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CMEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CMEndpointBuilderFactory.java
index 9d5c220..9cbaa39 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CMEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CMEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ChatScriptEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ChatScriptEndpointBuilderFactory.java
index 5319f34..1bc7e16 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ChatScriptEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ChatScriptEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ChunkEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ChunkEndpointBuilderFactory.java
index 8e58227..a7f0c4a 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ChunkEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ChunkEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CinderEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CinderEndpointBuilderFactory.java
index b25a43e..b4217f6 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CinderEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CinderEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ClassEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ClassEndpointBuilderFactory.java
index 007edf7..05be816 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ClassEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ClassEndpointBuilderFactory.java
@@ -18,7 +18,7 @@ package org.apache.camel.builder.endpoint.dsl;
import java.util.Map;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ControlBusEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ControlBusEndpointBuilderFactory.java
index 17e9d25..3647d63 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ControlBusEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ControlBusEndpointBuilderFactory.java
@@ -18,6 +18,7 @@ package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
import org.apache.camel.LoggingLevel;
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CryptoCmsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CryptoCmsEndpointBuilderFactory.java
index faa8180..47b370d 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CryptoCmsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CryptoCmsEndpointBuilderFactory.java
@@ -19,7 +19,7 @@ package org.apache.camel.builder.endpoint.dsl;
import java.security.KeyStore;
import java.util.List;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CwEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CwEndpointBuilderFactory.java
index 720d63c..761822b 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CwEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CwEndpointBuilderFactory.java
@@ -18,7 +18,7 @@ package org.apache.camel.builder.endpoint.dsl;
import java.util.Date;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DataFormatEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DataFormatEndpointBuilderFactory.java
index 7a2eba7..cc5791c 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DataFormatEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DataFormatEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DataSetTestEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DataSetTestEndpointBuilderFactory.java
index 75863c0..69f57c4 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DataSetTestEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DataSetTestEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DdbEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DdbEndpointBuilderFactory.java
index 80aee30..902ee0e 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DdbEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DdbEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DdbStreamEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DdbStreamEndpointBuilderFactory.java
index 928465a..20cb484 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DdbStreamEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DdbStreamEndpointBuilderFactory.java
@@ -18,6 +18,7 @@ package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
import org.apache.camel.builder.EndpointConsumerBuilder;
+import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
/**
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DebeziumEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DebeziumEndpointBuilderFactory.java
index 428a2c9..bd4ae72 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DebeziumEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DebeziumEndpointBuilderFactory.java
@@ -18,6 +18,7 @@ package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
import org.apache.camel.builder.EndpointConsumerBuilder;
+import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
/**
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DigitalOceanEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DigitalOceanEndpointBuilderFactory.java
index 2ae4479..856e881 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DigitalOceanEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DigitalOceanEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DigitalSignatureEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DigitalSignatureEndpointBuilderFactory.java
index 6a56e35..2a6e797 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DigitalSignatureEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DigitalSignatureEndpointBuilderFactory.java
@@ -22,7 +22,7 @@ import java.security.PublicKey;
import java.security.SecureRandom;
import java.security.cert.Certificate;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DnsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DnsEndpointBuilderFactory.java
index c8abd2d..eb0595e 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DnsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DnsEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DozerEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DozerEndpointBuilderFactory.java
index 0e3b50a..d078feb 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DozerEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DozerEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DrillEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DrillEndpointBuilderFactory.java
index 7188e8a..433eca9 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DrillEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DrillEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/EC2EndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/EC2EndpointBuilderFactory.java
index 274b27d..bdd1001 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/EC2EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/EC2EndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ECSEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ECSEndpointBuilderFactory.java
index e5290cc..e85370a 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ECSEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ECSEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/EKSEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/EKSEndpointBuilderFactory.java
index 217d8a8..6060ff3 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/EKSEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/EKSEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ElasticsearchEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ElasticsearchEndpointBuilderFactory.java
index 6376562..f07c32d 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ElasticsearchEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ElasticsearchEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ExecEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ExecEndpointBuilderFactory.java
index 6608802..1e849e8 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ExecEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ExecEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FileWatchEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FileWatchEndpointBuilderFactory.java
index 34b90fb..3201b9e 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FileWatchEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FileWatchEndpointBuilderFactory.java
@@ -18,6 +18,7 @@ package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
import org.apache.camel.builder.EndpointConsumerBuilder;
+import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
/**
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FlinkEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FlinkEndpointBuilderFactory.java
index cd28031..7a5b3b9 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FlinkEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FlinkEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FopEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FopEndpointBuilderFactory.java
index 3c2437d..b801d02 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FopEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FopEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FreemarkerEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FreemarkerEndpointBuilderFactory.java
index 33ac974..b51d7a9 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FreemarkerEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FreemarkerEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GangliaEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GangliaEndpointBuilderFactory.java
index 2813f50..b685e2f 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GangliaEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GangliaEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GeoCoderEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GeoCoderEndpointBuilderFactory.java
index 8962761..4a4b5c0 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GeoCoderEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GeoCoderEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GlanceEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GlanceEndpointBuilderFactory.java
index fb142f1..220e407 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GlanceEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GlanceEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleBigQueryEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleBigQueryEndpointBuilderFactory.java
index 8b0bd5f..351b903 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleBigQueryEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleBigQueryEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleBigQuerySQLEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleBigQuerySQLEndpointBuilderFactory.java
index 9e8f88e..0967f61 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleBigQuerySQLEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleBigQuerySQLEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleCalendarStreamEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleCalendarStreamEndpointBuilderFactory.java
index 4e2b021..1677cb0 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleCalendarStreamEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleCalendarStreamEndpointBuilderFactory.java
@@ -19,6 +19,7 @@ package org.apache.camel.builder.endpoint.dsl;
import java.util.List;
import javax.annotation.Generated;
import org.apache.camel.builder.EndpointConsumerBuilder;
+import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
/**
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleMailStreamEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleMailStreamEndpointBuilderFactory.java
index 1c88b9a..e012ddf 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleMailStreamEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleMailStreamEndpointBuilderFactory.java
@@ -18,6 +18,7 @@ package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
import org.apache.camel.builder.EndpointConsumerBuilder;
+import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
/**
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleSheetsStreamEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleSheetsStreamEndpointBuilderFactory.java
index 4334497..5de22ed 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleSheetsStreamEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleSheetsStreamEndpointBuilderFactory.java
@@ -19,6 +19,7 @@ package org.apache.camel.builder.endpoint.dsl;
import java.util.List;
import javax.annotation.Generated;
import org.apache.camel.builder.EndpointConsumerBuilder;
+import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
/**
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GrapeEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GrapeEndpointBuilderFactory.java
index e8f7f75..cae6097 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GrapeEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GrapeEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastAtomicnumberEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastAtomicnumberEndpointBuilderFactory.java
index d9d9a5d..0bd6998 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastAtomicnumberEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastAtomicnumberEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastInstanceEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastInstanceEndpointBuilderFactory.java
index 36ceb8a..f03c451 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastInstanceEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastInstanceEndpointBuilderFactory.java
@@ -18,6 +18,7 @@ package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
import org.apache.camel.builder.EndpointConsumerBuilder;
+import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
/**
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastRingbufferEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastRingbufferEndpointBuilderFactory.java
index 4b314f4..e5dbcd5 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastRingbufferEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastRingbufferEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HttpEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HttpEndpointBuilderFactory.java
index 472bf1a..0d7a654 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HttpEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HttpEndpointBuilderFactory.java
@@ -18,7 +18,7 @@ package org.apache.camel.builder.endpoint.dsl;
import java.util.Map;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
import org.apache.camel.spi.HeaderFilterStrategy;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IAMEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IAMEndpointBuilderFactory.java
index d641412..62e26f9 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IAMEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IAMEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IPFSEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IPFSEndpointBuilderFactory.java
index 07def28..d7cdf9d 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IPFSEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IPFSEndpointBuilderFactory.java
@@ -18,7 +18,7 @@ package org.apache.camel.builder.endpoint.dsl;
import java.nio.file.Path;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteComputeEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteComputeEndpointBuilderFactory.java
index 0e41a15..80826d9 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteComputeEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteComputeEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteEventsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteEventsEndpointBuilderFactory.java
index 61b66c3..cc2a442 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteEventsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteEventsEndpointBuilderFactory.java
@@ -18,6 +18,7 @@ package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
import org.apache.camel.builder.EndpointConsumerBuilder;
+import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
/**
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteIdGenEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteIdGenEndpointBuilderFactory.java
index b9513d5..b9afb6b 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteIdGenEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteIdGenEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteQueueEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteQueueEndpointBuilderFactory.java
index 4547c15..11fdde8 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteQueueEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteQueueEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteSetEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteSetEndpointBuilderFactory.java
index 87d4123..2fff757 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteSetEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteSetEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/InfluxDbEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/InfluxDbEndpointBuilderFactory.java
index 15b7c06..0f5df42 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/InfluxDbEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/InfluxDbEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JMXEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JMXEndpointBuilderFactory.java
index 97aa884..6ebbd68 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JMXEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JMXEndpointBuilderFactory.java
@@ -20,6 +20,7 @@ import java.util.Map;
import java.util.concurrent.ExecutorService;
import javax.annotation.Generated;
import org.apache.camel.builder.EndpointConsumerBuilder;
+import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
/**
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JdbcEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JdbcEndpointBuilderFactory.java
index 4266c06..34527bc 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JdbcEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JdbcEndpointBuilderFactory.java
@@ -18,7 +18,7 @@ package org.apache.camel.builder.endpoint.dsl;
import java.util.Map;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JettyHttpEndpointBuilder9Factory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JettyHttpEndpointBuilder9Factory.java
index 9810ef9..af7ac26 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JettyHttpEndpointBuilder9Factory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JettyHttpEndpointBuilder9Factory.java
@@ -18,6 +18,7 @@ package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
import org.apache.camel.builder.EndpointConsumerBuilder;
+import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
import org.apache.camel.spi.HeaderFilterStrategy;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JingEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JingEndpointBuilderFactory.java
index abb8a0d..0eb29c4 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JingEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JingEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JoltEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JoltEndpointBuilderFactory.java
index 9d47418..9044162 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JoltEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JoltEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JsonValidatorEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JsonValidatorEndpointBuilderFactory.java
index 548c4eb..e4191f7 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JsonValidatorEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JsonValidatorEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KMSEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KMSEndpointBuilderFactory.java
index 152354a..ef10e98 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KMSEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KMSEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KeystoneEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KeystoneEndpointBuilderFactory.java
index c3d8cc1..29bddaa 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KeystoneEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KeystoneEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KinesisFirehoseEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KinesisFirehoseEndpointBuilderFactory.java
index f58b60d..d497e93 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KinesisFirehoseEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KinesisFirehoseEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesConfigMapsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesConfigMapsEndpointBuilderFactory.java
index 052214d..68df2c5 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesConfigMapsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesConfigMapsEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesPersistentVolumesClaimsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesPersistentVolumesClaimsEndpointBuilderFactory.java
index 27d76f8..a1c3647 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesPersistentVolumesClaimsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesPersistentVolumesClaimsEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesPersistentVolumesEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesPersistentVolumesEndpointBuilderFactory.java
index f13f78d..d968ecd 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesPersistentVolumesEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesPersistentVolumesEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesResourcesQuotaEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesResourcesQuotaEndpointBuilderFactory.java
index 9f61f88..42dc61c 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesResourcesQuotaEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesResourcesQuotaEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesSecretsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesSecretsEndpointBuilderFactory.java
index f0dd621..5e766a6 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesSecretsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesSecretsEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesServiceAccountsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesServiceAccountsEndpointBuilderFactory.java
index ea5ef7f..801999c 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesServiceAccountsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesServiceAccountsEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LambdaEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LambdaEndpointBuilderFactory.java
index 6b1bb47..67158dc 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LambdaEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LambdaEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LanguageEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LanguageEndpointBuilderFactory.java
index 174d157..e49aceb 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LanguageEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LanguageEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LdapEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LdapEndpointBuilderFactory.java
index 1d3bafd..f91917b 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LdapEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LdapEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LdifEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LdifEndpointBuilderFactory.java
index 39f4c93..d4efeb3 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LdifEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LdifEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LogEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LogEndpointBuilderFactory.java
index aba75d2..fb276d8 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LogEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LogEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
import org.apache.camel.spi.ExchangeFormatter;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LuceneEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LuceneEndpointBuilderFactory.java
index 9977329..a48800f 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LuceneEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LuceneEndpointBuilderFactory.java
@@ -18,7 +18,7 @@ package org.apache.camel.builder.endpoint.dsl;
import java.io.File;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LumberjackEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LumberjackEndpointBuilderFactory.java
index 9db8fe8..827524a 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LumberjackEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LumberjackEndpointBuilderFactory.java
@@ -18,6 +18,7 @@ package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
import org.apache.camel.builder.EndpointConsumerBuilder;
+import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
/**
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MQEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MQEndpointBuilderFactory.java
index 0eda0f8..5428ab3 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MQEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MQEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MSKEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MSKEndpointBuilderFactory.java
index b6cfc7f..d3b72a0 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MSKEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MSKEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MasterEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MasterEndpointBuilderFactory.java
index 480f368..1bf48c9 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MasterEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MasterEndpointBuilderFactory.java
@@ -18,6 +18,7 @@ package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
import org.apache.camel.builder.EndpointConsumerBuilder;
+import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
/**
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MetricsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MetricsEndpointBuilderFactory.java
index 7bcd32d..7571407 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MetricsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MetricsEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MicroProfileMetricsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MicroProfileMetricsEndpointBuilderFactory.java
index 3b455b4..8d4818f 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MicroProfileMetricsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MicroProfileMetricsEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MicrometerEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MicrometerEndpointBuilderFactory.java
index 8c2b286..88bf46f 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MicrometerEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MicrometerEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MockEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MockEndpointBuilderFactory.java
index 76e543c..d28cb89 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MockEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MockEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MsvEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MsvEndpointBuilderFactory.java
index 2f3528e..807fb4d1 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MsvEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MsvEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MustacheEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MustacheEndpointBuilderFactory.java
index bd2de8b..efe5c53 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MustacheEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MustacheEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MvelEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MvelEndpointBuilderFactory.java
index 701b874..b198a90 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MvelEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MvelEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MyBatisBeanEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MyBatisBeanEndpointBuilderFactory.java
index 9dd0051..7eb43e9 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MyBatisBeanEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MyBatisBeanEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NagiosEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NagiosEndpointBuilderFactory.java
index e8a25d6..09ed26b 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NagiosEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NagiosEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NetWeaverEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NetWeaverEndpointBuilderFactory.java
index 869f4f5..b78a9d8 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NetWeaverEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NetWeaverEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NeutronEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NeutronEndpointBuilderFactory.java
index 7537929..24f0aca 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NeutronEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NeutronEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NovaEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NovaEndpointBuilderFactory.java
index 6f9f2a2..2310329 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NovaEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NovaEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/OpenshiftBuildConfigsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/OpenshiftBuildConfigsEndpointBuilderFactory.java
index 328b324..06cb22d 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/OpenshiftBuildConfigsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/OpenshiftBuildConfigsEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/OpenshiftBuildsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/OpenshiftBuildsEndpointBuilderFactory.java
index 2fab1ab..39af23e 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/OpenshiftBuildsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/OpenshiftBuildsEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PaxLoggingEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PaxLoggingEndpointBuilderFactory.java
index bf4afa6..c375322 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PaxLoggingEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PaxLoggingEndpointBuilderFactory.java
@@ -18,6 +18,7 @@ package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
import org.apache.camel.builder.EndpointConsumerBuilder;
+import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
/**
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PdfEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PdfEndpointBuilderFactory.java
index 6562789..3410f92 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PdfEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PdfEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PgReplicationSlotEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PgReplicationSlotEndpointBuilderFactory.java
index 34f82e9..856d2dc 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PgReplicationSlotEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PgReplicationSlotEndpointBuilderFactory.java
@@ -19,6 +19,7 @@ package org.apache.camel.builder.endpoint.dsl;
import java.util.Map;
import javax.annotation.Generated;
import org.apache.camel.builder.EndpointConsumerBuilder;
+import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
/**
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PrinterEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PrinterEndpointBuilderFactory.java
index 51f7967..4c337d9 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PrinterEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PrinterEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/QuartzEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/QuartzEndpointBuilderFactory.java
index 93626a5..c59c222 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/QuartzEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/QuartzEndpointBuilderFactory.java
@@ -19,6 +19,7 @@ package org.apache.camel.builder.endpoint.dsl;
import java.util.Map;
import javax.annotation.Generated;
import org.apache.camel.builder.EndpointConsumerBuilder;
+import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
/**
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RestApiEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RestApiEndpointBuilderFactory.java
index 386e083..4c1885d 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RestApiEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RestApiEndpointBuilderFactory.java
@@ -18,6 +18,7 @@ package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
import org.apache.camel.builder.EndpointConsumerBuilder;
+import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
/**
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RestSwaggerEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RestSwaggerEndpointBuilderFactory.java
index 423683a..ec1c1b2 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RestSwaggerEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RestSwaggerEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RssEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RssEndpointBuilderFactory.java
index b221d77..2fcc4cb 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RssEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RssEndpointBuilderFactory.java
@@ -19,6 +19,7 @@ package org.apache.camel.builder.endpoint.dsl;
import java.util.Date;
import javax.annotation.Generated;
import org.apache.camel.builder.EndpointConsumerBuilder;
+import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
/**
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SagaEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SagaEndpointBuilderFactory.java
index ccf1a1a..8c7f106 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SagaEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SagaEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SchedulerEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SchedulerEndpointBuilderFactory.java
index a1621f1..40ea2e4 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SchedulerEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SchedulerEndpointBuilderFactory.java
@@ -18,6 +18,7 @@ package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
import org.apache.camel.builder.EndpointConsumerBuilder;
+import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
/**
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SchematronEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SchematronEndpointBuilderFactory.java
index ad6fe07..4e6f32f 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SchematronEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SchematronEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ScpEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ScpEndpointBuilderFactory.java
index 96b0ab9..3fbef0d 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ScpEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ScpEndpointBuilderFactory.java
@@ -18,6 +18,7 @@ package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
import org.apache.camel.Expression;
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SdbEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SdbEndpointBuilderFactory.java
index 1fbbd33..46b4e83 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SdbEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SdbEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ServiceEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ServiceEndpointBuilderFactory.java
index a477efb..df922e7 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ServiceEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ServiceEndpointBuilderFactory.java
@@ -18,6 +18,7 @@ package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
import org.apache.camel.builder.EndpointConsumerBuilder;
+import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
/**
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ServiceNowEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ServiceNowEndpointBuilderFactory.java
index f30bfc0..5a0d093 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ServiceNowEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ServiceNowEndpointBuilderFactory.java
@@ -18,7 +18,7 @@ package org.apache.camel.builder.endpoint.dsl;
import java.util.Map;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ServletEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ServletEndpointBuilderFactory.java
index 04dc2b7..27d4eb7 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ServletEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ServletEndpointBuilderFactory.java
@@ -18,6 +18,7 @@ package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
import org.apache.camel.builder.EndpointConsumerBuilder;
+import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
import org.apache.camel.spi.HeaderFilterStrategy;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SesEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SesEndpointBuilderFactory.java
index fd67cc4..431c5e7 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SesEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SesEndpointBuilderFactory.java
@@ -18,7 +18,7 @@ package org.apache.camel.builder.endpoint.dsl;
import java.util.List;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SjmsBatchEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SjmsBatchEndpointBuilderFactory.java
index a04f4cc..9ba130b 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SjmsBatchEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SjmsBatchEndpointBuilderFactory.java
@@ -21,6 +21,7 @@ import javax.annotation.Generated;
import org.apache.camel.AggregationStrategy;
import org.apache.camel.Predicate;
import org.apache.camel.builder.EndpointConsumerBuilder;
+import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
import org.apache.camel.spi.HeaderFilterStrategy;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SnsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SnsEndpointBuilderFactory.java
index dcd952c..efa3a78 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SnsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SnsEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
import org.apache.camel.spi.HeaderFilterStrategy;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SolrEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SolrEndpointBuilderFactory.java
index b868baf..06e8a77 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SolrEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SolrEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SparkEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SparkEndpointBuilderFactory.java
index 543f029..7034409 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SparkEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SparkEndpointBuilderFactory.java
@@ -18,6 +18,7 @@ package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
import org.apache.camel.builder.EndpointConsumerBuilder;
+import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
/**
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SpringBatchEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SpringBatchEndpointBuilderFactory.java
index cecba6f..30a5739 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SpringBatchEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SpringBatchEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SpringLdapEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SpringLdapEndpointBuilderFactory.java
index 7bd3a01..4f2e50a 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SpringLdapEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SpringLdapEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SqlStoredEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SqlStoredEndpointBuilderFactory.java
index ebaf655..b452b25 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SqlStoredEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SqlStoredEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/StAXEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/StAXEndpointBuilderFactory.java
index 431bb6d..9a00f2b 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/StAXEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/StAXEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/StringTemplateEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/StringTemplateEndpointBuilderFactory.java
index 1c71783..aef5ba6 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/StringTemplateEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/StringTemplateEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SwiftEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SwiftEndpointBuilderFactory.java
index 7f66439..5d9b7b7 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SwiftEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SwiftEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TikaEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TikaEndpointBuilderFactory.java
index e8a1fb3..fb2f66f 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TikaEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TikaEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TimerEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TimerEndpointBuilderFactory.java
index 803047a..ca7aaed 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TimerEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TimerEndpointBuilderFactory.java
@@ -20,6 +20,7 @@ import java.util.Date;
import java.util.Timer;
import javax.annotation.Generated;
import org.apache.camel.builder.EndpointConsumerBuilder;
+import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
/**
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TranslateEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TranslateEndpointBuilderFactory.java
index 794ec22..3eff8bc 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TranslateEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TranslateEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ValidatorEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ValidatorEndpointBuilderFactory.java
index a8acdaa..5e47dd3 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ValidatorEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ValidatorEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/VelocityEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/VelocityEndpointBuilderFactory.java
index c3038bc..3d434ca 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/VelocityEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/VelocityEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/WebhookEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/WebhookEndpointBuilderFactory.java
index fd72151..969b5a6 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/WebhookEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/WebhookEndpointBuilderFactory.java
@@ -18,6 +18,7 @@ package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
import org.apache.camel.builder.EndpointConsumerBuilder;
+import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
/**
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/XChangeEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/XChangeEndpointBuilderFactory.java
index 9cdb65b..7ac7368 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/XChangeEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/XChangeEndpointBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/XJEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/XJEndpointBuilderFactory.java
index b8d8ecf..008410a 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/XJEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/XJEndpointBuilderFactory.java
@@ -18,7 +18,7 @@ package org.apache.camel.builder.endpoint.dsl;
import java.util.List;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/XmlSignatureEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/XmlSignatureEndpointBuilderFactory.java
index e000d4d..177aad5 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/XmlSignatureEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/XmlSignatureEndpointBuilderFactory.java
@@ -19,7 +19,7 @@ package org.apache.camel.builder.endpoint.dsl;
import java.util.List;
import java.util.Map;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/XsltEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/XsltEndpointBuilderFactory.java
index 582373b..ab6bf65 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/XsltEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/XsltEndpointBuilderFactory.java
@@ -18,7 +18,7 @@ package org.apache.camel.builder.endpoint.dsl;
import java.util.List;
import javax.annotation.Generated;
-
+import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ZooKeeperMasterEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ZooKeeperMasterEndpointBuilderFactory.java
index b5faad9..1acb195 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ZooKeeperMasterEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ZooKeeperMasterEndpointBuilderFactory.java
@@ -18,6 +18,7 @@ package org.apache.camel.builder.endpoint.dsl;
import javax.annotation.Generated;
import org.apache.camel.builder.EndpointConsumerBuilder;
+import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
/**
[camel] 01/08: CAMEL-13949: Better splitup between camel-core and
camel-core-engine.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch CAMEL-13949
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 74a338856b34949b153907850b3bc8cb42b6b313
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Sep 25 05:35:21 2019 +0200
CAMEL-13949: Better splitup between camel-core and camel-core-engine.
---
core/camel-core-engine/pom.xml | 556 +++++++++++++++++----
.../src/main/docs/eips/aggregate-eip.adoc | 0
.../src/main/docs/eips/batch-config-eip.adoc | 0
.../src/main/docs/eips/bean-eip.adoc | 0
.../src/main/docs/eips/choice-eip.adoc | 0
.../src/main/docs/eips/circuitBreaker-eip.adoc | 0
.../src/main/docs/eips/claimCheck-eip.adoc | 0
.../main/docs/eips/content-based-router-eip.adoc | 0
.../src/main/docs/eips/content-filter-eip.adoc | 0
.../src/main/docs/eips/convertBodyTo-eip.adoc | 0
.../src/main/docs/eips/customLoadBalancer-eip.adoc | 0
.../src/main/docs/eips/delay-eip.adoc | 0
.../src/main/docs/eips/dynamic-router.adoc | 0
.../src/main/docs/eips/dynamicRouter-eip.adoc | 0
.../src/main/docs/eips/enrich-eip.adoc | 0
.../main/docs/eips/eventDrivenConsumer-eip.adoc | 0
.../src/main/docs/eips/failover-eip.adoc | 0
.../src/main/docs/eips/filter-eip.adoc | 0
.../src/main/docs/eips/from-eip.adoc | 0
.../src/main/docs/eips/hystrix-eip.adoc | 0
.../main/docs/eips/hystrixConfiguration-eip.adoc | 0
.../src/main/docs/eips/idempotentConsumer-eip.adoc | 0
.../src/main/docs/eips/inOnly-eip.adoc | 0
.../src/main/docs/eips/inOut-eip.adoc | 0
.../src/main/docs/eips/loadBalance-eip.adoc | 0
.../src/main/docs/eips/log-eip.adoc | 0
.../src/main/docs/eips/loop-eip.adoc | 0
.../src/main/docs/eips/marshal-eip.adoc | 0
.../src/main/docs/eips/multicast-eip.adoc | 0
.../src/main/docs/eips/onFallback-eip.adoc | 0
.../src/main/docs/eips/otherwise-eip.adoc | 0
.../src/main/docs/eips/pipeline-eip.adoc | 0
.../src/main/docs/eips/pollEnrich-eip.adoc | 0
.../src/main/docs/eips/process-eip.adoc | 0
.../src/main/docs/eips/random-eip.adoc | 0
.../src/main/docs/eips/recipientList-eip.adoc | 0
.../src/main/docs/eips/removeHeader-eip.adoc | 0
.../src/main/docs/eips/removeHeaders-eip.adoc | 0
.../src/main/docs/eips/removeProperties-eip.adoc | 0
.../src/main/docs/eips/removeProperty-eip.adoc | 0
.../src/main/docs/eips/requestReply-eip.adoc | 0
.../src/main/docs/eips/resequence-eip.adoc | 0
.../src/main/docs/eips/rollback-eip.adoc | 0
.../src/main/docs/eips/roundRobin-eip.adoc | 0
.../src/main/docs/eips/routingSlip-eip.adoc | 0
.../src/main/docs/eips/saga-eip.adoc | 0
.../src/main/docs/eips/sample-eip.adoc | 0
.../src/main/docs/eips/script-eip.adoc | 0
.../src/main/docs/eips/serviceCall-eip.adoc | 0
.../src/main/docs/eips/setBody-eip.adoc | 0
.../src/main/docs/eips/setHeader-eip.adoc | 0
.../src/main/docs/eips/setOutHeader-eip.adoc | 0
.../src/main/docs/eips/setProperty-eip.adoc | 0
.../src/main/docs/eips/sort-eip.adoc | 0
.../src/main/docs/eips/split-eip.adoc | 0
.../src/main/docs/eips/step-eip.adoc | 0
.../src/main/docs/eips/sticky-eip.adoc | 0
.../src/main/docs/eips/stop-eip.adoc | 0
.../src/main/docs/eips/stream-config-eip.adoc | 0
.../src/main/docs/eips/threads-eip.adoc | 0
.../src/main/docs/eips/throttle-eip.adoc | 0
.../src/main/docs/eips/to-eip.adoc | 0
.../src/main/docs/eips/toD-eip.adoc | 0
.../src/main/docs/eips/topic-eip.adoc | 0
.../src/main/docs/eips/transform-eip.adoc | 0
.../src/main/docs/eips/unmarshal-eip.adoc | 0
.../src/main/docs/eips/validate-eip.adoc | 0
.../src/main/docs/eips/weighted-eip.adoc | 0
.../src/main/docs/eips/when-eip.adoc | 0
.../src/main/docs/eips/wireTap-eip.adoc | 0
.../apache/camel/builder/AdviceWithBuilder.java | 0
.../camel/builder/AdviceWithRouteBuilder.java | 0
.../org/apache/camel/builder/AdviceWithTask.java | 0
.../org/apache/camel/builder/AdviceWithTasks.java | 0
.../camel/builder/AggregationStrategies.java | 0
.../camel/builder/AggregationStrategyClause.java | 0
.../java/org/apache/camel/builder/Builder.java | 0
.../org/apache/camel/builder/BuilderSupport.java | 0
.../org/apache/camel/builder/DataFormatClause.java | 0
.../camel/builder/DeadLetterChannelBuilder.java | 0
.../camel/builder/DefaultErrorHandlerBuilder.java | 0
.../camel/builder/EndpointConsumerBuilder.java | 0
.../camel/builder/EndpointProducerBuilder.java | 0
.../org/apache/camel/builder/EnrichClause.java | 0
.../apache/camel/builder/ErrorHandlerBuilder.java | 0
.../camel/builder/ErrorHandlerBuilderRef.java | 0
.../camel/builder/ErrorHandlerBuilderSupport.java | 0
.../org/apache/camel/builder/ExchangeBuilder.java | 0
.../apache/camel/builder/ExpressionBuilder.java | 0
.../org/apache/camel/builder/ExpressionClause.java | 0
.../camel/builder/ExpressionClauseSupport.java | 0
.../camel/builder/FlexibleAggregationStrategy.java | 0
.../camel/builder/NoErrorHandlerBuilder.java | 0
.../org/apache/camel/builder/NotifyBuilder.java | 0
.../org/apache/camel/builder/PredicateBuilder.java | 0
.../org/apache/camel/builder/PredicateClause.java | 0
.../org/apache/camel/builder/ProcessClause.java | 0
.../org/apache/camel/builder/ProxyBuilder.java | 0
.../org/apache/camel/builder/RouteBuilder.java | 0
.../org/apache/camel/builder/SimpleBuilder.java | 0
.../apache/camel/builder/ThreadPoolBuilder.java | 0
.../camel/builder/ThreadPoolProfileBuilder.java | 0
.../apache/camel/builder/TransformerBuilder.java | 0
.../org/apache/camel/builder/ValidatorBuilder.java | 0
.../org/apache/camel/builder/ValueBuilder.java | 0
.../java/org/apache/camel/builder/package.html | 0
.../camel/impl/AbstractModelCamelContext.java | 0
.../org/apache/camel/impl/DefaultCamelContext.java | 0
.../camel/impl/DefaultExecutorServiceManager.java | 0
.../java/org/apache/camel/impl/DefaultModel.java | 0
.../camel/impl/DefaultModelJAXBContextFactory.java | 0
.../java/org/apache/camel/impl/JndiRegistry.java | 0
.../java/org/apache/camel/impl/RouteIdFactory.java | 0
.../java/org/apache/camel/impl/RouteService.java | 0
.../impl/cluster/ClusteredRouteConfiguration.java | 0
.../impl/cluster/ClusteredRouteController.java | 0
.../camel/impl/cluster/ClusteredRouteFilter.java | 0
.../camel/impl/cluster/ClusteredRouteFilters.java | 0
.../camel/impl/cluster/ClusteredRoutePolicy.java | 0
.../impl/cluster/ClusteredRoutePolicyFactory.java | 0
.../org/apache/camel/impl/cluster/package.html | 0
.../java}/java/org/apache/camel/impl/package.html | 0
.../apache/camel/model/AdviceWithDefinition.java | 0
.../apache/camel/model/AggregateDefinition.java | 0
.../org/apache/camel/model/BeanDefinition.java | 0
.../java}/java/org/apache/camel/model/Block.java | 0
.../org/apache/camel/model/CatchDefinition.java | 0
.../org/apache/camel/model/ChoiceDefinition.java | 0
.../apache/camel/model/ClaimCheckDefinition.java | 0
.../apache/camel/model/ClaimCheckOperation.java | 0
.../java/org/apache/camel/model/Constants.java | 0
.../apache/camel/model/ContextScanDefinition.java | 0
.../apache/camel/model/ConvertBodyDefinition.java | 0
.../apache/camel/model/DataFormatDefinition.java | 0
.../DefinitionPropertyPlaceholderConfigurer.java | 0
.../org/apache/camel/model/DelayDefinition.java | 0
.../apache/camel/model/DescriptionDefinition.java | 0
.../camel/model/DynamicRouterDefinition.java | 0
.../camel/model/EndpointRequiredDefinition.java | 0
.../org/apache/camel/model/EnrichDefinition.java | 0
.../model/ExecutorServiceAwareDefinition.java | 0
.../org/apache/camel/model/ExpressionNode.java | 0
.../apache/camel/model/ExpressionNodeHelper.java | 0
.../model/ExpressionSubElementDefinition.java | 0
.../org/apache/camel/model/FilterDefinition.java | 0
.../org/apache/camel/model/FinallyDefinition.java | 0
.../org/apache/camel/model/FromDefinition.java | 0
.../apache/camel/model/GlobalOptionDefinition.java | 0
.../camel/model/GlobalOptionsDefinition.java | 0
.../camel/model/HystrixConfigurationCommon.java | 0
.../model/HystrixConfigurationDefinition.java | 0
.../org/apache/camel/model/HystrixDefinition.java | 0
.../camel/model/IdempotentConsumerDefinition.java | 0
.../org/apache/camel/model/IdentifiedType.java | 0
.../org/apache/camel/model/InOnlyDefinition.java | 0
.../org/apache/camel/model/InOutDefinition.java | 0
.../apache/camel/model/InputTypeDefinition.java | 0
.../apache/camel/model/InterceptDefinition.java | 0
.../camel/model/InterceptFromDefinition.java | 0
.../model/InterceptSendToEndpointDefinition.java | 0
.../apache/camel/model/LoadBalanceDefinition.java | 0
.../apache/camel/model/LoadBalancerDefinition.java | 0
.../java/org/apache/camel/model/LogDefinition.java | 0
.../org/apache/camel/model/LoopDefinition.java | 0
.../org/apache/camel/model/MarshalDefinition.java | 0
.../java}/java/org/apache/camel/model/Model.java | 0
.../org/apache/camel/model/ModelCamelContext.java | 0
.../java/org/apache/camel/model/ModelHelper.java | 0
.../apache/camel/model/MulticastDefinition.java | 0
.../org/apache/camel/model/NoOutputDefinition.java | 0
.../apache/camel/model/OnCompletionDefinition.java | 0
.../org/apache/camel/model/OnCompletionMode.java | 0
.../apache/camel/model/OnExceptionDefinition.java | 0
.../apache/camel/model/OnFallbackDefinition.java | 0
.../model/OptimisticLockRetryPolicyDefinition.java | 0
.../camel/model/OptionalIdentifiedDefinition.java | 0
.../apache/camel/model/OtherAttributesAware.java | 0
.../apache/camel/model/OtherwiseDefinition.java | 0
.../org/apache/camel/model/OutputDefinition.java | 0
.../apache/camel/model/OutputExpressionNode.java | 0
.../java/org/apache/camel/model/OutputNode.java | 0
.../apache/camel/model/OutputTypeDefinition.java | 0
.../apache/camel/model/PackageScanDefinition.java | 0
.../org/apache/camel/model/PipelineDefinition.java | 0
.../org/apache/camel/model/PolicyDefinition.java | 0
.../apache/camel/model/PollEnrichDefinition.java | 0
.../org/apache/camel/model/ProcessDefinition.java | 0
.../apache/camel/model/ProcessorDefinition.java | 0
.../camel/model/ProcessorDefinitionHelper.java | 0
.../org/apache/camel/model/PropertyDefinition.java | 0
.../apache/camel/model/PropertyDefinitions.java | 0
.../camel/model/PropertyDescriptionsAdapter.java | 0
.../camel/model/RecipientListDefinition.java | 0
.../camel/model/RedeliveryPolicyDefinition.java | 0
.../apache/camel/model/RemoveHeaderDefinition.java | 0
.../camel/model/RemoveHeadersDefinition.java | 0
.../camel/model/RemovePropertiesDefinition.java | 0
.../camel/model/RemovePropertyDefinition.java | 0
.../apache/camel/model/ResequenceDefinition.java | 0
.../camel/model/RestContextRefDefinition.java | 0
.../model/RestContextRefDefinitionHelper.java | 0
.../org/apache/camel/model/RollbackDefinition.java | 0
.../apache/camel/model/RouteBuilderDefinition.java | 0
.../org/apache/camel/model/RouteContainer.java | 0
.../camel/model/RouteContextRefDefinition.java | 0
.../model/RouteContextRefDefinitionHelper.java | 0
.../org/apache/camel/model/RouteDefinition.java | 0
.../apache/camel/model/RouteDefinitionHelper.java | 0
.../java/org/apache/camel/model/RouteFilters.java | 0
.../org/apache/camel/model/RoutesDefinition.java | 0
.../apache/camel/model/RoutingSlipDefinition.java | 0
.../camel/model/SagaActionUriDefinition.java | 0
.../org/apache/camel/model/SagaCompletionMode.java | 0
.../org/apache/camel/model/SagaDefinition.java | 0
.../apache/camel/model/SagaOptionDefinition.java | 0
.../org/apache/camel/model/SagaPropagation.java | 0
.../org/apache/camel/model/SamplingDefinition.java | 0
.../org/apache/camel/model/ScriptDefinition.java | 0
.../org/apache/camel/model/SendDefinition.java | 0
.../org/apache/camel/model/SetBodyDefinition.java | 0
.../camel/model/SetExchangePatternDefinition.java | 0
.../apache/camel/model/SetHeaderDefinition.java | 0
.../apache/camel/model/SetPropertyDefinition.java | 0
.../org/apache/camel/model/SortDefinition.java | 0
.../org/apache/camel/model/SplitDefinition.java | 0
.../org/apache/camel/model/StepDefinition.java | 0
.../org/apache/camel/model/StopDefinition.java | 0
.../camel/model/ThreadPoolProfileDefinition.java | 0
.../org/apache/camel/model/ThreadsDefinition.java | 0
.../org/apache/camel/model/ThrottleDefinition.java | 0
.../camel/model/ThrowExceptionDefinition.java | 0
.../org/apache/camel/model/TimeUnitAdapter.java | 0
.../java/org/apache/camel/model/ToDefinition.java | 0
.../apache/camel/model/ToDynamicDefinition.java | 0
.../apache/camel/model/TransactedDefinition.java | 0
.../apache/camel/model/TransformDefinition.java | 0
.../java/org/apache/camel/model/TryDefinition.java | 0
.../apache/camel/model/UnmarshalDefinition.java | 0
.../org/apache/camel/model/ValidateDefinition.java | 0
.../org/apache/camel/model/WhenDefinition.java | 0
.../model/WhenSkipSendToEndpointDefinition.java | 0
.../org/apache/camel/model/WireTapDefinition.java | 0
...klistServiceCallServiceFilterConfiguration.java | 0
...ngServiceCallServiceDiscoveryConfiguration.java | 0
...edServiceCallServiceDiscoveryConfiguration.java | 0
...binedServiceCallServiceFilterConfiguration.java | 0
...ulServiceCallServiceDiscoveryConfiguration.java | 0
...ustomServiceCallServiceFilterConfiguration.java | 0
...erviceCallServiceLoadBalancerConfiguration.java | 0
...nsServiceCallServiceDiscoveryConfiguration.java | 0
...cdServiceCallServiceDiscoveryConfiguration.java | 0
...althyServiceCallServiceFilterConfiguration.java | 0
...esServiceCallServiceDiscoveryConfiguration.java | 0
...roughServiceCallServiceFilterConfiguration.java | 0
...erviceCallServiceLoadBalancerConfiguration.java | 0
.../cloud/ServiceCallConfigurationDefinition.java | 0
.../camel/model/cloud/ServiceCallDefinition.java | 0
.../cloud/ServiceCallDefinitionConstants.java | 0
.../cloud/ServiceCallExpressionConfiguration.java | 0
.../ServiceCallServiceChooserConfiguration.java | 0
.../ServiceCallServiceDiscoveryConfiguration.java | 0
.../ServiceCallServiceFilterConfiguration.java | 0
...erviceCallServiceLoadBalancerConfiguration.java | 0
...icServiceCallServiceDiscoveryConfiguration.java | 0
...erServiceCallServiceDiscoveryConfiguration.java | 0
.../org/apache/camel/model/cloud/package-info.java | 0
.../camel/model/config/BatchResequencerConfig.java | 0
.../camel/model/config/ResequencerConfig.java | 0
.../model/config/StreamResequencerConfig.java | 0
.../apache/camel/model/config/package-info.java | 0
.../camel/model/dataformat/ASN1DataFormat.java | 0
.../camel/model/dataformat/Any23DataFormat.java | 0
.../apache/camel/model/dataformat/Any23Type.java | 0
.../camel/model/dataformat/AvroDataFormat.java | 0
.../camel/model/dataformat/BarcodeDataFormat.java | 0
.../camel/model/dataformat/Base64DataFormat.java | 0
.../camel/model/dataformat/BeanioDataFormat.java | 0
.../camel/model/dataformat/BindyDataFormat.java | 0
.../apache/camel/model/dataformat/BindyType.java | 0
.../camel/model/dataformat/CBORDataFormat.java | 0
.../camel/model/dataformat/CryptoDataFormat.java | 0
.../camel/model/dataformat/CsvDataFormat.java | 0
.../camel/model/dataformat/CustomDataFormat.java | 0
.../model/dataformat/DataFormatsDefinition.java | 0
.../camel/model/dataformat/FhirDataformat.java | 0
.../camel/model/dataformat/FhirJsonDataFormat.java | 0
.../camel/model/dataformat/FhirXmlDataFormat.java | 0
.../camel/model/dataformat/FlatpackDataFormat.java | 0
.../camel/model/dataformat/GrokDataFormat.java | 0
.../camel/model/dataformat/GzipDataFormat.java | 0
.../camel/model/dataformat/HL7DataFormat.java | 0
.../camel/model/dataformat/IcalDataFormat.java | 0
.../model/dataformat/JacksonXMLDataFormat.java | 0
.../camel/model/dataformat/JaxbDataFormat.java | 0
.../camel/model/dataformat/JsonApiDataFormat.java | 0
.../camel/model/dataformat/JsonDataFormat.java | 0
.../apache/camel/model/dataformat/JsonLibrary.java | 0
.../camel/model/dataformat/LZFDataFormat.java | 0
.../model/dataformat/MimeMultipartDataFormat.java | 0
.../camel/model/dataformat/PGPDataFormat.java | 0
.../camel/model/dataformat/ProtobufDataFormat.java | 0
.../camel/model/dataformat/RssDataFormat.java | 0
.../camel/model/dataformat/SoapJaxbDataFormat.java | 0
.../camel/model/dataformat/SyslogDataFormat.java | 0
.../camel/model/dataformat/TarFileDataFormat.java | 0
.../camel/model/dataformat/ThriftDataFormat.java | 0
.../model/dataformat/TidyMarkupDataFormat.java | 0
.../dataformat/UniVocityAbstractDataFormat.java | 0
.../model/dataformat/UniVocityCsvDataFormat.java | 0
.../dataformat/UniVocityFixedWidthDataFormat.java | 0
.../camel/model/dataformat/UniVocityHeader.java | 0
.../model/dataformat/UniVocityTsvDataFormat.java | 0
.../model/dataformat/XMLSecurityDataFormat.java | 0
.../camel/model/dataformat/XStreamDataFormat.java | 0
.../camel/model/dataformat/XmlRpcDataFormat.java | 0
.../camel/model/dataformat/YAMLDataFormat.java | 0
.../apache/camel/model/dataformat/YAMLLibrary.java | 0
.../model/dataformat/YAMLTypeFilterDefinition.java | 0
.../camel/model/dataformat/YAMLTypeFilterType.java | 0
.../model/dataformat/ZipDeflaterDataFormat.java | 0
.../camel/model/dataformat/ZipFileDataFormat.java | 0
.../camel/model/dataformat/package-info.java | 0
.../camel/model/language/ConstantExpression.java | 0
.../model/language/ExchangePropertyExpression.java | 0
.../camel/model/language/ExpressionDefinition.java | 0
.../camel/model/language/GroovyExpression.java | 0
.../camel/model/language/HeaderExpression.java | 0
.../camel/model/language/Hl7TerserExpression.java | 0
.../camel/model/language/JsonPathExpression.java | 0
.../camel/model/language/LanguageExpression.java | 0
.../camel/model/language/MethodCallExpression.java | 0
.../camel/model/language/MvelExpression.java | 0
.../model/language/NamespaceAwareExpression.java | 0
.../camel/model/language/OgnlExpression.java | 0
.../apache/camel/model/language/RefExpression.java | 0
.../camel/model/language/SimpleExpression.java | 0
.../camel/model/language/SpELExpression.java | 0
.../camel/model/language/TokenizerExpression.java | 0
.../model/language/XMLTokenizerExpression.java | 0
.../camel/model/language/XPathExpression.java | 0
.../camel/model/language/XQueryExpression.java | 0
.../apache/camel/model/language/package-info.java | 0
.../loadbalancer/CustomLoadBalancerDefinition.java | 0
.../FailoverLoadBalancerDefinition.java | 0
.../loadbalancer/RandomLoadBalancerDefinition.java | 0
.../RoundRobinLoadBalancerDefinition.java | 0
.../loadbalancer/StickyLoadBalancerDefinition.java | 0
.../loadbalancer/TopicLoadBalancerDefinition.java | 0
.../WeightedLoadBalancerDefinition.java | 0
.../camel/model/loadbalancer/package-info.java | 0
.../java/org/apache/camel/model/package-info.java | 0
.../apache/camel/model/rest/CollectionFormat.java | 0
.../camel/model/rest/DeleteVerbDefinition.java | 0
.../apache/camel/model/rest/GetVerbDefinition.java | 0
.../camel/model/rest/HeadVerbDefinition.java | 0
.../camel/model/rest/PatchVerbDefinition.java | 0
.../camel/model/rest/PostVerbDefinition.java | 0
.../apache/camel/model/rest/PutVerbDefinition.java | 0
.../camel/model/rest/RestBindingDefinition.java | 0
.../apache/camel/model/rest/RestBindingMode.java | 0
.../model/rest/RestConfigurationDefinition.java | 0
.../org/apache/camel/model/rest/RestConstants.java | 0
.../org/apache/camel/model/rest/RestContainer.java | 0
.../apache/camel/model/rest/RestDefinition.java | 0
.../camel/model/rest/RestHostNameResolver.java | 0
.../model/rest/RestOperationParamDefinition.java | 0
.../RestOperationResponseHeaderDefinition.java | 0
.../rest/RestOperationResponseMsgDefinition.java | 0
.../org/apache/camel/model/rest/RestParamType.java | 0
.../camel/model/rest/RestPropertyDefinition.java | 0
.../camel/model/rest/RestSecuritiesDefinition.java | 0
.../camel/model/rest/RestSecurityApiKey.java | 0
.../camel/model/rest/RestSecurityBasicAuth.java | 0
.../camel/model/rest/RestSecurityDefinition.java | 0
.../camel/model/rest/RestSecurityOAuth2.java | 0
.../apache/camel/model/rest/RestsDefinition.java | 0
.../camel/model/rest/SecurityDefinition.java | 0
.../apache/camel/model/rest/VerbDefinition.java | 0
.../org/apache/camel/model/rest/package-info.java | 0
.../transformer/CustomTransformerDefinition.java | 0
.../DataFormatTransformerDefinition.java | 0
.../transformer/EndpointTransformerDefinition.java | 0
.../model/transformer/TransformerDefinition.java | 0
.../model/transformer/TransformersDefinition.java | 0
.../camel/model/transformer/package-info.java | 0
.../model/validator/CustomValidatorDefinition.java | 0
.../validator/EndpointValidatorDefinition.java | 0
.../validator/PredicateValidatorDefinition.java | 0
.../camel/model/validator/ValidatorDefinition.java | 0
.../model/validator/ValidatorsDefinition.java | 0
.../apache/camel/model/validator/package-info.java | 0
.../org/apache/camel/reifier/AggregateReifier.java | 0
.../java/org/apache/camel/reifier/BeanReifier.java | 0
.../org/apache/camel/reifier/CatchReifier.java | 0
.../org/apache/camel/reifier/ChoiceReifier.java | 0
.../apache/camel/reifier/ClaimCheckReifier.java | 0
.../apache/camel/reifier/ConvertBodyReifier.java | 0
.../org/apache/camel/reifier/DelayReifier.java | 0
.../apache/camel/reifier/DynamicRouterReifier.java | 0
.../org/apache/camel/reifier/EnrichReifier.java | 0
.../apache/camel/reifier/ExpressionReifier.java | 0
.../org/apache/camel/reifier/FilterReifier.java | 0
.../org/apache/camel/reifier/FinallyReifier.java | 0
.../org/apache/camel/reifier/HystrixReifier.java | 0
.../camel/reifier/IdempotentConsumerReifier.java | 0
.../apache/camel/reifier/InterceptFromReifier.java | 0
.../org/apache/camel/reifier/InterceptReifier.java | 0
.../reifier/InterceptSendToEndpointReifier.java | 0
.../apache/camel/reifier/LoadBalanceReifier.java | 0
.../java/org/apache/camel/reifier/LogReifier.java | 0
.../java/org/apache/camel/reifier/LoopReifier.java | 0
.../org/apache/camel/reifier/MarshalReifier.java | 0
.../org/apache/camel/reifier/MulticastReifier.java | 0
.../apache/camel/reifier/OnCompletionReifier.java | 0
.../apache/camel/reifier/OnExceptionReifier.java | 0
.../apache/camel/reifier/OnFallbackReifier.java | 0
.../org/apache/camel/reifier/OtherwiseReifier.java | 0
.../org/apache/camel/reifier/PipelineReifier.java | 0
.../org/apache/camel/reifier/PolicyReifier.java | 0
.../apache/camel/reifier/PollEnrichReifier.java | 0
.../org/apache/camel/reifier/ProcessReifier.java | 0
.../org/apache/camel/reifier/ProcessorReifier.java | 0
.../apache/camel/reifier/RecipientListReifier.java | 0
.../apache/camel/reifier/RemoveHeaderReifier.java | 0
.../apache/camel/reifier/RemoveHeadersReifier.java | 0
.../camel/reifier/RemovePropertiesReifier.java | 0
.../camel/reifier/RemovePropertyReifier.java | 0
.../apache/camel/reifier/ResequenceReifier.java | 0
.../org/apache/camel/reifier/RollbackReifier.java | 0
.../org/apache/camel/reifier/RouteReifier.java | 0
.../apache/camel/reifier/RoutingSlipReifier.java | 0
.../java/org/apache/camel/reifier/SagaReifier.java | 0
.../org/apache/camel/reifier/SamplingReifier.java | 0
.../org/apache/camel/reifier/ScriptReifier.java | 0
.../java/org/apache/camel/reifier/SendReifier.java | 0
.../apache/camel/reifier/ServiceCallReifier.java | 0
.../org/apache/camel/reifier/SetBodyReifier.java | 0
.../camel/reifier/SetExchangePatternReifier.java | 0
.../org/apache/camel/reifier/SetHeaderReifier.java | 0
.../apache/camel/reifier/SetPropertyReifier.java | 0
.../java/org/apache/camel/reifier/SortReifier.java | 0
.../org/apache/camel/reifier/SplitReifier.java | 0
.../java/org/apache/camel/reifier/StepReifier.java | 0
.../java/org/apache/camel/reifier/StopReifier.java | 0
.../org/apache/camel/reifier/ThreadsReifier.java | 0
.../org/apache/camel/reifier/ThrottleReifier.java | 0
.../camel/reifier/ThrowExceptionReifier.java | 0
.../org/apache/camel/reifier/ToDynamicReifier.java | 0
.../apache/camel/reifier/TransactedReifier.java | 0
.../org/apache/camel/reifier/TransformReifier.java | 0
.../java/org/apache/camel/reifier/TryReifier.java | 0
.../org/apache/camel/reifier/UnmarshalReifier.java | 0
.../org/apache/camel/reifier/ValidateReifier.java | 0
.../java/org/apache/camel/reifier/WhenReifier.java | 0
.../reifier/WhenSkipSendToEndpointReifier.java | 0
.../org/apache/camel/reifier/WireTapReifier.java | 0
.../reifier/dataformat/ASN1DataFormatReifier.java | 0
.../reifier/dataformat/Any23DataFormatReifier.java | 0
.../reifier/dataformat/AvroDataFormatReifier.java | 0
.../dataformat/BarcodeDataFormatReifier.java | 0
.../dataformat/Base64DataFormatReifier.java | 0
.../dataformat/BeanioDataFormatReifier.java | 0
.../reifier/dataformat/BindyDataFormatReifier.java | 0
.../reifier/dataformat/CBORDataFormatReifier.java | 0
.../dataformat/CryptoDataFormatReifier.java | 0
.../reifier/dataformat/CsvDataFormatReifier.java | 0
.../dataformat/CustomDataFormatReifier.java | 0
.../reifier/dataformat/DataFormatReifier.java | 0
.../reifier/dataformat/FhirDataFormatReifier.java | 0
.../dataformat/FhirJsonDataFormatReifier.java | 0
.../dataformat/FhirXmlDataFormatReifier.java | 0
.../dataformat/FlatpackDataFormatReifier.java | 0
.../reifier/dataformat/GrokDataFormatReifier.java | 0
.../reifier/dataformat/GzipDataFormatReifier.java | 0
.../reifier/dataformat/HL7DataFormatReifier.java | 0
.../reifier/dataformat/IcalDataFormatReifier.java | 0
.../dataformat/JacksonXMLDataFormatReifier.java | 0
.../reifier/dataformat/JaxbDataFormatReifier.java | 0
.../dataformat/JsonApiDataFormatReifier.java | 0
.../reifier/dataformat/JsonDataFormatReifier.java | 0
.../reifier/dataformat/LZFDataFormatReifier.java | 0
.../dataformat/MimeMultipartDataFormatReifier.java | 0
.../reifier/dataformat/PGPDataFormatReifier.java | 0
.../dataformat/ProtobufDataFormatReifier.java | 0
.../reifier/dataformat/RssDataFormatReifier.java | 0
.../dataformat/SoapJaxbDataFormatReifier.java | 0
.../dataformat/SyslogDataFormatReifier.java | 0
.../dataformat/TarFileDataFormatReifier.java | 0
.../dataformat/ThriftDataFormatReifier.java | 0
.../dataformat/TidyMarkupDataFormatReifier.java | 0
.../UniVocityAbstractDataFormatReifier.java | 0
.../dataformat/UniVocityCsvDataFormatReifier.java | 0
.../UniVocityFixedWidthDataFormatReifier.java | 0
.../dataformat/UniVocityTsvDataFormatReifier.java | 0
.../dataformat/XMLSecurityDataFormatReifier.java | 0
.../dataformat/XStreamDataFormatReifier.java | 0
.../dataformat/XmlRpcDataFormatReifier.java | 0
.../reifier/dataformat/YAMLDataFormatReifier.java | 0
.../reifier/dataformat/ZipDataFormatReifier.java | 0
.../dataformat/ZipFileDataFormatReifier.java | 0
.../errorhandler/DeadLetterChannelReifier.java | 0
.../errorhandler/DefaultErrorHandlerReifier.java | 0
.../errorhandler/ErrorHandlerRefReifier.java | 0
.../reifier/errorhandler/ErrorHandlerReifier.java | 0
.../errorhandler/NoErrorHandlerReifier.java | 0
.../loadbalancer/CustomLoadBalancerReifier.java | 0
.../loadbalancer/FailoverLoadBalancerReifier.java | 0
.../reifier/loadbalancer/LoadBalancerReifier.java | 0
.../loadbalancer/RandomLoadBalancerReifier.java | 0
.../RoundRobinLoadBalancerReifier.java | 0
.../loadbalancer/StickyLoadBalancerReifier.java | 0
.../loadbalancer/TopicLoadBalancerReifier.java | 0
.../loadbalancer/WeightedLoadBalancerReifier.java | 0
.../camel/reifier/rest/RestBindingReifier.java | 0
.../transformer/CustomTransformeReifier.java | 0
.../transformer/DataFormatTransformeReifier.java | 0
.../transformer/EndpointTransformeReifier.java | 0
.../reifier/transformer/TransformerReifier.java | 0
.../reifier/validator/CustomValidatorReifier.java | 0
.../validator/EndpointValidatorReifier.java | 0
.../validator/PredicateValidatorReifier.java | 0
.../camel/reifier/validator/ValidatorReifier.java | 0
.../src/main/schema/constant.json | 0
.../src/main/schema/exchangeProperty.json | 0
.../src/main/schema/expression.json | 0
.../src/main/schema/groovy.json | 0
.../src/main/schema/header.json | 0
.../src/main/schema/hl7terser.json | 0
.../src/main/schema/jsonpath.json | 0
.../src/main/schema/language.json | 0
.../src/main/schema/method.json | 0
.../src/main/schema/mvel.json | 0
.../src/main/schema/ognl.json | 0
.../src/main/schema/ref.json | 0
.../src/main/schema/simple.json | 0
.../src/main/schema/spel.json | 0
.../src/main/schema/tokenize.json | 0
.../src/main/schema/xpath.json | 0
.../src/main/schema/xquery.json | 0
.../src/main/schema/xtokenize.json | 0
core/camel-core/pom.xml | 444 +---------------
core/camel-core/src/revapi/ignore.json | 24 -
core/pom.xml | 2 +-
.../maven/packaging/PackageDataFormatMojo.java | 2 +-
.../camel/maven/packaging/PackageHelper.java | 2 +-
.../camel/maven/packaging/PackageLanguageMojo.java | 2 +-
.../maven/packaging/PrepareCatalogKarafMojo.java | 2 +-
.../camel/maven/packaging/PrepareCatalogMojo.java | 2 +-
.../packaging/PrepareCatalogSpringBootMojo.java | 2 +-
.../camel/maven/packaging/PrepareReadmeMojo.java | 2 +-
.../maven/packaging/model/ComponentModel.java | 2 +-
.../maven/packaging/model/DataFormatModel.java | 2 +-
.../camel/maven/packaging/model/LanguageModel.java | 2 +-
553 files changed, 461 insertions(+), 585 deletions(-)
diff --git a/core/camel-core-engine/pom.xml b/core/camel-core-engine/pom.xml
index ecfe0ff..d29527c 100644
--- a/core/camel-core-engine/pom.xml
+++ b/core/camel-core-engine/pom.xml
@@ -37,6 +37,14 @@
<properties>
<firstVersion>3.0.0</firstVersion>
<label>core</label>
+ <camel.osgi.dynamic>
+ org.apache.camel.spring.util;${camel.osgi.import.strict.version},
+ org.apache.camel.spring.pollingconsumer;${camel.osgi.import.strict.version},
+ org.apache.camel.processor.interceptor.jpa;${camel.osgi.import.strict.version},
+ org.apache.camel.pollconsumer.quartz;${camel.osgi.import.strict.version},
+ org.apache.camel.component.caffeine;${camel.osgi.import.strict.version},
+ net.sf.saxon
+ </camel.osgi.dynamic>
</properties>
<dependencies>
@@ -44,133 +52,467 @@
<!-- camel annotations -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>spi-annotations</artifactId>
+ <artifactId>meta-annotations</artifactId>
<optional>true</optional>
</dependency>
+
+ <!-- required dependencies by camel-core -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>meta-annotations</artifactId>
- <optional>true</optional>
+ <artifactId>spi-annotations</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-base</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-jaxp</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-management-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-support</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-bean</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-browse</artifactId>
- </exclusion>
- <!-- lets keep the lrucache -->
- <!-- <exclusion>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-caffeine-lrucache</artifactId>
- </exclusion> -->
- <exclusion>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-controlbus</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-dataformat</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-dataset</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-direct</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-directvm</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-file</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-language</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-log</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-mock</artifactId>
- </exclusion>
- <!-- lets keep properties component -->
- <!-- <exclusion>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-properties</artifactId>
- </exclusion> -->
- <exclusion>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-ref</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-rest</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-saga</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-scheduler</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-seda</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-stub</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-timer</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-validator</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-vm</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-xpath</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-xslt</artifactId>
- </exclusion>
- </exclusions>
+ <artifactId>camel-util</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-util-json</artifactId>
</dependency>
-
</dependencies>
+ <build>
+
+ <pluginManagement>
+ <plugins>
+ <!-- Eclipse m2e Lifecycle Management -->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>${lifecycle-mapping-version}</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-package-maven-plugin</artifactId>
+ <versionRange>${project.version}</versionRange>
+ <goals>
+ <goal>generate-eips-list</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore/>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-package-maven-plugin</artifactId>
+ <version>${project.version}</version>
+ <configuration>
+ <!-- set to true to make build fail fast if missing documentation in docs files -->
+ <failFast>false</failFast>
+ </configuration>
+ <executions>
+ <execution>
+ <id>generate</id>
+ <goals>
+ <goal>generate-jaxb-list</goal>
+ <goal>generate-eips-list</goal>
+ <goal>generate-components-list</goal>
+ <goal>generate-dataformats-list</goal>
+ <goal>generate-languages-list</goal>
+ </goals>
+ <phase>process-classes</phase>
+ </execution>
+ <execution>
+ <id>validate</id>
+ <goals>
+ <goal>validate-components</goal>
+ <goal>prepare-spring-boot-starter</goal>
+ <goal>prepare-spring-boot-auto-configuration</goal>
+ </goals>
+ <phase>prepare-package</phase>
+ </execution>
+ <execution>
+ <id>readme</id>
+ <goals>
+ <goal>update-readme</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-generated-resources</id>
+ <goals>
+ <goal>resources</goal>
+ </goals>
+ <phase>process-classes</phase>
+ <configuration>
+ <resources>
+ <resource>
+ <directory>${basedir}/target/generated/camel/components</directory>
+ </resource>
+ <resource>
+ <directory>${basedir}/target/generated/camel/dataformats</directory>
+ </resource>
+ <resource>
+ <directory>${basedir}/target/generated/camel/languages</directory>
+ </resource>
+ <resource>
+ <directory>${basedir}/target/generated/camel/models</directory>
+ </resource>
+ <resource>
+ <directory>${basedir}/target/generated/camel/jaxb</directory>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ <!-- we need to copy the xtokenize.json schema file from camel-core to camel-jaxp because camel-jaxp is built before
+ camel-core and we would have a chicken-and-egg situation where camel-jaxp needs xtokenize.json during its build phase
+ but this file is not available, so we have copied the file to camel-jaxp and then we use this maven plugin
+ to copy over the file so its kept up to date -->
+ <execution>
+ <id>copy-schema</id>
+ <goals>
+ <goal>resources</goal>
+ </goals>
+ <phase>prepare-package</phase>
+ <configuration>
+ <outputDirectory>${basedir}/src/main/schema</outputDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}/target/classes/org/apache/camel/model/language</directory>
+ <includes>
+ <include>*.json</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <_plugin>
+ org.apache.felix.bundleplugin.BlueprintPlugin,
+ aQute.lib.spring.SpringXMLType,
+ org.apache.felix.bundleplugin.JpaPlugin,
+ org.apache.camel.maven.bundle.CamelPlugin
+ </_plugin>
+ </instructions>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-bundle-plugin</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <links>
+ <link>http://download.oracle.com/javase/7/docs/api/</link>
+ <link>http://download.oracle.com/javaee/7/api/</link>
+ </links>
+ <linksource>true</linksource>
+ <maxmemory>256m</maxmemory>
+ <groups>
+ <group>
+ <title>Camel API</title>
+ <packages>org.apache.camel</packages>
+ </group>
+ <group>
+ <title>Fluent API (DSL) for building EIP rules</title>
+ <packages>org.apache.camel.builder:org.apache.camel.builder.*</packages>
+ </group>
+ <group>
+ <title>EIP model</title>
+ <packages>org.apache.camel.model:org.apache.camel.model.*</packages>
+ </group>
+ <group>
+ <title>Camel Components</title>
+ <packages>org.apache.camel.component:org.apache.camel.component.*</packages>
+ </group>
+ <group>
+ <title>Language APIs and plugins for Expressions and Predicates</title>
+ <packages>org.apache.camel.language:org.apache.camel.language.*</packages>
+ </group>
+ <group>
+ <title>Processors to implement the Enterprise Integration Patterns</title>
+ <packages>org.apache.camel.processor:org.apache.camel.processor.*</packages>
+ </group>
+ <group>
+ <title>Strategy APIs for implementors extending Camel</title>
+ <packages>org.apache.camel.spi</packages>
+ </group>
+ <group>
+ <title>Support APIs for implementors</title>
+ <packages>org.apache.camel.support:org.apache.camel.support.*</packages>
+ </group>
+ <group>
+ <title>Management (JMX) API</title>
+ <packages>
+ org.apache.camel.management:org.apache.camel.management.*:org.apache.camel.api.management.mbean
+ </packages>
+ </group>
+ <group>
+ <title>Camel Runtime</title>
+ <packages>org.apache.camel.impl:org.apache.camel.impl.*</packages>
+ </group>
+ <group>
+ <title>Type conversion helper classes</title>
+ <packages>org.apache.camel.converter:org.apache.camel.converter.*</packages>
+ </group>
+ <group>
+ <title>Utility classes</title>
+ <packages>org.apache.camel.util:org.apache.camel.util.*</packages>
+ </group>
+ </groups>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+
+ <profiles>
+ <profile>
+ <id>release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>package</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <links>
+ <link>http://download.oracle.com/javase/7/docs/api/</link>
+ <link>http://download.oracle.com/javaee/7/api/</link>
+ </links>
+ <linksource>true</linksource>
+ <maxmemory>256m</maxmemory>
+ <groups>
+ <group>
+ <title>Camel API</title>
+ <packages>org.apache.camel</packages>
+ </group>
+ <group>
+ <title>Fluent API (DSL) for building EIP rules</title>
+ <packages>org.apache.camel.builder:org.apache.camel.builder.*</packages>
+ </group>
+ <group>
+ <title>EIP model</title>
+ <packages>org.apache.camel.model:org.apache.camel.model.*</packages>
+ </group>
+ <group>
+ <title>Camel Components</title>
+ <packages>org.apache.camel.component:org.apache.camel.component.*</packages>
+ </group>
+ <group>
+ <title>Language APIs and plugins for Expressions and Predicates</title>
+ <packages>org.apache.camel.language:org.apache.camel.language.*</packages>
+ </group>
+ <group>
+ <title>Processors to implement the Enterprise Integration Patterns</title>
+ <packages>org.apache.camel.processor:org.apache.camel.processor.*</packages>
+ </group>
+ <group>
+ <title>Strategy APIs for implementors extending Camel</title>
+ <packages>org.apache.camel.spi</packages>
+ </group>
+ <group>
+ <title>Support APIs for implementors</title>
+ <packages>org.apache.camel.support:org.apache.camel.support.*</packages>
+ </group>
+ <group>
+ <title>Management (JMX) API</title>
+ <packages>
+ org.apache.camel.management:org.apache.camel.management.*:org.apache.camel.api.management.mbean
+ </packages>
+ </group>
+ <group>
+ <title>Camel Runtime</title>
+ <packages>org.apache.camel.impl:org.apache.camel.impl.*</packages>
+ </group>
+ <group>
+ <title>Type conversion helper classes</title>
+ <packages>org.apache.camel.converter:org.apache.camel.converter.*</packages>
+ </group>
+ <group>
+ <title>Utility classes</title>
+ <packages>org.apache.camel.util:org.apache.camel.util.*</packages>
+ </group>
+ </groups>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!-- enables the APT dependency so that it can be disabled in IDE builds -->
+ <profile>
+ <id>apt</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+
+ <dependencies>
+
+ <!-- enable the APT processor -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>apt</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ </dependencies>
+ </profile>
+
+ <!-- skip management tests on AIX as it hangs CI servers -->
+ <profile>
+ <id>aix</id>
+ <activation>
+ <os>
+ <name>aix</name>
+ </os>
+ </activation>
+ <properties>
+ <platform.skip.tests>org/apache/camel/management/**/*.java</platform.skip.tests>
+ </properties>
+ </profile>
+ <profile>
+ <id>xalan</id>
+ <dependencies>
+ <!-- enable the Xalan processor -->
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <version>${xalan-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>xerces</id>
+ <dependencies>
+ <!-- enable the xerces processor -->
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>${xerces-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>woodstox</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <dependencies>
+ <!-- xmltokenizer using woodstox -->
+ <dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>woodstox-core-asl</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <profile>
+ <id>jdk9+-build</id>
+ <activation>
+ <jdk>[9,)</jdk>
+ </activation>
+ <dependencies>
+
+ <!-- enable the APT processor -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>apt</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <!-- xmltokenizer using woodstox -->
+ <dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>woodstox-core-asl</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <!-- skip file stress tests as they are intended to run manually -->
+ <excludes>
+ <exclude>org/apache/camel/component/file/stress/**.java</exclude>
+ <exclude>**/DistributedCompletionIntervalTest.java</exclude>
+ <exclude>**/DistributedConcurrentPerCorrelationKeyTest.java</exclude>
+ <exclude>${platform.skip.tests}</exclude>
+ </excludes>
+ <forkedProcessTimeoutInSeconds>3000</forkedProcessTimeoutInSeconds>
+ <!-- needed for testing the properties component -->
+ <environmentVariables>
+ <FOO_SERVICE_HOST>myserver</FOO_SERVICE_HOST>
+ <FOO_SERVICE_PORT>8081</FOO_SERVICE_PORT>
+ </environmentVariables>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>${jakarta-jaxb-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>${glassfish-jaxb-runtime-version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
diff --git a/core/camel-core/src/main/docs/eips/aggregate-eip.adoc b/core/camel-core-engine/src/main/docs/eips/aggregate-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/aggregate-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/aggregate-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/batch-config-eip.adoc b/core/camel-core-engine/src/main/docs/eips/batch-config-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/batch-config-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/batch-config-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/bean-eip.adoc b/core/camel-core-engine/src/main/docs/eips/bean-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/bean-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/bean-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/choice-eip.adoc b/core/camel-core-engine/src/main/docs/eips/choice-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/choice-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/choice-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/circuitBreaker-eip.adoc b/core/camel-core-engine/src/main/docs/eips/circuitBreaker-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/circuitBreaker-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/circuitBreaker-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/claimCheck-eip.adoc b/core/camel-core-engine/src/main/docs/eips/claimCheck-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/claimCheck-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/claimCheck-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/content-based-router-eip.adoc b/core/camel-core-engine/src/main/docs/eips/content-based-router-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/content-based-router-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/content-based-router-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/content-filter-eip.adoc b/core/camel-core-engine/src/main/docs/eips/content-filter-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/content-filter-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/content-filter-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/convertBodyTo-eip.adoc b/core/camel-core-engine/src/main/docs/eips/convertBodyTo-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/convertBodyTo-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/convertBodyTo-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/customLoadBalancer-eip.adoc b/core/camel-core-engine/src/main/docs/eips/customLoadBalancer-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/customLoadBalancer-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/customLoadBalancer-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/delay-eip.adoc b/core/camel-core-engine/src/main/docs/eips/delay-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/delay-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/delay-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/dynamic-router.adoc b/core/camel-core-engine/src/main/docs/eips/dynamic-router.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/dynamic-router.adoc
rename to core/camel-core-engine/src/main/docs/eips/dynamic-router.adoc
diff --git a/core/camel-core/src/main/docs/eips/dynamicRouter-eip.adoc b/core/camel-core-engine/src/main/docs/eips/dynamicRouter-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/dynamicRouter-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/dynamicRouter-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/enrich-eip.adoc b/core/camel-core-engine/src/main/docs/eips/enrich-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/enrich-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/enrich-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/eventDrivenConsumer-eip.adoc b/core/camel-core-engine/src/main/docs/eips/eventDrivenConsumer-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/eventDrivenConsumer-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/eventDrivenConsumer-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/failover-eip.adoc b/core/camel-core-engine/src/main/docs/eips/failover-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/failover-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/failover-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/filter-eip.adoc b/core/camel-core-engine/src/main/docs/eips/filter-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/filter-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/filter-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/from-eip.adoc b/core/camel-core-engine/src/main/docs/eips/from-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/from-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/from-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/hystrix-eip.adoc b/core/camel-core-engine/src/main/docs/eips/hystrix-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/hystrix-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/hystrix-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/hystrixConfiguration-eip.adoc b/core/camel-core-engine/src/main/docs/eips/hystrixConfiguration-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/hystrixConfiguration-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/hystrixConfiguration-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/idempotentConsumer-eip.adoc b/core/camel-core-engine/src/main/docs/eips/idempotentConsumer-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/idempotentConsumer-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/idempotentConsumer-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/inOnly-eip.adoc b/core/camel-core-engine/src/main/docs/eips/inOnly-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/inOnly-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/inOnly-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/inOut-eip.adoc b/core/camel-core-engine/src/main/docs/eips/inOut-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/inOut-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/inOut-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/loadBalance-eip.adoc b/core/camel-core-engine/src/main/docs/eips/loadBalance-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/loadBalance-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/loadBalance-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/log-eip.adoc b/core/camel-core-engine/src/main/docs/eips/log-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/log-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/log-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/loop-eip.adoc b/core/camel-core-engine/src/main/docs/eips/loop-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/loop-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/loop-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/marshal-eip.adoc b/core/camel-core-engine/src/main/docs/eips/marshal-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/marshal-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/marshal-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/multicast-eip.adoc b/core/camel-core-engine/src/main/docs/eips/multicast-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/multicast-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/multicast-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/onFallback-eip.adoc b/core/camel-core-engine/src/main/docs/eips/onFallback-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/onFallback-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/onFallback-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/otherwise-eip.adoc b/core/camel-core-engine/src/main/docs/eips/otherwise-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/otherwise-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/otherwise-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/pipeline-eip.adoc b/core/camel-core-engine/src/main/docs/eips/pipeline-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/pipeline-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/pipeline-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/pollEnrich-eip.adoc b/core/camel-core-engine/src/main/docs/eips/pollEnrich-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/pollEnrich-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/pollEnrich-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/process-eip.adoc b/core/camel-core-engine/src/main/docs/eips/process-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/process-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/process-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/random-eip.adoc b/core/camel-core-engine/src/main/docs/eips/random-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/random-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/random-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/recipientList-eip.adoc b/core/camel-core-engine/src/main/docs/eips/recipientList-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/recipientList-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/recipientList-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/removeHeader-eip.adoc b/core/camel-core-engine/src/main/docs/eips/removeHeader-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/removeHeader-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/removeHeader-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/removeHeaders-eip.adoc b/core/camel-core-engine/src/main/docs/eips/removeHeaders-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/removeHeaders-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/removeHeaders-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/removeProperties-eip.adoc b/core/camel-core-engine/src/main/docs/eips/removeProperties-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/removeProperties-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/removeProperties-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/removeProperty-eip.adoc b/core/camel-core-engine/src/main/docs/eips/removeProperty-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/removeProperty-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/removeProperty-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/requestReply-eip.adoc b/core/camel-core-engine/src/main/docs/eips/requestReply-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/requestReply-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/requestReply-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/resequence-eip.adoc b/core/camel-core-engine/src/main/docs/eips/resequence-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/resequence-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/resequence-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/rollback-eip.adoc b/core/camel-core-engine/src/main/docs/eips/rollback-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/rollback-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/rollback-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/roundRobin-eip.adoc b/core/camel-core-engine/src/main/docs/eips/roundRobin-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/roundRobin-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/roundRobin-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/routingSlip-eip.adoc b/core/camel-core-engine/src/main/docs/eips/routingSlip-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/routingSlip-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/routingSlip-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/saga-eip.adoc b/core/camel-core-engine/src/main/docs/eips/saga-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/saga-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/saga-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/sample-eip.adoc b/core/camel-core-engine/src/main/docs/eips/sample-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/sample-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/sample-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/script-eip.adoc b/core/camel-core-engine/src/main/docs/eips/script-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/script-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/script-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/serviceCall-eip.adoc b/core/camel-core-engine/src/main/docs/eips/serviceCall-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/serviceCall-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/serviceCall-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/setBody-eip.adoc b/core/camel-core-engine/src/main/docs/eips/setBody-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/setBody-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/setBody-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/setHeader-eip.adoc b/core/camel-core-engine/src/main/docs/eips/setHeader-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/setHeader-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/setHeader-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/setOutHeader-eip.adoc b/core/camel-core-engine/src/main/docs/eips/setOutHeader-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/setOutHeader-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/setOutHeader-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/setProperty-eip.adoc b/core/camel-core-engine/src/main/docs/eips/setProperty-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/setProperty-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/setProperty-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/sort-eip.adoc b/core/camel-core-engine/src/main/docs/eips/sort-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/sort-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/sort-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/split-eip.adoc b/core/camel-core-engine/src/main/docs/eips/split-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/split-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/split-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/step-eip.adoc b/core/camel-core-engine/src/main/docs/eips/step-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/step-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/step-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/sticky-eip.adoc b/core/camel-core-engine/src/main/docs/eips/sticky-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/sticky-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/sticky-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/stop-eip.adoc b/core/camel-core-engine/src/main/docs/eips/stop-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/stop-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/stop-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/stream-config-eip.adoc b/core/camel-core-engine/src/main/docs/eips/stream-config-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/stream-config-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/stream-config-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/threads-eip.adoc b/core/camel-core-engine/src/main/docs/eips/threads-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/threads-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/threads-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/throttle-eip.adoc b/core/camel-core-engine/src/main/docs/eips/throttle-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/throttle-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/throttle-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/to-eip.adoc b/core/camel-core-engine/src/main/docs/eips/to-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/to-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/to-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/toD-eip.adoc b/core/camel-core-engine/src/main/docs/eips/toD-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/toD-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/toD-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/topic-eip.adoc b/core/camel-core-engine/src/main/docs/eips/topic-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/topic-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/topic-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/transform-eip.adoc b/core/camel-core-engine/src/main/docs/eips/transform-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/transform-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/transform-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/unmarshal-eip.adoc b/core/camel-core-engine/src/main/docs/eips/unmarshal-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/unmarshal-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/unmarshal-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/validate-eip.adoc b/core/camel-core-engine/src/main/docs/eips/validate-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/validate-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/validate-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/weighted-eip.adoc b/core/camel-core-engine/src/main/docs/eips/weighted-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/weighted-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/weighted-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/when-eip.adoc b/core/camel-core-engine/src/main/docs/eips/when-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/when-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/when-eip.adoc
diff --git a/core/camel-core/src/main/docs/eips/wireTap-eip.adoc b/core/camel-core-engine/src/main/docs/eips/wireTap-eip.adoc
similarity index 100%
rename from core/camel-core/src/main/docs/eips/wireTap-eip.adoc
rename to core/camel-core-engine/src/main/docs/eips/wireTap-eip.adoc
diff --git a/core/camel-core/src/main/java/org/apache/camel/builder/AdviceWithBuilder.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/AdviceWithBuilder.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/builder/AdviceWithBuilder.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/builder/AdviceWithBuilder.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/builder/AdviceWithRouteBuilder.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/AdviceWithRouteBuilder.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/builder/AdviceWithRouteBuilder.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/builder/AdviceWithRouteBuilder.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTask.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/AdviceWithTask.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTask.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/builder/AdviceWithTask.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTasks.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/AdviceWithTasks.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTasks.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/builder/AdviceWithTasks.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/builder/AggregationStrategies.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/AggregationStrategies.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/builder/AggregationStrategies.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/builder/AggregationStrategies.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/builder/AggregationStrategyClause.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/AggregationStrategyClause.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/builder/AggregationStrategyClause.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/builder/AggregationStrategyClause.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/builder/Builder.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/Builder.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/builder/Builder.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/builder/Builder.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/builder/BuilderSupport.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/BuilderSupport.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/builder/BuilderSupport.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/builder/BuilderSupport.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/DataFormatClause.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/builder/DataFormatClause.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/DeadLetterChannelBuilder.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/builder/DeadLetterChannelBuilder.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/builder/EndpointConsumerBuilder.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/EndpointConsumerBuilder.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/builder/EndpointConsumerBuilder.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/builder/EndpointConsumerBuilder.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/builder/EndpointProducerBuilder.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/EndpointProducerBuilder.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/builder/EndpointProducerBuilder.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/builder/EndpointProducerBuilder.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/builder/EnrichClause.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/EnrichClause.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/builder/EnrichClause.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/builder/EnrichClause.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilder.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/ErrorHandlerBuilder.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilder.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/builder/ErrorHandlerBuilder.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/builder/ExchangeBuilder.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/ExchangeBuilder.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/builder/ExchangeBuilder.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/builder/ExchangeBuilder.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/ExpressionBuilder.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/builder/ExpressionBuilder.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/ExpressionClause.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/builder/ExpressionClause.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/ExpressionClauseSupport.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/builder/ExpressionClauseSupport.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/builder/FlexibleAggregationStrategy.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/FlexibleAggregationStrategy.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/builder/FlexibleAggregationStrategy.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/builder/FlexibleAggregationStrategy.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/builder/NoErrorHandlerBuilder.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/NoErrorHandlerBuilder.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/builder/NoErrorHandlerBuilder.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/builder/NoErrorHandlerBuilder.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/builder/NotifyBuilder.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/NotifyBuilder.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/builder/NotifyBuilder.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/builder/NotifyBuilder.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/builder/PredicateBuilder.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/PredicateBuilder.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/builder/PredicateBuilder.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/builder/PredicateBuilder.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/builder/PredicateClause.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/PredicateClause.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/builder/PredicateClause.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/builder/PredicateClause.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/builder/ProcessClause.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/ProcessClause.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/builder/ProcessClause.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/builder/ProcessClause.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/builder/ProxyBuilder.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/ProxyBuilder.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/builder/ProxyBuilder.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/builder/ProxyBuilder.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/RouteBuilder.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/builder/RouteBuilder.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/builder/SimpleBuilder.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/SimpleBuilder.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/builder/SimpleBuilder.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/builder/SimpleBuilder.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/builder/ThreadPoolBuilder.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/ThreadPoolBuilder.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/builder/ThreadPoolBuilder.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/builder/ThreadPoolBuilder.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/builder/ThreadPoolProfileBuilder.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/ThreadPoolProfileBuilder.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/builder/ThreadPoolProfileBuilder.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/builder/ThreadPoolProfileBuilder.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/builder/TransformerBuilder.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/TransformerBuilder.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/builder/TransformerBuilder.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/builder/TransformerBuilder.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/builder/ValidatorBuilder.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/ValidatorBuilder.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/builder/ValidatorBuilder.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/builder/ValidatorBuilder.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/builder/ValueBuilder.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/ValueBuilder.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/builder/ValueBuilder.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/builder/ValueBuilder.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/builder/package.html b/core/camel-core-engine/src/main/java/java/org/apache/camel/builder/package.html
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/builder/package.html
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/builder/package.html
diff --git a/core/camel-core/src/main/java/org/apache/camel/impl/AbstractModelCamelContext.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/impl/AbstractModelCamelContext.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/impl/AbstractModelCamelContext.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/impl/AbstractModelCamelContext.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/impl/DefaultCamelContext.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/impl/DefaultCamelContext.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/impl/DefaultExecutorServiceManager.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/impl/DefaultExecutorServiceManager.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/impl/DefaultExecutorServiceManager.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/impl/DefaultExecutorServiceManager.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/impl/DefaultModel.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/impl/DefaultModel.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/impl/DefaultModel.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/impl/DefaultModel.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/impl/DefaultModelJAXBContextFactory.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/impl/DefaultModelJAXBContextFactory.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/impl/DefaultModelJAXBContextFactory.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/impl/DefaultModelJAXBContextFactory.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/impl/JndiRegistry.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/impl/JndiRegistry.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/impl/JndiRegistry.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/impl/JndiRegistry.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/impl/RouteIdFactory.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/impl/RouteIdFactory.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/impl/RouteIdFactory.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/impl/RouteIdFactory.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/impl/RouteService.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/impl/RouteService.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/impl/RouteService.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/impl/RouteService.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteConfiguration.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/impl/cluster/ClusteredRouteConfiguration.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteConfiguration.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/impl/cluster/ClusteredRouteConfiguration.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteController.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/impl/cluster/ClusteredRouteController.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteController.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/impl/cluster/ClusteredRouteController.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteFilter.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/impl/cluster/ClusteredRouteFilter.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteFilter.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/impl/cluster/ClusteredRouteFilter.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteFilters.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/impl/cluster/ClusteredRouteFilters.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteFilters.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/impl/cluster/ClusteredRouteFilters.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRoutePolicy.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/impl/cluster/ClusteredRoutePolicy.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRoutePolicy.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/impl/cluster/ClusteredRoutePolicy.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRoutePolicyFactory.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/impl/cluster/ClusteredRoutePolicyFactory.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRoutePolicyFactory.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/impl/cluster/ClusteredRoutePolicyFactory.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/impl/cluster/package.html b/core/camel-core-engine/src/main/java/java/org/apache/camel/impl/cluster/package.html
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/impl/cluster/package.html
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/impl/cluster/package.html
diff --git a/core/camel-core/src/main/java/org/apache/camel/impl/package.html b/core/camel-core-engine/src/main/java/java/org/apache/camel/impl/package.html
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/impl/package.html
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/impl/package.html
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/AdviceWithDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/AdviceWithDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/AdviceWithDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/AdviceWithDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/AggregateDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/AggregateDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/BeanDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/BeanDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/BeanDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/BeanDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/Block.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/Block.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/Block.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/Block.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/CatchDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/CatchDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/CatchDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/CatchDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/ChoiceDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/ChoiceDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/ChoiceDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/ChoiceDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/ClaimCheckDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/ClaimCheckDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/ClaimCheckDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/ClaimCheckDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/ClaimCheckOperation.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/ClaimCheckOperation.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/ClaimCheckOperation.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/ClaimCheckOperation.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/Constants.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/Constants.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/Constants.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/Constants.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/ContextScanDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/ContextScanDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/ContextScanDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/ContextScanDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/ConvertBodyDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/ConvertBodyDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/ConvertBodyDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/ConvertBodyDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/DataFormatDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/DataFormatDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/DataFormatDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/DataFormatDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/DefinitionPropertyPlaceholderConfigurer.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/DefinitionPropertyPlaceholderConfigurer.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/DefinitionPropertyPlaceholderConfigurer.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/DefinitionPropertyPlaceholderConfigurer.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/DelayDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/DelayDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/DelayDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/DelayDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/DescriptionDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/DescriptionDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/DescriptionDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/DescriptionDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/DynamicRouterDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/DynamicRouterDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/DynamicRouterDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/DynamicRouterDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/EndpointRequiredDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/EndpointRequiredDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/EndpointRequiredDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/EndpointRequiredDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/EnrichDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/EnrichDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/EnrichDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/EnrichDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/ExecutorServiceAwareDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/ExecutorServiceAwareDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/ExecutorServiceAwareDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/ExecutorServiceAwareDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/ExpressionNode.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/ExpressionNode.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/ExpressionNodeHelper.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/ExpressionNodeHelper.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/ExpressionNodeHelper.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/ExpressionNodeHelper.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/ExpressionSubElementDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/ExpressionSubElementDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/ExpressionSubElementDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/ExpressionSubElementDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/FilterDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/FilterDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/FilterDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/FilterDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/FinallyDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/FinallyDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/FinallyDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/FinallyDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/FromDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/FromDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/FromDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/FromDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/GlobalOptionDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/GlobalOptionDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/GlobalOptionDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/GlobalOptionDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/GlobalOptionsDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/GlobalOptionsDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/GlobalOptionsDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/GlobalOptionsDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/HystrixConfigurationCommon.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/HystrixConfigurationCommon.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/HystrixConfigurationCommon.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/HystrixConfigurationCommon.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/HystrixConfigurationDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/HystrixConfigurationDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/HystrixConfigurationDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/HystrixConfigurationDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/HystrixDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/HystrixDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/HystrixDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/HystrixDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/IdempotentConsumerDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/IdempotentConsumerDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/IdempotentConsumerDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/IdempotentConsumerDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/IdentifiedType.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/IdentifiedType.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/IdentifiedType.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/IdentifiedType.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/InOnlyDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/InOnlyDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/InOnlyDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/InOnlyDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/InOutDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/InOutDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/InOutDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/InOutDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/InputTypeDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/InputTypeDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/InputTypeDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/InputTypeDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/InterceptDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/InterceptDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/InterceptDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/InterceptDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/InterceptFromDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/InterceptFromDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/InterceptFromDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/InterceptFromDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/LoadBalanceDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/LoadBalanceDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/LoadBalancerDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/LoadBalancerDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/LoadBalancerDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/LoadBalancerDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/LogDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/LogDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/LogDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/LogDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/LoopDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/LoopDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/LoopDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/LoopDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/MarshalDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/MarshalDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/Model.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/Model.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/Model.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/Model.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/ModelCamelContext.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/ModelCamelContext.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/ModelCamelContext.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/ModelCamelContext.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/ModelHelper.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/ModelHelper.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/ModelHelper.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/ModelHelper.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/MulticastDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/MulticastDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/MulticastDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/MulticastDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/NoOutputDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/NoOutputDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/NoOutputDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/NoOutputDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/OnCompletionDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/OnCompletionDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/OnCompletionDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/OnCompletionDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/OnCompletionMode.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/OnCompletionMode.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/OnCompletionMode.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/OnCompletionMode.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/OnExceptionDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/OnExceptionDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/OnFallbackDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/OnFallbackDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/OnFallbackDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/OnFallbackDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/OptimisticLockRetryPolicyDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/OptimisticLockRetryPolicyDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/OptimisticLockRetryPolicyDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/OptimisticLockRetryPolicyDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/OptionalIdentifiedDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/OptionalIdentifiedDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/OtherAttributesAware.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/OtherAttributesAware.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/OtherAttributesAware.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/OtherAttributesAware.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/OtherwiseDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/OtherwiseDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/OtherwiseDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/OtherwiseDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/OutputDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/OutputDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/OutputDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/OutputDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/OutputExpressionNode.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/OutputExpressionNode.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/OutputExpressionNode.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/OutputExpressionNode.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/OutputNode.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/OutputNode.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/OutputNode.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/OutputNode.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/OutputTypeDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/OutputTypeDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/OutputTypeDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/OutputTypeDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/PackageScanDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/PackageScanDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/PackageScanDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/PackageScanDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/PipelineDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/PipelineDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/PipelineDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/PipelineDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/PolicyDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/PolicyDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/PolicyDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/PolicyDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/PollEnrichDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/PollEnrichDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/PollEnrichDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/PollEnrichDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/ProcessDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/ProcessDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/ProcessDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/ProcessDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/ProcessorDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/ProcessorDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/ProcessorDefinitionHelper.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/ProcessorDefinitionHelper.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/PropertyDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/PropertyDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/PropertyDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/PropertyDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/PropertyDefinitions.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/PropertyDefinitions.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/PropertyDefinitions.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/PropertyDefinitions.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/PropertyDescriptionsAdapter.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/PropertyDescriptionsAdapter.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/PropertyDescriptionsAdapter.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/PropertyDescriptionsAdapter.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/RecipientListDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/RecipientListDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/RedeliveryPolicyDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/RedeliveryPolicyDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/RedeliveryPolicyDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/RedeliveryPolicyDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/RemoveHeaderDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/RemoveHeaderDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/RemoveHeaderDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/RemoveHeaderDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/RemoveHeadersDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/RemoveHeadersDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/RemoveHeadersDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/RemoveHeadersDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/RemovePropertiesDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/RemovePropertiesDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/RemovePropertiesDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/RemovePropertiesDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/RemovePropertyDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/RemovePropertyDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/RemovePropertyDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/RemovePropertyDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/ResequenceDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/ResequenceDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/ResequenceDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/ResequenceDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/RestContextRefDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/RestContextRefDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/RestContextRefDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/RestContextRefDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/RestContextRefDefinitionHelper.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/RestContextRefDefinitionHelper.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/RestContextRefDefinitionHelper.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/RestContextRefDefinitionHelper.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/RollbackDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/RollbackDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/RollbackDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/RollbackDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/RouteBuilderDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/RouteBuilderDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/RouteBuilderDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/RouteBuilderDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/RouteContainer.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/RouteContainer.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/RouteContainer.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/RouteContainer.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/RouteContextRefDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/RouteContextRefDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/RouteContextRefDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/RouteContextRefDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/RouteContextRefDefinitionHelper.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/RouteContextRefDefinitionHelper.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/RouteContextRefDefinitionHelper.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/RouteContextRefDefinitionHelper.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/RouteDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/RouteDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/RouteDefinitionHelper.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/RouteDefinitionHelper.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/RouteDefinitionHelper.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/RouteDefinitionHelper.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/RouteFilters.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/RouteFilters.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/RouteFilters.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/RouteFilters.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/RoutesDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/RoutesDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/RoutesDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/RoutesDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/RoutingSlipDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/RoutingSlipDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/RoutingSlipDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/RoutingSlipDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/SagaActionUriDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/SagaActionUriDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/SagaActionUriDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/SagaActionUriDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/SagaCompletionMode.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/SagaCompletionMode.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/SagaCompletionMode.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/SagaCompletionMode.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/SagaDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/SagaDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/SagaDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/SagaDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/SagaOptionDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/SagaOptionDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/SagaOptionDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/SagaOptionDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/SagaPropagation.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/SagaPropagation.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/SagaPropagation.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/SagaPropagation.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/SamplingDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/SamplingDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/SamplingDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/SamplingDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/ScriptDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/ScriptDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/ScriptDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/ScriptDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/SendDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/SendDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/SendDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/SendDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/SetBodyDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/SetBodyDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/SetBodyDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/SetBodyDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/SetExchangePatternDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/SetExchangePatternDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/SetExchangePatternDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/SetExchangePatternDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/SetHeaderDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/SetHeaderDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/SetHeaderDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/SetHeaderDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/SetPropertyDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/SetPropertyDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/SetPropertyDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/SetPropertyDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/SortDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/SortDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/SortDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/SortDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/SplitDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/SplitDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/SplitDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/SplitDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/StepDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/StepDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/StepDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/StepDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/StopDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/StopDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/StopDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/StopDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/ThreadPoolProfileDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/ThreadPoolProfileDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/ThreadPoolProfileDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/ThreadPoolProfileDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/ThreadsDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/ThreadsDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/ThreadsDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/ThreadsDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/ThrottleDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/ThrottleDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/ThrottleDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/ThrottleDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/ThrowExceptionDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/ThrowExceptionDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/ThrowExceptionDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/ThrowExceptionDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/TimeUnitAdapter.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/TimeUnitAdapter.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/TimeUnitAdapter.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/TimeUnitAdapter.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/ToDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/ToDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/ToDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/ToDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/ToDynamicDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/ToDynamicDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/ToDynamicDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/ToDynamicDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/TransactedDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/TransactedDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/TransactedDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/TransactedDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/TransformDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/TransformDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/TransformDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/TransformDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/TryDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/TryDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/TryDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/TryDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/UnmarshalDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/UnmarshalDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/ValidateDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/ValidateDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/ValidateDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/ValidateDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/WhenDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/WhenDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/WhenDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/WhenDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/WhenSkipSendToEndpointDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/WhenSkipSendToEndpointDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/WhenSkipSendToEndpointDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/WhenSkipSendToEndpointDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/WireTapDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/WireTapDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/WireTapDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/WireTapDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/cloud/BlacklistServiceCallServiceFilterConfiguration.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/BlacklistServiceCallServiceFilterConfiguration.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/cloud/BlacklistServiceCallServiceFilterConfiguration.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/BlacklistServiceCallServiceFilterConfiguration.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/cloud/CachingServiceCallServiceDiscoveryConfiguration.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/CachingServiceCallServiceDiscoveryConfiguration.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/cloud/CachingServiceCallServiceDiscoveryConfiguration.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/CachingServiceCallServiceDiscoveryConfiguration.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/cloud/CombinedServiceCallServiceDiscoveryConfiguration.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/CombinedServiceCallServiceDiscoveryConfiguration.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/cloud/CombinedServiceCallServiceDiscoveryConfiguration.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/CombinedServiceCallServiceDiscoveryConfiguration.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/cloud/CombinedServiceCallServiceFilterConfiguration.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/CombinedServiceCallServiceFilterConfiguration.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/cloud/CombinedServiceCallServiceFilterConfiguration.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/CombinedServiceCallServiceFilterConfiguration.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/cloud/ConsulServiceCallServiceDiscoveryConfiguration.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/ConsulServiceCallServiceDiscoveryConfiguration.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/cloud/ConsulServiceCallServiceDiscoveryConfiguration.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/ConsulServiceCallServiceDiscoveryConfiguration.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/cloud/CustomServiceCallServiceFilterConfiguration.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/CustomServiceCallServiceFilterConfiguration.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/cloud/CustomServiceCallServiceFilterConfiguration.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/CustomServiceCallServiceFilterConfiguration.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/cloud/DefaultServiceCallServiceLoadBalancerConfiguration.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/DefaultServiceCallServiceLoadBalancerConfiguration.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/cloud/DefaultServiceCallServiceLoadBalancerConfiguration.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/DefaultServiceCallServiceLoadBalancerConfiguration.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/cloud/DnsServiceCallServiceDiscoveryConfiguration.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/DnsServiceCallServiceDiscoveryConfiguration.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/cloud/DnsServiceCallServiceDiscoveryConfiguration.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/DnsServiceCallServiceDiscoveryConfiguration.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/cloud/EtcdServiceCallServiceDiscoveryConfiguration.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/EtcdServiceCallServiceDiscoveryConfiguration.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/cloud/EtcdServiceCallServiceDiscoveryConfiguration.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/EtcdServiceCallServiceDiscoveryConfiguration.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/cloud/HealthyServiceCallServiceFilterConfiguration.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/HealthyServiceCallServiceFilterConfiguration.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/cloud/HealthyServiceCallServiceFilterConfiguration.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/HealthyServiceCallServiceFilterConfiguration.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/cloud/KubernetesServiceCallServiceDiscoveryConfiguration.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/KubernetesServiceCallServiceDiscoveryConfiguration.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/cloud/KubernetesServiceCallServiceDiscoveryConfiguration.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/KubernetesServiceCallServiceDiscoveryConfiguration.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/cloud/PassThroughServiceCallServiceFilterConfiguration.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/PassThroughServiceCallServiceFilterConfiguration.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/cloud/PassThroughServiceCallServiceFilterConfiguration.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/PassThroughServiceCallServiceFilterConfiguration.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/cloud/RibbonServiceCallServiceLoadBalancerConfiguration.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/RibbonServiceCallServiceLoadBalancerConfiguration.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/cloud/RibbonServiceCallServiceLoadBalancerConfiguration.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/RibbonServiceCallServiceLoadBalancerConfiguration.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallConfigurationDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/ServiceCallConfigurationDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallConfigurationDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/ServiceCallConfigurationDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/ServiceCallDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/ServiceCallDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallDefinitionConstants.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/ServiceCallDefinitionConstants.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallDefinitionConstants.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/ServiceCallDefinitionConstants.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallExpressionConfiguration.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/ServiceCallExpressionConfiguration.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallExpressionConfiguration.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/ServiceCallExpressionConfiguration.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceChooserConfiguration.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/ServiceCallServiceChooserConfiguration.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceChooserConfiguration.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/ServiceCallServiceChooserConfiguration.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceDiscoveryConfiguration.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/ServiceCallServiceDiscoveryConfiguration.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceDiscoveryConfiguration.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/ServiceCallServiceDiscoveryConfiguration.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceFilterConfiguration.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/ServiceCallServiceFilterConfiguration.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceFilterConfiguration.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/ServiceCallServiceFilterConfiguration.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceLoadBalancerConfiguration.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/ServiceCallServiceLoadBalancerConfiguration.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceLoadBalancerConfiguration.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/ServiceCallServiceLoadBalancerConfiguration.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/cloud/StaticServiceCallServiceDiscoveryConfiguration.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/StaticServiceCallServiceDiscoveryConfiguration.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/cloud/StaticServiceCallServiceDiscoveryConfiguration.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/StaticServiceCallServiceDiscoveryConfiguration.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/cloud/ZooKeeperServiceCallServiceDiscoveryConfiguration.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/ZooKeeperServiceCallServiceDiscoveryConfiguration.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/cloud/ZooKeeperServiceCallServiceDiscoveryConfiguration.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/ZooKeeperServiceCallServiceDiscoveryConfiguration.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/cloud/package-info.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/package-info.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/cloud/package-info.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/cloud/package-info.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/config/BatchResequencerConfig.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/config/BatchResequencerConfig.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/config/BatchResequencerConfig.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/config/BatchResequencerConfig.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/config/ResequencerConfig.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/config/ResequencerConfig.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/config/ResequencerConfig.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/config/ResequencerConfig.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/config/StreamResequencerConfig.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/config/StreamResequencerConfig.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/config/StreamResequencerConfig.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/config/StreamResequencerConfig.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/config/package-info.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/config/package-info.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/config/package-info.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/config/package-info.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/dataformat/ASN1DataFormat.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/ASN1DataFormat.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/dataformat/ASN1DataFormat.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/ASN1DataFormat.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/dataformat/Any23DataFormat.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/Any23DataFormat.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/dataformat/Any23DataFormat.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/Any23DataFormat.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/dataformat/Any23Type.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/Any23Type.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/dataformat/Any23Type.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/Any23Type.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/dataformat/AvroDataFormat.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/AvroDataFormat.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/dataformat/AvroDataFormat.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/AvroDataFormat.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/dataformat/BarcodeDataFormat.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/BarcodeDataFormat.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/dataformat/BarcodeDataFormat.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/BarcodeDataFormat.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/dataformat/Base64DataFormat.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/Base64DataFormat.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/dataformat/Base64DataFormat.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/Base64DataFormat.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/dataformat/BeanioDataFormat.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/BeanioDataFormat.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/dataformat/BeanioDataFormat.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/BeanioDataFormat.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/dataformat/BindyDataFormat.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/BindyDataFormat.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/dataformat/BindyDataFormat.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/BindyDataFormat.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/dataformat/BindyType.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/BindyType.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/dataformat/BindyType.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/BindyType.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/dataformat/CBORDataFormat.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/CBORDataFormat.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/dataformat/CBORDataFormat.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/CBORDataFormat.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/dataformat/CryptoDataFormat.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/CryptoDataFormat.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/dataformat/CryptoDataFormat.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/CryptoDataFormat.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/CsvDataFormat.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/CsvDataFormat.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/dataformat/CustomDataFormat.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/CustomDataFormat.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/dataformat/CustomDataFormat.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/CustomDataFormat.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/dataformat/FhirDataformat.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/FhirDataformat.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/dataformat/FhirDataformat.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/FhirDataformat.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/dataformat/FhirJsonDataFormat.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/FhirJsonDataFormat.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/dataformat/FhirJsonDataFormat.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/FhirJsonDataFormat.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/dataformat/FhirXmlDataFormat.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/FhirXmlDataFormat.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/dataformat/FhirXmlDataFormat.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/FhirXmlDataFormat.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/dataformat/FlatpackDataFormat.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/FlatpackDataFormat.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/dataformat/FlatpackDataFormat.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/FlatpackDataFormat.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/dataformat/GrokDataFormat.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/GrokDataFormat.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/dataformat/GrokDataFormat.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/GrokDataFormat.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/dataformat/GzipDataFormat.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/GzipDataFormat.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/dataformat/GzipDataFormat.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/GzipDataFormat.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/HL7DataFormat.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/HL7DataFormat.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/dataformat/IcalDataFormat.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/IcalDataFormat.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/dataformat/IcalDataFormat.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/IcalDataFormat.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/dataformat/JacksonXMLDataFormat.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/JacksonXMLDataFormat.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/dataformat/JacksonXMLDataFormat.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/JacksonXMLDataFormat.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/JaxbDataFormat.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/JaxbDataFormat.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonApiDataFormat.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/JsonApiDataFormat.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonApiDataFormat.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/JsonApiDataFormat.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/JsonDataFormat.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/JsonDataFormat.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonLibrary.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/JsonLibrary.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonLibrary.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/JsonLibrary.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/dataformat/LZFDataFormat.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/LZFDataFormat.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/dataformat/LZFDataFormat.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/LZFDataFormat.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/dataformat/MimeMultipartDataFormat.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/MimeMultipartDataFormat.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/dataformat/MimeMultipartDataFormat.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/MimeMultipartDataFormat.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/dataformat/PGPDataFormat.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/PGPDataFormat.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/dataformat/PGPDataFormat.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/PGPDataFormat.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/dataformat/ProtobufDataFormat.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/ProtobufDataFormat.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/dataformat/ProtobufDataFormat.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/ProtobufDataFormat.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/dataformat/RssDataFormat.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/RssDataFormat.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/dataformat/RssDataFormat.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/RssDataFormat.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/dataformat/SoapJaxbDataFormat.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/SoapJaxbDataFormat.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/dataformat/SoapJaxbDataFormat.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/SoapJaxbDataFormat.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/dataformat/SyslogDataFormat.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/SyslogDataFormat.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/dataformat/SyslogDataFormat.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/SyslogDataFormat.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/dataformat/TarFileDataFormat.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/TarFileDataFormat.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/dataformat/TarFileDataFormat.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/TarFileDataFormat.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/dataformat/ThriftDataFormat.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/ThriftDataFormat.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/dataformat/ThriftDataFormat.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/ThriftDataFormat.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/dataformat/TidyMarkupDataFormat.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/TidyMarkupDataFormat.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/dataformat/TidyMarkupDataFormat.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/TidyMarkupDataFormat.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityAbstractDataFormat.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/UniVocityAbstractDataFormat.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityAbstractDataFormat.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/UniVocityAbstractDataFormat.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityCsvDataFormat.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/UniVocityCsvDataFormat.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityCsvDataFormat.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/UniVocityCsvDataFormat.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityFixedWidthDataFormat.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/UniVocityFixedWidthDataFormat.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityFixedWidthDataFormat.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/UniVocityFixedWidthDataFormat.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityHeader.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/UniVocityHeader.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityHeader.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/UniVocityHeader.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityTsvDataFormat.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/UniVocityTsvDataFormat.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityTsvDataFormat.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/UniVocityTsvDataFormat.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/dataformat/XMLSecurityDataFormat.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/XMLSecurityDataFormat.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/dataformat/XMLSecurityDataFormat.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/XMLSecurityDataFormat.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/XStreamDataFormat.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/XStreamDataFormat.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/dataformat/XmlRpcDataFormat.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/XmlRpcDataFormat.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/dataformat/XmlRpcDataFormat.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/XmlRpcDataFormat.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/dataformat/YAMLDataFormat.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/YAMLDataFormat.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/dataformat/YAMLDataFormat.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/YAMLDataFormat.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/dataformat/YAMLLibrary.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/YAMLLibrary.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/dataformat/YAMLLibrary.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/YAMLLibrary.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/dataformat/YAMLTypeFilterDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/YAMLTypeFilterDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/dataformat/YAMLTypeFilterDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/YAMLTypeFilterDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/dataformat/YAMLTypeFilterType.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/YAMLTypeFilterType.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/dataformat/YAMLTypeFilterType.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/YAMLTypeFilterType.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/dataformat/ZipDeflaterDataFormat.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/ZipDeflaterDataFormat.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/dataformat/ZipDeflaterDataFormat.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/ZipDeflaterDataFormat.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/dataformat/ZipFileDataFormat.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/ZipFileDataFormat.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/dataformat/ZipFileDataFormat.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/ZipFileDataFormat.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/dataformat/package-info.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/package-info.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/dataformat/package-info.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/dataformat/package-info.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/language/ConstantExpression.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/ConstantExpression.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/language/ConstantExpression.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/ConstantExpression.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/language/ExchangePropertyExpression.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/ExchangePropertyExpression.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/language/ExchangePropertyExpression.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/ExchangePropertyExpression.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/language/ExpressionDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/ExpressionDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/language/ExpressionDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/ExpressionDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/language/GroovyExpression.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/GroovyExpression.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/language/GroovyExpression.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/GroovyExpression.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/language/HeaderExpression.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/HeaderExpression.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/language/HeaderExpression.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/HeaderExpression.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/language/Hl7TerserExpression.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/Hl7TerserExpression.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/language/Hl7TerserExpression.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/Hl7TerserExpression.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/language/JsonPathExpression.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/JsonPathExpression.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/language/JsonPathExpression.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/JsonPathExpression.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/language/LanguageExpression.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/LanguageExpression.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/language/LanguageExpression.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/LanguageExpression.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/MethodCallExpression.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/MethodCallExpression.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/language/MvelExpression.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/MvelExpression.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/language/MvelExpression.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/MvelExpression.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/language/NamespaceAwareExpression.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/NamespaceAwareExpression.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/language/NamespaceAwareExpression.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/NamespaceAwareExpression.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/language/OgnlExpression.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/OgnlExpression.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/language/OgnlExpression.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/OgnlExpression.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/language/RefExpression.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/RefExpression.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/language/RefExpression.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/RefExpression.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/language/SimpleExpression.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/SimpleExpression.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/language/SimpleExpression.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/SimpleExpression.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/language/SpELExpression.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/SpELExpression.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/language/SpELExpression.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/SpELExpression.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/language/TokenizerExpression.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/TokenizerExpression.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/language/TokenizerExpression.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/TokenizerExpression.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/language/XMLTokenizerExpression.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/XMLTokenizerExpression.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/language/XMLTokenizerExpression.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/XMLTokenizerExpression.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/language/XPathExpression.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/XPathExpression.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/language/XPathExpression.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/XPathExpression.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/language/XQueryExpression.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/XQueryExpression.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/language/XQueryExpression.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/XQueryExpression.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/language/package-info.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/package-info.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/language/package-info.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/language/package-info.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/loadbalancer/CustomLoadBalancerDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/loadbalancer/CustomLoadBalancerDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/loadbalancer/CustomLoadBalancerDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/loadbalancer/CustomLoadBalancerDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/loadbalancer/FailoverLoadBalancerDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/loadbalancer/FailoverLoadBalancerDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/loadbalancer/FailoverLoadBalancerDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/loadbalancer/FailoverLoadBalancerDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RandomLoadBalancerDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/loadbalancer/RandomLoadBalancerDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RandomLoadBalancerDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/loadbalancer/RandomLoadBalancerDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RoundRobinLoadBalancerDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/loadbalancer/RoundRobinLoadBalancerDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RoundRobinLoadBalancerDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/loadbalancer/RoundRobinLoadBalancerDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/loadbalancer/StickyLoadBalancerDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/loadbalancer/StickyLoadBalancerDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/loadbalancer/StickyLoadBalancerDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/loadbalancer/StickyLoadBalancerDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/loadbalancer/TopicLoadBalancerDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/loadbalancer/TopicLoadBalancerDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/loadbalancer/TopicLoadBalancerDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/loadbalancer/TopicLoadBalancerDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/loadbalancer/WeightedLoadBalancerDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/loadbalancer/WeightedLoadBalancerDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/loadbalancer/WeightedLoadBalancerDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/loadbalancer/WeightedLoadBalancerDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/loadbalancer/package-info.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/loadbalancer/package-info.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/loadbalancer/package-info.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/loadbalancer/package-info.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/package-info.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/package-info.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/package-info.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/package-info.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/rest/CollectionFormat.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/CollectionFormat.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/rest/CollectionFormat.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/CollectionFormat.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/rest/DeleteVerbDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/DeleteVerbDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/rest/DeleteVerbDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/DeleteVerbDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/rest/GetVerbDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/GetVerbDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/rest/GetVerbDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/GetVerbDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/rest/HeadVerbDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/HeadVerbDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/rest/HeadVerbDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/HeadVerbDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/rest/PatchVerbDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/PatchVerbDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/rest/PatchVerbDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/PatchVerbDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/rest/PostVerbDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/PostVerbDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/rest/PostVerbDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/PostVerbDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/rest/PutVerbDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/PutVerbDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/rest/PutVerbDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/PutVerbDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/rest/RestBindingDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestBindingDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/rest/RestBindingDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestBindingDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/rest/RestBindingMode.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestBindingMode.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/rest/RestBindingMode.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestBindingMode.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/rest/RestConfigurationDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestConfigurationDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/rest/RestConfigurationDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestConfigurationDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/rest/RestConstants.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestConstants.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/rest/RestConstants.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestConstants.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/rest/RestContainer.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestContainer.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/rest/RestContainer.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestContainer.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/rest/RestHostNameResolver.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestHostNameResolver.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/rest/RestHostNameResolver.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestHostNameResolver.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/rest/RestOperationParamDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestOperationParamDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/rest/RestOperationParamDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestOperationParamDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/rest/RestOperationResponseHeaderDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestOperationResponseHeaderDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/rest/RestOperationResponseHeaderDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestOperationResponseHeaderDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/rest/RestOperationResponseMsgDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestOperationResponseMsgDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/rest/RestOperationResponseMsgDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestOperationResponseMsgDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/rest/RestParamType.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestParamType.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/rest/RestParamType.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestParamType.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/rest/RestPropertyDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestPropertyDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/rest/RestPropertyDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestPropertyDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/rest/RestSecuritiesDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestSecuritiesDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/rest/RestSecuritiesDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestSecuritiesDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/rest/RestSecurityApiKey.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestSecurityApiKey.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/rest/RestSecurityApiKey.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestSecurityApiKey.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/rest/RestSecurityBasicAuth.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestSecurityBasicAuth.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/rest/RestSecurityBasicAuth.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestSecurityBasicAuth.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/rest/RestSecurityDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestSecurityDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/rest/RestSecurityDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestSecurityDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/rest/RestSecurityOAuth2.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestSecurityOAuth2.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/rest/RestSecurityOAuth2.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestSecurityOAuth2.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/rest/RestsDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestsDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/rest/RestsDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/RestsDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/rest/SecurityDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/SecurityDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/rest/SecurityDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/SecurityDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/rest/VerbDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/VerbDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/rest/VerbDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/VerbDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/rest/package-info.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/package-info.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/rest/package-info.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/rest/package-info.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/transformer/CustomTransformerDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/transformer/CustomTransformerDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/transformer/CustomTransformerDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/transformer/CustomTransformerDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/transformer/DataFormatTransformerDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/transformer/DataFormatTransformerDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/transformer/DataFormatTransformerDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/transformer/DataFormatTransformerDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/transformer/EndpointTransformerDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/transformer/EndpointTransformerDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/transformer/EndpointTransformerDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/transformer/EndpointTransformerDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/transformer/TransformerDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/transformer/TransformerDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/transformer/TransformerDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/transformer/TransformerDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/transformer/TransformersDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/transformer/TransformersDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/transformer/TransformersDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/transformer/TransformersDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/transformer/package-info.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/transformer/package-info.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/transformer/package-info.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/transformer/package-info.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/validator/CustomValidatorDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/validator/CustomValidatorDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/validator/CustomValidatorDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/validator/CustomValidatorDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/validator/EndpointValidatorDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/validator/EndpointValidatorDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/validator/EndpointValidatorDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/validator/EndpointValidatorDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/validator/PredicateValidatorDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/validator/PredicateValidatorDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/validator/PredicateValidatorDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/validator/PredicateValidatorDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/validator/ValidatorDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/validator/ValidatorDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/validator/ValidatorDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/validator/ValidatorDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/validator/ValidatorsDefinition.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/validator/ValidatorsDefinition.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/validator/ValidatorsDefinition.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/validator/ValidatorsDefinition.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/validator/package-info.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/model/validator/package-info.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/model/validator/package-info.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/model/validator/package-info.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/AggregateReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/AggregateReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/AggregateReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/AggregateReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/BeanReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/BeanReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/BeanReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/BeanReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/CatchReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/CatchReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/CatchReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/CatchReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/ChoiceReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/ChoiceReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/ChoiceReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/ChoiceReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/ClaimCheckReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/ClaimCheckReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/ClaimCheckReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/ClaimCheckReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/ConvertBodyReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/ConvertBodyReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/ConvertBodyReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/ConvertBodyReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/DelayReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/DelayReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/DelayReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/DelayReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/DynamicRouterReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/DynamicRouterReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/DynamicRouterReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/DynamicRouterReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/EnrichReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/EnrichReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/EnrichReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/EnrichReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/ExpressionReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/ExpressionReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/ExpressionReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/ExpressionReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/FilterReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/FilterReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/FilterReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/FilterReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/FinallyReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/FinallyReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/FinallyReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/FinallyReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/HystrixReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/HystrixReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/HystrixReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/HystrixReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/IdempotentConsumerReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/IdempotentConsumerReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/IdempotentConsumerReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/IdempotentConsumerReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/InterceptFromReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/InterceptFromReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/InterceptFromReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/InterceptFromReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/InterceptReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/InterceptReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/InterceptReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/InterceptReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/InterceptSendToEndpointReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/InterceptSendToEndpointReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/InterceptSendToEndpointReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/InterceptSendToEndpointReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/LoadBalanceReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/LoadBalanceReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/LoadBalanceReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/LoadBalanceReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/LogReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/LogReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/LogReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/LogReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/LoopReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/LoopReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/LoopReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/LoopReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/MarshalReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/MarshalReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/MarshalReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/MarshalReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/MulticastReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/MulticastReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/MulticastReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/MulticastReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/OnCompletionReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/OnCompletionReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/OnCompletionReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/OnCompletionReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/OnExceptionReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/OnExceptionReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/OnExceptionReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/OnExceptionReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/OnFallbackReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/OnFallbackReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/OnFallbackReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/OnFallbackReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/OtherwiseReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/OtherwiseReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/OtherwiseReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/OtherwiseReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/PipelineReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/PipelineReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/PipelineReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/PipelineReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/PolicyReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/PolicyReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/PolicyReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/PolicyReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/PollEnrichReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/PollEnrichReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/PollEnrichReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/PollEnrichReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/ProcessReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/ProcessReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/ProcessReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/ProcessReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/ProcessorReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/ProcessorReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/ProcessorReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/ProcessorReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/RecipientListReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/RecipientListReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/RecipientListReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/RecipientListReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/RemoveHeaderReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/RemoveHeaderReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/RemoveHeaderReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/RemoveHeaderReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/RemoveHeadersReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/RemoveHeadersReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/RemoveHeadersReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/RemoveHeadersReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/RemovePropertiesReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/RemovePropertiesReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/RemovePropertiesReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/RemovePropertiesReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/RemovePropertyReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/RemovePropertyReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/RemovePropertyReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/RemovePropertyReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/ResequenceReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/ResequenceReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/ResequenceReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/ResequenceReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/RollbackReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/RollbackReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/RollbackReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/RollbackReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/RouteReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/RouteReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/RouteReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/RouteReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/RoutingSlipReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/RoutingSlipReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/RoutingSlipReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/RoutingSlipReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/SagaReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/SagaReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/SagaReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/SagaReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/SamplingReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/SamplingReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/SamplingReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/SamplingReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/ScriptReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/ScriptReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/ScriptReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/ScriptReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/SendReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/SendReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/SendReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/SendReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/ServiceCallReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/ServiceCallReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/ServiceCallReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/ServiceCallReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/SetBodyReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/SetBodyReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/SetBodyReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/SetBodyReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/SetExchangePatternReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/SetExchangePatternReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/SetExchangePatternReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/SetExchangePatternReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/SetHeaderReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/SetHeaderReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/SetHeaderReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/SetHeaderReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/SetPropertyReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/SetPropertyReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/SetPropertyReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/SetPropertyReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/SortReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/SortReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/SortReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/SortReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/SplitReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/SplitReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/SplitReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/SplitReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/StepReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/StepReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/StepReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/StepReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/StopReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/StopReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/StopReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/StopReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/ThreadsReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/ThreadsReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/ThreadsReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/ThreadsReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/ThrottleReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/ThrottleReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/ThrottleReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/ThrottleReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/ThrowExceptionReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/ThrowExceptionReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/ThrowExceptionReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/ThrowExceptionReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/ToDynamicReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/ToDynamicReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/ToDynamicReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/ToDynamicReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/TransactedReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/TransactedReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/TransactedReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/TransactedReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/TransformReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/TransformReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/TransformReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/TransformReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/TryReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/TryReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/TryReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/TryReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/UnmarshalReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/UnmarshalReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/UnmarshalReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/UnmarshalReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/ValidateReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/ValidateReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/ValidateReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/ValidateReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/WhenReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/WhenReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/WhenReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/WhenReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/WhenSkipSendToEndpointReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/WhenSkipSendToEndpointReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/WhenSkipSendToEndpointReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/WhenSkipSendToEndpointReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/WireTapReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/WireTapReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/WireTapReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/WireTapReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/ASN1DataFormatReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/ASN1DataFormatReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/ASN1DataFormatReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/ASN1DataFormatReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/Any23DataFormatReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/Any23DataFormatReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/Any23DataFormatReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/Any23DataFormatReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/AvroDataFormatReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/AvroDataFormatReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/AvroDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/AvroDataFormatReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/BarcodeDataFormatReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/BarcodeDataFormatReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/BarcodeDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/BarcodeDataFormatReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/Base64DataFormatReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/Base64DataFormatReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/Base64DataFormatReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/Base64DataFormatReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/BeanioDataFormatReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/BeanioDataFormatReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/BeanioDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/BeanioDataFormatReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/BindyDataFormatReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/BindyDataFormatReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/BindyDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/BindyDataFormatReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/CBORDataFormatReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/CBORDataFormatReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/CBORDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/CBORDataFormatReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/CryptoDataFormatReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/CryptoDataFormatReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/CryptoDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/CryptoDataFormatReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/CsvDataFormatReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/CsvDataFormatReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/CsvDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/CsvDataFormatReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/CustomDataFormatReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/CustomDataFormatReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/CustomDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/CustomDataFormatReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/DataFormatReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/DataFormatReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/DataFormatReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/DataFormatReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/FhirDataFormatReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/FhirDataFormatReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/FhirDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/FhirDataFormatReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/FhirJsonDataFormatReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/FhirJsonDataFormatReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/FhirJsonDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/FhirJsonDataFormatReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/FhirXmlDataFormatReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/FhirXmlDataFormatReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/FhirXmlDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/FhirXmlDataFormatReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/FlatpackDataFormatReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/FlatpackDataFormatReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/FlatpackDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/FlatpackDataFormatReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/GrokDataFormatReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/GrokDataFormatReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/GrokDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/GrokDataFormatReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/GzipDataFormatReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/GzipDataFormatReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/GzipDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/GzipDataFormatReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/HL7DataFormatReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/HL7DataFormatReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/HL7DataFormatReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/HL7DataFormatReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/IcalDataFormatReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/IcalDataFormatReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/IcalDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/IcalDataFormatReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/JacksonXMLDataFormatReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/JacksonXMLDataFormatReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/JacksonXMLDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/JacksonXMLDataFormatReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/JaxbDataFormatReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/JaxbDataFormatReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/JaxbDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/JaxbDataFormatReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/JsonApiDataFormatReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/JsonApiDataFormatReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/JsonApiDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/JsonApiDataFormatReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/JsonDataFormatReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/JsonDataFormatReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/JsonDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/JsonDataFormatReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/LZFDataFormatReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/LZFDataFormatReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/LZFDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/LZFDataFormatReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/MimeMultipartDataFormatReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/MimeMultipartDataFormatReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/MimeMultipartDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/MimeMultipartDataFormatReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/PGPDataFormatReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/PGPDataFormatReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/PGPDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/PGPDataFormatReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/ProtobufDataFormatReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/ProtobufDataFormatReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/ProtobufDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/ProtobufDataFormatReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/RssDataFormatReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/RssDataFormatReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/RssDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/RssDataFormatReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/SoapJaxbDataFormatReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/SoapJaxbDataFormatReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/SoapJaxbDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/SoapJaxbDataFormatReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/SyslogDataFormatReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/SyslogDataFormatReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/SyslogDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/SyslogDataFormatReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/TarFileDataFormatReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/TarFileDataFormatReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/TarFileDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/TarFileDataFormatReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/ThriftDataFormatReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/ThriftDataFormatReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/ThriftDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/ThriftDataFormatReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/TidyMarkupDataFormatReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/TidyMarkupDataFormatReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/TidyMarkupDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/TidyMarkupDataFormatReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/UniVocityAbstractDataFormatReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/UniVocityAbstractDataFormatReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/UniVocityAbstractDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/UniVocityAbstractDataFormatReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/UniVocityCsvDataFormatReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/UniVocityCsvDataFormatReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/UniVocityCsvDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/UniVocityCsvDataFormatReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/UniVocityFixedWidthDataFormatReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/UniVocityFixedWidthDataFormatReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/UniVocityFixedWidthDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/UniVocityFixedWidthDataFormatReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/UniVocityTsvDataFormatReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/UniVocityTsvDataFormatReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/UniVocityTsvDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/UniVocityTsvDataFormatReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/XMLSecurityDataFormatReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/XMLSecurityDataFormatReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/XMLSecurityDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/XMLSecurityDataFormatReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/XStreamDataFormatReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/XStreamDataFormatReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/XStreamDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/XStreamDataFormatReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/XmlRpcDataFormatReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/XmlRpcDataFormatReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/XmlRpcDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/XmlRpcDataFormatReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/YAMLDataFormatReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/YAMLDataFormatReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/YAMLDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/YAMLDataFormatReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/ZipDataFormatReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/ZipDataFormatReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/ZipDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/ZipDataFormatReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/ZipFileDataFormatReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/ZipFileDataFormatReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/ZipFileDataFormatReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/dataformat/ZipFileDataFormatReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/errorhandler/DeadLetterChannelReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/errorhandler/DeadLetterChannelReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/errorhandler/DeadLetterChannelReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/errorhandler/DeadLetterChannelReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/errorhandler/DefaultErrorHandlerReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/errorhandler/DefaultErrorHandlerReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/errorhandler/DefaultErrorHandlerReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/errorhandler/DefaultErrorHandlerReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerRefReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/errorhandler/ErrorHandlerRefReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerRefReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/errorhandler/ErrorHandlerRefReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/errorhandler/ErrorHandlerReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/errorhandler/ErrorHandlerReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/errorhandler/NoErrorHandlerReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/errorhandler/NoErrorHandlerReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/errorhandler/NoErrorHandlerReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/errorhandler/NoErrorHandlerReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/loadbalancer/CustomLoadBalancerReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/loadbalancer/CustomLoadBalancerReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/loadbalancer/CustomLoadBalancerReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/loadbalancer/CustomLoadBalancerReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/loadbalancer/FailoverLoadBalancerReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/loadbalancer/FailoverLoadBalancerReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/loadbalancer/FailoverLoadBalancerReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/loadbalancer/FailoverLoadBalancerReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/loadbalancer/LoadBalancerReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/loadbalancer/LoadBalancerReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/loadbalancer/LoadBalancerReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/loadbalancer/LoadBalancerReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/loadbalancer/RandomLoadBalancerReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/loadbalancer/RandomLoadBalancerReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/loadbalancer/RandomLoadBalancerReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/loadbalancer/RandomLoadBalancerReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/loadbalancer/RoundRobinLoadBalancerReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/loadbalancer/RoundRobinLoadBalancerReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/loadbalancer/RoundRobinLoadBalancerReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/loadbalancer/RoundRobinLoadBalancerReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/loadbalancer/StickyLoadBalancerReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/loadbalancer/StickyLoadBalancerReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/loadbalancer/StickyLoadBalancerReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/loadbalancer/StickyLoadBalancerReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/loadbalancer/TopicLoadBalancerReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/loadbalancer/TopicLoadBalancerReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/loadbalancer/TopicLoadBalancerReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/loadbalancer/TopicLoadBalancerReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/loadbalancer/WeightedLoadBalancerReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/loadbalancer/WeightedLoadBalancerReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/loadbalancer/WeightedLoadBalancerReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/loadbalancer/WeightedLoadBalancerReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/rest/RestBindingReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/rest/RestBindingReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/rest/RestBindingReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/rest/RestBindingReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/transformer/CustomTransformeReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/transformer/CustomTransformeReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/transformer/CustomTransformeReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/transformer/CustomTransformeReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/transformer/DataFormatTransformeReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/transformer/DataFormatTransformeReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/transformer/DataFormatTransformeReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/transformer/DataFormatTransformeReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/transformer/EndpointTransformeReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/transformer/EndpointTransformeReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/transformer/EndpointTransformeReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/transformer/EndpointTransformeReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/transformer/TransformerReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/transformer/TransformerReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/transformer/TransformerReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/transformer/TransformerReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/validator/CustomValidatorReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/validator/CustomValidatorReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/validator/CustomValidatorReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/validator/CustomValidatorReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/validator/EndpointValidatorReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/validator/EndpointValidatorReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/validator/EndpointValidatorReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/validator/EndpointValidatorReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/validator/PredicateValidatorReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/validator/PredicateValidatorReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/validator/PredicateValidatorReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/validator/PredicateValidatorReifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/validator/ValidatorReifier.java b/core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/validator/ValidatorReifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/reifier/validator/ValidatorReifier.java
rename to core/camel-core-engine/src/main/java/java/org/apache/camel/reifier/validator/ValidatorReifier.java
diff --git a/core/camel-core/src/main/schema/constant.json b/core/camel-core-engine/src/main/schema/constant.json
similarity index 100%
rename from core/camel-core/src/main/schema/constant.json
rename to core/camel-core-engine/src/main/schema/constant.json
diff --git a/core/camel-core/src/main/schema/exchangeProperty.json b/core/camel-core-engine/src/main/schema/exchangeProperty.json
similarity index 100%
rename from core/camel-core/src/main/schema/exchangeProperty.json
rename to core/camel-core-engine/src/main/schema/exchangeProperty.json
diff --git a/core/camel-core/src/main/schema/expression.json b/core/camel-core-engine/src/main/schema/expression.json
similarity index 100%
rename from core/camel-core/src/main/schema/expression.json
rename to core/camel-core-engine/src/main/schema/expression.json
diff --git a/core/camel-core/src/main/schema/groovy.json b/core/camel-core-engine/src/main/schema/groovy.json
similarity index 100%
rename from core/camel-core/src/main/schema/groovy.json
rename to core/camel-core-engine/src/main/schema/groovy.json
diff --git a/core/camel-core/src/main/schema/header.json b/core/camel-core-engine/src/main/schema/header.json
similarity index 100%
rename from core/camel-core/src/main/schema/header.json
rename to core/camel-core-engine/src/main/schema/header.json
diff --git a/core/camel-core/src/main/schema/hl7terser.json b/core/camel-core-engine/src/main/schema/hl7terser.json
similarity index 100%
rename from core/camel-core/src/main/schema/hl7terser.json
rename to core/camel-core-engine/src/main/schema/hl7terser.json
diff --git a/core/camel-core/src/main/schema/jsonpath.json b/core/camel-core-engine/src/main/schema/jsonpath.json
similarity index 100%
rename from core/camel-core/src/main/schema/jsonpath.json
rename to core/camel-core-engine/src/main/schema/jsonpath.json
diff --git a/core/camel-core/src/main/schema/language.json b/core/camel-core-engine/src/main/schema/language.json
similarity index 100%
rename from core/camel-core/src/main/schema/language.json
rename to core/camel-core-engine/src/main/schema/language.json
diff --git a/core/camel-core/src/main/schema/method.json b/core/camel-core-engine/src/main/schema/method.json
similarity index 100%
rename from core/camel-core/src/main/schema/method.json
rename to core/camel-core-engine/src/main/schema/method.json
diff --git a/core/camel-core/src/main/schema/mvel.json b/core/camel-core-engine/src/main/schema/mvel.json
similarity index 100%
rename from core/camel-core/src/main/schema/mvel.json
rename to core/camel-core-engine/src/main/schema/mvel.json
diff --git a/core/camel-core/src/main/schema/ognl.json b/core/camel-core-engine/src/main/schema/ognl.json
similarity index 100%
rename from core/camel-core/src/main/schema/ognl.json
rename to core/camel-core-engine/src/main/schema/ognl.json
diff --git a/core/camel-core/src/main/schema/ref.json b/core/camel-core-engine/src/main/schema/ref.json
similarity index 100%
rename from core/camel-core/src/main/schema/ref.json
rename to core/camel-core-engine/src/main/schema/ref.json
diff --git a/core/camel-core/src/main/schema/simple.json b/core/camel-core-engine/src/main/schema/simple.json
similarity index 100%
rename from core/camel-core/src/main/schema/simple.json
rename to core/camel-core-engine/src/main/schema/simple.json
diff --git a/core/camel-core/src/main/schema/spel.json b/core/camel-core-engine/src/main/schema/spel.json
similarity index 100%
rename from core/camel-core/src/main/schema/spel.json
rename to core/camel-core-engine/src/main/schema/spel.json
diff --git a/core/camel-core/src/main/schema/tokenize.json b/core/camel-core-engine/src/main/schema/tokenize.json
similarity index 100%
rename from core/camel-core/src/main/schema/tokenize.json
rename to core/camel-core-engine/src/main/schema/tokenize.json
diff --git a/core/camel-core/src/main/schema/xpath.json b/core/camel-core-engine/src/main/schema/xpath.json
similarity index 100%
rename from core/camel-core/src/main/schema/xpath.json
rename to core/camel-core-engine/src/main/schema/xpath.json
diff --git a/core/camel-core/src/main/schema/xquery.json b/core/camel-core-engine/src/main/schema/xquery.json
similarity index 100%
rename from core/camel-core/src/main/schema/xquery.json
rename to core/camel-core-engine/src/main/schema/xquery.json
diff --git a/core/camel-core/src/main/schema/xtokenize.json b/core/camel-core-engine/src/main/schema/xtokenize.json
similarity index 100%
rename from core/camel-core/src/main/schema/xtokenize.json
rename to core/camel-core-engine/src/main/schema/xtokenize.json
diff --git a/core/camel-core/pom.xml b/core/camel-core/pom.xml
index 8304eff..5a2eafd 100644
--- a/core/camel-core/pom.xml
+++ b/core/camel-core/pom.xml
@@ -34,58 +34,12 @@
<name>Camel :: Core</name>
<description>The Core Camel Java DSL based router</description>
- <properties>
- <camel.osgi.dynamic>
- org.apache.camel.spring.util;${camel.osgi.import.strict.version},
- org.apache.camel.spring.pollingconsumer;${camel.osgi.import.strict.version},
- org.apache.camel.processor.interceptor.jpa;${camel.osgi.import.strict.version},
- org.apache.camel.pollconsumer.quartz;${camel.osgi.import.strict.version},
- org.apache.camel.component.caffeine;${camel.osgi.import.strict.version},
- net.sf.saxon
- </camel.osgi.dynamic>
- </properties>
-
<dependencies>
- <!-- camel optional annotations -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>meta-annotations</artifactId>
- <optional>true</optional>
- </dependency>
-
<!-- required dependencies by camel-core -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>spi-annotations</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-base</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-jaxp</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-management-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-support</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-util</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-util-json</artifactId>
+ <artifactId>camel-core-engine</artifactId>
</dependency>
<!-- core components -->
@@ -288,35 +242,6 @@
</dependencies>
<build>
- <pluginManagement>
- <plugins>
- <!-- Eclipse m2e Lifecycle Management -->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>${lifecycle-mapping-version}</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-package-maven-plugin</artifactId>
- <versionRange>${project.version}</versionRange>
- <goals>
- <goal>generate-eips-list</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore/>
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
<plugins>
<plugin>
@@ -370,98 +295,6 @@
</environmentVariables>
</configuration>
</plugin>
-
- <plugin>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-package-maven-plugin</artifactId>
- <version>${project.version}</version>
- <configuration>
- <!-- set to true to make build fail fast if missing documentation in docs files -->
- <failFast>false</failFast>
- </configuration>
- <executions>
- <execution>
- <id>generate</id>
- <goals>
- <goal>generate-jaxb-list</goal>
- <goal>generate-eips-list</goal>
- <goal>generate-components-list</goal>
- <goal>generate-dataformats-list</goal>
- <goal>generate-languages-list</goal>
- </goals>
- <phase>process-classes</phase>
- </execution>
- <execution>
- <id>validate</id>
- <goals>
- <goal>validate-components</goal>
- <goal>prepare-spring-boot-starter</goal>
- <goal>prepare-spring-boot-auto-configuration</goal>
- </goals>
- <phase>prepare-package</phase>
- </execution>
- <execution>
- <id>readme</id>
- <goals>
- <goal>update-readme</goal>
- </goals>
- <phase>package</phase>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-generated-resources</id>
- <goals>
- <goal>resources</goal>
- </goals>
- <phase>process-classes</phase>
- <configuration>
- <resources>
- <resource>
- <directory>${basedir}/target/generated/camel/components</directory>
- </resource>
- <resource>
- <directory>${basedir}/target/generated/camel/dataformats</directory>
- </resource>
- <resource>
- <directory>${basedir}/target/generated/camel/languages</directory>
- </resource>
- <resource>
- <directory>${basedir}/target/generated/camel/models</directory>
- </resource>
- <resource>
- <directory>${basedir}/target/generated/camel/jaxb</directory>
- </resource>
- </resources>
- </configuration>
- </execution>
- <!-- we need to copy the xtokenize.json schema file from camel-core to camel-jaxp because camel-jaxp is built before
- camel-core and we would have a chicken-and-egg situation where camel-jaxp needs xtokenize.json during its build phase
- but this file is not available, so we have copied the file to camel-jaxp and then we use this maven plugin
- to copy over the file so its kept up to date -->
- <execution>
- <id>copy-schema</id>
- <goals>
- <goal>resources</goal>
- </goals>
- <phase>prepare-package</phase>
- <configuration>
- <outputDirectory>${basedir}/src/main/schema</outputDirectory>
- <resources>
- <resource>
- <directory>${basedir}/target/classes/org/apache/camel/model/language</directory>
- <includes>
- <include>*.json</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
@@ -486,279 +319,4 @@
</plugins>
</build>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <links>
- <link>http://download.oracle.com/javase/7/docs/api/</link>
- <link>http://download.oracle.com/javaee/7/api/</link>
- </links>
- <linksource>true</linksource>
- <maxmemory>256m</maxmemory>
- <groups>
- <group>
- <title>Camel API</title>
- <packages>org.apache.camel</packages>
- </group>
- <group>
- <title>Fluent API (DSL) for building EIP rules</title>
- <packages>org.apache.camel.builder:org.apache.camel.builder.*</packages>
- </group>
- <group>
- <title>EIP model</title>
- <packages>org.apache.camel.model:org.apache.camel.model.*</packages>
- </group>
- <group>
- <title>Camel Components</title>
- <packages>org.apache.camel.component:org.apache.camel.component.*</packages>
- </group>
- <group>
- <title>Language APIs and plugins for Expressions and Predicates</title>
- <packages>org.apache.camel.language:org.apache.camel.language.*</packages>
- </group>
- <group>
- <title>Processors to implement the Enterprise Integration Patterns</title>
- <packages>org.apache.camel.processor:org.apache.camel.processor.*</packages>
- </group>
- <group>
- <title>Strategy APIs for implementors extending Camel</title>
- <packages>org.apache.camel.spi</packages>
- </group>
- <group>
- <title>Support APIs for implementors</title>
- <packages>org.apache.camel.support:org.apache.camel.support.*</packages>
- </group>
- <group>
- <title>Management (JMX) API</title>
- <packages>
- org.apache.camel.management:org.apache.camel.management.*:org.apache.camel.api.management.mbean
- </packages>
- </group>
- <group>
- <title>Camel Runtime</title>
- <packages>org.apache.camel.impl:org.apache.camel.impl.*</packages>
- </group>
- <group>
- <title>Type conversion helper classes</title>
- <packages>org.apache.camel.converter:org.apache.camel.converter.*</packages>
- </group>
- <group>
- <title>Utility classes</title>
- <packages>org.apache.camel.util:org.apache.camel.util.*</packages>
- </group>
- </groups>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-
- <profiles>
- <profile>
- <id>release</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <id>package</id>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <links>
- <link>http://download.oracle.com/javase/7/docs/api/</link>
- <link>http://download.oracle.com/javaee/7/api/</link>
- </links>
- <linksource>true</linksource>
- <maxmemory>256m</maxmemory>
- <groups>
- <group>
- <title>Camel API</title>
- <packages>org.apache.camel</packages>
- </group>
- <group>
- <title>Fluent API (DSL) for building EIP rules</title>
- <packages>org.apache.camel.builder:org.apache.camel.builder.*</packages>
- </group>
- <group>
- <title>EIP model</title>
- <packages>org.apache.camel.model:org.apache.camel.model.*</packages>
- </group>
- <group>
- <title>Camel Components</title>
- <packages>org.apache.camel.component:org.apache.camel.component.*</packages>
- </group>
- <group>
- <title>Language APIs and plugins for Expressions and Predicates</title>
- <packages>org.apache.camel.language:org.apache.camel.language.*</packages>
- </group>
- <group>
- <title>Processors to implement the Enterprise Integration Patterns</title>
- <packages>org.apache.camel.processor:org.apache.camel.processor.*</packages>
- </group>
- <group>
- <title>Strategy APIs for implementors extending Camel</title>
- <packages>org.apache.camel.spi</packages>
- </group>
- <group>
- <title>Support APIs for implementors</title>
- <packages>org.apache.camel.support:org.apache.camel.support.*</packages>
- </group>
- <group>
- <title>Management (JMX) API</title>
- <packages>
- org.apache.camel.management:org.apache.camel.management.*:org.apache.camel.api.management.mbean
- </packages>
- </group>
- <group>
- <title>Camel Runtime</title>
- <packages>org.apache.camel.impl:org.apache.camel.impl.*</packages>
- </group>
- <group>
- <title>Type conversion helper classes</title>
- <packages>org.apache.camel.converter:org.apache.camel.converter.*</packages>
- </group>
- <group>
- <title>Utility classes</title>
- <packages>org.apache.camel.util:org.apache.camel.util.*</packages>
- </group>
- </groups>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!-- enables the APT dependency so that it can be disabled in IDE builds -->
- <profile>
- <id>apt</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
-
- <dependencies>
-
- <!-- enable the APT processor -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>apt</artifactId>
- <scope>provided</scope>
- </dependency>
-
- </dependencies>
- </profile>
-
- <!-- skip management tests on AIX as it hangs CI servers -->
- <profile>
- <id>aix</id>
- <activation>
- <os>
- <name>aix</name>
- </os>
- </activation>
- <properties>
- <platform.skip.tests>org/apache/camel/management/**/*.java</platform.skip.tests>
- </properties>
- </profile>
- <profile>
- <id>xalan</id>
- <dependencies>
- <!-- enable the Xalan processor -->
- <dependency>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- <version>${xalan-version}</version>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>xerces</id>
- <dependencies>
- <!-- enable the xerces processor -->
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>${xerces-version}</version>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>woodstox</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <dependencies>
- <!-- xmltokenizer using woodstox -->
- <dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>woodstox-core-asl</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <dependencies>
-
- <!-- enable the APT processor -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>apt</artifactId>
- <scope>provided</scope>
- </dependency>
- <!-- xmltokenizer using woodstox -->
- <dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>woodstox-core-asl</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <!-- skip file stress tests as they are intended to run manually -->
- <excludes>
- <exclude>org/apache/camel/component/file/stress/**.java</exclude>
- <exclude>**/DistributedCompletionIntervalTest.java</exclude>
- <exclude>**/DistributedConcurrentPerCorrelationKeyTest.java</exclude>
- <exclude>${platform.skip.tests}</exclude>
- </excludes>
- <forkedProcessTimeoutInSeconds>3000</forkedProcessTimeoutInSeconds>
- <!-- needed for testing the properties component -->
- <environmentVariables>
- <FOO_SERVICE_HOST>myserver</FOO_SERVICE_HOST>
- <FOO_SERVICE_PORT>8081</FOO_SERVICE_PORT>
- </environmentVariables>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- <version>${jakarta-jaxb-version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>jaxb-runtime</artifactId>
- <version>${glassfish-jaxb-runtime-version}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/core/camel-core/src/revapi/ignore.json b/core/camel-core/src/revapi/ignore.json
deleted file mode 100644
index 4d8e5fd..0000000
--- a/core/camel-core/src/revapi/ignore.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "revapi" : {
- "java": {
- "missing-classes": {
- "behavior": "ignore"
- }
- },
- "ignore" : [
- {
- "code" : "java.class.nonPublicPartOfAPI"
- },
- {
- "code" : "java.method.returnTypeChanged",
- "package" : "org.apache.camel.management.mbean",
- "classSimpleName" : "ManagedClaimCheck",
- "methodName": "getDefinition",
- "elementKind": "method",
- "justification": "Needed for Claim-Check EIP",
- "oldType": "org.apache.camel.model.ExpressionNode",
- "newType": "org.apache.camel.model.ProcessorDefinition<?>"
- }
- ]
- }
-}
\ No newline at end of file
diff --git a/core/pom.xml b/core/pom.xml
index 69ccb24..315ddca 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -44,8 +44,8 @@
<module>camel-management</module>
<module>camel-base</module>
<module>camel-jaxp</module>
- <module>camel-core</module>
<module>camel-core-engine</module>
+ <module>camel-core</module>
<module>camel-endpointdsl</module>
<module>camel-core-osgi</module>
<module>camel-core-xml</module>
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
index 07d1396..ffdffb5 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
@@ -153,7 +153,7 @@ public class PackageDataFormatMojo extends AbstractGeneratorMojo {
}
}
} else {
- throw new MojoExecutionException("Error finding core/camel-core/target/camel-core-" + project.getVersion() + ".jar file. Make sure camel-core has been built first.");
+ throw new MojoExecutionException("Error finding core/camel-core/target/camel-core-engine-" + project.getVersion() + ".jar file. Make sure camel-core has been built first.");
}
}
} catch (Exception e) {
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageHelper.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageHelper.java
index 4453d82..76d6bdc 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageHelper.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageHelper.java
@@ -182,7 +182,7 @@ public final class PackageHelper {
}
public static File findCamelCoreDirectory(File dir) {
- return findCamelDirectory(dir, "core/camel-core");
+ return findCamelDirectory(dir, "core/camel-core-engine");
}
public static File findCamelDirectory(File dir, String path) {
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java
index 291a749..a4178ff 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java
@@ -194,7 +194,7 @@ public class PackageLanguageMojo extends AbstractGeneratorMojo {
}
}
} else {
- throw new MojoExecutionException("Error finding core/camel-core/target/camel-core-" + project.getVersion() + ".jar file. Make sure camel-core has been built first.");
+ throw new MojoExecutionException("Error finding core/camel-core/target/camel-core-engine-" + project.getVersion() + ".jar file. Make sure camel-core has been built first.");
}
}
} catch (Exception e) {
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogKarafMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogKarafMojo.java
index 735779a..3fc1578 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogKarafMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogKarafMojo.java
@@ -102,7 +102,7 @@ public class PrepareCatalogKarafMojo extends AbstractMojo {
/**
* The camel-core directory
*/
- @Parameter(defaultValue = "${project.build.directory}/../../../core/camel-core")
+ @Parameter(defaultValue = "${project.build.directory}/../../../core/camel-core-engine")
protected File coreDir;
/**
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
index c0f2a2b..e7384fa 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
@@ -137,7 +137,7 @@ public class PrepareCatalogMojo extends AbstractMojo {
/**
* The camel-core directory
*/
- @Parameter(defaultValue = "${project.build.directory}/../../../core/camel-core")
+ @Parameter(defaultValue = "${project.build.directory}/../../../core/camel-core-engine")
protected File coreDir;
/**
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogSpringBootMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogSpringBootMojo.java
index 44450a3..6cf874f 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogSpringBootMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogSpringBootMojo.java
@@ -99,7 +99,7 @@ public class PrepareCatalogSpringBootMojo extends AbstractMojo {
/**
* The camel-core directory
*/
- @Parameter(defaultValue = "${project.build.directory}/../../../core/camel-core")
+ @Parameter(defaultValue = "${project.build.directory}/../../../core/camel-core-engine")
protected File coreDir;
/**
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareReadmeMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareReadmeMojo.java
index 53ff530..5ccfcf5 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareReadmeMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareReadmeMojo.java
@@ -94,7 +94,7 @@ public class PrepareReadmeMojo extends AbstractMojo {
/**
* The directory for camel-core
*/
- @Parameter(defaultValue = "${project.directory}/../../../core/camel-core")
+ @Parameter(defaultValue = "${project.directory}/../../../core/camel-core-engine")
protected File readmeCoreDir;
/**
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/ComponentModel.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/ComponentModel.java
index 45ce1f5..8b8b7f6 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/ComponentModel.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/ComponentModel.java
@@ -237,7 +237,7 @@ public class ComponentModel {
}
if ("camel-core".equals(artifactId)) {
- return coreOnly ? "src/main/docs" : "../core/camel-core/src/main/docs";
+ return coreOnly ? "src/main/docs" : "../core/camel-core-engine/src/main/docs";
} else {
return artifactId + "/src/main/docs";
}
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/DataFormatModel.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/DataFormatModel.java
index f2e97dd..e7d4b41 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/DataFormatModel.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/DataFormatModel.java
@@ -173,7 +173,7 @@ public class DataFormatModel {
}
if ("camel-core".equals(artifactId)) {
- return coreOnly ? "src/main/docs" : "../core/camel-core/src/main/docs";
+ return coreOnly ? "src/main/docs" : "../core/camel-core-engine/src/main/docs";
} else {
return artifactId + "/src/main/docs";
}
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/LanguageModel.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/LanguageModel.java
index c34c5cd..b4b7962 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/LanguageModel.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/LanguageModel.java
@@ -168,7 +168,7 @@ public class LanguageModel {
public String getDocLink() {
if ("camel-core".equals(artifactId)) {
- return coreOnly ? "src/main/docs" : "../core/camel-core/src/main/docs";
+ return coreOnly ? "src/main/docs" : "../core/camel-core-engine/src/main/docs";
} else {
return artifactId + "/src/main/docs";
}
[camel] 07/08: CAMEL-13949: Better splitup between camel-core and
camel-core-engine.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch CAMEL-13949
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 1a033f90beadfa9787284653c708555d5abee045
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Sep 25 07:24:51 2019 +0200
CAMEL-13949: Better splitup between camel-core and camel-core-engine.
---
components/camel-blueprint/pom.xml | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/components/camel-blueprint/pom.xml b/components/camel-blueprint/pom.xml
index 2a3a65d..e2ae1f3 100644
--- a/components/camel-blueprint/pom.xml
+++ b/components/camel-blueprint/pom.xml
@@ -382,17 +382,20 @@
<include name="org/apache/camel/core/xml/*.java"/>
<include name="org/apache/camel/core/xml/util/**/*.java"/>
</fileset>
- <fileset dir="${basedir}/../../core/camel-core-engine/src/main/java">
- <include name="org/apache/camel/model/**/*.java"/>
+ <fileset dir="${basedir}/../../core/camel-api/src/main/java">
<include name="org/apache/camel/ExchangePattern.java"/>
<include name="org/apache/camel/LoggingLevel.java"/>
<include name="org/apache/camel/ManagementStatisticsLevel.java"/>
- <include name="**/package-info.java"/>
- <exclude name="org/apache/camel/model/endpoint/*.java"/>
+ <include name="org/apache/camel/ShutdownRoute.java"/>
+ <include name="org/apache/camel/ShutdownRunningTask.java"/>
+ <include name="org/apache/camel/WaitForTaskToComplete.java"/>
+ </fileset>
+ <fileset dir="${basedir}/../../core/camel-core-engine/src/main/java">
+ <include name="org/apache/camel/model/**/*.java"/>
+ <include name="org/apache/camel/package-info.java"/>
</fileset>
<fileset dir="${basedir}/../../core/camel-util/src/main/java">
- <include
- name="org/apache/camel/util/concurrent/ThreadPoolRejectedPolicy.java"/>
+ <include name="org/apache/camel/util/concurrent/ThreadPoolRejectedPolicy.java"/>
</fileset>
</copy>
</target>