This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.


    from b63ab02  camel-catalog for karaf needs to be refactored when moved to 
camel-karaf repo
     new 67ff8e3  Move RouteContext lookup methods to AbstractReifier
     new 56bac57  Remove remaining RouteContext / CamelContext parameters in 
reifiers methods
     new 4275688e Move ErrorHandler all reification to the reifiers
     new 028a6b8  [CAMEL-13440] Remove RouteContext
     new 67abe4f  Use ExchangeHelper.getRoute(Exchange) when possible
     new ed11c1c  A bit of cleaning
     new 463fcd1  Remove references to error handler and event driven 
processors once creation is finished
     new d79fe4b  Use AbstractReifier.createProcessor() when possible
     new 05f7baf  Restore compatibility
     new 8f1441e  Use NamedNode instead of RouteDefinition as in the RoutePolicy
     new 389442b  Use proper generics on Model
     new af3034e  Explicitely call the xml generation mojo
     new e86e736  Remove generated legal files
     new 937aaf7  Use @JdkService annotation to generate META-INF services 
files for FactoryFinder
     new fa5eaad  Use a single class instead of various resolvers
     new bd91ab6  Revert "Remove references to error handler and event driven 
processors once creation is finished"
     new 941e2ae  Use doAddService for newly created services
     new a8a5385  Remove warnings since we are testing a deprecated class
     new 611bc99  Camel-test: Added camel-core-languages as dep
     new bcd26a1  Fix services creation
     new 849256b  Camel-Main: Added camel-core-languages dep explicitly
     new 0f817b0  Camel-test-junit5: Added camel-core-languages as dep
     new 73502c0  Move DefaultModelJAXBContextFactory to camel-xml-jaxb
     new 4108b4e  Refactor tests to avoid the usage of deprecated JndiRegistry
     new 9b24690  Completely remove the deprecated JndiRegistry
     new 73b7290  Move default service creation to camel-base 
SimpleCamelContext, move model related methods to DefaultCamelContext
     new a58155e  CS: remove unused imports
     new 909bbce  Rename package org.apache.camel.impl.cluster to 
org.apache.camel.cluster
     new 382930d  DefaultCamelContext is not abstract
     new 1922858  Use @JdkService for CaffeineLRUCacheFactory
     new 8405dc8  Generate service file using @JdkService for 
DefaultRestRegistryFactory
     new 916d796  CAMEL-13440: Remove RouteContext and further cleanup

