This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch fix/CAMEL-23763
in repository https://gitbox.apache.org/repos/asf/camel.git
discard 55b6d25b59c4 CAMEL-23763: Make rest/template/kamelet on
RouteDefinition @XmlTransient
add 93449c89cc2f CAMEL-23757: Add Java DSL model writer for full-circle
DSL transformation (#24031)
add b7bba87d2968 chore: camel-spring-ws - exclude transitive opensaml
dependencies
add c0bb895f80ea Regen
add e536bcc2ba38 CAMEL-23763: Make rest/template/kamelet on
RouteDefinition @XmlTransient
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 (55b6d25b59c4)
\
N -- N -- N refs/heads/fix/CAMEL-23763 (e536bcc2ba38)
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.
No new revisions were added by this update.
Summary of changes:
.../org/apache/camel/catalog/others.properties | 1 +
.../org/apache/camel/catalog/others/java-io.json | 15 +
.../camel-spring-parent/camel-spring-ws/pom.xml | 4 +
.../org/apache/camel/spi/annotations/DslArg.java | 79 +
.../apache/camel/model/AggregateDefinition.java | 30 +
.../apache/camel/model/BasicExpressionNode.java | 2 +
.../org/apache/camel/model/BeanDefinition.java | 3 +
.../org/apache/camel/model/CatchDefinition.java | 2 +
.../apache/camel/model/ClaimCheckDefinition.java | 4 +
.../apache/camel/model/ConvertBodyDefinition.java | 2 +
.../camel/model/ConvertHeaderDefinition.java | 3 +
.../camel/model/ConvertVariableDefinition.java | 3 +
.../org/apache/camel/model/EnrichDefinition.java | 2 +
.../org/apache/camel/model/ExpressionNode.java | 2 +
.../FaultToleranceConfigurationDefinition.java | 66 +
.../camel/model/InterceptFromDefinition.java | 2 +
.../model/InterceptSendToEndpointDefinition.java | 2 +
.../org/apache/camel/model/KameletDefinition.java | 2 +
.../java/org/apache/camel/model/LogDefinition.java | 3 +
.../apache/camel/model/OnExceptionDefinition.java | 2 +
.../org/apache/camel/model/PolicyDefinition.java | 2 +
.../org/apache/camel/model/PollDefinition.java | 3 +
.../apache/camel/model/PollEnrichDefinition.java | 2 +
.../org/apache/camel/model/ProcessDefinition.java | 2 +
.../apache/camel/model/RemoveHeaderDefinition.java | 2 +
.../camel/model/RemoveHeadersDefinition.java | 2 +
.../camel/model/RemovePropertiesDefinition.java | 2 +
.../camel/model/RemovePropertyDefinition.java | 2 +
.../camel/model/RemoveVariableDefinition.java | 2 +
.../model/Resilience4jConfigurationDefinition.java | 134 +
.../org/apache/camel/model/RollbackDefinition.java | 2 +
.../org/apache/camel/model/RouteDefinition.java | 11 +
.../org/apache/camel/model/SamplingDefinition.java | 12 +
.../org/apache/camel/model/SendDefinition.java | 2 +
.../camel/model/SetExchangePatternDefinition.java | 2 +
.../apache/camel/model/SetHeaderDefinition.java | 2 +
.../apache/camel/model/SetPropertyDefinition.java | 2 +
.../apache/camel/model/SetVariableDefinition.java | 2 +
.../org/apache/camel/model/ThreadsDefinition.java | 3 +
.../camel/model/ThrowExceptionDefinition.java | 3 +
.../java/org/apache/camel/model/ToDefinition.java | 2 +
.../apache/camel/model/ToDynamicDefinition.java | 2 +
.../camel/model/TransformDataTypeDefinition.java | 3 +
.../apache/camel/model/rest/RestDefinition.java | 2 +
.../apache/camel/model/rest/VerbDefinition.java | 2 +
core/camel-java-io/pom.xml | 93 +
.../apache/camel/java/out/JavaDslModelWriter.java | 6458 ++++++++++++++++++++
.../services/org/apache/camel/other.properties | 7 +
.../src/generated/resources/java-io.json | 15 +
.../camel/java/out/JavaDslModelWriterSupport.java | 1157 ++++
.../apache/camel/java/out/JavaDslCompileTest.java | 544 ++
.../camel/java/out/JavaDslModelWriterTest.java | 293 +
.../src/test/resources/aggregateAdvanced.xml | 42 +
.../src/test/resources/beanWithRef.xml | 28 +
.../test/resources/circuitBreakerResilience4j.xml | 38 +
.../src/test/resources/claimCheckOperation.xml | 30 +
.../src/test/resources/doTryMultiCatch.xml | 44 +
.../src/test/resources/errorHandlerDefault.xml | 34 +
.../src/test/resources/expressionOptions.xml | 36 +
.../src/test/resources/java-dsl-choice.txt | 11 +
.../src/test/resources/java-dsl-filter.txt | 6 +
.../src/test/resources/java-dsl-set-header.txt | 6 +
.../src/test/resources/java-dsl-simple.txt | 4 +
.../src/test/resources/java-dsl-split.txt | 7 +
.../src/test/resources/java-dsl-wiretap.txt | 4 +
core/camel-java-io/src/test/resources/kamelet.xml | 26 +
.../src/test/resources/logWithLevel.xml | 28 +
.../src/test/resources/marshalDataFormats.xml | 78 +
.../src/test/resources/onExceptionAdvanced.xml | 43 +
.../src/test/resources/restOpenApi.xml | 24 +
.../src/test/resources/sagaAdvanced.xml | 35 +
.../src/test/resources/simpleRestConfiguration.xml | 26 +
.../src/test/resources/simpleTemplatedRoute.xml | 0
.../src/test/resources/threadsPoolSize.xml | 28 +
.../src/test/resources/throttleAdvanced.xml | 30 +
.../src/test/resources/throwExceptionSimple.xml | 31 +
.../src/test/resources/toWithPattern.xml | 27 +
core/camel-xml-io/src/test/resources/aggregate.xml | 30 +
.../camel-xml-io/src/test/resources/claimCheck.xml | 31 +
.../src/test/resources/convertHeaderTo.xml | 26 +
.../src/test/resources/convertVariableTo.xml | 26 +
core/camel-xml-io/src/test/resources/delay.xml | 28 +
.../src/test/resources/doTryCatchFinally.xml | 34 +
.../src/test/resources/dynamicRouter.xml | 27 +
.../src/test/resources/enrichAndPollEnrich.xml | 31 +
.../src/test/resources/idempotentConsumer.xml | 28 +
.../src/test/resources/interceptFrom.xml | 28 +
.../src/test/resources/interceptFromAndSendTo.xml | 29 +
core/camel-xml-io/src/test/resources/multicast.xml | 30 +
.../src/test/resources/onCompletion.xml | 28 +
core/camel-xml-io/src/test/resources/pausable.xml | 26 +
core/camel-xml-io/src/test/resources/poll.xml | 26 +
.../test/resources/removeHeadersAndProperties.xml | 30 +
core/camel-xml-io/src/test/resources/resumable.xml | 26 +
core/camel-xml-io/src/test/resources/rollback.xml | 25 +
core/camel-xml-io/src/test/resources/sample.xml | 26 +
.../src/test/resources/setExchangePattern.xml | 26 +
core/camel-xml-io/src/test/resources/sort.xml | 28 +
core/camel-xml-io/src/test/resources/step.xml | 29 +
core/camel-xml-io/src/test/resources/stop.xml | 29 +
core/camel-xml-io/src/test/resources/threads.xml | 26 +
core/camel-xml-io/src/test/resources/throttle.xml | 28 +
core/camel-xml-io/src/test/resources/toD.xml | 26 +
core/camel-xml-io/src/test/resources/tokenizer.xml | 28 +
.../camel-xml-io/src/test/resources/transacted.xml | 26 +
.../src/test/resources/transformDataType.xml | 26 +
core/camel-xml-io/src/test/resources/unmarshal.xml | 28 +
core/camel-xml-io/src/test/resources/validate.xml | 28 +
core/camel-xml-io/src/test/resources/wireTap.xml | 26 +
core/pom.xml | 1 +
docs/user-manual/modules/ROOT/nav.adoc | 1 +
.../ROOT/pages/camel-4x-upgrade-guide-4_21.adoc | 6 +
.../modules/ROOT/pages/java-dsl-model-writer.adoc | 211 +
.../packaging/JavaDslModelWriterGeneratorMojo.java | 179 +
.../resources/velocity/model-java-dsl-writer.vm | 392 ++
.../org/apache/camel/spi/annotations/DslArg.java | 79 +
116 files changed, 11425 insertions(+)
create mode 100644
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/java-io.json
create mode 100644
core/camel-api/src/generated/java/org/apache/camel/spi/annotations/DslArg.java
create mode 100644 core/camel-java-io/pom.xml
create mode 100644
core/camel-java-io/src/generated/java/org/apache/camel/java/out/JavaDslModelWriter.java
create mode 100644
core/camel-java-io/src/generated/resources/META-INF/services/org/apache/camel/other.properties
create mode 100644 core/camel-java-io/src/generated/resources/java-io.json
create mode 100644
core/camel-java-io/src/main/java/org/apache/camel/java/out/JavaDslModelWriterSupport.java
create mode 100644
core/camel-java-io/src/test/java/org/apache/camel/java/out/JavaDslCompileTest.java
create mode 100644
core/camel-java-io/src/test/java/org/apache/camel/java/out/JavaDslModelWriterTest.java
create mode 100644 core/camel-java-io/src/test/resources/aggregateAdvanced.xml
create mode 100644 core/camel-java-io/src/test/resources/beanWithRef.xml
create mode 100644
core/camel-java-io/src/test/resources/circuitBreakerResilience4j.xml
create mode 100644
core/camel-java-io/src/test/resources/claimCheckOperation.xml
create mode 100644 core/camel-java-io/src/test/resources/doTryMultiCatch.xml
create mode 100644
core/camel-java-io/src/test/resources/errorHandlerDefault.xml
create mode 100644 core/camel-java-io/src/test/resources/expressionOptions.xml
create mode 100644 core/camel-java-io/src/test/resources/java-dsl-choice.txt
create mode 100644 core/camel-java-io/src/test/resources/java-dsl-filter.txt
create mode 100644
core/camel-java-io/src/test/resources/java-dsl-set-header.txt
create mode 100644 core/camel-java-io/src/test/resources/java-dsl-simple.txt
create mode 100644 core/camel-java-io/src/test/resources/java-dsl-split.txt
create mode 100644 core/camel-java-io/src/test/resources/java-dsl-wiretap.txt
create mode 100644 core/camel-java-io/src/test/resources/kamelet.xml
create mode 100644 core/camel-java-io/src/test/resources/logWithLevel.xml
create mode 100644 core/camel-java-io/src/test/resources/marshalDataFormats.xml
create mode 100644
core/camel-java-io/src/test/resources/onExceptionAdvanced.xml
create mode 100644 core/camel-java-io/src/test/resources/restOpenApi.xml
create mode 100644 core/camel-java-io/src/test/resources/sagaAdvanced.xml
create mode 100644
core/camel-java-io/src/test/resources/simpleRestConfiguration.xml
copy
dsl/camel-xml-io-dsl/src/test/resources/org/apache/camel/main/xml/camel-my-templated-route.xml
=> core/camel-java-io/src/test/resources/simpleTemplatedRoute.xml (100%)
create mode 100644 core/camel-java-io/src/test/resources/threadsPoolSize.xml
create mode 100644 core/camel-java-io/src/test/resources/throttleAdvanced.xml
create mode 100644
core/camel-java-io/src/test/resources/throwExceptionSimple.xml
create mode 100644 core/camel-java-io/src/test/resources/toWithPattern.xml
create mode 100644 core/camel-xml-io/src/test/resources/aggregate.xml
create mode 100644 core/camel-xml-io/src/test/resources/claimCheck.xml
create mode 100644 core/camel-xml-io/src/test/resources/convertHeaderTo.xml
create mode 100644 core/camel-xml-io/src/test/resources/convertVariableTo.xml
create mode 100644 core/camel-xml-io/src/test/resources/delay.xml
create mode 100644 core/camel-xml-io/src/test/resources/doTryCatchFinally.xml
create mode 100644 core/camel-xml-io/src/test/resources/dynamicRouter.xml
create mode 100644 core/camel-xml-io/src/test/resources/enrichAndPollEnrich.xml
create mode 100644 core/camel-xml-io/src/test/resources/idempotentConsumer.xml
create mode 100644 core/camel-xml-io/src/test/resources/interceptFrom.xml
create mode 100644
core/camel-xml-io/src/test/resources/interceptFromAndSendTo.xml
create mode 100644 core/camel-xml-io/src/test/resources/multicast.xml
create mode 100644 core/camel-xml-io/src/test/resources/onCompletion.xml
create mode 100644 core/camel-xml-io/src/test/resources/pausable.xml
create mode 100644 core/camel-xml-io/src/test/resources/poll.xml
create mode 100644
core/camel-xml-io/src/test/resources/removeHeadersAndProperties.xml
create mode 100644 core/camel-xml-io/src/test/resources/resumable.xml
create mode 100644 core/camel-xml-io/src/test/resources/rollback.xml
create mode 100644 core/camel-xml-io/src/test/resources/sample.xml
create mode 100644 core/camel-xml-io/src/test/resources/setExchangePattern.xml
create mode 100644 core/camel-xml-io/src/test/resources/sort.xml
create mode 100644 core/camel-xml-io/src/test/resources/step.xml
create mode 100644 core/camel-xml-io/src/test/resources/stop.xml
create mode 100644 core/camel-xml-io/src/test/resources/threads.xml
create mode 100644 core/camel-xml-io/src/test/resources/throttle.xml
create mode 100644 core/camel-xml-io/src/test/resources/toD.xml
create mode 100644 core/camel-xml-io/src/test/resources/tokenizer.xml
create mode 100644 core/camel-xml-io/src/test/resources/transacted.xml
create mode 100644 core/camel-xml-io/src/test/resources/transformDataType.xml
create mode 100644 core/camel-xml-io/src/test/resources/unmarshal.xml
create mode 100644 core/camel-xml-io/src/test/resources/validate.xml
create mode 100644 core/camel-xml-io/src/test/resources/wireTap.xml
create mode 100644
docs/user-manual/modules/ROOT/pages/java-dsl-model-writer.adoc
create mode 100644
tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/JavaDslModelWriterGeneratorMojo.java
create mode 100644
tooling/maven/camel-package-maven-plugin/src/main/resources/velocity/model-java-dsl-writer.vm
create mode 100644
tooling/spi-annotations/src/main/java/org/apache/camel/spi/annotations/DslArg.java
