You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2020/10/24 19:52:11 UTC
[camel] branch master updated: CAMEL-15740: camel-core - Modularize
into core and reifier modules
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new e3460f8 CAMEL-15740: camel-core - Modularize into core and reifier modules
e3460f8 is described below
commit e3460f86f43e9a78a3c4777029fdf86fbe105903
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sat Oct 24 20:42:09 2020 +0200
CAMEL-15740: camel-core - Modularize into core and reifier modules
---
apache-camel/pom.xml | 8 ++
apache-camel/src/main/descriptors/common-bin.xml | 2 +
bom/camel-bom/pom.xml | 10 ++
components/camel-spring/pom.xml | 7 +-
core/camel-core-engine/pom.xml | 7 +-
core/camel-core-model/pom.xml | 103 +++++++++++++++++++++
...ToleranceConfigurationDefinitionConfigurer.java | 0
.../HystrixConfigurationDefinitionConfigurer.java | 0
...ilience4jConfigurationDefinitionConfigurer.java | 0
...mel.model.FaultToleranceConfigurationDefinition | 0
...ache.camel.model.HystrixConfigurationDefinition | 0
...camel.model.Resilience4jConfigurationDefinition | 0
.../services/org/apache/camel/model.properties | 0
.../org/apache/camel/model/aggregate.json | 0
.../resources/org/apache/camel/model/bean.json | 0
.../resources/org/apache/camel/model/choice.json | 0
.../org/apache/camel/model/circuitBreaker.json | 0
.../org/apache/camel/model/claimCheck.json | 0
.../camel/model/cloud/blacklistServiceFilter.json | 0
.../camel/model/cloud/cachingServiceDiscovery.json | 0
.../model/cloud/combinedServiceDiscovery.json | 0
.../camel/model/cloud/combinedServiceFilter.json | 0
.../camel/model/cloud/consulServiceDiscovery.json | 0
.../camel/model/cloud/customServiceFilter.json | 0
.../camel/model/cloud/defaultLoadBalancer.json | 0
.../camel/model/cloud/dnsServiceDiscovery.json | 0
.../camel/model/cloud/etcdServiceDiscovery.json | 0
.../camel/model/cloud/healthyServiceFilter.json | 0
.../org/apache/camel/model/cloud/jaxb.index | 0
.../model/cloud/kubernetesServiceDiscovery.json | 0
.../model/cloud/loadBalancerConfiguration.json | 0
.../model/cloud/passThroughServiceFilter.json | 0
.../camel/model/cloud/ribbonLoadBalancer.json | 0
.../org/apache/camel/model/cloud/serviceCall.json | 0
.../model/cloud/serviceCallConfiguration.json | 0
.../model/cloud/serviceChooserConfiguration.json | 0
.../model/cloud/serviceDiscoveryConfiguration.json | 0
.../camel/model/cloud/serviceExpression.json | 0
.../model/cloud/serviceFilterConfiguration.json | 0
.../camel/model/cloud/staticServiceDiscovery.json | 0
.../model/cloud/zookeeperServiceDiscovery.json | 0
.../apache/camel/model/config/batch-config.json | 0
.../org/apache/camel/model/config/jaxb.index | 0
.../apache/camel/model/config/stream-config.json | 0
.../org/apache/camel/model/contextScan.json | 0
.../org/apache/camel/model/convertBodyTo.json | 0
.../org/apache/camel/model/dataformat/any23.json | 0
.../org/apache/camel/model/dataformat/asn1.json | 0
.../org/apache/camel/model/dataformat/avro.json | 0
.../org/apache/camel/model/dataformat/barcode.json | 0
.../org/apache/camel/model/dataformat/base64.json | 0
.../org/apache/camel/model/dataformat/beanio.json | 0
.../org/apache/camel/model/dataformat/bindy.json | 0
.../org/apache/camel/model/dataformat/cbor.json | 0
.../org/apache/camel/model/dataformat/crypto.json | 0
.../org/apache/camel/model/dataformat/csv.json | 0
.../camel/model/dataformat/customDataFormat.json | 0
.../apache/camel/model/dataformat/dataFormats.json | 0
.../apache/camel/model/dataformat/fhirJson.json | 0
.../org/apache/camel/model/dataformat/fhirXml.json | 0
.../apache/camel/model/dataformat/flatpack.json | 0
.../org/apache/camel/model/dataformat/grok.json | 0
.../camel/model/dataformat/gzipdeflater.json | 0
.../org/apache/camel/model/dataformat/hl7.json | 0
.../org/apache/camel/model/dataformat/ical.json | 0
.../apache/camel/model/dataformat/jacksonxml.json | 0
.../org/apache/camel/model/dataformat/jaxb.index | 0
.../org/apache/camel/model/dataformat/jaxb.json | 0
.../org/apache/camel/model/dataformat/json.json | 0
.../org/apache/camel/model/dataformat/jsonApi.json | 0
.../org/apache/camel/model/dataformat/lzf.json | 0
.../camel/model/dataformat/mime-multipart.json | 0
.../org/apache/camel/model/dataformat/pgp.json | 0
.../apache/camel/model/dataformat/protobuf.json | 0
.../org/apache/camel/model/dataformat/rss.json | 0
.../apache/camel/model/dataformat/secureXML.json | 0
.../apache/camel/model/dataformat/soapjaxb.json | 0
.../org/apache/camel/model/dataformat/syslog.json | 0
.../org/apache/camel/model/dataformat/tarfile.json | 0
.../org/apache/camel/model/dataformat/thrift.json | 0
.../apache/camel/model/dataformat/tidyMarkup.json | 0
.../apache/camel/model/dataformat/typeFilter.json | 0
.../camel/model/dataformat/univocity-csv.json | 0
.../camel/model/dataformat/univocity-fixed.json | 0
.../camel/model/dataformat/univocity-header.json | 0
.../camel/model/dataformat/univocity-tsv.json | 0
.../org/apache/camel/model/dataformat/xmlrpc.json | 0
.../org/apache/camel/model/dataformat/xstream.json | 0
.../org/apache/camel/model/dataformat/yaml.json | 0
.../apache/camel/model/dataformat/zipdeflater.json | 0
.../org/apache/camel/model/dataformat/zipfile.json | 0
.../resources/org/apache/camel/model/delay.json | 0
.../org/apache/camel/model/description.json | 0
.../resources/org/apache/camel/model/doCatch.json | 0
.../org/apache/camel/model/doFinally.json | 0
.../resources/org/apache/camel/model/doTry.json | 0
.../org/apache/camel/model/dynamicRouter.json | 0
.../resources/org/apache/camel/model/enrich.json | 0
.../camel/model/faultToleranceConfiguration.json | 0
.../resources/org/apache/camel/model/filter.json | 0
.../resources/org/apache/camel/model/from.json | 0
.../org/apache/camel/model/globalOption.json | 0
.../org/apache/camel/model/globalOptions.json | 0
.../apache/camel/model/hystrixConfiguration.json | 0
.../org/apache/camel/model/idempotentConsumer.json | 0
.../resources/org/apache/camel/model/inOnly.json | 0
.../resources/org/apache/camel/model/inOut.json | 0
.../org/apache/camel/model/inputType.json | 0
.../org/apache/camel/model/intercept.json | 0
.../org/apache/camel/model/interceptFrom.json | 0
.../camel/model/interceptSendToEndpoint.json | 0
.../resources/org/apache/camel/model/jaxb.index | 0
.../org/apache/camel/model/language/constant.json | 0
.../camel/model/language/exchangeProperty.json | 0
.../apache/camel/model/language/expression.json | 0
.../org/apache/camel/model/language/groovy.json | 0
.../org/apache/camel/model/language/header.json | 0
.../org/apache/camel/model/language/hl7terser.json | 0
.../org/apache/camel/model/language/jaxb.index | 0
.../org/apache/camel/model/language/joor.json | 0
.../org/apache/camel/model/language/jsonpath.json | 0
.../org/apache/camel/model/language/language.json | 0
.../org/apache/camel/model/language/method.json | 0
.../org/apache/camel/model/language/mvel.json | 0
.../org/apache/camel/model/language/ognl.json | 0
.../org/apache/camel/model/language/ref.json | 0
.../org/apache/camel/model/language/simple.json | 0
.../org/apache/camel/model/language/spel.json | 0
.../org/apache/camel/model/language/tokenize.json | 0
.../org/apache/camel/model/language/xpath.json | 0
.../org/apache/camel/model/language/xquery.json | 0
.../org/apache/camel/model/language/xtokenize.json | 0
.../org/apache/camel/model/loadBalance.json | 0
.../model/loadbalancer/customLoadBalancer.json | 0
.../apache/camel/model/loadbalancer/failover.json | 0
.../org/apache/camel/model/loadbalancer/jaxb.index | 0
.../apache/camel/model/loadbalancer/random.json | 0
.../camel/model/loadbalancer/roundRobin.json | 0
.../apache/camel/model/loadbalancer/sticky.json | 0
.../org/apache/camel/model/loadbalancer/topic.json | 0
.../apache/camel/model/loadbalancer/weighted.json | 0
.../resources/org/apache/camel/model/log.json | 0
.../resources/org/apache/camel/model/loop.json | 0
.../resources/org/apache/camel/model/marshal.json | 0
.../org/apache/camel/model/multicast.json | 0
.../org/apache/camel/model/onCompletion.json | 0
.../org/apache/camel/model/onException.json | 0
.../org/apache/camel/model/onFallback.json | 0
.../camel/model/optimisticLockRetryPolicy.json | 0
.../org/apache/camel/model/otherwise.json | 0
.../org/apache/camel/model/outputType.json | 0
.../org/apache/camel/model/packageScan.json | 0
.../resources/org/apache/camel/model/pipeline.json | 0
.../resources/org/apache/camel/model/policy.json | 0
.../org/apache/camel/model/pollEnrich.json | 0
.../resources/org/apache/camel/model/process.json | 0
.../resources/org/apache/camel/model/property.json | 0
.../org/apache/camel/model/recipientList.json | 0
.../org/apache/camel/model/redeliveryPolicy.json | 0
.../org/apache/camel/model/removeHeader.json | 0
.../org/apache/camel/model/removeHeaders.json | 0
.../org/apache/camel/model/removeProperties.json | 0
.../org/apache/camel/model/removeProperty.json | 0
.../org/apache/camel/model/resequence.json | 0
.../camel/model/resilience4jConfiguration.json | 0
.../org/apache/camel/model/rest/apiKey.json | 0
.../org/apache/camel/model/rest/basicAuth.json | 0
.../org/apache/camel/model/rest/delete.json | 0
.../resources/org/apache/camel/model/rest/get.json | 0
.../org/apache/camel/model/rest/head.json | 0
.../org/apache/camel/model/rest/jaxb.index | 0
.../org/apache/camel/model/rest/oauth2.json | 0
.../org/apache/camel/model/rest/param.json | 0
.../org/apache/camel/model/rest/patch.json | 0
.../org/apache/camel/model/rest/post.json | 0
.../resources/org/apache/camel/model/rest/put.json | 0
.../apache/camel/model/rest/responseHeader.json | 0
.../apache/camel/model/rest/responseMessage.json | 0
.../org/apache/camel/model/rest/rest.json | 0
.../org/apache/camel/model/rest/restBinding.json | 0
.../apache/camel/model/rest/restConfiguration.json | 0
.../org/apache/camel/model/rest/restProperty.json | 0
.../org/apache/camel/model/rest/rests.json | 0
.../org/apache/camel/model/rest/security.json | 0
.../camel/model/rest/securityDefinitions.json | 0
.../org/apache/camel/model/rest/verb.json | 0
.../org/apache/camel/model/restContextRef.json | 0
.../resources/org/apache/camel/model/rollback.json | 0
.../resources/org/apache/camel/model/route.json | 0
.../org/apache/camel/model/routeBuilder.json | 0
.../org/apache/camel/model/routeContextRef.json | 0
.../org/apache/camel/model/routeTemplate.json | 0
.../camel/model/routeTemplateContextRef.json | 0
.../org/apache/camel/model/routeTemplates.json | 0
.../resources/org/apache/camel/model/routes.json | 0
.../org/apache/camel/model/routingSlip.json | 0
.../resources/org/apache/camel/model/saga.json | 0
.../resources/org/apache/camel/model/sample.json | 0
.../resources/org/apache/camel/model/script.json | 0
.../resources/org/apache/camel/model/setBody.json | 0
.../org/apache/camel/model/setExchangePattern.json | 0
.../org/apache/camel/model/setHeader.json | 0
.../org/apache/camel/model/setProperty.json | 0
.../resources/org/apache/camel/model/sort.json | 0
.../resources/org/apache/camel/model/split.json | 0
.../resources/org/apache/camel/model/step.json | 0
.../resources/org/apache/camel/model/stop.json | 0
.../org/apache/camel/model/templateParameter.json | 0
.../org/apache/camel/model/threadPoolProfile.json | 0
.../resources/org/apache/camel/model/threads.json | 0
.../resources/org/apache/camel/model/throttle.json | 0
.../org/apache/camel/model/throwException.json | 0
.../resources/org/apache/camel/model/to.json | 0
.../resources/org/apache/camel/model/toD.json | 0
.../org/apache/camel/model/transacted.json | 0
.../org/apache/camel/model/transform.json | 0
.../org/apache/camel/model/transformer/jaxb.index | 0
.../camel/model/transformer/transformers.json | 0
.../org/apache/camel/model/unmarshal.json | 0
.../resources/org/apache/camel/model/validate.json | 0
.../org/apache/camel/model/validator/jaxb.index | 0
.../apache/camel/model/validator/validators.json | 0
.../resources/org/apache/camel/model/when.json | 0
.../apache/camel/model/whenSkipSendToEndpoint.json | 0
.../resources/org/apache/camel/model/wireTap.json | 0
.../java/org/apache/camel/builder/AdviceWith.java | 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
.../apache/camel/builder/LambdaRouteBuilder.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
.../builder/RouteBuilderLifecycleStrategy.java | 0
.../org/apache/camel/builder/SimpleBuilder.java | 0
.../camel/builder/TemplatedRouteBuilder.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
.../apache/camel/model/AdviceWithDefinition.java | 0
.../apache/camel/model/AggregateDefinition.java | 0
.../org/apache/camel/model/BeanDefinition.java | 0
.../main/java/org/apache/camel/model/Block.java | 0
.../org/apache/camel/model/CatchDefinition.java | 0
.../org/apache/camel/model/ChoiceDefinition.java | 0
.../camel/model/CircuitBreakerDefinition.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
.../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
.../model/FaultToleranceConfigurationCommon.java | 0
.../FaultToleranceConfigurationDefinition.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
.../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
.../main/java/org/apache/camel/model/Model.java | 0
.../org/apache/camel/model/ModelCamelContext.java | 0
.../apache/camel/model/ModelLifecycleStrategy.java | 0
.../camel/model/ModelLifecycleStrategySupport.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/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/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
.../model/Resilience4jConfigurationCommon.java | 0
.../model/Resilience4jConfigurationDefinition.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
.../apache/camel/model/RouteTemplateContainer.java | 0
.../model/RouteTemplateContextRefDefinition.java | 0
.../RouteTemplateContextRefDefinitionHelper.java | 0
.../camel/model/RouteTemplateDefinition.java | 0
.../model/RouteTemplateParameterDefinition.java | 0
.../camel/model/RouteTemplatesDefinition.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
.../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
.../model/cloud/ServiceCallConfiguration.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
.../DeadLetterChannelConfiguration.java | 0
.../DefaultErrorHandlerConfiguration.java | 0
.../model/errorhandler/ErrorHandlerHelper.java | 0
.../errorhandler/ErrorHandlerRefConfiguration.java | 0
.../errorhandler/NoErrorHandlerConfiguraiton.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/JoorExpression.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/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
core/camel-core-reifier/pom.xml | 87 +++++++++++++++++
.../camel/reifier/AbstractPolicyReifier.java | 0
.../org/apache/camel/reifier/AbstractReifier.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
.../camel/reifier/CircuitBreakerReifier.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
.../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
.../camel/reifier/language/ExpressionReifier.java | 0
.../reifier/language/JoorExpressionReifier.java | 0
.../language/JsonPathExpressionReifier.java | 0
.../language/MethodCallExpressionReifier.java | 0
.../reifier/language/SimpleExpressionReifier.java | 0
.../language/TokenizerExpressionReifier.java | 0
.../language/XMLTokenizerExpressionReifier.java | 0
.../reifier/language/XPathExpressionReifier.java | 0
.../reifier/language/XQueryExpressionReifier.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/DataFormatTransformerReifier.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
core/pom.xml | 2 +
parent/pom.xml | 10 ++
.../apache/camel/tooling/util/PackageHelper.java | 4 +
.../camel/maven/EipDocumentationEnricherMojo.java | 13 ++-
.../maven/EipDocumentationEnricherMojoTest.java | 18 +---
.../integration/EIPDocumentationMojoTest.java | 2 +-
.../maven/packaging/PackageDataFormatMojo.java | 4 +-
.../camel/maven/packaging/PackageLanguageMojo.java | 4 +-
.../camel/maven/packaging/PrepareCatalogMojo.java | 13 ++-
.../camel/maven/packaging/UpdateReadmeMojo.java | 4 +-
700 files changed, 259 insertions(+), 39 deletions(-)
diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index 2c1e32f..00a8870 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -78,6 +78,14 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-core-model</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core-reifier</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-core-languages</artifactId>
</dependency>
<dependency>
diff --git a/apache-camel/src/main/descriptors/common-bin.xml b/apache-camel/src/main/descriptors/common-bin.xml
index 30a1329..acec19a 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -35,6 +35,8 @@
<include>org.apache.camel:camel-support</include>
<include>org.apache.camel:camel-core</include>
<include>org.apache.camel:camel-core-engine</include>
+ <include>org.apache.camel:camel-core-model</include>
+ <include>org.apache.camel:camel-core-reifier</include>
<include>org.apache.camel:camel-core-languages</include>
<include>org.apache.camel:camel-core-xml</include>
<include>org.apache.camel:camel-core-catalog</include>
diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index 060f690..181d335 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -544,6 +544,16 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-core-model</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core-reifier</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-core-xml</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/components/camel-spring/pom.xml b/components/camel-spring/pom.xml
index b241add..86e30b3 100644
--- a/components/camel-spring/pom.xml
+++ b/components/camel-spring/pom.xml
@@ -383,13 +383,13 @@
</artifactItem>
<artifactItem>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-core-engine</artifactId>
+ <artifactId>camel-core-model</artifactId>
<version>${project.version}</version>
<type>jar</type>
<classifier>sources</classifier>
<overWrite>true</overWrite>
<excludes>**/*nDefinitionConfigurer.java</excludes>
- <outputDirectory>target/sources/camel-core-engine</outputDirectory>
+ <outputDirectory>target/sources/camel-core-model</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.apache.camel</groupId>
@@ -468,7 +468,7 @@
<include name="org/apache/camel/ShutdownRunningTask.java" />
<include name="org/apache/camel/WaitForTaskToComplete.java" />
</fileset>
- <fileset dir="${project.build.directory}/sources/camel-core-engine">
+ <fileset dir="${project.build.directory}/sources/camel-core-model">
<include name="org/apache/camel/model/**/*.java" />
<include name="org/apache/camel/package-info.java" />
</fileset>
@@ -634,6 +634,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-model/apidocs/</link>
<link>http://camel.apache.org/maven/current/camel-core-engine/apidocs/</link>
</links>
<linksource>true</linksource>
diff --git a/core/camel-core-engine/pom.xml b/core/camel-core-engine/pom.xml
index 4cbe311..490bc06 100644
--- a/core/camel-core-engine/pom.xml
+++ b/core/camel-core-engine/pom.xml
@@ -72,6 +72,10 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-core-reifier</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-management-api</artifactId>
</dependency>
<dependency>
@@ -135,9 +139,6 @@
<class>org.apache.camel.ExtendedCamelContext=org.apache.camel.impl.ExtendedCamelContext</class>
<!-- we want to have configurer for RestConfiguration in camel-core-engine -->
<class>org.apache.camel.spi.RestConfiguration=org.apache.camel.impl.RestConfiguration</class>
- <class>org.apache.camel.model.FaultToleranceConfigurationDefinition</class>
- <class>org.apache.camel.model.Resilience4jConfigurationDefinition</class>
- <class>org.apache.camel.model.HystrixConfigurationDefinition</class>
</classes>
</configuration>
</execution>
diff --git a/core/camel-core-model/pom.xml b/core/camel-core-model/pom.xml
new file mode 100644
index 0000000..5fcfdcb
--- /dev/null
+++ b/core/camel-core-model/pom.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>core</artifactId>
+ <version>3.7.0-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
+
+ <artifactId>camel-core-model</artifactId>
+ <packaging>jar</packaging>
+
+ <name>Camel :: Core Model</name>
+ <description>Camel model</description>
+
+ <properties>
+ <firstVersion>3.7.0</firstVersion>
+ <label>core</label>
+ </properties>
+
+ <dependencies>
+
+ <!-- required dependencies by camel-core -->
+ <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-support</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-util</artifactId>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-package-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-configurer</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>generate-configurer</goal>
+ </goals>
+ <configuration>
+ <discoverClasses>false</discoverClasses>
+ <classes>
+ <class>org.apache.camel.model.FaultToleranceConfigurationDefinition</class>
+ <class>org.apache.camel.model.Resilience4jConfigurationDefinition</class>
+ <class>org.apache.camel.model.HystrixConfigurationDefinition</class>
+ </classes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-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>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
diff --git a/core/camel-core-engine/src/generated/java/org/apache/camel/model/FaultToleranceConfigurationDefinitionConfigurer.java b/core/camel-core-model/src/generated/java/org/apache/camel/model/FaultToleranceConfigurationDefinitionConfigurer.java
similarity index 100%
rename from core/camel-core-engine/src/generated/java/org/apache/camel/model/FaultToleranceConfigurationDefinitionConfigurer.java
rename to core/camel-core-model/src/generated/java/org/apache/camel/model/FaultToleranceConfigurationDefinitionConfigurer.java
diff --git a/core/camel-core-engine/src/generated/java/org/apache/camel/model/HystrixConfigurationDefinitionConfigurer.java b/core/camel-core-model/src/generated/java/org/apache/camel/model/HystrixConfigurationDefinitionConfigurer.java
similarity index 100%
rename from core/camel-core-engine/src/generated/java/org/apache/camel/model/HystrixConfigurationDefinitionConfigurer.java
rename to core/camel-core-model/src/generated/java/org/apache/camel/model/HystrixConfigurationDefinitionConfigurer.java
diff --git a/core/camel-core-engine/src/generated/java/org/apache/camel/model/Resilience4jConfigurationDefinitionConfigurer.java b/core/camel-core-model/src/generated/java/org/apache/camel/model/Resilience4jConfigurationDefinitionConfigurer.java
similarity index 100%
rename from core/camel-core-engine/src/generated/java/org/apache/camel/model/Resilience4jConfigurationDefinitionConfigurer.java
rename to core/camel-core-model/src/generated/java/org/apache/camel/model/Resilience4jConfigurationDefinitionConfigurer.java
diff --git a/core/camel-core-engine/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.model.FaultToleranceConfigurationDefinition b/core/camel-core-model/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.model.FaultToleranceConfigurationDefinition
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.model.FaultToleranceConfigurationDefinition
rename to core/camel-core-model/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.model.FaultToleranceConfigurationDefinition
diff --git a/core/camel-core-engine/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.model.HystrixConfigurationDefinition b/core/camel-core-model/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.model.HystrixConfigurationDefinition
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.model.HystrixConfigurationDefinition
rename to core/camel-core-model/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.model.HystrixConfigurationDefinition
diff --git a/core/camel-core-engine/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.model.Resilience4jConfigurationDefinition b/core/camel-core-model/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.model.Resilience4jConfigurationDefinition
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.model.Resilience4jConfigurationDefinition
rename to core/camel-core-model/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.model.Resilience4jConfigurationDefinition
diff --git a/core/camel-core-engine/src/generated/resources/META-INF/services/org/apache/camel/model.properties b/core/camel-core-model/src/generated/resources/META-INF/services/org/apache/camel/model.properties
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/META-INF/services/org/apache/camel/model.properties
rename to core/camel-core-model/src/generated/resources/META-INF/services/org/apache/camel/model.properties
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/aggregate.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/aggregate.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/aggregate.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/aggregate.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/bean.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/bean.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/bean.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/bean.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/choice.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/choice.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/choice.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/choice.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/circuitBreaker.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/circuitBreaker.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/circuitBreaker.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/circuitBreaker.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/claimCheck.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/claimCheck.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/claimCheck.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/claimCheck.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/blacklistServiceFilter.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/blacklistServiceFilter.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/blacklistServiceFilter.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/blacklistServiceFilter.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/cachingServiceDiscovery.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/cachingServiceDiscovery.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/cachingServiceDiscovery.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/cachingServiceDiscovery.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/combinedServiceDiscovery.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/combinedServiceDiscovery.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/combinedServiceDiscovery.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/combinedServiceDiscovery.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/combinedServiceFilter.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/combinedServiceFilter.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/combinedServiceFilter.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/combinedServiceFilter.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/consulServiceDiscovery.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/consulServiceDiscovery.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/consulServiceDiscovery.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/consulServiceDiscovery.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/customServiceFilter.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/customServiceFilter.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/customServiceFilter.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/customServiceFilter.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/defaultLoadBalancer.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/defaultLoadBalancer.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/defaultLoadBalancer.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/defaultLoadBalancer.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/dnsServiceDiscovery.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/dnsServiceDiscovery.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/dnsServiceDiscovery.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/dnsServiceDiscovery.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/etcdServiceDiscovery.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/etcdServiceDiscovery.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/etcdServiceDiscovery.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/etcdServiceDiscovery.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/healthyServiceFilter.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/healthyServiceFilter.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/healthyServiceFilter.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/healthyServiceFilter.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/jaxb.index b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/jaxb.index
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/jaxb.index
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/jaxb.index
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/kubernetesServiceDiscovery.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/kubernetesServiceDiscovery.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/kubernetesServiceDiscovery.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/kubernetesServiceDiscovery.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/loadBalancerConfiguration.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/loadBalancerConfiguration.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/loadBalancerConfiguration.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/loadBalancerConfiguration.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/passThroughServiceFilter.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/passThroughServiceFilter.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/passThroughServiceFilter.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/passThroughServiceFilter.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/ribbonLoadBalancer.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/ribbonLoadBalancer.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/ribbonLoadBalancer.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/ribbonLoadBalancer.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/serviceCall.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/serviceCall.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/serviceCall.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/serviceCall.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/serviceCallConfiguration.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/serviceCallConfiguration.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/serviceCallConfiguration.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/serviceCallConfiguration.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/serviceChooserConfiguration.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/serviceChooserConfiguration.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/serviceChooserConfiguration.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/serviceChooserConfiguration.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/serviceDiscoveryConfiguration.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/serviceDiscoveryConfiguration.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/serviceDiscoveryConfiguration.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/serviceDiscoveryConfiguration.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/serviceExpression.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/serviceExpression.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/serviceExpression.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/serviceExpression.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/serviceFilterConfiguration.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/serviceFilterConfiguration.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/serviceFilterConfiguration.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/serviceFilterConfiguration.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/staticServiceDiscovery.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/staticServiceDiscovery.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/staticServiceDiscovery.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/staticServiceDiscovery.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/zookeeperServiceDiscovery.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/zookeeperServiceDiscovery.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/zookeeperServiceDiscovery.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/zookeeperServiceDiscovery.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/config/batch-config.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/config/batch-config.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/config/batch-config.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/config/batch-config.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/config/jaxb.index b/core/camel-core-model/src/generated/resources/org/apache/camel/model/config/jaxb.index
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/config/jaxb.index
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/config/jaxb.index
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/config/stream-config.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/config/stream-config.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/config/stream-config.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/config/stream-config.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/contextScan.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/contextScan.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/contextScan.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/contextScan.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/convertBodyTo.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/convertBodyTo.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/convertBodyTo.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/convertBodyTo.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/any23.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/any23.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/any23.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/any23.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/asn1.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/asn1.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/asn1.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/asn1.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/avro.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/avro.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/avro.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/avro.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/barcode.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/barcode.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/barcode.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/barcode.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/base64.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/base64.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/base64.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/base64.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/beanio.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/beanio.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/beanio.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/beanio.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/bindy.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/bindy.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/bindy.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/bindy.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/cbor.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/cbor.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/cbor.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/cbor.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/crypto.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/crypto.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/crypto.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/crypto.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/csv.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/csv.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/csv.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/csv.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/customDataFormat.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/customDataFormat.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/customDataFormat.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/customDataFormat.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/dataFormats.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/dataFormats.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/dataFormats.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/dataFormats.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/fhirJson.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/fhirJson.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/fhirJson.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/fhirJson.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/fhirXml.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/fhirXml.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/fhirXml.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/fhirXml.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/flatpack.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/flatpack.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/flatpack.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/flatpack.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/grok.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/grok.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/grok.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/grok.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/gzipdeflater.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/gzipdeflater.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/gzipdeflater.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/gzipdeflater.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/hl7.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/hl7.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/hl7.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/hl7.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/ical.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/ical.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/ical.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/ical.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/jacksonxml.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/jacksonxml.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/jacksonxml.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/jacksonxml.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/jaxb.index b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/jaxb.index
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/jaxb.index
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/jaxb.index
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/jaxb.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/jaxb.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/jaxb.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/jaxb.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/json.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/json.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/json.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/json.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/jsonApi.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/jsonApi.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/jsonApi.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/jsonApi.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/lzf.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/lzf.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/lzf.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/lzf.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/mime-multipart.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/mime-multipart.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/mime-multipart.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/mime-multipart.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/pgp.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/pgp.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/pgp.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/pgp.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/protobuf.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/protobuf.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/protobuf.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/protobuf.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/rss.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/rss.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/rss.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/rss.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/secureXML.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/secureXML.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/secureXML.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/secureXML.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/soapjaxb.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/soapjaxb.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/soapjaxb.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/soapjaxb.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/syslog.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/syslog.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/syslog.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/syslog.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/tarfile.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/tarfile.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/tarfile.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/tarfile.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/thrift.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/thrift.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/thrift.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/thrift.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/tidyMarkup.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/tidyMarkup.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/tidyMarkup.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/tidyMarkup.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/typeFilter.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/typeFilter.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/typeFilter.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/typeFilter.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/univocity-csv.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/univocity-csv.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/univocity-csv.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/univocity-csv.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/univocity-fixed.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/univocity-fixed.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/univocity-fixed.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/univocity-fixed.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/univocity-header.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/univocity-header.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/univocity-header.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/univocity-header.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/univocity-tsv.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/univocity-tsv.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/univocity-tsv.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/univocity-tsv.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/xmlrpc.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/xmlrpc.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/xmlrpc.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/xmlrpc.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/xstream.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/xstream.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/xstream.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/xstream.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/yaml.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/yaml.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/yaml.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/yaml.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/zipdeflater.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/zipdeflater.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/zipdeflater.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/zipdeflater.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/zipfile.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/zipfile.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/zipfile.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/zipfile.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/delay.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/delay.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/delay.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/delay.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/description.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/description.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/description.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/description.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/doCatch.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/doCatch.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/doCatch.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/doCatch.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/doFinally.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/doFinally.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/doFinally.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/doFinally.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/doTry.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/doTry.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/doTry.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/doTry.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dynamicRouter.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dynamicRouter.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/dynamicRouter.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/dynamicRouter.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/enrich.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/enrich.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/enrich.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/enrich.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/faultToleranceConfiguration.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/faultToleranceConfiguration.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/faultToleranceConfiguration.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/faultToleranceConfiguration.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/filter.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/filter.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/filter.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/filter.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/from.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/from.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/from.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/from.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/globalOption.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/globalOption.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/globalOption.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/globalOption.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/globalOptions.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/globalOptions.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/globalOptions.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/globalOptions.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/hystrixConfiguration.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/hystrixConfiguration.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/hystrixConfiguration.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/hystrixConfiguration.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/idempotentConsumer.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/idempotentConsumer.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/idempotentConsumer.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/idempotentConsumer.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/inOnly.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/inOnly.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/inOnly.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/inOnly.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/inOut.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/inOut.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/inOut.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/inOut.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/inputType.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/inputType.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/inputType.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/inputType.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/intercept.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/intercept.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/intercept.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/intercept.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/interceptFrom.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/interceptFrom.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/interceptFrom.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/interceptFrom.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/interceptSendToEndpoint.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/interceptSendToEndpoint.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/interceptSendToEndpoint.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/interceptSendToEndpoint.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/jaxb.index b/core/camel-core-model/src/generated/resources/org/apache/camel/model/jaxb.index
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/jaxb.index
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/jaxb.index
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/constant.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/constant.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/constant.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/language/constant.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/exchangeProperty.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/exchangeProperty.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/exchangeProperty.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/language/exchangeProperty.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/expression.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/expression.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/expression.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/language/expression.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/groovy.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/groovy.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/groovy.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/language/groovy.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/header.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/header.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/header.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/language/header.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/hl7terser.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/hl7terser.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/hl7terser.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/language/hl7terser.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/jaxb.index b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/jaxb.index
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/jaxb.index
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/language/jaxb.index
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/joor.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/joor.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/joor.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/language/joor.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/jsonpath.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/jsonpath.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/jsonpath.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/language/jsonpath.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/language.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/language.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/language.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/language/language.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/method.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/method.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/method.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/language/method.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/mvel.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/mvel.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/mvel.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/language/mvel.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/ognl.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/ognl.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/ognl.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/language/ognl.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/ref.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/ref.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/ref.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/language/ref.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/simple.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/simple.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/simple.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/language/simple.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/spel.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/spel.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/spel.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/language/spel.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/tokenize.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/tokenize.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/tokenize.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/language/tokenize.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/xpath.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/xpath.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/xpath.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/language/xpath.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/xquery.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/xquery.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/xquery.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/language/xquery.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/xtokenize.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/xtokenize.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/xtokenize.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/language/xtokenize.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/loadBalance.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/loadBalance.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/loadBalance.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/loadBalance.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/loadbalancer/customLoadBalancer.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/loadbalancer/customLoadBalancer.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/loadbalancer/customLoadBalancer.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/loadbalancer/customLoadBalancer.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/loadbalancer/failover.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/loadbalancer/failover.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/loadbalancer/failover.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/loadbalancer/failover.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/loadbalancer/jaxb.index b/core/camel-core-model/src/generated/resources/org/apache/camel/model/loadbalancer/jaxb.index
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/loadbalancer/jaxb.index
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/loadbalancer/jaxb.index
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/loadbalancer/random.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/loadbalancer/random.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/loadbalancer/random.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/loadbalancer/random.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/loadbalancer/roundRobin.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/loadbalancer/roundRobin.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/loadbalancer/roundRobin.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/loadbalancer/roundRobin.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/loadbalancer/sticky.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/loadbalancer/sticky.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/loadbalancer/sticky.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/loadbalancer/sticky.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/loadbalancer/topic.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/loadbalancer/topic.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/loadbalancer/topic.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/loadbalancer/topic.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/loadbalancer/weighted.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/loadbalancer/weighted.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/loadbalancer/weighted.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/loadbalancer/weighted.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/log.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/log.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/log.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/log.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/loop.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/loop.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/loop.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/loop.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/marshal.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/marshal.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/marshal.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/marshal.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/multicast.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/multicast.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/multicast.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/multicast.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/onCompletion.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/onCompletion.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/onCompletion.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/onCompletion.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/onException.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/onException.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/onException.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/onException.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/onFallback.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/onFallback.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/onFallback.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/onFallback.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/optimisticLockRetryPolicy.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/optimisticLockRetryPolicy.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/optimisticLockRetryPolicy.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/optimisticLockRetryPolicy.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/otherwise.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/otherwise.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/otherwise.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/otherwise.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/outputType.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/outputType.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/outputType.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/outputType.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/packageScan.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/packageScan.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/packageScan.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/packageScan.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/pipeline.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/pipeline.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/pipeline.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/pipeline.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/policy.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/policy.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/policy.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/policy.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/pollEnrich.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/pollEnrich.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/pollEnrich.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/pollEnrich.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/process.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/process.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/process.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/process.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/property.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/property.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/property.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/property.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/recipientList.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/recipientList.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/recipientList.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/recipientList.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/redeliveryPolicy.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/redeliveryPolicy.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/redeliveryPolicy.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/redeliveryPolicy.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/removeHeader.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/removeHeader.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/removeHeader.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/removeHeader.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/removeHeaders.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/removeHeaders.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/removeHeaders.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/removeHeaders.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/removeProperties.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/removeProperties.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/removeProperties.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/removeProperties.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/removeProperty.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/removeProperty.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/removeProperty.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/removeProperty.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/resequence.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/resequence.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/resequence.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/resequence.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/resilience4jConfiguration.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/resilience4jConfiguration.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/resilience4jConfiguration.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/resilience4jConfiguration.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/apiKey.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/apiKey.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/apiKey.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/apiKey.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/basicAuth.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/basicAuth.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/basicAuth.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/basicAuth.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/delete.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/delete.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/delete.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/delete.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/get.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/get.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/get.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/get.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/head.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/head.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/head.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/head.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/jaxb.index b/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/jaxb.index
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/jaxb.index
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/jaxb.index
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/oauth2.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/oauth2.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/oauth2.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/oauth2.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/param.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/param.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/param.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/param.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/patch.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/patch.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/patch.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/patch.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/post.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/post.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/post.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/post.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/put.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/put.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/put.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/put.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/responseHeader.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/responseHeader.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/responseHeader.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/responseHeader.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/responseMessage.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/responseMessage.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/responseMessage.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/responseMessage.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/rest.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/rest.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/rest.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/rest.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/restBinding.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/restBinding.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/restBinding.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/restBinding.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/restConfiguration.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/restConfiguration.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/restConfiguration.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/restConfiguration.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/restProperty.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/restProperty.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/restProperty.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/restProperty.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/rests.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/rests.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/rests.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/rests.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/security.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/security.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/security.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/security.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/securityDefinitions.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/securityDefinitions.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/securityDefinitions.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/securityDefinitions.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/verb.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/verb.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/verb.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/verb.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/restContextRef.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/restContextRef.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/restContextRef.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/restContextRef.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rollback.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/rollback.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/rollback.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/rollback.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/route.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/route.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/route.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/route.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/routeBuilder.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/routeBuilder.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/routeBuilder.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/routeBuilder.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/routeContextRef.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/routeContextRef.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/routeContextRef.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/routeContextRef.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/routeTemplate.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/routeTemplate.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/routeTemplate.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/routeTemplate.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/routeTemplateContextRef.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/routeTemplateContextRef.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/routeTemplateContextRef.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/routeTemplateContextRef.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/routeTemplates.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/routeTemplates.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/routeTemplates.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/routeTemplates.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/routes.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/routes.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/routes.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/routes.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/routingSlip.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/routingSlip.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/routingSlip.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/routingSlip.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/saga.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/saga.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/saga.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/saga.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/sample.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/sample.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/sample.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/sample.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/script.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/script.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/script.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/script.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/setBody.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/setBody.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/setBody.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/setBody.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/setExchangePattern.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/setExchangePattern.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/setExchangePattern.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/setExchangePattern.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/setHeader.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/setHeader.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/setHeader.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/setHeader.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/setProperty.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/setProperty.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/setProperty.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/setProperty.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/sort.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/sort.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/sort.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/sort.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/split.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/split.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/split.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/split.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/step.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/step.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/step.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/step.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/stop.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/stop.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/stop.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/stop.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/templateParameter.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/templateParameter.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/templateParameter.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/templateParameter.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/threadPoolProfile.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/threadPoolProfile.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/threadPoolProfile.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/threadPoolProfile.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/threads.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/threads.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/threads.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/threads.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/throttle.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/throttle.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/throttle.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/throttle.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/throwException.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/throwException.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/throwException.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/throwException.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/to.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/to.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/to.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/to.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/toD.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/toD.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/toD.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/toD.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/transacted.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/transacted.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/transacted.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/transacted.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/transform.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/transform.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/transform.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/transform.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/transformer/jaxb.index b/core/camel-core-model/src/generated/resources/org/apache/camel/model/transformer/jaxb.index
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/transformer/jaxb.index
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/transformer/jaxb.index
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/transformer/transformers.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/transformer/transformers.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/transformer/transformers.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/transformer/transformers.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/unmarshal.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/unmarshal.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/unmarshal.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/unmarshal.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/validate.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/validate.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/validate.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/validate.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/validator/jaxb.index b/core/camel-core-model/src/generated/resources/org/apache/camel/model/validator/jaxb.index
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/validator/jaxb.index
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/validator/jaxb.index
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/validator/validators.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/validator/validators.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/validator/validators.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/validator/validators.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/when.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/when.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/when.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/when.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/whenSkipSendToEndpoint.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/whenSkipSendToEndpoint.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/whenSkipSendToEndpoint.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/whenSkipSendToEndpoint.json
diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/wireTap.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/wireTap.json
similarity index 100%
rename from core/camel-core-engine/src/generated/resources/org/apache/camel/model/wireTap.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/wireTap.json
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/builder/AdviceWith.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/AdviceWith.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/builder/AdviceWith.java
rename to core/camel-core-model/src/main/java/org/apache/camel/builder/AdviceWith.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/builder/AdviceWithBuilder.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/AdviceWithBuilder.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/builder/AdviceWithBuilder.java
rename to core/camel-core-model/src/main/java/org/apache/camel/builder/AdviceWithBuilder.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/builder/AdviceWithRouteBuilder.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/AdviceWithRouteBuilder.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/builder/AdviceWithRouteBuilder.java
rename to core/camel-core-model/src/main/java/org/apache/camel/builder/AdviceWithRouteBuilder.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/builder/AdviceWithTask.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/AdviceWithTask.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/builder/AdviceWithTask.java
rename to core/camel-core-model/src/main/java/org/apache/camel/builder/AdviceWithTask.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/builder/AdviceWithTasks.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/AdviceWithTasks.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/builder/AdviceWithTasks.java
rename to core/camel-core-model/src/main/java/org/apache/camel/builder/AdviceWithTasks.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/builder/AggregationStrategies.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/AggregationStrategies.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/builder/AggregationStrategies.java
rename to core/camel-core-model/src/main/java/org/apache/camel/builder/AggregationStrategies.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/builder/AggregationStrategyClause.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/AggregationStrategyClause.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/builder/AggregationStrategyClause.java
rename to core/camel-core-model/src/main/java/org/apache/camel/builder/AggregationStrategyClause.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/builder/Builder.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/Builder.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/builder/Builder.java
rename to core/camel-core-model/src/main/java/org/apache/camel/builder/Builder.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/builder/BuilderSupport.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/BuilderSupport.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/builder/BuilderSupport.java
rename to core/camel-core-model/src/main/java/org/apache/camel/builder/BuilderSupport.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/builder/DataFormatClause.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/DataFormatClause.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/builder/DataFormatClause.java
rename to core/camel-core-model/src/main/java/org/apache/camel/builder/DataFormatClause.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java
rename to core/camel-core-model/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java
rename to core/camel-core-model/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/builder/EndpointConsumerBuilder.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/EndpointConsumerBuilder.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/builder/EndpointConsumerBuilder.java
rename to core/camel-core-model/src/main/java/org/apache/camel/builder/EndpointConsumerBuilder.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/builder/EndpointProducerBuilder.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/EndpointProducerBuilder.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/builder/EndpointProducerBuilder.java
rename to core/camel-core-model/src/main/java/org/apache/camel/builder/EndpointProducerBuilder.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/builder/EnrichClause.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/EnrichClause.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/builder/EnrichClause.java
rename to core/camel-core-model/src/main/java/org/apache/camel/builder/EnrichClause.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/builder/ErrorHandlerBuilder.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/ErrorHandlerBuilder.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/builder/ErrorHandlerBuilder.java
rename to core/camel-core-model/src/main/java/org/apache/camel/builder/ErrorHandlerBuilder.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java
rename to core/camel-core-model/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java
rename to core/camel-core-model/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/builder/ExchangeBuilder.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/ExchangeBuilder.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/builder/ExchangeBuilder.java
rename to core/camel-core-model/src/main/java/org/apache/camel/builder/ExchangeBuilder.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/builder/ExpressionBuilder.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
rename to core/camel-core-model/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/builder/ExpressionClause.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/ExpressionClause.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/builder/ExpressionClause.java
rename to core/camel-core-model/src/main/java/org/apache/camel/builder/ExpressionClause.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
rename to core/camel-core-model/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/builder/FlexibleAggregationStrategy.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/FlexibleAggregationStrategy.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/builder/FlexibleAggregationStrategy.java
rename to core/camel-core-model/src/main/java/org/apache/camel/builder/FlexibleAggregationStrategy.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/builder/LambdaRouteBuilder.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/LambdaRouteBuilder.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/builder/LambdaRouteBuilder.java
rename to core/camel-core-model/src/main/java/org/apache/camel/builder/LambdaRouteBuilder.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/builder/NoErrorHandlerBuilder.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/NoErrorHandlerBuilder.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/builder/NoErrorHandlerBuilder.java
rename to core/camel-core-model/src/main/java/org/apache/camel/builder/NoErrorHandlerBuilder.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/builder/NotifyBuilder.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/NotifyBuilder.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/builder/NotifyBuilder.java
rename to core/camel-core-model/src/main/java/org/apache/camel/builder/NotifyBuilder.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/builder/PredicateBuilder.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/PredicateBuilder.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/builder/PredicateBuilder.java
rename to core/camel-core-model/src/main/java/org/apache/camel/builder/PredicateBuilder.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/builder/PredicateClause.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/PredicateClause.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/builder/PredicateClause.java
rename to core/camel-core-model/src/main/java/org/apache/camel/builder/PredicateClause.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/builder/ProcessClause.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/ProcessClause.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/builder/ProcessClause.java
rename to core/camel-core-model/src/main/java/org/apache/camel/builder/ProcessClause.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/builder/ProxyBuilder.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/ProxyBuilder.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/builder/ProxyBuilder.java
rename to core/camel-core-model/src/main/java/org/apache/camel/builder/ProxyBuilder.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/builder/RouteBuilder.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteBuilder.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/builder/RouteBuilder.java
rename to core/camel-core-model/src/main/java/org/apache/camel/builder/RouteBuilder.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/builder/RouteBuilderLifecycleStrategy.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteBuilderLifecycleStrategy.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/builder/RouteBuilderLifecycleStrategy.java
rename to core/camel-core-model/src/main/java/org/apache/camel/builder/RouteBuilderLifecycleStrategy.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/builder/SimpleBuilder.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/SimpleBuilder.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/builder/SimpleBuilder.java
rename to core/camel-core-model/src/main/java/org/apache/camel/builder/SimpleBuilder.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/builder/TemplatedRouteBuilder.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/TemplatedRouteBuilder.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/builder/TemplatedRouteBuilder.java
rename to core/camel-core-model/src/main/java/org/apache/camel/builder/TemplatedRouteBuilder.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/builder/ThreadPoolBuilder.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/ThreadPoolBuilder.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/builder/ThreadPoolBuilder.java
rename to core/camel-core-model/src/main/java/org/apache/camel/builder/ThreadPoolBuilder.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/builder/ThreadPoolProfileBuilder.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/ThreadPoolProfileBuilder.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/builder/ThreadPoolProfileBuilder.java
rename to core/camel-core-model/src/main/java/org/apache/camel/builder/ThreadPoolProfileBuilder.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/builder/TransformerBuilder.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/TransformerBuilder.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/builder/TransformerBuilder.java
rename to core/camel-core-model/src/main/java/org/apache/camel/builder/TransformerBuilder.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/builder/ValidatorBuilder.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/ValidatorBuilder.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/builder/ValidatorBuilder.java
rename to core/camel-core-model/src/main/java/org/apache/camel/builder/ValidatorBuilder.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/builder/ValueBuilder.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/ValueBuilder.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/builder/ValueBuilder.java
rename to core/camel-core-model/src/main/java/org/apache/camel/builder/ValueBuilder.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/builder/package.html b/core/camel-core-model/src/main/java/org/apache/camel/builder/package.html
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/builder/package.html
rename to core/camel-core-model/src/main/java/org/apache/camel/builder/package.html
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/AdviceWithDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/AdviceWithDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/AdviceWithDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/AdviceWithDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/AggregateDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/AggregateDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/AggregateDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/AggregateDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/BeanDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/BeanDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/BeanDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/BeanDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/Block.java b/core/camel-core-model/src/main/java/org/apache/camel/model/Block.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/Block.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/Block.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/CatchDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/CatchDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/CatchDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/CatchDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/ChoiceDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/ChoiceDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/ChoiceDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/ChoiceDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/CircuitBreakerDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/CircuitBreakerDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/CircuitBreakerDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/CircuitBreakerDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/ClaimCheckDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/ClaimCheckDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/ClaimCheckDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/ClaimCheckDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/ClaimCheckOperation.java b/core/camel-core-model/src/main/java/org/apache/camel/model/ClaimCheckOperation.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/ClaimCheckOperation.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/ClaimCheckOperation.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/Constants.java b/core/camel-core-model/src/main/java/org/apache/camel/model/Constants.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/Constants.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/Constants.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/ContextScanDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/ContextScanDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/ContextScanDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/ContextScanDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/ConvertBodyDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/ConvertBodyDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/ConvertBodyDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/ConvertBodyDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/DataFormatDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/DataFormatDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/DataFormatDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/DataFormatDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/DelayDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/DelayDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/DelayDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/DelayDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/DescriptionDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/DescriptionDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/DescriptionDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/DescriptionDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/DynamicRouterDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/DynamicRouterDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/DynamicRouterDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/DynamicRouterDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/EndpointRequiredDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/EndpointRequiredDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/EndpointRequiredDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/EndpointRequiredDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/EnrichDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/EnrichDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/EnrichDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/EnrichDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/ExecutorServiceAwareDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/ExecutorServiceAwareDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/ExecutorServiceAwareDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/ExecutorServiceAwareDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/ExpressionNode.java b/core/camel-core-model/src/main/java/org/apache/camel/model/ExpressionNode.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/ExpressionNode.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/ExpressionNode.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/ExpressionNodeHelper.java b/core/camel-core-model/src/main/java/org/apache/camel/model/ExpressionNodeHelper.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/ExpressionNodeHelper.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/ExpressionNodeHelper.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/ExpressionSubElementDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/ExpressionSubElementDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/ExpressionSubElementDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/ExpressionSubElementDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/FaultToleranceConfigurationCommon.java b/core/camel-core-model/src/main/java/org/apache/camel/model/FaultToleranceConfigurationCommon.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/FaultToleranceConfigurationCommon.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/FaultToleranceConfigurationCommon.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/FaultToleranceConfigurationDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/FaultToleranceConfigurationDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/FaultToleranceConfigurationDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/FaultToleranceConfigurationDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/FilterDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/FilterDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/FilterDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/FilterDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/FinallyDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/FinallyDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/FinallyDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/FinallyDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/FromDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/FromDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/FromDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/FromDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/GlobalOptionDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/GlobalOptionDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/GlobalOptionDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/GlobalOptionDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/GlobalOptionsDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/GlobalOptionsDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/GlobalOptionsDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/GlobalOptionsDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/HystrixConfigurationCommon.java b/core/camel-core-model/src/main/java/org/apache/camel/model/HystrixConfigurationCommon.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/HystrixConfigurationCommon.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/HystrixConfigurationCommon.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/HystrixConfigurationDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/HystrixConfigurationDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/HystrixConfigurationDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/HystrixConfigurationDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/IdempotentConsumerDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/IdempotentConsumerDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/IdempotentConsumerDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/IdempotentConsumerDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/IdentifiedType.java b/core/camel-core-model/src/main/java/org/apache/camel/model/IdentifiedType.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/IdentifiedType.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/IdentifiedType.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/InOnlyDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/InOnlyDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/InOnlyDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/InOnlyDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/InOutDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/InOutDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/InOutDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/InOutDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/InputTypeDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/InputTypeDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/InputTypeDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/InputTypeDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/InterceptDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/InterceptDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/InterceptDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/InterceptDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/InterceptFromDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/InterceptFromDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/InterceptFromDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/InterceptFromDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/LoadBalancerDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/LoadBalancerDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/LoadBalancerDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/LoadBalancerDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/LogDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/LogDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/LogDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/LogDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/LoopDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/LoopDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/LoopDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/LoopDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/MarshalDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/MarshalDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/MarshalDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/MarshalDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/Model.java b/core/camel-core-model/src/main/java/org/apache/camel/model/Model.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/Model.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/Model.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/ModelCamelContext.java b/core/camel-core-model/src/main/java/org/apache/camel/model/ModelCamelContext.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/ModelCamelContext.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/ModelCamelContext.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/ModelLifecycleStrategy.java b/core/camel-core-model/src/main/java/org/apache/camel/model/ModelLifecycleStrategy.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/ModelLifecycleStrategy.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/ModelLifecycleStrategy.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/ModelLifecycleStrategySupport.java b/core/camel-core-model/src/main/java/org/apache/camel/model/ModelLifecycleStrategySupport.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/ModelLifecycleStrategySupport.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/ModelLifecycleStrategySupport.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/MulticastDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/MulticastDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/MulticastDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/MulticastDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/NoOutputDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/NoOutputDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/NoOutputDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/NoOutputDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/OnCompletionDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/OnCompletionDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/OnCompletionDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/OnCompletionDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/OnCompletionMode.java b/core/camel-core-model/src/main/java/org/apache/camel/model/OnCompletionMode.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/OnCompletionMode.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/OnCompletionMode.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/OnExceptionDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/OnExceptionDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/OnExceptionDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/OnExceptionDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/OnFallbackDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/OnFallbackDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/OnFallbackDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/OnFallbackDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/OptimisticLockRetryPolicyDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/OptimisticLockRetryPolicyDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/OptimisticLockRetryPolicyDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/OptimisticLockRetryPolicyDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/OptionalIdentifiedDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/OptionalIdentifiedDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/OptionalIdentifiedDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/OptionalIdentifiedDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/OtherwiseDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/OtherwiseDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/OtherwiseDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/OtherwiseDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/OutputDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/OutputDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/OutputDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/OutputDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/OutputExpressionNode.java b/core/camel-core-model/src/main/java/org/apache/camel/model/OutputExpressionNode.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/OutputExpressionNode.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/OutputExpressionNode.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/OutputNode.java b/core/camel-core-model/src/main/java/org/apache/camel/model/OutputNode.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/OutputNode.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/OutputNode.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/OutputTypeDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/OutputTypeDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/OutputTypeDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/OutputTypeDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/PackageScanDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/PackageScanDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/PackageScanDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/PackageScanDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/PipelineDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/PipelineDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/PipelineDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/PipelineDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/PolicyDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/PolicyDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/PolicyDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/PolicyDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/PollEnrichDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/PollEnrichDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/PollEnrichDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/PollEnrichDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/ProcessDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/ProcessDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/ProcessDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/ProcessDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/ProcessorDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/ProcessorDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/ProcessorDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/ProcessorDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java b/core/camel-core-model/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/PropertyDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/PropertyDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/PropertyDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/PropertyDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/PropertyDefinitions.java b/core/camel-core-model/src/main/java/org/apache/camel/model/PropertyDefinitions.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/PropertyDefinitions.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/PropertyDefinitions.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/RecipientListDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/RecipientListDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/RecipientListDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/RecipientListDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/RedeliveryPolicyDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/RedeliveryPolicyDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/RedeliveryPolicyDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/RedeliveryPolicyDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/RemoveHeaderDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/RemoveHeaderDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/RemoveHeaderDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/RemoveHeaderDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/RemoveHeadersDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/RemoveHeadersDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/RemoveHeadersDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/RemoveHeadersDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/RemovePropertiesDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/RemovePropertiesDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/RemovePropertiesDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/RemovePropertiesDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/RemovePropertyDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/RemovePropertyDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/RemovePropertyDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/RemovePropertyDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/ResequenceDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/ResequenceDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/ResequenceDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/ResequenceDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/Resilience4jConfigurationCommon.java b/core/camel-core-model/src/main/java/org/apache/camel/model/Resilience4jConfigurationCommon.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/Resilience4jConfigurationCommon.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/Resilience4jConfigurationCommon.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/Resilience4jConfigurationDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/Resilience4jConfigurationDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/Resilience4jConfigurationDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/Resilience4jConfigurationDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/RestContextRefDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/RestContextRefDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/RestContextRefDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/RestContextRefDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/RestContextRefDefinitionHelper.java b/core/camel-core-model/src/main/java/org/apache/camel/model/RestContextRefDefinitionHelper.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/RestContextRefDefinitionHelper.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/RestContextRefDefinitionHelper.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/RollbackDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/RollbackDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/RollbackDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/RollbackDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/RouteBuilderDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/RouteBuilderDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/RouteBuilderDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/RouteBuilderDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/RouteContainer.java b/core/camel-core-model/src/main/java/org/apache/camel/model/RouteContainer.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/RouteContainer.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/RouteContainer.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/RouteContextRefDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/RouteContextRefDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/RouteContextRefDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/RouteContextRefDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/RouteContextRefDefinitionHelper.java b/core/camel-core-model/src/main/java/org/apache/camel/model/RouteContextRefDefinitionHelper.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/RouteContextRefDefinitionHelper.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/RouteContextRefDefinitionHelper.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/RouteDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/RouteDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/RouteDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/RouteDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/RouteDefinitionHelper.java b/core/camel-core-model/src/main/java/org/apache/camel/model/RouteDefinitionHelper.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/RouteDefinitionHelper.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/RouteDefinitionHelper.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/RouteFilters.java b/core/camel-core-model/src/main/java/org/apache/camel/model/RouteFilters.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/RouteFilters.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/RouteFilters.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/RouteTemplateContainer.java b/core/camel-core-model/src/main/java/org/apache/camel/model/RouteTemplateContainer.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/RouteTemplateContainer.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/RouteTemplateContainer.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/RouteTemplateContextRefDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/RouteTemplateContextRefDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/RouteTemplateContextRefDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/RouteTemplateContextRefDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/RouteTemplateContextRefDefinitionHelper.java b/core/camel-core-model/src/main/java/org/apache/camel/model/RouteTemplateContextRefDefinitionHelper.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/RouteTemplateContextRefDefinitionHelper.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/RouteTemplateContextRefDefinitionHelper.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/RouteTemplateDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/RouteTemplateDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/RouteTemplateDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/RouteTemplateDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/RouteTemplateParameterDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/RouteTemplateParameterDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/RouteTemplateParameterDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/RouteTemplateParameterDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/RouteTemplatesDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/RouteTemplatesDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/RouteTemplatesDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/RouteTemplatesDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/RoutesDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/RoutesDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/RoutesDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/RoutesDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/RoutingSlipDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/RoutingSlipDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/RoutingSlipDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/RoutingSlipDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/SagaActionUriDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/SagaActionUriDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/SagaActionUriDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/SagaActionUriDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/SagaCompletionMode.java b/core/camel-core-model/src/main/java/org/apache/camel/model/SagaCompletionMode.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/SagaCompletionMode.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/SagaCompletionMode.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/SagaDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/SagaDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/SagaDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/SagaDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/SagaOptionDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/SagaOptionDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/SagaOptionDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/SagaOptionDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/SagaPropagation.java b/core/camel-core-model/src/main/java/org/apache/camel/model/SagaPropagation.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/SagaPropagation.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/SagaPropagation.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/SamplingDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/SamplingDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/SamplingDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/SamplingDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/ScriptDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/ScriptDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/ScriptDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/ScriptDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/SendDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/SendDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/SendDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/SendDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/SetBodyDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/SetBodyDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/SetBodyDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/SetBodyDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/SetExchangePatternDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/SetExchangePatternDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/SetExchangePatternDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/SetExchangePatternDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/SetHeaderDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/SetHeaderDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/SetHeaderDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/SetHeaderDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/SetPropertyDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/SetPropertyDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/SetPropertyDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/SetPropertyDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/SortDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/SortDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/SortDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/SortDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/SplitDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/SplitDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/SplitDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/SplitDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/StepDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/StepDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/StepDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/StepDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/StopDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/StopDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/StopDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/StopDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/ThreadPoolProfileDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/ThreadPoolProfileDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/ThreadPoolProfileDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/ThreadPoolProfileDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/ThreadsDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/ThreadsDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/ThreadsDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/ThreadsDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/ThrottleDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/ThrottleDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/ThrottleDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/ThrottleDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/ThrowExceptionDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/ThrowExceptionDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/ThrowExceptionDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/ThrowExceptionDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/ToDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/ToDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/ToDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/ToDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/ToDynamicDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/ToDynamicDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/ToDynamicDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/ToDynamicDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/TransactedDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/TransactedDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/TransactedDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/TransactedDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/TransformDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/TransformDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/TransformDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/TransformDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/TryDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/TryDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/TryDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/TryDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/UnmarshalDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/UnmarshalDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/UnmarshalDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/UnmarshalDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/ValidateDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/ValidateDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/ValidateDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/ValidateDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/WhenDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/WhenDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/WhenDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/WhenDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/WhenSkipSendToEndpointDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/WhenSkipSendToEndpointDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/WhenSkipSendToEndpointDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/WhenSkipSendToEndpointDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/WireTapDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/WireTapDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/WireTapDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/WireTapDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/BlacklistServiceCallServiceFilterConfiguration.java b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/BlacklistServiceCallServiceFilterConfiguration.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/BlacklistServiceCallServiceFilterConfiguration.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/cloud/BlacklistServiceCallServiceFilterConfiguration.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/CachingServiceCallServiceDiscoveryConfiguration.java b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/CachingServiceCallServiceDiscoveryConfiguration.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/CachingServiceCallServiceDiscoveryConfiguration.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/cloud/CachingServiceCallServiceDiscoveryConfiguration.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/CombinedServiceCallServiceDiscoveryConfiguration.java b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/CombinedServiceCallServiceDiscoveryConfiguration.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/CombinedServiceCallServiceDiscoveryConfiguration.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/cloud/CombinedServiceCallServiceDiscoveryConfiguration.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/CombinedServiceCallServiceFilterConfiguration.java b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/CombinedServiceCallServiceFilterConfiguration.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/CombinedServiceCallServiceFilterConfiguration.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/cloud/CombinedServiceCallServiceFilterConfiguration.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/ConsulServiceCallServiceDiscoveryConfiguration.java b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ConsulServiceCallServiceDiscoveryConfiguration.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/ConsulServiceCallServiceDiscoveryConfiguration.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ConsulServiceCallServiceDiscoveryConfiguration.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/CustomServiceCallServiceFilterConfiguration.java b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/CustomServiceCallServiceFilterConfiguration.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/CustomServiceCallServiceFilterConfiguration.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/cloud/CustomServiceCallServiceFilterConfiguration.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/DefaultServiceCallServiceLoadBalancerConfiguration.java b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/DefaultServiceCallServiceLoadBalancerConfiguration.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/DefaultServiceCallServiceLoadBalancerConfiguration.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/cloud/DefaultServiceCallServiceLoadBalancerConfiguration.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/DnsServiceCallServiceDiscoveryConfiguration.java b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/DnsServiceCallServiceDiscoveryConfiguration.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/DnsServiceCallServiceDiscoveryConfiguration.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/cloud/DnsServiceCallServiceDiscoveryConfiguration.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/EtcdServiceCallServiceDiscoveryConfiguration.java b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/EtcdServiceCallServiceDiscoveryConfiguration.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/EtcdServiceCallServiceDiscoveryConfiguration.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/cloud/EtcdServiceCallServiceDiscoveryConfiguration.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/HealthyServiceCallServiceFilterConfiguration.java b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/HealthyServiceCallServiceFilterConfiguration.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/HealthyServiceCallServiceFilterConfiguration.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/cloud/HealthyServiceCallServiceFilterConfiguration.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/KubernetesServiceCallServiceDiscoveryConfiguration.java b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/KubernetesServiceCallServiceDiscoveryConfiguration.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/KubernetesServiceCallServiceDiscoveryConfiguration.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/cloud/KubernetesServiceCallServiceDiscoveryConfiguration.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/PassThroughServiceCallServiceFilterConfiguration.java b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/PassThroughServiceCallServiceFilterConfiguration.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/PassThroughServiceCallServiceFilterConfiguration.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/cloud/PassThroughServiceCallServiceFilterConfiguration.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/RibbonServiceCallServiceLoadBalancerConfiguration.java b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/RibbonServiceCallServiceLoadBalancerConfiguration.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/RibbonServiceCallServiceLoadBalancerConfiguration.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/cloud/RibbonServiceCallServiceLoadBalancerConfiguration.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/ServiceCallConfiguration.java b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallConfiguration.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/ServiceCallConfiguration.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallConfiguration.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/ServiceCallConfigurationDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallConfigurationDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/ServiceCallConfigurationDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallConfigurationDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/ServiceCallDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/ServiceCallDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/ServiceCallDefinitionConstants.java b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallDefinitionConstants.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/ServiceCallDefinitionConstants.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallDefinitionConstants.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/ServiceCallExpressionConfiguration.java b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallExpressionConfiguration.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/ServiceCallExpressionConfiguration.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallExpressionConfiguration.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceChooserConfiguration.java b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceChooserConfiguration.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceChooserConfiguration.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceChooserConfiguration.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceDiscoveryConfiguration.java b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceDiscoveryConfiguration.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceDiscoveryConfiguration.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceDiscoveryConfiguration.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceFilterConfiguration.java b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceFilterConfiguration.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceFilterConfiguration.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceFilterConfiguration.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceLoadBalancerConfiguration.java b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceLoadBalancerConfiguration.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceLoadBalancerConfiguration.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceLoadBalancerConfiguration.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/StaticServiceCallServiceDiscoveryConfiguration.java b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/StaticServiceCallServiceDiscoveryConfiguration.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/StaticServiceCallServiceDiscoveryConfiguration.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/cloud/StaticServiceCallServiceDiscoveryConfiguration.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/ZooKeeperServiceCallServiceDiscoveryConfiguration.java b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ZooKeeperServiceCallServiceDiscoveryConfiguration.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/ZooKeeperServiceCallServiceDiscoveryConfiguration.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ZooKeeperServiceCallServiceDiscoveryConfiguration.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/package-info.java b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/package-info.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/package-info.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/cloud/package-info.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/config/BatchResequencerConfig.java b/core/camel-core-model/src/main/java/org/apache/camel/model/config/BatchResequencerConfig.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/config/BatchResequencerConfig.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/config/BatchResequencerConfig.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/config/ResequencerConfig.java b/core/camel-core-model/src/main/java/org/apache/camel/model/config/ResequencerConfig.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/config/ResequencerConfig.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/config/ResequencerConfig.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/config/StreamResequencerConfig.java b/core/camel-core-model/src/main/java/org/apache/camel/model/config/StreamResequencerConfig.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/config/StreamResequencerConfig.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/config/StreamResequencerConfig.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/config/package-info.java b/core/camel-core-model/src/main/java/org/apache/camel/model/config/package-info.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/config/package-info.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/config/package-info.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/ASN1DataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/ASN1DataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/ASN1DataFormat.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/ASN1DataFormat.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/Any23DataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/Any23DataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/Any23DataFormat.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/Any23DataFormat.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/Any23Type.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/Any23Type.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/Any23Type.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/Any23Type.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/AvroDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/AvroDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/AvroDataFormat.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/AvroDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/BarcodeDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/BarcodeDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/BarcodeDataFormat.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/BarcodeDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/Base64DataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/Base64DataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/Base64DataFormat.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/Base64DataFormat.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/BeanioDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/BeanioDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/BeanioDataFormat.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/BeanioDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/BindyDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/BindyDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/BindyDataFormat.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/BindyDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/BindyType.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/BindyType.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/BindyType.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/BindyType.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/CBORDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/CBORDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/CBORDataFormat.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/CBORDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/CryptoDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/CryptoDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/CryptoDataFormat.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/CryptoDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/CustomDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/CustomDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/CustomDataFormat.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/CustomDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/FhirDataformat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/FhirDataformat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/FhirDataformat.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/FhirDataformat.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/FhirJsonDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/FhirJsonDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/FhirJsonDataFormat.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/FhirJsonDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/FhirXmlDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/FhirXmlDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/FhirXmlDataFormat.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/FhirXmlDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/FlatpackDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/FlatpackDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/FlatpackDataFormat.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/FlatpackDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/GrokDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/GrokDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/GrokDataFormat.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/GrokDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/GzipDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/GzipDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/GzipDataFormat.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/GzipDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/IcalDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/IcalDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/IcalDataFormat.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/IcalDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/JacksonXMLDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/JacksonXMLDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/JacksonXMLDataFormat.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/JacksonXMLDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/JsonApiDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/JsonApiDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/JsonApiDataFormat.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/JsonApiDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/JsonLibrary.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/JsonLibrary.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/JsonLibrary.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/JsonLibrary.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/LZFDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/LZFDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/LZFDataFormat.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/LZFDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/MimeMultipartDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/MimeMultipartDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/MimeMultipartDataFormat.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/MimeMultipartDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/PGPDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/PGPDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/PGPDataFormat.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/PGPDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/ProtobufDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/ProtobufDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/ProtobufDataFormat.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/ProtobufDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/RssDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/RssDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/RssDataFormat.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/RssDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/SoapJaxbDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/SoapJaxbDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/SoapJaxbDataFormat.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/SoapJaxbDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/SyslogDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/SyslogDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/SyslogDataFormat.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/SyslogDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/TarFileDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/TarFileDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/TarFileDataFormat.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/TarFileDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/ThriftDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/ThriftDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/ThriftDataFormat.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/ThriftDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/TidyMarkupDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/TidyMarkupDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/TidyMarkupDataFormat.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/TidyMarkupDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/UniVocityAbstractDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/UniVocityAbstractDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/UniVocityAbstractDataFormat.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/UniVocityAbstractDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/UniVocityCsvDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/UniVocityCsvDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/UniVocityCsvDataFormat.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/UniVocityCsvDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/UniVocityFixedWidthDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/UniVocityFixedWidthDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/UniVocityFixedWidthDataFormat.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/UniVocityFixedWidthDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/UniVocityHeader.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/UniVocityHeader.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/UniVocityHeader.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/UniVocityHeader.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/UniVocityTsvDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/UniVocityTsvDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/UniVocityTsvDataFormat.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/UniVocityTsvDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/XMLSecurityDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/XMLSecurityDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/XMLSecurityDataFormat.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/XMLSecurityDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/XmlRpcDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/XmlRpcDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/XmlRpcDataFormat.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/XmlRpcDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/YAMLDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/YAMLDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/YAMLDataFormat.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/YAMLDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/YAMLLibrary.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/YAMLLibrary.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/YAMLLibrary.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/YAMLLibrary.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/YAMLTypeFilterDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/YAMLTypeFilterDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/YAMLTypeFilterDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/YAMLTypeFilterDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/YAMLTypeFilterType.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/YAMLTypeFilterType.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/YAMLTypeFilterType.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/YAMLTypeFilterType.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/ZipDeflaterDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/ZipDeflaterDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/ZipDeflaterDataFormat.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/ZipDeflaterDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/ZipFileDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/ZipFileDataFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/ZipFileDataFormat.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/ZipFileDataFormat.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/package-info.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/package-info.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/package-info.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/package-info.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/errorhandler/DeadLetterChannelConfiguration.java b/core/camel-core-model/src/main/java/org/apache/camel/model/errorhandler/DeadLetterChannelConfiguration.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/errorhandler/DeadLetterChannelConfiguration.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/errorhandler/DeadLetterChannelConfiguration.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/errorhandler/DefaultErrorHandlerConfiguration.java b/core/camel-core-model/src/main/java/org/apache/camel/model/errorhandler/DefaultErrorHandlerConfiguration.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/errorhandler/DefaultErrorHandlerConfiguration.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/errorhandler/DefaultErrorHandlerConfiguration.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/errorhandler/ErrorHandlerHelper.java b/core/camel-core-model/src/main/java/org/apache/camel/model/errorhandler/ErrorHandlerHelper.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/errorhandler/ErrorHandlerHelper.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/errorhandler/ErrorHandlerHelper.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/errorhandler/ErrorHandlerRefConfiguration.java b/core/camel-core-model/src/main/java/org/apache/camel/model/errorhandler/ErrorHandlerRefConfiguration.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/errorhandler/ErrorHandlerRefConfiguration.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/errorhandler/ErrorHandlerRefConfiguration.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/errorhandler/NoErrorHandlerConfiguraiton.java b/core/camel-core-model/src/main/java/org/apache/camel/model/errorhandler/NoErrorHandlerConfiguraiton.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/errorhandler/NoErrorHandlerConfiguraiton.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/errorhandler/NoErrorHandlerConfiguraiton.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/language/ConstantExpression.java b/core/camel-core-model/src/main/java/org/apache/camel/model/language/ConstantExpression.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/language/ConstantExpression.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/language/ConstantExpression.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/language/ExchangePropertyExpression.java b/core/camel-core-model/src/main/java/org/apache/camel/model/language/ExchangePropertyExpression.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/language/ExchangePropertyExpression.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/language/ExchangePropertyExpression.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/language/ExpressionDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/language/ExpressionDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/language/ExpressionDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/language/ExpressionDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/language/GroovyExpression.java b/core/camel-core-model/src/main/java/org/apache/camel/model/language/GroovyExpression.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/language/GroovyExpression.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/language/GroovyExpression.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/language/HeaderExpression.java b/core/camel-core-model/src/main/java/org/apache/camel/model/language/HeaderExpression.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/language/HeaderExpression.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/language/HeaderExpression.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/language/Hl7TerserExpression.java b/core/camel-core-model/src/main/java/org/apache/camel/model/language/Hl7TerserExpression.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/language/Hl7TerserExpression.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/language/Hl7TerserExpression.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/language/JoorExpression.java b/core/camel-core-model/src/main/java/org/apache/camel/model/language/JoorExpression.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/language/JoorExpression.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/language/JoorExpression.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/language/JsonPathExpression.java b/core/camel-core-model/src/main/java/org/apache/camel/model/language/JsonPathExpression.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/language/JsonPathExpression.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/language/JsonPathExpression.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/language/LanguageExpression.java b/core/camel-core-model/src/main/java/org/apache/camel/model/language/LanguageExpression.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/language/LanguageExpression.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/language/LanguageExpression.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/language/MethodCallExpression.java b/core/camel-core-model/src/main/java/org/apache/camel/model/language/MethodCallExpression.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/language/MethodCallExpression.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/language/MethodCallExpression.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/language/MvelExpression.java b/core/camel-core-model/src/main/java/org/apache/camel/model/language/MvelExpression.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/language/MvelExpression.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/language/MvelExpression.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/language/NamespaceAwareExpression.java b/core/camel-core-model/src/main/java/org/apache/camel/model/language/NamespaceAwareExpression.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/language/NamespaceAwareExpression.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/language/NamespaceAwareExpression.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/language/OgnlExpression.java b/core/camel-core-model/src/main/java/org/apache/camel/model/language/OgnlExpression.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/language/OgnlExpression.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/language/OgnlExpression.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/language/RefExpression.java b/core/camel-core-model/src/main/java/org/apache/camel/model/language/RefExpression.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/language/RefExpression.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/language/RefExpression.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/language/SimpleExpression.java b/core/camel-core-model/src/main/java/org/apache/camel/model/language/SimpleExpression.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/language/SimpleExpression.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/language/SimpleExpression.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/language/SpELExpression.java b/core/camel-core-model/src/main/java/org/apache/camel/model/language/SpELExpression.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/language/SpELExpression.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/language/SpELExpression.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/language/TokenizerExpression.java b/core/camel-core-model/src/main/java/org/apache/camel/model/language/TokenizerExpression.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/language/TokenizerExpression.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/language/TokenizerExpression.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/language/XMLTokenizerExpression.java b/core/camel-core-model/src/main/java/org/apache/camel/model/language/XMLTokenizerExpression.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/language/XMLTokenizerExpression.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/language/XMLTokenizerExpression.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/language/XPathExpression.java b/core/camel-core-model/src/main/java/org/apache/camel/model/language/XPathExpression.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/language/XPathExpression.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/language/XPathExpression.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/language/XQueryExpression.java b/core/camel-core-model/src/main/java/org/apache/camel/model/language/XQueryExpression.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/language/XQueryExpression.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/language/XQueryExpression.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/language/package-info.java b/core/camel-core-model/src/main/java/org/apache/camel/model/language/package-info.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/language/package-info.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/language/package-info.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/loadbalancer/CustomLoadBalancerDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/CustomLoadBalancerDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/loadbalancer/CustomLoadBalancerDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/CustomLoadBalancerDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/loadbalancer/FailoverLoadBalancerDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/FailoverLoadBalancerDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/loadbalancer/FailoverLoadBalancerDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/FailoverLoadBalancerDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/loadbalancer/RandomLoadBalancerDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/RandomLoadBalancerDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/loadbalancer/RandomLoadBalancerDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/RandomLoadBalancerDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/loadbalancer/RoundRobinLoadBalancerDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/RoundRobinLoadBalancerDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/loadbalancer/RoundRobinLoadBalancerDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/RoundRobinLoadBalancerDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/loadbalancer/StickyLoadBalancerDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/StickyLoadBalancerDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/loadbalancer/StickyLoadBalancerDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/StickyLoadBalancerDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/loadbalancer/TopicLoadBalancerDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/TopicLoadBalancerDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/loadbalancer/TopicLoadBalancerDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/TopicLoadBalancerDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/loadbalancer/WeightedLoadBalancerDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/WeightedLoadBalancerDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/loadbalancer/WeightedLoadBalancerDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/WeightedLoadBalancerDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/loadbalancer/package-info.java b/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/package-info.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/loadbalancer/package-info.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/package-info.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/package-info.java b/core/camel-core-model/src/main/java/org/apache/camel/model/package-info.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/package-info.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/package-info.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/rest/CollectionFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/CollectionFormat.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/rest/CollectionFormat.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/rest/CollectionFormat.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/rest/DeleteVerbDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/DeleteVerbDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/rest/DeleteVerbDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/rest/DeleteVerbDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/rest/GetVerbDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/GetVerbDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/rest/GetVerbDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/rest/GetVerbDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/rest/HeadVerbDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/HeadVerbDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/rest/HeadVerbDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/rest/HeadVerbDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/rest/PatchVerbDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/PatchVerbDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/rest/PatchVerbDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/rest/PatchVerbDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/rest/PostVerbDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/PostVerbDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/rest/PostVerbDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/rest/PostVerbDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/rest/PutVerbDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/PutVerbDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/rest/PutVerbDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/rest/PutVerbDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestBindingDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestBindingDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestBindingDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestBindingDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestBindingMode.java b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestBindingMode.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestBindingMode.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestBindingMode.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestConfigurationDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestConfigurationDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestConfigurationDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestConfigurationDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestContainer.java b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestContainer.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestContainer.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestContainer.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestHostNameResolver.java b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestHostNameResolver.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestHostNameResolver.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestHostNameResolver.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestOperationParamDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestOperationParamDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestOperationParamDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestOperationParamDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestOperationResponseHeaderDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestOperationResponseHeaderDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestOperationResponseHeaderDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestOperationResponseHeaderDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestOperationResponseMsgDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestOperationResponseMsgDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestOperationResponseMsgDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestOperationResponseMsgDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestParamType.java b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestParamType.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestParamType.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestParamType.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestPropertyDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestPropertyDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestPropertyDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestPropertyDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestSecuritiesDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestSecuritiesDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestSecuritiesDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestSecuritiesDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestSecurityApiKey.java b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestSecurityApiKey.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestSecurityApiKey.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestSecurityApiKey.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestSecurityBasicAuth.java b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestSecurityBasicAuth.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestSecurityBasicAuth.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestSecurityBasicAuth.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestSecurityDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestSecurityDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestSecurityDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestSecurityDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestSecurityOAuth2.java b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestSecurityOAuth2.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestSecurityOAuth2.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestSecurityOAuth2.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestsDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestsDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/rest/RestsDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestsDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/rest/SecurityDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/SecurityDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/rest/SecurityDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/rest/SecurityDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/rest/VerbDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/VerbDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/rest/VerbDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/rest/VerbDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/rest/package-info.java b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/package-info.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/rest/package-info.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/rest/package-info.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/transformer/CustomTransformerDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/transformer/CustomTransformerDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/transformer/CustomTransformerDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/transformer/CustomTransformerDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/transformer/DataFormatTransformerDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/transformer/DataFormatTransformerDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/transformer/DataFormatTransformerDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/transformer/DataFormatTransformerDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/transformer/EndpointTransformerDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/transformer/EndpointTransformerDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/transformer/EndpointTransformerDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/transformer/EndpointTransformerDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/transformer/TransformerDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/transformer/TransformerDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/transformer/TransformerDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/transformer/TransformerDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/transformer/TransformersDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/transformer/TransformersDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/transformer/TransformersDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/transformer/TransformersDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/transformer/package-info.java b/core/camel-core-model/src/main/java/org/apache/camel/model/transformer/package-info.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/transformer/package-info.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/transformer/package-info.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/validator/CustomValidatorDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/validator/CustomValidatorDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/validator/CustomValidatorDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/validator/CustomValidatorDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/validator/EndpointValidatorDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/validator/EndpointValidatorDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/validator/EndpointValidatorDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/validator/EndpointValidatorDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/validator/PredicateValidatorDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/validator/PredicateValidatorDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/validator/PredicateValidatorDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/validator/PredicateValidatorDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/validator/ValidatorDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/validator/ValidatorDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/validator/ValidatorDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/validator/ValidatorDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/validator/ValidatorsDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/validator/ValidatorsDefinition.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/validator/ValidatorsDefinition.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/validator/ValidatorsDefinition.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/validator/package-info.java b/core/camel-core-model/src/main/java/org/apache/camel/model/validator/package-info.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/model/validator/package-info.java
rename to core/camel-core-model/src/main/java/org/apache/camel/model/validator/package-info.java
diff --git a/core/camel-core-reifier/pom.xml b/core/camel-core-reifier/pom.xml
new file mode 100644
index 0000000..248178f
--- /dev/null
+++ b/core/camel-core-reifier/pom.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>core</artifactId>
+ <version>3.7.0-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
+
+ <artifactId>camel-core-reifier</artifactId>
+ <packaging>jar</packaging>
+
+ <name>Camel :: Core Reifier</name>
+ <description>Camel model to processor reifiers</description>
+
+ <properties>
+ <firstVersion>3.7.0</firstVersion>
+ <label>core</label>
+ </properties>
+
+ <dependencies>
+
+ <!-- required dependencies by camel-core -->
+ <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-support</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core-model</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-util</artifactId>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-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>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/AbstractPolicyReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/AbstractPolicyReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/AbstractPolicyReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/AbstractPolicyReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/AbstractReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/AbstractReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/AbstractReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/AbstractReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/AggregateReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/AggregateReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/AggregateReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/AggregateReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/BeanReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/BeanReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/BeanReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/BeanReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/CatchReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/CatchReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/CatchReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/CatchReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/ChoiceReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ChoiceReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/ChoiceReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ChoiceReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/CircuitBreakerReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/CircuitBreakerReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/CircuitBreakerReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/CircuitBreakerReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/ClaimCheckReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ClaimCheckReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/ClaimCheckReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ClaimCheckReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/ConvertBodyReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ConvertBodyReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/ConvertBodyReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ConvertBodyReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/DelayReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/DelayReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/DelayReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/DelayReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/DynamicRouterReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/DynamicRouterReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/DynamicRouterReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/DynamicRouterReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/EnrichReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/EnrichReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/EnrichReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/EnrichReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/ExpressionReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ExpressionReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/ExpressionReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ExpressionReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/FilterReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/FilterReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/FilterReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/FilterReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/FinallyReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/FinallyReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/FinallyReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/FinallyReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/IdempotentConsumerReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/IdempotentConsumerReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/IdempotentConsumerReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/IdempotentConsumerReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/InterceptFromReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/InterceptFromReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/InterceptFromReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/InterceptFromReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/InterceptReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/InterceptReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/InterceptReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/InterceptReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/InterceptSendToEndpointReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/InterceptSendToEndpointReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/InterceptSendToEndpointReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/InterceptSendToEndpointReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/LoadBalanceReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/LoadBalanceReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/LoadBalanceReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/LoadBalanceReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/LogReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/LogReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/LogReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/LogReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/LoopReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/LoopReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/LoopReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/LoopReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/MarshalReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/MarshalReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/MarshalReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/MarshalReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/MulticastReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/MulticastReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/MulticastReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/MulticastReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/OnCompletionReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/OnCompletionReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/OnCompletionReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/OnCompletionReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/OnExceptionReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/OnExceptionReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/OnExceptionReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/OnExceptionReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/OnFallbackReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/OnFallbackReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/OnFallbackReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/OnFallbackReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/OtherwiseReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/OtherwiseReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/OtherwiseReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/OtherwiseReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/PipelineReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/PipelineReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/PipelineReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/PipelineReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/PolicyReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/PolicyReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/PolicyReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/PolicyReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/PollEnrichReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/PollEnrichReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/PollEnrichReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/PollEnrichReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/ProcessReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ProcessReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/ProcessReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ProcessReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/ProcessorReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ProcessorReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/ProcessorReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ProcessorReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/RecipientListReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/RecipientListReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/RecipientListReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/RecipientListReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/RemoveHeaderReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/RemoveHeaderReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/RemoveHeaderReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/RemoveHeaderReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/RemoveHeadersReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/RemoveHeadersReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/RemoveHeadersReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/RemoveHeadersReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/RemovePropertiesReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/RemovePropertiesReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/RemovePropertiesReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/RemovePropertiesReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/RemovePropertyReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/RemovePropertyReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/RemovePropertyReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/RemovePropertyReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/ResequenceReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ResequenceReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/ResequenceReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ResequenceReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/RollbackReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/RollbackReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/RollbackReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/RollbackReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/RouteReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/RouteReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/RouteReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/RouteReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/RoutingSlipReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/RoutingSlipReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/RoutingSlipReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/RoutingSlipReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/SagaReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/SagaReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/SagaReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/SagaReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/SamplingReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/SamplingReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/SamplingReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/SamplingReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/ScriptReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ScriptReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/ScriptReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ScriptReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/SendReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/SendReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/SendReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/SendReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/ServiceCallReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ServiceCallReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/ServiceCallReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ServiceCallReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/SetBodyReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/SetBodyReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/SetBodyReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/SetBodyReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/SetExchangePatternReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/SetExchangePatternReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/SetExchangePatternReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/SetExchangePatternReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/SetHeaderReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/SetHeaderReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/SetHeaderReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/SetHeaderReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/SetPropertyReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/SetPropertyReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/SetPropertyReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/SetPropertyReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/SortReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/SortReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/SortReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/SortReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/SplitReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/SplitReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/SplitReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/SplitReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/StepReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/StepReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/StepReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/StepReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/StopReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/StopReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/StopReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/StopReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/ThreadsReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ThreadsReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/ThreadsReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ThreadsReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/ThrottleReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ThrottleReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/ThrottleReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ThrottleReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/ThrowExceptionReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ThrowExceptionReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/ThrowExceptionReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ThrowExceptionReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/ToDynamicReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ToDynamicReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/ToDynamicReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ToDynamicReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/TransactedReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/TransactedReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/TransactedReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/TransactedReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/TransformReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/TransformReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/TransformReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/TransformReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/TryReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/TryReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/TryReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/TryReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/UnmarshalReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/UnmarshalReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/UnmarshalReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/UnmarshalReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/ValidateReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ValidateReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/ValidateReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ValidateReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/WhenReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/WhenReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/WhenReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/WhenReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/WhenSkipSendToEndpointReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/WhenSkipSendToEndpointReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/WhenSkipSendToEndpointReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/WhenSkipSendToEndpointReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/WireTapReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/WireTapReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/WireTapReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/WireTapReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/ASN1DataFormatReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/ASN1DataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/ASN1DataFormatReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/ASN1DataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/Any23DataFormatReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/Any23DataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/Any23DataFormatReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/Any23DataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/AvroDataFormatReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/AvroDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/AvroDataFormatReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/AvroDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/BarcodeDataFormatReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/BarcodeDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/BarcodeDataFormatReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/BarcodeDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/Base64DataFormatReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/Base64DataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/Base64DataFormatReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/Base64DataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/BeanioDataFormatReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/BeanioDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/BeanioDataFormatReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/BeanioDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/BindyDataFormatReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/BindyDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/BindyDataFormatReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/BindyDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/CBORDataFormatReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/CBORDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/CBORDataFormatReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/CBORDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/CryptoDataFormatReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/CryptoDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/CryptoDataFormatReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/CryptoDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/CsvDataFormatReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/CsvDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/CsvDataFormatReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/CsvDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/CustomDataFormatReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/CustomDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/CustomDataFormatReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/CustomDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/DataFormatReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/DataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/DataFormatReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/DataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/FhirDataFormatReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/FhirDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/FhirDataFormatReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/FhirDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/FhirJsonDataFormatReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/FhirJsonDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/FhirJsonDataFormatReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/FhirJsonDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/FhirXmlDataFormatReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/FhirXmlDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/FhirXmlDataFormatReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/FhirXmlDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/FlatpackDataFormatReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/FlatpackDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/FlatpackDataFormatReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/FlatpackDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/GrokDataFormatReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/GrokDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/GrokDataFormatReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/GrokDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/GzipDataFormatReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/GzipDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/GzipDataFormatReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/GzipDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/HL7DataFormatReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/HL7DataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/HL7DataFormatReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/HL7DataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/IcalDataFormatReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/IcalDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/IcalDataFormatReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/IcalDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/JacksonXMLDataFormatReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/JacksonXMLDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/JacksonXMLDataFormatReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/JacksonXMLDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/JaxbDataFormatReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/JaxbDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/JaxbDataFormatReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/JaxbDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/JsonApiDataFormatReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/JsonApiDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/JsonApiDataFormatReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/JsonApiDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/JsonDataFormatReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/JsonDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/JsonDataFormatReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/JsonDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/LZFDataFormatReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/LZFDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/LZFDataFormatReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/LZFDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/MimeMultipartDataFormatReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/MimeMultipartDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/MimeMultipartDataFormatReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/MimeMultipartDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/PGPDataFormatReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/PGPDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/PGPDataFormatReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/PGPDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/ProtobufDataFormatReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/ProtobufDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/ProtobufDataFormatReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/ProtobufDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/RssDataFormatReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/RssDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/RssDataFormatReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/RssDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/SoapJaxbDataFormatReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/SoapJaxbDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/SoapJaxbDataFormatReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/SoapJaxbDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/SyslogDataFormatReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/SyslogDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/SyslogDataFormatReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/SyslogDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/TarFileDataFormatReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/TarFileDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/TarFileDataFormatReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/TarFileDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/ThriftDataFormatReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/ThriftDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/ThriftDataFormatReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/ThriftDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/TidyMarkupDataFormatReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/TidyMarkupDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/TidyMarkupDataFormatReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/TidyMarkupDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/UniVocityAbstractDataFormatReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/UniVocityAbstractDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/UniVocityAbstractDataFormatReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/UniVocityAbstractDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/UniVocityCsvDataFormatReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/UniVocityCsvDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/UniVocityCsvDataFormatReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/UniVocityCsvDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/UniVocityFixedWidthDataFormatReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/UniVocityFixedWidthDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/UniVocityFixedWidthDataFormatReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/UniVocityFixedWidthDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/UniVocityTsvDataFormatReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/UniVocityTsvDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/UniVocityTsvDataFormatReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/UniVocityTsvDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/XMLSecurityDataFormatReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/XMLSecurityDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/XMLSecurityDataFormatReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/XMLSecurityDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/XStreamDataFormatReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/XStreamDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/XStreamDataFormatReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/XStreamDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/XmlRpcDataFormatReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/XmlRpcDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/XmlRpcDataFormatReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/XmlRpcDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/YAMLDataFormatReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/YAMLDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/YAMLDataFormatReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/YAMLDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/ZipDataFormatReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/ZipDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/ZipDataFormatReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/ZipDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/ZipFileDataFormatReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/ZipFileDataFormatReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/ZipFileDataFormatReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/ZipFileDataFormatReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/errorhandler/DeadLetterChannelReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/DeadLetterChannelReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/errorhandler/DeadLetterChannelReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/DeadLetterChannelReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/errorhandler/DefaultErrorHandlerReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/DefaultErrorHandlerReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/errorhandler/DefaultErrorHandlerReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/DefaultErrorHandlerReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerRefReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerRefReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerRefReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerRefReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/errorhandler/NoErrorHandlerReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/NoErrorHandlerReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/errorhandler/NoErrorHandlerReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/NoErrorHandlerReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/language/ExpressionReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/language/ExpressionReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/language/ExpressionReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/language/ExpressionReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/language/JoorExpressionReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/language/JoorExpressionReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/language/JoorExpressionReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/language/JoorExpressionReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/language/JsonPathExpressionReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/language/JsonPathExpressionReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/language/JsonPathExpressionReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/language/JsonPathExpressionReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/language/MethodCallExpressionReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/language/MethodCallExpressionReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/language/MethodCallExpressionReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/language/MethodCallExpressionReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/language/SimpleExpressionReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/language/SimpleExpressionReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/language/SimpleExpressionReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/language/SimpleExpressionReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/language/TokenizerExpressionReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/language/TokenizerExpressionReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/language/TokenizerExpressionReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/language/TokenizerExpressionReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/language/XMLTokenizerExpressionReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/language/XMLTokenizerExpressionReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/language/XMLTokenizerExpressionReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/language/XMLTokenizerExpressionReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/language/XPathExpressionReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/language/XPathExpressionReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/language/XPathExpressionReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/language/XPathExpressionReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/language/XQueryExpressionReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/language/XQueryExpressionReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/language/XQueryExpressionReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/language/XQueryExpressionReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/loadbalancer/CustomLoadBalancerReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/loadbalancer/CustomLoadBalancerReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/loadbalancer/CustomLoadBalancerReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/loadbalancer/CustomLoadBalancerReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/loadbalancer/FailoverLoadBalancerReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/loadbalancer/FailoverLoadBalancerReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/loadbalancer/FailoverLoadBalancerReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/loadbalancer/FailoverLoadBalancerReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/loadbalancer/LoadBalancerReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/loadbalancer/LoadBalancerReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/loadbalancer/LoadBalancerReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/loadbalancer/LoadBalancerReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/loadbalancer/RandomLoadBalancerReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/loadbalancer/RandomLoadBalancerReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/loadbalancer/RandomLoadBalancerReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/loadbalancer/RandomLoadBalancerReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/loadbalancer/RoundRobinLoadBalancerReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/loadbalancer/RoundRobinLoadBalancerReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/loadbalancer/RoundRobinLoadBalancerReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/loadbalancer/RoundRobinLoadBalancerReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/loadbalancer/StickyLoadBalancerReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/loadbalancer/StickyLoadBalancerReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/loadbalancer/StickyLoadBalancerReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/loadbalancer/StickyLoadBalancerReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/loadbalancer/TopicLoadBalancerReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/loadbalancer/TopicLoadBalancerReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/loadbalancer/TopicLoadBalancerReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/loadbalancer/TopicLoadBalancerReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/loadbalancer/WeightedLoadBalancerReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/loadbalancer/WeightedLoadBalancerReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/loadbalancer/WeightedLoadBalancerReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/loadbalancer/WeightedLoadBalancerReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/rest/RestBindingReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/rest/RestBindingReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/rest/RestBindingReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/rest/RestBindingReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/transformer/CustomTransformeReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/transformer/CustomTransformeReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/transformer/CustomTransformeReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/transformer/CustomTransformeReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/transformer/DataFormatTransformerReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/transformer/DataFormatTransformerReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/transformer/DataFormatTransformerReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/transformer/DataFormatTransformerReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/transformer/EndpointTransformeReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/transformer/EndpointTransformeReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/transformer/EndpointTransformeReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/transformer/EndpointTransformeReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/transformer/TransformerReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/transformer/TransformerReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/transformer/TransformerReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/transformer/TransformerReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/validator/CustomValidatorReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/validator/CustomValidatorReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/validator/CustomValidatorReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/validator/CustomValidatorReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/validator/EndpointValidatorReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/validator/EndpointValidatorReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/validator/EndpointValidatorReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/validator/EndpointValidatorReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/validator/PredicateValidatorReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/validator/PredicateValidatorReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/validator/PredicateValidatorReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/validator/PredicateValidatorReifier.java
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/validator/ValidatorReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/validator/ValidatorReifier.java
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/reifier/validator/ValidatorReifier.java
rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/validator/ValidatorReifier.java
diff --git a/core/pom.xml b/core/pom.xml
index 90c62bd..ef70a56 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -46,6 +46,8 @@
<module>camel-cluster</module>
<module>camel-core-engine</module>
<module>camel-core-languages</module>
+ <module>camel-core-model</module>
+ <module>camel-core-reifier</module>
<module>camel-xml-io</module>
<module>camel-xml-jaxb</module>
<module>camel-core</module>
diff --git a/parent/pom.xml b/parent/pom.xml
index 28c7419..127cb32 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -680,6 +680,16 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-core-model</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core-reifier</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-endpointdsl</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/PackageHelper.java b/tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/PackageHelper.java
index 3628107..e26fcea 100644
--- a/tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/PackageHelper.java
+++ b/tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/PackageHelper.java
@@ -147,6 +147,10 @@ public final class PackageHelper {
return findCamelDirectory(dir, "core/camel-core-engine");
}
+ public static File findCamelCoreModelDirectory(File dir) {
+ return findCamelDirectory(dir, "core/camel-core-model");
+ }
+
public static File findCamelDirectory(File dir, String path) {
if (dir == null) {
return null;
diff --git a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/main/java/org/apache/camel/maven/EipDocumentationEnricherMojo.java b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/main/java/org/apache/camel/maven/EipDocumentationEnricherMojo.java
index 8c1f6c4..c95c075 100644
--- a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/main/java/org/apache/camel/maven/EipDocumentationEnricherMojo.java
+++ b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/main/java/org/apache/camel/maven/EipDocumentationEnricherMojo.java
@@ -69,10 +69,10 @@ public class EipDocumentationEnricherMojo extends AbstractMojo {
public File outputCamelSchemaFile;
/**
- * Path to camel core-engine project root directory.
+ * Path to camel core-model project root directory.
*/
- @Parameter(defaultValue = "${project.build.directory}/sources/camel-core-engine")
- public File camelCoreDir;
+ @Parameter(defaultValue = "${project.build.directory}/sources/camel-core-model")
+ public File camelCoreModelDir;
/**
* Path to camel core xml project root directory.
@@ -139,9 +139,8 @@ public class EipDocumentationEnricherMojo extends AbstractMojo {
validateExists(inputCamelSchemaFile, "inputCamelSchemaFile");
validateIsFile(inputCamelSchemaFile, "inputCamelSchemaFile");
- validateExists(camelCoreDir, "camelCoreDir");
validateExists(camelCoreXmlDir, "camelCoreXmlDir");
- validateIsDirectory(camelCoreDir, "camelCoreDir");
+ validateIsDirectory(camelCoreModelDir, "camelCoreModelDir");
validateIsDirectory(camelCoreXmlDir, "camelCoreXmlDir");
if (blueprint) {
validateExists(camelSpringDir, "camelSpringDir");
@@ -163,9 +162,9 @@ public class EipDocumentationEnricherMojo extends AbstractMojo {
DomFinder domFinder = new DomFinder(document, xPath);
DocumentationEnricher documentationEnricher = new DocumentationEnricher(document);
- // include schema files from camel-core, camel-core-xml and from camel-spring
+ // include schema files from camel-core-model, camel-core-xml and from camel-spring
Set<File> files = new HashSet<>();
- PackageHelper.findJsonFiles(new File(camelCoreDir, pathToModelDir), files);
+ PackageHelper.findJsonFiles(new File(camelCoreModelDir, pathToModelDir), files);
PackageHelper.findJsonFiles(new File(camelCoreXmlDir, pathToCoreXmlModelDir), files);
if (blueprint) {
PackageHelper.findJsonFiles(new File(camelSpringDir, pathToSpringModelDir), files);
diff --git a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/EipDocumentationEnricherMojoTest.java b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/EipDocumentationEnricherMojoTest.java
index 0f75abb..ee4a52c 100644
--- a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/EipDocumentationEnricherMojoTest.java
+++ b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/EipDocumentationEnricherMojoTest.java
@@ -41,14 +41,14 @@ public class EipDocumentationEnricherMojoTest {
@BeforeEach
public void setUp() throws Exception {
- eipDocumentationEnricherMojo.camelCoreDir = mockCamelCore;
+ eipDocumentationEnricherMojo.camelCoreModelDir = mockCamelCore;
eipDocumentationEnricherMojo.inputCamelSchemaFile = mockInputSchema;
eipDocumentationEnricherMojo.pathToModelDir = "sub/path";
}
@Test
public void testExecuteCamelCoreIsNull() throws Exception {
- eipDocumentationEnricherMojo.camelCoreDir = null;
+ eipDocumentationEnricherMojo.camelCoreModelDir = null;
when(mockInputSchema.exists()).thenReturn(true);
when(mockInputSchema.isFile()).thenReturn(true);
@@ -62,20 +62,6 @@ public class EipDocumentationEnricherMojoTest {
}
@Test
- public void testExecuteCamelCoreIsNotADirectory() throws Exception {
- when(mockCamelCore.exists()).thenReturn(true);
- when(mockInputSchema.exists()).thenReturn(true);
- when(mockInputSchema.isFile()).thenReturn(true);
-
- try {
- eipDocumentationEnricherMojo.execute();
- fail("Expected MojoExecutionException");
- } catch (MojoExecutionException e) {
- // Expected.
- }
- }
-
- @Test
public void testExecuteInputCamelSchemaIsNotAFile() throws Exception {
when(mockInputSchema.exists()).thenReturn(true);
when(mockInputSchema.isFile()).thenReturn(false);
diff --git a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/integration/EIPDocumentationMojoTest.java b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/integration/EIPDocumentationMojoTest.java
index 2aae1b3..466cd18 100644
--- a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/integration/EIPDocumentationMojoTest.java
+++ b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/integration/EIPDocumentationMojoTest.java
@@ -49,7 +49,7 @@ public class EIPDocumentationMojoTest {
@BeforeEach
public void setUp() throws Exception {
- eipDocumentationEnricherMojo.camelCoreDir = ResourceUtils.getResourceAsFile("integration/camel-core-integration");
+ eipDocumentationEnricherMojo.camelCoreModelDir = ResourceUtils.getResourceAsFile("integration/camel-core-integration");
eipDocumentationEnricherMojo.camelCoreXmlDir = ResourceUtils.getResourceAsFile("integration/camel-core-integration");
eipDocumentationEnricherMojo.camelSpringDir = ResourceUtils.getResourceAsFile("integration/camel-core-integration");
eipDocumentationEnricherMojo.inputCamelSchemaFile = ResourceUtils.getResourceAsFile("integration/camel-spring.xsd");
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 16862cc..6dc736a 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
@@ -170,7 +170,7 @@ public class PackageDataFormatMojo extends AbstractGeneratorMojo {
// and create json schema model file for this data format
try {
if (apacheCamel && count > 0) {
- File core = PackageHelper.findCamelCoreDirectory(project.getBasedir());
+ File core = PackageHelper.findCamelCoreModelDirectory(project.getBasedir());
if (core != null) {
for (Map.Entry<String, String> entry : javaTypes.entrySet()) {
String name = entry.getKey();
@@ -236,7 +236,7 @@ public class PackageDataFormatMojo extends AbstractGeneratorMojo {
}
} else {
throw new MojoExecutionException(
- "Error finding core/camel-core/target/camel-core-engine-" + project.getVersion()
+ "Error finding core/camel-core/target/camel-core-model-" + project.getVersion()
+ ".jar file. Make sure camel-core has been built first.");
}
}
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 c725fc3..f8f7dfa 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
@@ -143,7 +143,7 @@ public class PackageLanguageMojo extends AbstractGeneratorMojo {
// and create json schema model file for this language
try {
if (apacheCamel && count > 0) {
- File core = PackageHelper.findCamelCoreDirectory(project.getBasedir());
+ File core = PackageHelper.findCamelCoreModelDirectory(project.getBasedir());
if (core != null) {
for (Map.Entry<String, String> entry : javaTypes.entrySet()) {
String name = entry.getKey();
@@ -178,7 +178,7 @@ public class PackageLanguageMojo extends AbstractGeneratorMojo {
}
} else {
throw new MojoExecutionException(
- "Error finding core/camel-core/target/camel-core-engine-" + project.getVersion()
+ "Error finding core/camel-core/target/camel-core-model-" + project.getVersion()
+ ".jar file. Make sure camel-core has been built first.");
}
}
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 934749c..cb9d439 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
@@ -152,6 +152,12 @@ public class PrepareCatalogMojo extends AbstractMojo {
protected File coreDir;
/**
+ * The camel-model directory
+ */
+ @Parameter(defaultValue = "${project.build.directory}/../../../core/camel-core-model")
+ protected File modelDir;
+
+ /**
* The camel-base directory
*/
@Parameter(defaultValue = "${project.build.directory}/../../../core/camel-base")
@@ -223,7 +229,8 @@ public class PrepareCatalogMojo extends AbstractMojo {
allPropertiesFiles = new TreeSet<>();
Stream.concat(list(componentsDir.toPath()),
- Stream.of(coreDir.toPath(), baseDir.toPath(), languagesDir.toPath(), jaxpDir.toPath(), springDir.toPath()))
+ Stream.of(coreDir.toPath(), modelDir.toPath(), baseDir.toPath(), languagesDir.toPath(), jaxpDir.toPath(),
+ springDir.toPath()))
.filter(dir -> !"target".equals(dir.getFileName().toString())).map(this::getComponentPath)
.filter(dir -> Files.isDirectory(dir.resolve("src")))
.map(p -> p.resolve("target/classes")).flatMap(PackageHelper::walk).forEach(p -> {
@@ -252,7 +259,7 @@ public class PrepareCatalogMojo extends AbstractMojo {
}
protected void executeModel() throws Exception {
- Path coreDir = this.coreDir.toPath();
+ Path coreDir = this.modelDir.toPath();
Path springDir = this.springDir.toPath();
Path modelsOutDir = this.modelsOutDir.toPath();
@@ -654,7 +661,7 @@ public class PrepareCatalogMojo extends AbstractMojo {
// find all camel maven modules
Stream.concat(list(componentsDir.toPath()).filter(dir -> !"target".equals(dir.getFileName().toString())).map(this::getComponentPath),
- Stream.of(coreDir.toPath(), baseDir.toPath(), languagesDir.toPath(), jaxpDir.toPath()))
+ Stream.of(coreDir.toPath(), modelDir.toPath(), baseDir.toPath(), languagesDir.toPath(), jaxpDir.toPath()))
.forEach(dir -> {
List<Path> l = PackageHelper.walk(dir.resolve("src/main/docs")).filter(f -> f.getFileName().toString().endsWith(".adoc")).collect(Collectors.toList());
if (l.isEmpty()) {
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java
index 9483757..77247c7 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java
@@ -458,9 +458,9 @@ public class UpdateReadmeMojo extends AbstractGeneratorMojo {
}
private void executeEips() throws MojoExecutionException {
- // only run if in camel-core-engine
+ // only run if in camel-core-model
String currentDir = Paths.get(".").normalize().toAbsolutePath().toString();
- if (!currentDir.endsWith("camel-core-engine")) {
+ if (!currentDir.endsWith("camel-core-model")) {
return;
}