The 32 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 ...tomixClientClusteredRoutePolicyFactoryMain.java |   2 +-
 .../AtomixClientRoutePolicyFactoryTestSupport.java |   2 +-
 .../AtomixClientRoutePolicyTestSupport.java        |   2 +-
 .../cluster/AtomixRoutePolicyFactoryTest.java      |   2 +-
 .../atomix/cluster/AtomixRoutePolicyTest.java      |   2 +-
 .../org/apache/camel/bean-processor-factory        |   2 +
 .../services/org/apache/camel/bean-proxy-factory   |   2 +
 .../bean/DefaultBeanProcessorFactory.java          |   2 +
 .../component/bean/DefaultBeanProxyFactory.java    |   2 +
 .../org/apache/camel/bean-processor-factory        |  18 -
 .../services/org/apache/camel/bean-proxy-factory   |  18 -
 components/camel-blueprint/pom.xml                 |   4 +
 .../BlueprintModelJAXBContextFactory.java          |   2 +-
 .../JtaTransactionErrorHandlerBuilder.java         |  99 +---
 ...java => JtaTransactionErrorHandlerReifier.java} | 133 ++---
 .../cdi/transaction/JtaTransactionPolicy.java      |  34 +-
 .../ConsulClusteredRoutePolicyFactoryMain.java     |   2 +-
 .../ConsulClusteredRoutePolicyFactoryTest.java     |   2 +-
 .../cluster/ConsulClusteredRoutePolicyTest.java    |   2 +-
 .../component/controlbus/ControlBusProducer.java   |  18 +-
 .../camel/component/fhir/FhirConfigurationIT.java  |   2 +-
 .../camel/component/file/GenericFileEndpoint.java  |  11 +-
 .../google/calendar/CalendarConfigurationTest.java |   2 +-
 .../google/drive/DriveConfigurationTest.java       |   2 +-
 .../google/mail/GmailConfigurationTest.java        |   2 +-
 .../google/sheets/SheetsConfigurationTest.java     |   2 +-
 .../hystrix/processor/HystrixProcessorFactory.java |   6 +-
 .../hystrix/processor/HystrixReifier.java          |  75 ++-
 .../processor/HystrixHierarchicalConfigTest.java   |  16 +-
 .../SpringHystrixRouteHierarchicalConfigTest.java  |  10 +-
 .../infinispan/policy/InfinispanRoutePolicy.java   |   2 +-
 .../component/jcache/policy/JCachePolicy.java      |  10 +-
 .../JGroupsRaftClusteredRoutePolicyTest.java       |   2 +-
 .../component/jms/tx/AbstractTransactionTest.java  |   4 +-
 .../camel/component/netty/NettyRedeliveryTest.java |   2 +-
 .../camel/routepolicy/quartz/ScheduledJob.java     |   2 +-
 .../services/org/apache/camel/reactive-executor    |   2 +
 .../reactive/vertx/VertXReactiveExecutor.java      |   2 +
 .../services/org/apache/camel/reactive-executor    |  18 -
 .../resilience4j/ResilienceProcessorFactory.java   |   6 +-
 .../component/resilience4j/ResilienceReifier.java  |  37 +-
 .../org/apache/camel/rest-registry-factory         |   2 +
 .../component/rest/DefaultRestRegistryFactory.java |   2 +
 .../org/apache/camel/rest-registry-factory         |  19 -
 .../shiro/security/ShiroSecurityPolicy.java        |   8 +-
 .../SpringSecurityAuthorizationPolicy.java         |   6 +-
 .../spring/SpringModelJAXBContextFactory.java      |   2 +-
 .../camel/spring/spi/SpringTransactionPolicy.java  |  26 +-
 .../spring/spi/TransactionErrorHandlerBuilder.java |  66 ---
 .../spring/spi/TransactionErrorHandlerReifier.java |  23 +-
 .../camel/spring/CamelContextFactoryBeanTest.java  |   2 +-
 .../apache/camel/spring/EndpointReferenceTest.java |   6 +-
 .../spring/config/CamelContextFactoryBeanTest.java |   4 +-
 .../spring/config/DummyErrorHandlerBuilder.java    |  44 +-
 .../camel/spring/config/ErrorHandlerTest.java      |   4 +-
 components/camel-test-junit5/pom.xml               |   4 +
 .../apache/camel/test/junit4/CamelTestSupport.java |  71 +--
 .../java/org/apache/camel/zipkin/ZipkinTracer.java |  14 +-
 ...ngZooKeeperClusteredRouteConfigurationTest.java |   2 +-
 .../ZooKeeperClusteredRoutePolicyFactoryMain.java  |   2 +-
 .../ZooKeeperClusteredRoutePolicyFactoryTest.java  |   2 +-
 .../cluster/ZooKeeperClusteredRoutePolicyTest.java |   2 +-
 ...ingZooKeeperClusteredRouteConfigurationTest.xml |   2 +-
 .../apache/camel/spi/annotations/JdkService.java   |   2 +-
 .../src/main/java/org/apache/camel/Channel.java    |   6 +-
 .../java/org/apache/camel/ErrorHandlerFactory.java |  23 -
 .../org/apache/camel/ExtendedCamelContext.java     |   3 +-
 .../src/main/java/org/apache/camel/Route.java      | 162 +++++-
 .../org/apache/camel/RuntimeConfiguration.java     |   2 +-
 .../apache/camel/catalog/RuntimeCamelCatalog.java  |   5 +
 .../org/apache/camel/spi/BeanProcessorFactory.java |   5 +
 .../org/apache/camel/spi/BeanProxyFactory.java     |   5 +
 .../java/org/apache/camel/spi/FactoryFinder.java   |   2 +
 .../apache/camel/spi/FactoryFinderResolver.java    |   4 +-
 .../org/apache/camel/spi/HeadersMapFactory.java    |   7 +-
 .../org/apache/camel/spi/LifecycleStrategy.java    |  18 +-
 .../camel/spi/ManagementObjectNameStrategy.java    |   2 +-
 .../apache/camel/spi/ManagementObjectStrategy.java |   2 +-
 .../apache/camel/spi/ModelJAXBContextFactory.java  |   5 +
 .../org/apache/camel/spi/ModelToXMLDumper.java     |   5 +
 .../src/main/java/org/apache/camel/spi/Policy.java |   9 +-
 .../org/apache/camel/spi/ProcessorFactory.java     |   9 +-
 .../org/apache/camel/spi/PropertiesComponent.java  |   5 +
 .../org/apache/camel/spi/ReactiveExecutor.java     |   5 +
 .../org/apache/camel/spi/RestRegistryFactory.java  |   5 +
 .../java/org/apache/camel/spi/RouteContext.java    | 283 ----------
 .../main/java/org/apache/camel/spi/UnitOfWork.java |  22 +-
 .../camel/spi/XMLRoutesDefinitionLoader.java       |   5 +
 .../org/apache/camel/properties-component-factory  |   2 +
 .../component/properties/PropertiesComponent.java  |   5 +-
 .../camel/impl/engine/AbstractCamelContext.java    |  63 ++-
 .../impl/engine/BaseExecutorServiceManager.java    |   2 +-
 .../apache/camel/impl/engine/BaseRouteService.java |  17 +-
 .../camel/impl/engine/BaseServiceResolver.java     |  64 +++
 .../impl/engine/BeanProcessorFactoryResolver.java  |  72 ---
 .../impl/engine/BeanProxyFactoryResolver.java      |  72 ---
 .../impl/engine/CamelPostProcessorHelper.java      |   3 -
 .../engine/DefaultAsyncProcessorAwaitManager.java  |  11 +-
 .../impl/engine/DefaultFactoryFinderResolver.java  |   5 -
 .../impl/engine/DefaultInflightRepository.java     |  11 +-
 .../camel/impl/engine/DefaultProcessorFactory.java |  14 +-
 .../org/apache/camel/impl/engine/DefaultRoute.java | 490 ++++++++++++++++-
 .../camel/impl/engine/DefaultRouteContext.java     | 585 ---------------------
 .../camel/impl/engine/DefaultRouteError.java       |   4 +-
 .../engine/DefaultRuntimeEndpointRegistry.java     |  21 +-
 .../camel/impl/engine/DefaultShutdownStrategy.java |   8 +-
 .../impl/engine/DefaultTransformerRegistry.java    |   2 -
 .../camel/impl/engine/DefaultUnitOfWork.java       |  24 +-
 .../impl/engine/DefaultValidatorRegistry.java      |   4 -
 .../impl/engine/EventDrivenConsumerRoute.java      | 141 -----
 .../impl/engine/HeadersMapFactoryResolver.java     |  76 ---
 .../apache/camel/impl/engine/MDCUnitOfWork.java    |  17 +-
 .../engine/PropertiesComponentFactoryResolver.java |  72 ---
 .../impl/engine/ReactiveExecutorResolver.java      |  73 ---
 .../impl/engine/RestRegistryFactoryResolver.java   |  75 ---
 .../impl/engine/RuntimeCamelCatalogResolver.java   |  76 ---
 .../camel/impl/engine/SimpleCamelContext.java}     | 175 +++---
 .../impl/engine/SupervisingRouteController.java    |  23 +-
 .../camel/impl/engine/TypedProcessorFactory.java   |  14 +-
 .../apache/camel/impl/health/RouteHealthCheck.java |   6 +-
 .../camel/processor/CamelInternalProcessor.java    |  34 +-
 .../apache/camel/processor/MulticastProcessor.java |  49 +-
 .../camel/processor/RecipientListProcessor.java    |  32 +-
 .../org/apache/camel/processor/RoutingSlip.java    |  11 +-
 .../java/org/apache/camel/processor/Splitter.java  |   8 +-
 .../camel/processor/channel/DefaultChannel.java    |  40 +-
 .../DefaultExceptionPolicyStrategy.java            |   8 +-
 .../errorhandler/RedeliveryErrorHandler.java       |  18 +-
 .../org/apache/camel/properties-component-factory  |  18 -
 .../services/org/apache/camel/lru-cache-factory    |   2 +
 .../caffeine/lrucache/CaffeineLRUCacheFactory.java |   2 +
 .../services/org/apache/camel/lru-cache-factory    |  19 -
 .../impl/cloud/ServiceCallProcessorFactory.java    |   6 +-
 .../services/org/apache/camel/runtime-camelcatalog |   2 +
 .../catalog/impl/DefaultRuntimeCamelCatalog.java   |   2 +
 .../services/org/apache/camel/runtime-camelcatalog |  18 -
 .../camel/builder/AdviceWithRouteBuilder.java      |  25 +-
 .../camel/builder/DeadLetterChannelBuilder.java    |  31 --
 .../camel/builder/DefaultErrorHandlerBuilder.java  |  38 --
 .../camel/builder/ErrorHandlerBuilderRef.java      |  29 -
 .../camel/builder/ErrorHandlerBuilderSupport.java  | 103 +---
 .../camel/builder/NoErrorHandlerBuilder.java       |  30 --
 .../org/apache/camel/builder/NotifyBuilder.java    |   9 +-
 .../org/apache/camel/builder/ProxyBuilder.java     |   3 -
 .../cluster/ClusteredRouteConfiguration.java       |   2 +-
 .../cluster/ClusteredRouteController.java          |   3 +-
 .../{impl => }/cluster/ClusteredRouteFilter.java   |   6 +-
 .../{impl => }/cluster/ClusteredRouteFilters.java  |  12 +-
 .../{impl => }/cluster/ClusteredRoutePolicy.java   |   9 +-
 .../cluster/ClusteredRoutePolicyFactory.java       |   6 +-
 .../apache/camel/{impl => }/cluster/package.html   |   0
 .../camel/impl/AbstractModelCamelContext.java      | 334 ------------
 .../org/apache/camel/impl/DefaultCamelContext.java | 360 +++++--------
 .../java/org/apache/camel/impl/DefaultModel.java   |  15 +-
 .../java/org/apache/camel/impl/JndiRegistry.java   |  61 ---
 .../camel/impl/ModelToXMLDumperResolver.java       |  75 ---
 .../java/org/apache/camel/impl/RouteService.java   |  10 +-
 .../impl/XMLRoutesDefinitionLoaderResolver.java    |  76 ---
 .../main/java/org/apache/camel/model/Model.java    |   4 +-
 ...ctedReifier.java => AbstractPolicyReifier.java} |  64 +--
 .../org/apache/camel/reifier/AbstractReifier.java  |  67 ++-
 .../org/apache/camel/reifier/AggregateReifier.java |  24 +-
 .../java/org/apache/camel/reifier/BeanReifier.java |  11 +-
 .../org/apache/camel/reifier/CatchReifier.java     |  13 +-
 .../org/apache/camel/reifier/ChoiceReifier.java    |   7 +-
 .../camel/reifier/CircuitBreakerReifier.java       |   6 +-
 .../apache/camel/reifier/ClaimCheckReifier.java    |  12 +-
 .../apache/camel/reifier/ConvertBodyReifier.java   |   7 +-
 .../org/apache/camel/reifier/DelayReifier.java     |   6 +-
 .../apache/camel/reifier/DynamicRouterReifier.java |  12 +-
 .../org/apache/camel/reifier/EnrichReifier.java    |   8 +-
 .../apache/camel/reifier/ExpressionReifier.java    |   6 +-
 .../org/apache/camel/reifier/FilterReifier.java    |   6 +-
 .../org/apache/camel/reifier/FinallyReifier.java   |   6 +-
 .../camel/reifier/IdempotentConsumerReifier.java   |  13 +-
 .../apache/camel/reifier/InterceptFromReifier.java |   6 +-
 .../org/apache/camel/reifier/InterceptReifier.java |  10 +-
 .../reifier/InterceptSendToEndpointReifier.java    |  18 +-
 .../apache/camel/reifier/LoadBalanceReifier.java   |   8 +-
 .../java/org/apache/camel/reifier/LogReifier.java  |  21 +-
 .../java/org/apache/camel/reifier/LoopReifier.java |   6 +-
 .../org/apache/camel/reifier/MarshalReifier.java   |   6 +-
 .../org/apache/camel/reifier/MulticastReifier.java |  11 +-
 .../apache/camel/reifier/OnCompletionReifier.java  |  12 +-
 .../apache/camel/reifier/OnExceptionReifier.java   |  20 +-
 .../apache/camel/reifier/OnFallbackReifier.java    |   6 +-
 .../org/apache/camel/reifier/OtherwiseReifier.java |   6 +-
 .../org/apache/camel/reifier/PipelineReifier.java  |   6 +-
 .../org/apache/camel/reifier/PolicyReifier.java    |  22 +-
 .../apache/camel/reifier/PollEnrichReifier.java    |   8 +-
 .../org/apache/camel/reifier/ProcessReifier.java   |   8 +-
 .../org/apache/camel/reifier/ProcessorReifier.java | 112 ++--
 .../apache/camel/reifier/RecipientListReifier.java |  18 +-
 .../apache/camel/reifier/RemoveHeaderReifier.java  |   6 +-
 .../apache/camel/reifier/RemoveHeadersReifier.java |   6 +-
 .../camel/reifier/RemovePropertiesReifier.java     |   6 +-
 .../camel/reifier/RemovePropertyReifier.java       |   6 +-
 .../apache/camel/reifier/ResequenceReifier.java    |  23 +-
 .../org/apache/camel/reifier/RollbackReifier.java  |   6 +-
 .../org/apache/camel/reifier/RouteReifier.java     | 244 ++++++---
 .../apache/camel/reifier/RoutingSlipReifier.java   |  15 +-
 .../java/org/apache/camel/reifier/SagaReifier.java |  26 +-
 .../org/apache/camel/reifier/SamplingReifier.java  |   6 +-
 .../org/apache/camel/reifier/ScriptReifier.java    |   6 +-
 .../java/org/apache/camel/reifier/SendReifier.java |  15 +-
 .../apache/camel/reifier/ServiceCallReifier.java   |   6 +-
 .../org/apache/camel/reifier/SetBodyReifier.java   |   6 +-
 .../camel/reifier/SetExchangePatternReifier.java   |   6 +-
 .../org/apache/camel/reifier/SetHeaderReifier.java |   6 +-
 .../apache/camel/reifier/SetPropertyReifier.java   |   6 +-
 .../java/org/apache/camel/reifier/SortReifier.java |   8 +-
 .../org/apache/camel/reifier/SplitReifier.java     |  11 +-
 .../java/org/apache/camel/reifier/StepReifier.java |   8 +-
 .../java/org/apache/camel/reifier/StopReifier.java |   6 +-
 .../org/apache/camel/reifier/ThreadsReifier.java   |  10 +-
 .../org/apache/camel/reifier/ThrottleReifier.java  |   6 +-
 .../camel/reifier/ThrowExceptionReifier.java       |   9 +-
 .../org/apache/camel/reifier/ToDynamicReifier.java |  10 +-
 .../apache/camel/reifier/TransactedReifier.java    | 124 +----
 .../org/apache/camel/reifier/TransformReifier.java |   6 +-
 .../java/org/apache/camel/reifier/TryReifier.java  |   6 +-
 .../org/apache/camel/reifier/UnmarshalReifier.java |   6 +-
 .../org/apache/camel/reifier/ValidateReifier.java  |   6 +-
 .../java/org/apache/camel/reifier/WhenReifier.java |   6 +-
 .../reifier/WhenSkipSendToEndpointReifier.java     |   6 +-
 .../org/apache/camel/reifier/WireTapReifier.java   |  19 +-
 .../reifier/dataformat/DataFormatReifier.java      |  33 +-
 .../errorhandler/DeadLetterChannelReifier.java     |   8 +-
 .../errorhandler/DefaultErrorHandlerReifier.java   |  10 +-
 .../errorhandler/ErrorHandlerRefReifier.java       |  18 +-
 .../reifier/errorhandler/ErrorHandlerReifier.java  | 125 +++--
 .../errorhandler/NoErrorHandlerReifier.java        |   6 +-
 .../loadbalancer/CustomLoadBalancerReifier.java    |   9 +-
 .../loadbalancer/FailoverLoadBalancerReifier.java  |   6 +-
 .../reifier/loadbalancer/LoadBalancerReifier.java  |  16 +-
 .../loadbalancer/RandomLoadBalancerReifier.java    |   6 +-
 .../RoundRobinLoadBalancerReifier.java             |   6 +-
 .../loadbalancer/StickyLoadBalancerReifier.java    |   6 +-
 .../loadbalancer/TopicLoadBalancerReifier.java     |   6 +-
 .../loadbalancer/WeightedLoadBalancerReifier.java  |   6 +-
 .../camel/reifier/rest/RestBindingReifier.java     |  10 +-
 .../transformer/CustomTransformeReifier.java       |   2 +-
 .../transformer/EndpointTransformeReifier.java     |   2 +-
 .../reifier/validator/CustomValidatorReifier.java  |   2 +-
 .../validator/EndpointValidatorReifier.java        |   2 +-
 .../camel/core/osgi/OsgiFactoryFinderResolver.java |   5 -
 .../java/org/apache/camel/ContextTestSupport.java  |   7 +-
 .../camel/builder/ContextErrorHandlerTest.java     |   6 +-
 .../org/apache/camel/builder/ErrorHandlerTest.java |  10 +-
 .../camel/builder/NotifyBuilderFromRouteTest.java  |   6 +-
 .../org/apache/camel/builder/RouteBuilderTest.java |  22 +-
 .../camel/builder/ThreadPoolBuilderTest.java       |   6 +-
 .../cluster/ClusterServiceSelectorTest.java        |   5 +-
 .../{impl => }/cluster/ClusterServiceViewTest.java |   5 +-
 ...seMethodWithMatchingTypeAndSkipSettersTest.java |   6 +-
 .../bean/BeanComponentMissingParenthesisTest.java  |   6 +-
 .../camel/component/bean/BeanConcurrentTest.java   |   6 +-
 .../camel/component/bean/BeanEndpointTest.java     |   6 +-
 .../BeanExchangeAsReturnTypeNotAllowedTest.java    |  10 +-
 .../bean/BeanExplicitMethodAmbiguousTest.java      |   6 +-
 .../component/bean/BeanExplicitMethodTest.java     |   6 +-
 .../bean/BeanExpressionConcurrentTest.java         |   6 +-
 .../component/bean/BeanImplicitMethodTest.java     |  10 +-
 .../camel/component/bean/BeanInPipelineTest.java   |   8 +-
 .../component/bean/BeanInfoSelectMethodTest.java   |   6 +-
 .../component/bean/BeanInvokeWithNullBodyTest.java |   6 +-
 .../camel/component/bean/BeanLifecycleTest.java    |   6 +-
 .../bean/BeanLookupUsingJndiRegistryIssueTest.java |   4 +-
 .../camel/component/bean/BeanMapPutTest.java       |   6 +-
 .../bean/BeanMethodValueWithCommaTest.java         |   6 +-
 .../bean/BeanMethodValueWithExchangeTest.java      |   6 +-
 ...rameterAndNoMethodWithNoParameterIssueTest.java |   6 +-
 .../bean/BeanMethodWithStringParameterTest.java    |   6 +-
 .../component/bean/BeanOgnlPerformanceTest.java    |   6 +-
 .../bean/BeanParameterInvalidSyntaxTest.java       |   6 +-
 .../bean/BeanParameterInvalidValueTest.java        |   6 +-
 .../BeanParameterMethodCallThreeBodyOgnlTest.java  |   6 +-
 .../bean/BeanParameterNoBeanBindingTest.java       |   6 +-
 .../bean/BeanParameterThreeBodyOgnlTest.java       |   6 +-
 .../component/bean/BeanParameterValueOgnlTest.java |   6 +-
 .../bean/BeanParameterValueOverloadedTest.java     |   6 +-
 .../component/bean/BeanParameterValueTest.java     |   6 +-
 .../camel/component/bean/BeanPipelineTest.java     |   8 +-
 .../component/bean/BeanPropagateHeaderTest.java    |   6 +-
 .../component/bean/BeanRefMethodNotFoundTest.java  |   6 +-
 .../camel/component/bean/BeanRefNotFoundTest.java  |   6 +-
 .../camel/component/bean/BeanRegistryBeanTest.java |   6 +-
 .../bean/BeanReturnCallableReturnNullTest.java     |  10 +-
 .../component/bean/BeanReturnCallableTest.java     |  10 +-
 .../bean/BeanWithAnnotationAndExchangeTest.java    |  10 +-
 .../bean/BeanWithAnnotationInheritedTest.java      |   9 +-
 .../BeanWithExchangeExceptionAnnotationTest.java   |  10 +-
 .../BeanWithExpressionInjectionPredicateTest.java  |   8 +-
 .../bean/BeanWithExpressionInjectionTest.java      |   9 +-
 .../camel/component/bean/BeanWithHeaderTest.java   |  10 +-
 .../bean/BeanWithHeadersAndBodyInject2Test.java    |   8 +-
 .../bean/BeanWithHeadersAndBodyInject3Test.java    |   8 +-
 .../bean/BeanWithHeadersAndBodyInjectionTest.java  |   8 +-
 .../bean/BeanWithInputStreamBodyTest.java          |   6 +-
 .../component/bean/BeanWithMethodHeaderTest.java   |   8 +-
 ...thPropertiesAndHeadersAndBodyInjectionTest.java |   8 +-
 .../BeanWithPropertiesAndHeadersInjectionTest.java |   8 +-
 ...BeanWithXPathInjectionUsingHeaderValueTest.java |   8 +-
 .../BeanWithXPathInjectionUsingResultTypeTest.java |   9 +-
 .../BodyAnnotationToDisambiguateMethodsTest.java   |   8 +-
 ...entWithPropertiesLookupSetFromEndpointTest.java |   6 +-
 .../bean/CustomParameterMappingStrategyTest.java   |   6 +-
 .../bean/DefaultParameterMappingStrategyTest.java  |   5 +-
 ...ressionAnnotationToDisambiguateMethodsTest.java |   8 +-
 .../bean/FileBeanParameterBindingTest.java         |   6 +-
 .../bean/MethodCallBeanRefMethodNotFoundTest.java  |   6 +-
 .../bean/MethodCallBeanRefNotFoundTest.java        |   6 +-
 .../bean/MethodCallRefOrBeanPrefixTest.java        |   6 +-
 .../camel/component/bean/MyCurrencyBeanTest.java   |   6 +-
 .../camel/component/bean/NewInstanceTest.java      |   9 +-
 .../camel/component/bean/PredicateAsBeanTest.java  |   8 +-
 ...nguageBeanFunctionMethodValueWithCommaTest.java |   6 +-
 ...BeanFunctionMethodValueWithParenthesisTest.java |   6 +-
 .../bean/issues/BeanRouteToDerivedClassTest.java   |   6 +-
 .../issues/BeanVsProcessorPerformanceTest.java     |   6 +-
 .../bean/issues/FilterBeanRegistryTest.java        |   6 +-
 .../camel/component/dataset/BigDataSetTest.java    |  11 +-
 .../camel/component/dataset/CustomDataSetTest.java |  11 +-
 .../component/dataset/DataSetConsumerTest.java     |  11 +-
 .../component/dataset/DataSetPreloadTest.java      |  11 +-
 .../component/dataset/DataSetProducerTest.java     |  11 +-
 .../camel/component/dataset/DataSetSedaTest.java   |  11 +-
 .../camel/component/dataset/DataSetTest.java       |  11 +-
 .../component/dataset/FileDataSetConsumerTest.java |  11 +-
 .../dataset/FileDataSetConsumerWithSplitTest.java  |  11 +-
 .../component/dataset/FileDataSetProducerTest.java |  11 +-
 .../dataset/FileDataSetProducerWithSplitTest.java  |  11 +-
 .../component/dataset/ListDataSetConsumerTest.java |  11 +-
 .../component/dataset/ListDataSetProducerTest.java |  11 +-
 .../component/dataset/RoutePerformanceTest.java    |  11 +-
 .../directvm/DirectVmHeaderFilterStrategyTest.java |   3 +-
 .../file/AntPathMatcherGenericFileFilterTest.java  |   6 +-
 .../camel/component/file/BeanToFileTest.java       |   8 +-
 .../file/FileBeginFailureOneTimeTest.java          |   6 +-
 ...ileConsumerBridgeRouteExceptionHandlerTest.java |   6 +-
 .../FileConsumerCustomExceptionHandlerTest.java    |   6 +-
 .../file/FileConsumerCustomSchedulerTest.java      |   6 +-
 .../file/FileConsumerDirectoryFilterTest.java      |   6 +-
 .../file/FileConsumerFileExpressionTest.java       |   6 +-
 ...leConsumerFileExpressionThrowExceptionTest.java |   6 +-
 .../component/file/FileConsumerFileFilterTest.java |   6 +-
 .../file/FileConsumerIdempotentRefTest.java        |   6 +-
 .../file/FileConsumerMoveExpressionTest.java       |   6 +-
 .../file/FileConsumerPollStrategyNotBeginTest.java |   6 +-
 ...FileConsumerPollStrategyPolledMessagesTest.java |   6 +-
 ...umerPollStrategyRollbackThrowExceptionTest.java |   6 +-
 ...FileConsumerPollStrategyStopOnRollbackTest.java |   6 +-
 .../file/FileConsumerPollStrategyTest.java         |   6 +-
 ...rFileRecursiveFilterDeleteOldLockFilesTest.java |   6 +-
 .../component/file/FileProducerExpressionTest.java |   6 +-
 .../file/FileProducerMoveExistingStrategyTest.java |   6 +-
 .../camel/component/file/FileSorterRefTest.java    |   6 +-
 .../file/FilerProducerDoneFileNameRouteTest.java   |   6 +-
 .../file/FilerProducerDoneFileNameTest.java        |   6 +-
 .../camel/component/file/ToFileRouteTest.java      |   6 +-
 .../FileLockClusteredRoutePolicyFactoryTest.java   |   2 +-
 .../cluster/FileLockClusteredRoutePolicyTest.java  |   2 +-
 .../FileIdempotentReadLockDelayedAsyncTest.java    |   6 +-
 .../FileIdempotentReadLockDelayedTest.java         |   6 +-
 .../file/strategy/FileIdempotentReadLockTest.java  |   6 +-
 .../language/LanguageScriptRouteTest.java          |   6 +-
 .../camel/component/log/LogListenerTest.java       |   5 +-
 .../apache/camel/component/log/LogMaskTest.java    |   8 +-
 .../camel/component/mock/MockAsBeanTest.java       |   6 +-
 .../camel/component/mock/MockEndpointTest.java     |   6 +-
 .../PropertiesComponentOnExceptionTest.java        |   6 +-
 ...rtiesComponentSomethingElseBoundToJndiTest.java |   6 +-
 .../camel/component/rest/FromRestApiTest.java      |   6 +-
 .../component/rest/FromRestConfigurationTest.java  |   6 +-
 .../component/rest/FromRestDefaultValueTest.java   |   6 +-
 .../component/rest/FromRestDuplicateTest.java      |   6 +-
 .../component/rest/FromRestGetContentTypeTest.java |   6 +-
 .../rest/FromRestGetCorsAllowCredentialsTest.java  |   6 +-
 .../component/rest/FromRestGetCorsCustomTest.java  |   6 +-
 .../camel/component/rest/FromRestGetCorsTest.java  |   6 +-
 .../rest/FromRestGetEmbeddedRouteTest.java         |   6 +-
 .../rest/FromRestGetHttpErrorCodeTest.java         |   6 +-
 .../component/rest/FromRestGetInterceptTest.java   |   6 +-
 .../component/rest/FromRestGetOnExceptionTest.java |   6 +-
 .../rest/FromRestGetPlaceholderParamTest.java      |  11 +-
 .../component/rest/FromRestGetPolicyTest.java      |  12 +-
 .../camel/component/rest/FromRestGetTest.java      |   6 +-
 .../rest/RestComponentVerifierExtensionTest.java   |   6 +-
 .../component/rest/RestComponentVerifierTest.java  |   6 +-
 .../component/scheduler/SchedulerRouteTest.java    |   8 +-
 .../seda/SedaConcurrentConsumersTest.java          |   6 +-
 .../seda/SedaDefaultBlockWhenFullTest.java         |   6 +-
 .../component/timer/TimerGracefulShutdownTest.java |   6 +-
 .../timer/TimerReferenceConfigurationTest.java     |   6 +-
 .../camel/component/timer/TimerRouteTest.java      |   8 +-
 .../validator/CustomSchemaFactoryFeatureTest.java  |   6 +-
 .../component/validator/ValidatorBeanCallTest.java |   6 +-
 .../ValidatorResourceResolverFactoryTest.java      |  20 +-
 .../apache/camel/component/vm/VMSplitterTest.java  |   6 +-
 .../xslt/XsltCustomizeEntityResolverTest.java      |   6 +-
 .../xslt/XsltCustomizeURIResolverTest.java         |   6 +-
 .../apache/camel/component/xslt/XsltRouteTest.java |   6 +-
 .../component/xslt/XsltUriResolverFactoryTest.java |  19 +-
 .../camel/impl/BeanInjectRouteBuilderTest.java     |   9 +-
 .../CamelContextAddRestDefinitionsFromXmlTest.java |  11 +-
 .../camel/impl/DataFormatContextAwareTest.java     |   9 +-
 .../DefaultComponentReferencePropertiesTest.java   |   9 +-
 .../apache/camel/impl/DefaultComponentTest.java    |  19 +-
 .../apache/camel/impl/DummyLifecycleStrategy.java  |  17 +-
 .../apache/camel/impl/GetRegistryAsTypeTest.java   |   5 +-
 .../org/apache/camel/impl/JndiRegistryTest.java    |  80 ---
 .../camel/impl/LanguageCamelContextAwareTest.java  |   9 +-
 .../impl/LifecycleStrategyFailOnStartupTest.java   |   3 +-
 .../camel/impl/LifecycleStrategyServiceTest.java   |   3 +-
 .../camel/impl/LogDebugBodyMaxCharsOffTest.java    |   9 +-
 .../camel/impl/LogDebugBodyMaxCharsTest.java       |   9 +-
 .../apache/camel/impl/LogDebugBodyStreamsTest.java |   9 +-
 .../camel/impl/MultipleLifecycleStrategyTest.java  |   3 +-
 .../org/apache/camel/impl/RefDataFormatTest.java   |   9 +-
 .../camel/impl/RouteIdRestDefinitionTest.java      |  11 +-
 .../RoutePolicyAutoStartupCancelledOnInitTest.java |   2 +-
 .../camel/impl/RoutePolicyRefCallbackTest.java     |   9 +-
 .../StartupListenerComponentFromRegistryTest.java  |   5 +-
 .../impl/engine/CamelPostProcessorHelperTest.java  |   7 +-
 .../camel/impl/model/RouteIdFactoryTest.java       |   6 +-
 .../validator/BeanValidatorInputValidateTest.java  |   6 +-
 .../validator/BeanValidatorOutputValidateTest.java |   6 +-
 .../apache/camel/issues/AdviceWithPolicyTest.java  |   6 +-
 .../camel/issues/AdviceWithTransactedTest.java     |   6 +-
 ...tScopedOnExceptionErrorHandlerRefIssueTest.java |   6 +-
 ...ExceptionErrorHandlerRefIssueTwoRoutesTest.java |   6 +-
 ...xceptionNotHandledErrorHandlerRefIssueTest.java |   6 +-
 ...otHandledErrorHandlerRefIssueTwoRoutesTest.java |   6 +-
 ...HandledRouteScopedErrorHandlerRefIssueTest.java |   6 +-
 ...uteScopedErrorHandlerRefIssueTwoRoutesTest.java |   6 +-
 ...ceptionRouteScopedErrorHandlerRefIssueTest.java |   6 +-
 ...uteScopedErrorHandlerRefIssueTwoRoutesTest.java |   6 +-
 .../OnExceptionErrorHandlerRefIssueTest.java       |   6 +-
 ...ExceptionErrorHandlerRefIssueTwoRoutesTest.java |   6 +-
 ...xceptionNotHandledErrorHandlerRefIssueTest.java |   6 +-
 ...otHandledErrorHandlerRefIssueTwoRoutesTest.java |   6 +-
 ...HandledRouteScopedErrorHandlerRefIssueTest.java |   6 +-
 ...uteScopedErrorHandlerRefIssueTwoRoutesTest.java |   6 +-
 ...ceptionRouteScopedErrorHandlerRefIssueTest.java |   6 +-
 ...uteScopedErrorHandlerRefIssueTwoRoutesTest.java |   6 +-
 .../camel/issues/OnExceptionWithTwoBeansTest.java  |   7 +-
 ...etryRouteScopedUntilRecipientListIssueTest.java |   6 +-
 .../camel/issues/SedaFileIdempotentIssueTest.java  |   6 +-
 .../camel/issues/SetHeaderInDoCatchIssueTest.java  |   7 +-
 ...terUsingBeanReturningCloseableIteratorTest.java |   6 +-
 .../SplitterUsingBeanReturningMessageTest.java     |   6 +-
 .../TransactedPropertyPlaceholderIssueTest.java    |   6 +-
 .../camel/issues/TryCatchWithSplitIssueTest.java   |   6 +-
 .../language/BeanAnnotationParameterTest.java      |   6 +-
 .../language/BeanAnnotationParameterTwoTest.java   |   6 +-
 ...LWithDotInParameterPropertyPlaceholderTest.java |   6 +-
 .../BeanLanguageOGNLWithDotInParameterTest.java    |   6 +-
 .../java/org/apache/camel/language/BeanTest.java   |  13 +-
 .../apache/camel/language/FileLanguageTest.java    |   6 +-
 .../apache/camel/language/LanguageServiceTest.java |   6 +-
 .../apache/camel/language/RefPredicateTest.java    |   6 +-
 .../java/org/apache/camel/language/RefTest.java    |   6 +-
 .../camel/language/simple/SimpleOperatorTest.java  |   6 +-
 .../language/simple/SimpleParserPredicateTest.java |   6 +-
 .../apache/camel/language/simple/SimpleTest.java   |   6 +-
 .../apache/camel/model/LoadRestFromXmlTest.java    |   6 +-
 .../model/LoadRouteFromXmlWithOnExceptionTest.java |   6 +-
 .../model/LoadRouteFromXmlWithPolicyTest.java      |  12 +-
 .../org/apache/camel/model/XmlTestSupport.java     |   2 +-
 .../camel/processor/BeanCachedProcessorTest.java   |  15 +-
 .../org/apache/camel/processor/BeanCachedTest.java |  15 +-
 .../BeanOgnMethodWithXPathInjectionTest.java       |   8 +-
 .../BeanRecipientListInterfaceAnnotationTest.java  |  10 +-
 .../camel/processor/BeanRecipientListTest.java     |   8 +-
 .../processor/BeanRecipientListTimeoutTest.java    |   8 +-
 .../org/apache/camel/processor/BeanRouteTest.java  |   8 +-
 .../apache/camel/processor/BeanSingletonTest.java  |  16 +-
 .../camel/processor/BeanWithExceptionTest.java     |   8 +-
 .../processor/BeanWithXPathInjectionTest.java      |   9 +-
 .../CBRPredicateBeanThrowExceptionTest.java        |   6 +-
 .../org/apache/camel/processor/ClaimCheckTest.java |   6 +-
 .../processor/ComposedMessageProcessorTest.java    |   6 +-
 .../CustomConsumerExceptionHandlerTest.java        |   6 +-
 .../processor/CustomProcessorFactoryTest.java      |   6 +-
 .../camel/processor/CustomRefLoadBalanceTest.java  |   6 +-
 .../processor/DataFormatServiceCustomRefTest.java  |   6 +-
 .../DeadLetterChannelAlwaysHandledTest.java        |   6 +-
 .../DeadLetterChannelRestartFromBeginningTest.java |   6 +-
 .../camel/processor/DefaultErrorHandlerTest.java   |   4 +-
 .../DefinitionPolicyPerProcessorTest.java          |  12 +-
 .../org/apache/camel/processor/DetourTest.java     |   6 +-
 .../processor/ErrorHandlerWrappedEachNodeTest.java |   6 +-
 .../apache/camel/processor/LogEipListenerTest.java |   6 +-
 .../org/apache/camel/processor/LogEipMaskTest.java |   8 +-
 .../apache/camel/processor/MethodFilterTest.java   |  11 +-
 .../org/apache/camel/processor/NormalizerTest.java |   8 +-
 .../camel/processor/PolicyPerProcessorTest.java    |  12 +-
 .../apache/camel/processor/PolicyPerRouteTest.java |  12 +-
 .../processor/RecipientListBeanOnPrepareTest.java  |   6 +-
 .../camel/processor/RecipientListBeanTest.java     |   6 +-
 ...pientListContextScopedOnExceptionIssueTest.java |   4 +-
 .../RecipientListFineGrainedErrorHandlingTest.java |   6 +-
 ...ntListParallelFineGrainedErrorHandlingTest.java |   6 +-
 .../processor/RecipientListReturnValueTest.java    |   6 +-
 .../apache/camel/processor/ResequencerTest.java    |   4 +-
 .../camel/processor/RoutePoliciesRefTest.java      |   6 +-
 ...utingSlipContextScopedOnExceptionIssueTest.java |   4 +-
 .../camel/processor/SimpleMockTwoRoutesTest.java   |   6 +-
 .../org/apache/camel/processor/SimulatorTest.java  |   8 +-
 .../camel/processor/SplitAggregateInOutTest.java   |   6 +-
 .../processor/SplitRefCustomExpressionTest.java    |   6 +-
 .../camel/processor/SplitterMethodCallTest.java    |   6 +-
 .../apache/camel/processor/SplitterPojoTest.java   |   6 +-
 .../camel/processor/StreamResequencerTest.java     |   4 +-
 .../camel/processor/ThrottlerMethodCallTest.java   |   6 +-
 .../TryCatchCaughtExceptionFinallyTest.java        |   6 +-
 .../processor/TryCatchCaughtExceptionTest.java     |   6 +-
 .../TryCatchCaughtExceptionTwoTimesTest.java       |   6 +-
 .../processor/TryFinallyCaughtExceptionTest.java   |   6 +-
 .../processor/WireTapBeanAsProcessorTest.java      |   6 +-
 .../camel/processor/WireTapOnPrepareRefTest.java   |   6 +-
 .../camel/processor/WireTapShutdownBeanTest.java   |   6 +-
 .../camel/processor/WireTapShutdownRouteTest.java  |   6 +-
 .../camel/processor/WireTapVoidBeanTest.java       |   6 +-
 .../AggregateForceCompletionOnStopTest.java        |   6 +-
 ...gationStrategyBeanAdapterRefMethodNameTest.java |   6 +-
 .../AggregationStrategyBeanAdapterRefTest.java     |   6 +-
 .../processor/async/AsyncEndpointPolicyTest.java   |  12 +-
 .../async/AsyncEndpointRecipientListBean3Test.java |   6 +-
 .../async/AsyncEndpointRecipientListBean4Test.java |   6 +-
 .../async/AsyncEndpointRecipientListBeanTest.java  |   6 +-
 ...tRecipientListFineGrainedErrorHandlingTest.java |   6 +-
 .../async/AsyncEndpointRoutingSlipBean2Test.java   |   6 +-
 .../async/AsyncEndpointRoutingSlipBean3Test.java   |   6 +-
 ...syncEndpointRoutingSlipBeanNonBlockingTest.java |   6 +-
 .../async/AsyncEndpointRoutingSlipBeanTest.java    |   6 +-
 ...sorAwaitManagerInterruptWithRedeliveryTest.java |  13 +-
 .../camel/processor/enricher/EnricherRefTest.java  |   6 +-
 .../enricher/PollEnrichBridgeErrorHandlerTest.java |   6 +-
 .../processor/enricher/PollEnricherRefTest.java    |   6 +-
 .../errorhandler/ErrorHandlerSupportTest.java      |  19 +-
 .../DefaultExceptionPolicyStrategyTest.java        |  11 +-
 ...xtScopedOnExceptionCorrectRouteContextTest.java |   4 +-
 ...efaultErrorHandlerExchangeFormatterRefTest.java |   6 +-
 ...rorHandlerOnExceptionOccurredProcessorTest.java |   6 +-
 .../DefaultErrorHandlerRetryWhileTest.java         |   6 +-
 .../onexception/OnExceptionComplexRouteTest.java   |   6 +-
 .../onexception/OnExceptionFromChoiceTest.java     |   6 +-
 .../OnExceptionFromChoiceUseOriginalBodyTest.java  |   6 +-
 ...nExceptionOccurredProcessorOnExceptionTest.java |   6 +-
 .../OnExceptionOccurredProcessorTest.java          |   6 +-
 .../onexception/OnExceptionRetryUntilTest.java     |   6 +-
 ...ptionRetryUntilWithDefaultErrorHandlerTest.java |   6 +-
 .../onexception/OnExceptionRouteTest.java          |   6 +-
 ...nExceptionRouteWithDefaultErrorHandlerTest.java |   6 +-
 .../RoutingSlipDataModificationTest.java           |   8 +-
 .../routingslip/RoutingSlipWithExceptionTest.java  |   8 +-
 .../camel/reifier/DataFormatReifierTest.java       |   8 +-
 .../apache/camel/reifier/ProcessorReifierTest.java |   6 +-
 ...ndiCamelSingletonInitialContextFactoryTest.java |  11 +-
 .../apache/camel/util/CamelContextHelperTest.java  |   6 +-
 .../util/DumpModelAsXmlDanishCharactersTest.java   |   6 +-
 .../util/DumpModelAsXmlRouteExpressionTest.java    |   6 +-
 .../util/DumpModelAsXmlRoutePredicateTest.java     |   6 +-
 .../services/org/apache/camel/headers-map-factory  |   2 +
 .../headersmap/FastHeadersMapFactory.java          |   2 +
 .../services/org/apache/camel/headers-map-factory  |  18 -
 .../DefaultManagementObjectNameStrategy.java       |  15 +-
 .../DefaultManagementObjectStrategy.java           |  67 ++-
 .../management/JmxManagementLifecycleStrategy.java |  53 +-
 .../management/mbean/ManagedErrorHandler.java      |  16 +-
 .../camel/management/mbean/ManagedRoute.java       |  14 +-
 .../management/ManagedCustomLoadBalancerTest.java  |  10 +-
 .../camel/management/ManagedCustomPolicyTest.java  |   6 +-
 .../camel/management/ManagedProcessTest.java       |  10 +-
 .../apache/camel/support/CamelContextHelper.java   |  35 +-
 .../org/apache/camel/support/ExchangeHelper.java   |  25 +-
 .../org/apache/camel/support/LRUCacheFactory.java  |   7 +-
 .../camel/support/LifecycleStrategySupport.java    |  17 +-
 .../org/apache/camel/support/MessageHelper.java    |  11 +-
 .../camel/support/builder/ExpressionBuilder.java   |  13 +-
 core/camel-xml-io/pom.xml                          |  12 +-
 .../services/org/apache/camel/xmlroutes-loader     |   2 +
 .../in/ModelParserXMLRoutesDefinitionLoader.java   |   2 +
 .../services/org/apache/camel/xmlroutes-loader     |  18 -
 .../org/apache/camel/model-jaxbcontext-factory     |   2 +
 .../services/org/apache/camel/modelxml-dumper      |   2 +
 .../services/org/apache/camel/xmlroutes-loader     |   2 +
 .../xml/jaxb}/DefaultModelJAXBContextFactory.java  |   4 +-
 .../camel/xml/jaxb/JaxbModelToXMLDumper.java       |   2 +
 .../xml/jaxb/JaxbXMLRoutesDefinitionLoader.java    |   2 +
 .../src/main/resources/META-INF/LICENSE.txt        | 203 -------
 .../src/main/resources/META-INF/NOTICE.txt         |  15 -
 .../services/org/apache/camel/modelxml-dumper      |  18 -
 .../services/org/apache/camel/xmlroutes-loader     |  18 -
 .../itest/jaxb/SpringLoadRouteFromXmlTest.java     |   2 +-
 .../apache/camel/maven/packaging/GenerateMojo.java |   2 -
 .../camel/maven/packaging/SpiGeneratorMojo.java    |   2 +-
 598 files changed, 3561 insertions(+), 6112 deletions(-)
 create mode 100644 
