This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a change to branch CAMEL-17923/add-constant-name-to-header-model
in repository https://gitbox.apache.org/repos/asf/camel.git
discard 1055f383000 CAMEL-17923: Add the name of the constant to the header
model
omit e665d6c0c80 CAMEL-17924: Only expose public headers in the
documentation
add dd2e9f15b7c Fix documentation
add cd2bbcca072 (chores) Fixed a typo in the javadoc comment
add b81b1ee8361 CAMEL-17924: Only expose public headers in the
documentation (#7386)
add 04999556a32 Regen for commit 0b6a02ac7da71a8e0feb6aba8b58a5e55133a070
add 870e656bd6c Errorhandler in dsl (#7391)
add 38be1ba4b52 CAMEL-17910: camel-jms - InOut with reply-to-type shared -
race condition
add 55bc0f2430f CAMEL-16834: error handler in DSL model
add a3251852667 CAMEL-17930: camel-yaml-dsl - Yaml schema - generate enums
for logging levels
add 1a0c2b3078e CAMEL-17930: camel-yaml-dsl - Yaml schema - generate enums
for logging levels
add d21aca68ed7 CAMEL-16834: error handler in DSL model
add 9e8135d877c CAMEL-16834: error handler in DSL model
add ad087c0649c Doc fix for website build
add 82cedbb0ab6 CAMEL-17931: disable header _id in metadata as this causes
website build problem
add 2db1b65ec05 Regen for commit 38be1ba4b529caabd632b21d4ead14e00168b19e
(#7394)
add a0c3371e39a Regen for commit 82cedbb0ab6f910a12249e60e03e7a437b90c7e3
(#7396)
add a82ce7333f7 CAMEL-17879: remove beanio dataformat since camel-beanio
was removed
add 947df0f5427 CAMEL-17879: remove camel-etcd leftovers
add 00510a67fe8 Fix typos in Contributing guide
add b65e64f5f0c Fix typo optimistick -> optimistic
new c458c2c9520 CAMEL-17923: Add the name of the constant to the header
model
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (1055f383000)
\
N -- N -- N
refs/heads/CAMEL-17923/add-constant-name-to-header-model (c458c2c9520)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CONTRIBUTING.md | 10 +-
.../org/apache/camel/catalog/components/gora.json | 4 +
.../apache/camel/catalog/components/mongodb.json | 1 -
.../org/apache/camel/catalog/models.properties | 6 +
.../apache/camel/catalog/models/dataFormats.json | 2 +-
.../camel/catalog/models/deadLetterChannel.json | 31 +
.../camel/catalog/models/defaultErrorHandler.json | 29 +
.../apache/camel/catalog/models/errorHandler.json | 24 +-
.../camel/catalog/models/errorHandlerRef.json | 18 +
.../catalog/models/jtaTransactionErrorHandler.json | 31 +
.../org/apache/camel/catalog/models/marshal.json | 2 +-
.../camel/catalog/models/noErrorHandler.json | 17 +
.../camel/catalog/models/redeliveryPolicy.json | 27 +-
.../models/springTransactionErrorHandler.json | 31 +
.../org/apache/camel/catalog/models/unmarshal.json | 2 +-
.../org/apache/camel/catalog/others/cdi-jta.json | 2 +-
.../org/apache/camel/catalog/others/cdi-main.json | 2 +-
.../org/apache/camel/catalog/others/cdi.json | 2 +-
.../apache/camel/catalog/schemas/camel-spring.xsd | 1116 +++++++--------
.../camel/component/avro/avro-http-producer.xml | 4 +-
.../camel/component/avro/avro-netty-producer.xml | 4 +-
components/camel-cdi-jta/pom.xml | 1 +
.../src/generated/resources/cdi-jta.json | 2 +-
.../camel-cdi-jta/src/main/docs/cdi-jta.adoc | 2 +-
.../java/org/apache/camel/cdi/CdiRouteBuilder.java | 45 -
components/camel-cdi-main/pom.xml | 1 +
.../src/generated/resources/cdi-main.json | 2 +-
.../camel-cdi-main/src/main/docs/cdi-main.adoc | 2 +-
components/camel-cdi/pom.xml | 1 +
.../camel-cdi/src/generated/resources/cdi.json | 2 +-
components/camel-cdi/src/main/docs/cdi.adoc | 2 +-
.../CdiJtaTransactionErrorHandlerBuilder.java | 23 -
.../CdiTransactionalErrorHandlerBuilder.java | 35 -
.../component/cxf/jaxrs/CxfRsConsumerTest.java | 4 +-
.../cxf/jaxrs/CxfRsSpringConsumerTest.java | 4 +-
components/camel-debug/src/main/docs/debug.adoc | 2 +
.../jms/reply/MessageSelectorCreator.java | 57 +-
...JMXTXUseOriginalBodyWithTXErrorHandlerTest.java | 4 +-
...tionErrorHandlerRedeliveryDelayTest-context.xml | 2 +-
.../jms/tx/JMSTransactionErrorHandlerTest.xml | 2 +-
.../jms/tx/JMSTransactionalClientTest.xml | 2 +-
.../tx/JMSTransactionalClientWithRollbackTest.xml | 2 +-
...nsactionErrorHandlerBuilderAsSpringBeanTest.xml | 2 +-
.../camel/jta/JtaTransactionErrorHandler.java | 9 +
.../jta/JtaTransactionErrorHandlerBuilder.java | 100 --
.../jta/JtaTransactionErrorHandlerReifier.java | 182 ++-
.../org/apache/camel/jta/JtaTransactionPolicy.java | 37 +-
.../apache/camel/component/mongodb/mongodb.json | 1 -
.../src/main/docs/mongodb-component.adoc | 4 +-
.../camel/component/mongodb/MongoDbConstants.java | 13 +-
.../org/apache/camel/spring/xml/errorHandler.json | 4 +-
.../org/apache/camel/spring/xml/jaxb.index | 4 +-
.../camel/spring/xml/CamelContextFactoryBean.java | 2 +-
...tion.java => SpringErrorHandlerDefinition.java} | 8 +-
...andlerType.java => SpringErrorHandlerType.java} | 18 +-
.../spring/xml/handler/CamelNamespaceHandler.java | 16 +
.../xml/handler/ErrorHandlerDefinitionParser.java | 58 +-
.../spring/config/DummyErrorHandlerBuilder.java | 7 +-
.../TransactionalClientDataSourceAsyncTest.java | 4 +-
.../handler/ErrorHandlerDefinitionParserTest.java | 20 +-
...adLetterChannelRedeliveryConfigTest-context.xml | 2 +-
.../DefaultErrorHandlerConfigTest-context.xml | 2 +-
.../apache/camel/spring/config/errorHandler.xml | 2 +-
.../springTransactionalClientDataSource.xml | 2 +-
...HandlerAndContextScopedOnExceptionIssueTest.xml | 2 +-
.../processor/InheritErrorHandlerDefaultTest.xml | 2 +-
.../processor/InheritErrorHandlerFalseTest.xml | 2 +-
.../processor/InheritErrorHandlerTrueTest.xml | 2 +-
...ngDeadLetterChannelInvalidDeadLetterUriTest.xml | 2 +-
...LetterChannelInvalidOptionDeadLetterUriTest.xml | 2 +-
.../SpringDeadLetterChannelUseOriginalBodyTest.xml | 4 +-
...etterChannelUseOriginalExchangeWithFileTest.xml | 4 +-
.../camel/spring/processor/failOverLoadBalance.xml | 2 +-
...eadLetterChannelOnExceptionOnRedeliveryTest.xml | 2 +-
.../onexception/RedeliveryPolicyRefTest.xml | 2 +-
.../SpringContextScopeOnExceptionTest.xml | 2 +-
...ingOnExceptionFromChoiceUseOriginalBodyTest.xml | 2 +-
.../SpringOnExceptionUseOriginalBodyTest.xml | 2 +-
.../deadLetterChannelHandledExampleTest.xml | 2 +-
.../onExceptionNotNormalizedClassNameTest.xml | 2 +-
.../onexception/onExceptionSubRouteTest.xml | 4 +-
.../camel/spring/xml/buildCustomProcessor.xml | 2 +-
.../spring/xml/buildCustomProcessorWithFilter.xml | 2 +-
.../camel/spring/xml/buildDynamicRecipientList.xml | 2 +-
.../camel/spring/xml/buildIdempotentConsumer.xml | 2 +-
.../apache/camel/spring/xml/buildSimpleRoute.xml | 2 +-
.../spring/xml/buildSimpleRouteWithChoice.xml | 2 +-
.../xml/buildSimpleRouteWithHeaderPredicate.xml | 2 +-
.../org/apache/camel/spring/xml/buildSplitter.xml | 2 +-
.../camel/spring/xml/buildStaticRecipientList.xml | 2 +-
.../org/apache/camel/spring/xml/buildWireTap.xml | 2 +-
.../apache/camel/spring/SpringRouteBuilder.java | 14 +-
...a => LegacyTransactionErrorHandlerBuilder.java} | 17 +-
...a => LegacyTransactionErrorHandlerReifier.java} | 13 +-
.../camel/spring/spi/SpringTransactionPolicy.java | 22 +-
.../spring/spi/TransactionErrorHandlerReifier.java | 224 ++-
.../camel-sql/src/main/docs/sql-component.adoc | 9 +-
.../camel-test/camel-test-cdi-junit5/pom.xml | 1 +
.../java/org/apache/camel/ErrorHandlerFactory.java | 15 +
.../org/apache/camel/spi/ExceptionHandler.java | 4 +-
.../camel/impl/engine/AbstractCamelContext.java | 1 +
.../org/apache/camel/impl/engine/DefaultRoute.java | 1 +
.../camel/impl/DefaultModelReifierFactory.java | 4 +-
.../DeadLetterChannelBuilderConfigurer.java | 145 --
.../DefaultErrorHandlerBuilderConfigurer.java | 145 --
...g.apache.camel.builder.DeadLetterChannelBuilder | 2 -
...apache.camel.builder.DefaultErrorHandlerBuilder | 2 -
.../services/org/apache/camel/model.properties | 7 +
.../apache/camel/model/dataformat/dataFormats.json | 2 +-
.../org/apache/camel/model/dataformat/jaxb.index | 1 -
.../org/apache/camel/model/errorHandler.json | 18 +
.../model/errorhandler/deadLetterChannel.json | 31 +
.../model/errorhandler/defaultErrorHandler.json | 29 +
.../camel/model/errorhandler/errorHandlerRef.json | 18 +
.../org/apache/camel/model/errorhandler/jaxb.index | 7 +
.../errorhandler/jtaTransactionErrorHandler.json | 31 +
.../camel/model/errorhandler/noErrorHandler.json | 17 +
.../springTransactionErrorHandler.json | 31 +
.../resources/org/apache/camel/model/jaxb.index | 1 +
.../resources/org/apache/camel/model/marshal.json | 2 +-
.../org/apache/camel/model/redeliveryPolicy.json | 27 +-
.../org/apache/camel/model/unmarshal.json | 2 +-
.../org/apache/camel/builder/BuilderSupport.java | 94 +-
.../org/apache/camel/builder/DataFormatClause.java | 50 -
.../camel/builder/DeadLetterChannelBuilder.java | 52 +-
.../camel/builder/DefaultErrorHandlerBuilder.java | 649 +--------
...java => JtaTransactionErrorHandlerBuilder.java} | 18 +-
...er.java => LegacyDeadLetterChannelBuilder.java} | 17 +-
....java => LegacyDefaultErrorHandlerBuilder.java} | 108 +-
.../LegacyErrorHandlerBuilder.java} | 10 +-
...rRef.java => LegacyErrorHandlerBuilderRef.java} | 15 +-
....java => LegacyErrorHandlerBuilderSupport.java} | 5 +-
...pport.java => LegacyNoErrorHandlerBuilder.java} | 11 +-
.../camel/builder/NoErrorHandlerBuilder.java | 20 +-
...derSupport.java => RefErrorHandlerBuilder.java} | 13 +-
.../org/apache/camel/builder/RouteBuilder.java | 24 +-
...a => SpringTransactionErrorHandlerBuilder.java} | 18 +-
.../java/org/apache/camel/model/Constants.java | 1 +
.../apache/camel/model/ErrorHandlerDefinition.java | 66 +
.../org/apache/camel/model/MarshalDefinition.java | 2 -
.../camel/model/RedeliveryPolicyDefinition.java | 34 +-
.../org/apache/camel/model/RouteDefinition.java | 21 +-
.../apache/camel/model/RouteDefinitionHelper.java | 9 +-
.../apache/camel/model/UnmarshalDefinition.java | 2 -
.../camel/model/dataformat/BeanioDataFormat.java | 157 ---
.../model/dataformat/DataFormatsDefinition.java | 1 -
...erties.java => BaseErrorHandlerDefinition.java} | 8 +-
.../DeadLetterChannelConfiguration.java | 4 +
.../errorhandler/DeadLetterChannelDefinition.java | 138 ++
.../errorhandler/DeadLetterChannelProperties.java | 4 +
.../DefaultErrorHandlerConfiguration.java | 15 +
.../DefaultErrorHandlerDefinition.java | 792 +++++++++++
.../DefaultErrorHandlerProperties.java | 4 +
.../model/errorhandler/ErrorHandlerHelper.java | 10 +-
.../errorhandler/ErrorHandlerRefConfiguration.java | 19 +
.../errorhandler/ErrorHandlerRefDefinition.java | 78 ++
.../errorhandler/ErrorHandlerRefProperties.java | 5 +
...a => JtaTransactionErrorHandlerDefinition.java} | 27 +-
.../errorhandler/NoErrorHandlerConfiguration.java | 17 +-
...operties.java => NoErrorHandlerDefinition.java} | 30 +-
.../errorhandler/NoErrorHandlerProperties.java | 4 +
...> SpringTransactionErrorHandlerDefinition.java} | 27 +-
.../TransactionErrorHandlerDefinition.java | 123 ++
...HandlerConfiguration.java => package-info.java} | 15 +-
.../DataFormatTransformerDefinition.java | 2 -
.../org/apache/camel/reifier/RouteReifier.java | 14 +-
.../dataformat/BeanioDataFormatReifier.java | 43 -
.../reifier/dataformat/DataFormatReifier.java | 3 -
.../errorhandler/DeadLetterChannelReifier.java | 109 +-
.../errorhandler/DefaultErrorHandlerReifier.java | 89 +-
.../errorhandler/ErrorHandlerRefReifier.java | 7 +-
.../reifier/errorhandler/ErrorHandlerReifier.java | 173 ++-
...er.java => LegacyDeadLetterChannelReifier.java} | 8 +-
....java => LegacyDefaultErrorHandlerReifier.java} | 8 +-
...fier.java => LegacyErrorHandlerRefReifier.java} | 8 +-
.../errorhandler/LegacyNoErrorHandlerReifier.java} | 35 +-
.../errorhandler/NoErrorHandlerReifier.java | 6 +-
.../core/xml/AbstractCamelContextFactoryBean.java | 5 +-
.../AbstractCamelRedeliveryPolicyFactoryBean.java | 1 +
.../camel/builder/ContextErrorHandlerTest.java | 5 +-
.../builder/RouteTemplateErrorHandlerTest.java | 8 +-
...tScopedOnExceptionErrorHandlerRefIssueTest.java | 3 +-
...ExceptionErrorHandlerRefIssueTwoRoutesTest.java | 6 +-
...xceptionNotHandledErrorHandlerRefIssueTest.java | 3 +-
...otHandledErrorHandlerRefIssueTwoRoutesTest.java | 3 +-
...HandledRouteScopedErrorHandlerRefIssueTest.java | 4 +-
...uteScopedErrorHandlerRefIssueTwoRoutesTest.java | 5 +-
...ceptionRouteScopedErrorHandlerRefIssueTest.java | 4 +-
...uteScopedErrorHandlerRefIssueTwoRoutesTest.java | 5 +-
.../issues/OnExceptionContinuedIssueTest.java | 3 +-
.../OnExceptionErrorHandlerRefIssueTest.java | 3 +-
...ExceptionErrorHandlerRefIssueTwoRoutesTest.java | 3 +-
...xceptionNotHandledErrorHandlerRefIssueTest.java | 3 +-
...otHandledErrorHandlerRefIssueTwoRoutesTest.java | 3 +-
...HandledRouteScopedErrorHandlerRefIssueTest.java | 3 +-
...uteScopedErrorHandlerRefIssueTwoRoutesTest.java | 5 +-
...ceptionRouteScopedErrorHandlerRefIssueTest.java | 3 +-
...uteScopedErrorHandlerRefIssueTwoRoutesTest.java | 5 +-
.../BodyOnlyAggregationStrategyTest.java | 7 +-
.../errorhandler/ErrorHandlerSupportTest.java | 2 +-
.../errorhandler/NewDeadLetterChannelTest.java} | 31 +-
.../DefaultExceptionPolicyStrategyTest.java | 2 +-
.../java/org/apache/camel/xml/in/ModelParser.java | 106 +-
.../ROOT/pages/camel-3x-upgrade-guide-3_17.adoc | 52 +-
.../builder/endpoint/EndpointBuilderFactory.java | 3 -
.../camel/builder/endpoint/EndpointBuilders.java | 3 -
.../builder/endpoint/StaticEndpointBuilders.java | 135 --
.../dsl/EtcdKeysEndpointBuilderFactory.java | 328 -----
.../dsl/EtcdStatsEndpointBuilderFactory.java | 1422 --------------------
.../dsl/EtcdWatchEndpointBuilderFactory.java | 442 ------
.../camel/dsl/groovy/common/GroovyDSL.groovy | 4 +-
.../org/apache/camel/dsl/js/JavaScriptDSL.java | 4 +-
.../org/apache/camel/dsl/kotlin/KotlinDSL.kt | 4 +-
.../camel-yaml-dsl-deserializers/pom.xml | 5 -
.../dsl/yaml/deserializers/ModelDeserializers.java | 748 ++++++----
.../deserializers/ModelDeserializersResolver.java | 27 +-
.../ErrorHandlerBuilderDeserializer.java | 30 +-
.../dsl/yaml/GenerateYamlDeserializersMojo.java | 59 +-
.../maven/dsl/yaml/GenerateYamlSupportMojo.java | 17 +-
.../src/generated/resources/camel-yaml-dsl.json | 545 +++++---
.../src/generated/resources/camelYamlDsl.json | 541 +++++---
.../camel/dsl/yaml/YamlRoutesBuilderLoader.java | 31 +-
.../apache/camel/dsl/yaml/ErrorHandlerTest.groovy | 20 +-
.../camel/dsl/yaml/KameletBindingLoaderTest.groovy | 34 +-
.../org/apache/camel/itest/TransactionSupport.java | 8 +-
225 files changed, 5055 insertions(+), 5822 deletions(-)
create mode 100644
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/deadLetterChannel.json
create mode 100644
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/defaultErrorHandler.json
create mode 100644
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/errorHandlerRef.json
create mode 100644
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/jtaTransactionErrorHandler.json
create mode 100644
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/noErrorHandler.json
create mode 100644
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/springTransactionErrorHandler.json
delete mode 100644
components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/CdiRouteBuilder.java
delete mode 100644
components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/CdiJtaTransactionErrorHandlerBuilder.java
delete mode 100644
components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/CdiTransactionalErrorHandlerBuilder.java
delete mode 100644
components/camel-jta/src/main/java/org/apache/camel/jta/JtaTransactionErrorHandlerBuilder.java
rename
components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/{ErrorHandlerDefinition.java
=> SpringErrorHandlerDefinition.java} (98%)
rename
components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/{ErrorHandlerType.java
=> SpringErrorHandlerType.java} (74%)
rename
components/camel-spring/src/main/java/org/apache/camel/spring/spi/{TransactionErrorHandlerBuilder.java
=> LegacyTransactionErrorHandlerBuilder.java} (82%)
copy
components/camel-spring/src/main/java/org/apache/camel/spring/spi/{TransactionErrorHandlerReifier.java
=> LegacyTransactionErrorHandlerReifier.java} (90%)
delete mode 100644
core/camel-core-model/src/generated/java/org/apache/camel/builder/DeadLetterChannelBuilderConfigurer.java
delete mode 100644
core/camel-core-model/src/generated/java/org/apache/camel/builder/DefaultErrorHandlerBuilderConfigurer.java
delete mode 100644
core/camel-core-model/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.builder.DeadLetterChannelBuilder
delete mode 100644
core/camel-core-model/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.builder.DefaultErrorHandlerBuilder
create mode 100644
core/camel-core-model/src/generated/resources/org/apache/camel/model/errorHandler.json
create mode 100644
core/camel-core-model/src/generated/resources/org/apache/camel/model/errorhandler/deadLetterChannel.json
create mode 100644
core/camel-core-model/src/generated/resources/org/apache/camel/model/errorhandler/defaultErrorHandler.json
create mode 100644
core/camel-core-model/src/generated/resources/org/apache/camel/model/errorhandler/errorHandlerRef.json
create mode 100644
core/camel-core-model/src/generated/resources/org/apache/camel/model/errorhandler/jaxb.index
create mode 100644
core/camel-core-model/src/generated/resources/org/apache/camel/model/errorhandler/jtaTransactionErrorHandler.json
create mode 100644
core/camel-core-model/src/generated/resources/org/apache/camel/model/errorhandler/noErrorHandler.json
create mode 100644
core/camel-core-model/src/generated/resources/org/apache/camel/model/errorhandler/springTransactionErrorHandler.json
copy
core/camel-core-model/src/main/java/org/apache/camel/builder/{ErrorHandlerBuilderSupport.java
=> JtaTransactionErrorHandlerBuilder.java} (61%)
copy
core/camel-core-model/src/main/java/org/apache/camel/builder/{DeadLetterChannelBuilder.java
=> LegacyDeadLetterChannelBuilder.java} (80%)
copy
core/camel-core-model/src/main/java/org/apache/camel/builder/{DefaultErrorHandlerBuilder.java
=> LegacyDefaultErrorHandlerBuilder.java} (83%)
copy
core/camel-core-model/src/main/java/org/apache/camel/{model/errorhandler/NoErrorHandlerProperties.java
=> builder/LegacyErrorHandlerBuilder.java} (81%)
rename
core/camel-core-model/src/main/java/org/apache/camel/builder/{ErrorHandlerBuilderRef.java
=> LegacyErrorHandlerBuilderRef.java} (79%)
copy
core/camel-core-model/src/main/java/org/apache/camel/builder/{ErrorHandlerBuilderSupport.java
=> LegacyErrorHandlerBuilderSupport.java} (83%)
copy
core/camel-core-model/src/main/java/org/apache/camel/builder/{ErrorHandlerBuilderSupport.java
=> LegacyNoErrorHandlerBuilder.java} (70%)
copy
core/camel-core-model/src/main/java/org/apache/camel/builder/{ErrorHandlerBuilderSupport.java
=> RefErrorHandlerBuilder.java} (74%)
rename
core/camel-core-model/src/main/java/org/apache/camel/builder/{ErrorHandlerBuilderSupport.java
=> SpringTransactionErrorHandlerBuilder.java} (60%)
create mode 100644
core/camel-core-model/src/main/java/org/apache/camel/model/ErrorHandlerDefinition.java
delete mode 100644
core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/BeanioDataFormat.java
copy
core/camel-core-model/src/main/java/org/apache/camel/model/errorhandler/{NoErrorHandlerProperties.java
=> BaseErrorHandlerDefinition.java} (82%)
create mode 100644
core/camel-core-model/src/main/java/org/apache/camel/model/errorhandler/DeadLetterChannelDefinition.java
create mode 100644
core/camel-core-model/src/main/java/org/apache/camel/model/errorhandler/DefaultErrorHandlerDefinition.java
create mode 100644
core/camel-core-model/src/main/java/org/apache/camel/model/errorhandler/ErrorHandlerRefDefinition.java
copy
core/camel-core-model/src/main/java/org/apache/camel/model/errorhandler/{ErrorHandlerRefProperties.java
=> JtaTransactionErrorHandlerDefinition.java} (56%)
copy
core/camel-core-model/src/main/java/org/apache/camel/model/errorhandler/{ErrorHandlerRefProperties.java
=> NoErrorHandlerDefinition.java} (59%)
copy
core/camel-core-model/src/main/java/org/apache/camel/model/errorhandler/{ErrorHandlerRefProperties.java
=> SpringTransactionErrorHandlerDefinition.java} (55%)
create mode 100644
core/camel-core-model/src/main/java/org/apache/camel/model/errorhandler/TransactionErrorHandlerDefinition.java
copy
core/camel-core-model/src/main/java/org/apache/camel/model/errorhandler/{NoErrorHandlerConfiguration.java
=> package-info.java} (73%)
delete mode 100644
core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/BeanioDataFormatReifier.java
copy
core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/{DeadLetterChannelReifier.java
=> LegacyDeadLetterChannelReifier.java} (92%)
copy
core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/{DefaultErrorHandlerReifier.java
=> LegacyDefaultErrorHandlerReifier.java} (93%)
copy
core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/{ErrorHandlerRefReifier.java
=> LegacyErrorHandlerRefReifier.java} (87%)
rename
core/{camel-core-model/src/main/java/org/apache/camel/builder/ErrorHandlerBuilder.java
=>
camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/LegacyNoErrorHandlerReifier.java}
(50%)
copy
core/camel-core/src/test/java/org/apache/camel/{issues/ContextScopedOnExceptionRouteScopedErrorHandlerRefIssueTest.java
=> processor/errorhandler/NewDeadLetterChannelTest.java} (60%)
delete mode 100644
dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EtcdKeysEndpointBuilderFactory.java
delete mode 100644
dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EtcdStatsEndpointBuilderFactory.java
delete mode 100644
dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EtcdWatchEndpointBuilderFactory.java
