This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch CAMEL-16757b
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 58d633ef6293df3f253643631c69cdd32ee99069
Merge: 54a9346 0ce9094
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Mon Aug 2 06:54:18 2021 +0200
Merge branch 'CAMEL-16757' into CAMEL-16757b
.../org/apache/camel/catalog/models.properties | 2 +
.../camel/catalog/models/routesConfiguration.json | 17 +++
.../camel/catalog/models/routesConfigurations.json | 17 +++
.../apache/camel/catalog/schemas/camel-spring.xsd | 43 +++++++
.../main/java/org/apache/camel/CamelContext.java | 8 ++
.../java/org/apache/camel/CamelContextAware.java | 2 +-
...tAware.java => RouteConfigurationsBuilder.java} | 28 +----
.../java/org/apache/camel/spi/RoutesLoader.java | 19 ++-
.../camel/impl/engine/AbstractCamelContext.java | 17 ++-
.../org/apache/camel/impl/DefaultCamelContext.java | 22 ++++
.../java/org/apache/camel/impl/DefaultModel.java | 23 ++++
.../camel/impl/lw/LightweightCamelContext.java | 22 ++++
.../impl/lw/LightweightRuntimeCamelContext.java | 6 +
.../services/org/apache/camel/model.properties | 3 +-
.../resources/org/apache/camel/model/jaxb.index | 2 +
.../org/apache/camel/model/routeConfiguration.json | 17 +++
.../apache/camel/model/routeConfigurations.json | 16 +++
.../apache/camel/model/templateBeanFactory.json | 17 ---
.../org/apache/camel/builder/BuilderSupport.java | 33 ++++-
.../org/apache/camel/builder/RouteBuilder.java | 22 +++-
.../camel/builder/RouteConfigurationBuilder.java | 91 ++++++++++++++
.../main/java/org/apache/camel/model/Model.java | 21 ++++
.../camel/model/RouteConfigurationDefinition.java | 138 +++++++++++++++++++++
...ion.java => RouteConfigurationsDefinition.java} | 87 ++++++-------
.../camel/model/RouteTemplatesDefinition.java | 3 +-
.../org/apache/camel/model/RoutesDefinition.java | 28 ++++-
.../apache/camel/model/rest/RestsDefinition.java | 3 +-
.../java/org/apache/camel/ContextTestSupport.java | 13 +-
.../model/RoutesConfigurationBuilderTest.java | 87 +++++++++++++
...outesConfigurationMultipleRouteBuilderTest.java | 65 ++++++++++
.../camel/model/RoutesConfigurationTest.java | 59 +++++++++
.../org/apache/camel/main/RoutesConfigurer.java | 39 ++++--
.../java/org/apache/camel/xml/in/ModelParser.java | 47 +++++++
.../dsl/support/RouteBuilderLoaderSupport.java | 2 +
.../camel/dsl/xml/io/XmlRoutesBuilderLoader.java | 34 +++--
.../dsl/xml/jaxb/JaxbXmlRoutesBuilderLoader.java | 13 +-
.../camel-yaml-dsl-deserializers/pom.xml | 2 +
.../dsl/yaml/deserializers/CustomResolver.java | 3 +
.../RouteConfigurationDefinitionDeserializer.java | 64 ++++++++++
.../src/generated/resources/camel-yaml-dsl.json | 39 ++++++
.../camel/dsl/yaml/YamlRoutesBuilderLoader.java | 22 +++-
.../camel/dsl/yaml/RouteConfigurationTest.groovy | 109 ++++++++++++++++
.../packaging/ModelXmlParserGeneratorMojo.java | 4 +-
43 files changed, 1172 insertions(+), 137 deletions(-)