components/camel-bean/src/generated/resources/META-INF/services/org/apache/camel/bean-processor-factory
 create mode 100644 
components/camel-bean/src/generated/resources/META-INF/services/org/apache/camel/bean-proxy-factory
 delete mode 100644 
components/camel-bean/src/main/resources/META-INF/services/org/apache/camel/bean-processor-factory
 delete mode 100644 
components/camel-bean/src/main/resources/META-INF/services/org/apache/camel/bean-proxy-factory
 copy 
components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/{JtaTransactionErrorHandlerBuilder.java
 => JtaTransactionErrorHandlerReifier.java} (50%)
 create mode 100644 
components/camel-reactive-executor-vertx/src/generated/resources/META-INF/services/org/apache/camel/reactive-executor
 delete mode 100644 
components/camel-reactive-executor-vertx/src/main/resources/META-INF/services/org/apache/camel/reactive-executor
 create mode 100644 
components/camel-rest/src/generated/resources/META-INF/services/org/apache/camel/rest-registry-factory
 delete mode 100644 
components/camel-rest/src/main/resources/META-INF/services/org/apache/camel/rest-registry-factory
 delete mode 100644 
core/camel-api/src/main/java/org/apache/camel/spi/RouteContext.java
 create mode 100644 
core/camel-base/src/generated/resources/META-INF/services/org/apache/camel/properties-component-factory
 create mode 100644 
core/camel-base/src/main/java/org/apache/camel/impl/engine/BaseServiceResolver.java
 delete mode 100644 
core/camel-base/src/main/java/org/apache/camel/impl/engine/BeanProcessorFactoryResolver.java
 delete mode 100644 
core/camel-base/src/main/java/org/apache/camel/impl/engine/BeanProxyFactoryResolver.java
 delete mode 100644 
core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultRouteContext.java
 delete mode 100644 
core/camel-base/src/main/java/org/apache/camel/impl/engine/EventDrivenConsumerRoute.java
 delete mode 100644 
core/camel-base/src/main/java/org/apache/camel/impl/engine/HeadersMapFactoryResolver.java
 delete mode 100644 
core/camel-base/src/main/java/org/apache/camel/impl/engine/PropertiesComponentFactoryResolver.java
 delete mode 100644 
core/camel-base/src/main/java/org/apache/camel/impl/engine/ReactiveExecutorResolver.java
 delete mode 100644 
core/camel-base/src/main/java/org/apache/camel/impl/engine/RestRegistryFactoryResolver.java
 delete mode 100644 
core/camel-base/src/main/java/org/apache/camel/impl/engine/RuntimeCamelCatalogResolver.java
 copy 
core/{camel-core-engine/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
 => 
camel-base/src/main/java/org/apache/camel/impl/engine/SimpleCamelContext.java} 
(70%)
 delete mode 100644 
core/camel-base/src/main/resources/META-INF/services/org/apache/camel/properties-component-factory
 create mode 100644 
core/camel-caffeine-lrucache/src/generated/resources/META-INF/services/org/apache/camel/lru-cache-factory
 delete mode 100644 
core/camel-caffeine-lrucache/src/main/resources/META-INF/services/org/apache/camel/lru-cache-factory
 create mode 100644 
core/camel-core-catalog/src/generated/resources/META-INF/services/org/apache/camel/runtime-camelcatalog
 delete mode 100644 
core/camel-core-catalog/src/main/resources/META-INF/services/org/apache/camel/runtime-camelcatalog
 rename core/camel-core-engine/src/main/java/org/apache/camel/{impl => 
}/cluster/ClusteredRouteConfiguration.java (97%)
 rename core/camel-core-engine/src/main/java/org/apache/camel/{impl => 
}/cluster/ClusteredRouteController.java (99%)
 rename core/camel-core-engine/src/main/java/org/apache/camel/{impl => 
}/cluster/ClusteredRouteFilter.java (87%)
 rename core/camel-core-engine/src/main/java/org/apache/camel/{impl => 
}/cluster/ClusteredRouteFilters.java (88%)
 rename core/camel-core-engine/src/main/java/org/apache/camel/{impl => 
}/cluster/ClusteredRoutePolicy.java (97%)
 rename core/camel-core-engine/src/main/java/org/apache/camel/{impl => 
}/cluster/ClusteredRoutePolicyFactory.java (94%)
 rename core/camel-core-engine/src/main/java/org/apache/camel/{impl => 
}/cluster/package.html (100%)
 delete mode 100644 
core/camel-core-engine/src/main/java/org/apache/camel/impl/AbstractModelCamelContext.java
 delete mode 100644 
core/camel-core-engine/src/main/java/org/apache/camel/impl/JndiRegistry.java
 delete mode 100644 
core/camel-core-engine/src/main/java/org/apache/camel/impl/ModelToXMLDumperResolver.java
 delete mode 100644 
core/camel-core-engine/src/main/java/org/apache/camel/impl/XMLRoutesDefinitionLoaderResolver.java
 copy 
core/camel-core-engine/src/main/java/org/apache/camel/reifier/{TransactedReifier.java
 => AbstractPolicyReifier.java} (66%)
 rename core/camel-core/src/test/java/org/apache/camel/{impl => 
}/cluster/ClusterServiceSelectorTest.java (98%)
 rename core/camel-core/src/test/java/org/apache/camel/{impl => 
}/cluster/ClusterServiceViewTest.java (97%)
 delete mode 100644 
core/camel-core/src/test/java/org/apache/camel/impl/JndiRegistryTest.java
 create mode 100644 
core/camel-headersmap/src/generated/resources/META-INF/services/org/apache/camel/headers-map-factory
 delete mode 100644 
core/camel-headersmap/src/main/resources/META-INF/services/org/apache/camel/headers-map-factory
 create mode 100644 
core/camel-xml-io/src/generated/resources/META-INF/services/org/apache/camel/xmlroutes-loader
 delete mode 100644 
core/camel-xml-io/src/main/resources/META-INF/services/org/apache/camel/xmlroutes-loader
 create mode 100644 
core/camel-xml-jaxb/src/generated/resources/META-INF/services/org/apache/camel/model-jaxbcontext-factory
 create mode 100644 
core/camel-xml-jaxb/src/generated/resources/META-INF/services/org/apache/camel/modelxml-dumper
 create mode 100644 
core/camel-xml-jaxb/src/generated/resources/META-INF/services/org/apache/camel/xmlroutes-loader
 rename core/{camel-core-engine/src/main/java/org/apache/camel/impl => 
camel-xml-jaxb/src/main/java/org/apache/camel/xml/jaxb}/DefaultModelJAXBContextFactory.java
 (92%)
 delete mode 100644 core/camel-xml-jaxb/src/main/resources/META-INF/LICENSE.txt
 delete mode 100644 core/camel-xml-jaxb/src/main/resources/META-INF/NOTICE.txt
 delete mode 100644 
core/camel-xml-jaxb/src/main/resources/META-INF/services/org/apache/camel/modelxml-dumper
 delete mode 100644 
core/camel-xml-jaxb/src/main/resources/META-INF/services/org/apache/camel/xmlroutes-loader

Reply via email to