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 2021/02/11 16:48:49 UTC
[camel] branch master updated: CAMEL-16170: Modularize camel-spring
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 ed507e8 CAMEL-16170: Modularize camel-spring
ed507e8 is described below
commit ed507e8858299a315c73226681a22d1c6c5b9088
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Feb 11 16:58:18 2021 +0100
CAMEL-16170: Modularize camel-spring
---
.../src/main/resources/archetype-resources/pom.xml | 4 +
bom/camel-bom/pom.xml | 5 +
.../org/apache/camel/catalog/docs.properties | 1 +
.../apache/camel/catalog/docs/mock-component.adoc | 4 +-
.../camel/catalog/docs/polling-consumer.adoc | 4 +-
.../apache/camel/catalog/docs/spring-summary.adoc | 7 +-
.../org/apache/camel/catalog/docs/spring-xml.adoc | 38 ++
.../org/apache/camel/catalog/models.properties | 3 +
.../camel/catalog/models/beanPostProcessor.json | 2 +-
.../apache/camel/catalog/models/camelContext.json | 10 +-
.../camel/catalog/models/consumerTemplate.json | 2 +-
.../org/apache/camel/catalog/models/endpoint.json | 2 +-
.../apache/camel/catalog/models/errorHandler.json | 6 +-
.../camel/catalog/models/fluentTemplate.json | 2 +-
.../camel/catalog/models/keyStoreParameters.json | 19 +
.../catalog/models/redeliveryPolicyProfile.json | 2 +-
.../apache/camel/catalog/models/restContext.json | 2 +-
.../apache/camel/catalog/models/routeContext.json | 2 +-
.../camel/catalog/models/routeTemplateContext.json | 2 +-
.../catalog/models/secureRandomParameters.json | 17 +
.../camel/catalog/models/sslContextParameters.json | 19 +
.../org/apache/camel/catalog/models/template.json | 2 +-
.../apache/camel/catalog/models/threadPool.json | 2 +-
.../org/apache/camel/catalog/others.properties | 1 +
.../apache/camel/catalog/others/spring-xml.json | 15 +
.../apache/camel/catalog/schemas/camel-spring.xsd | 244 ++++++--
.../org/apache/camel/catalog/CamelCatalogTest.java | 11 +-
components/camel-apns/pom.xml | 2 +-
components/camel-asn1/pom.xml | 2 +-
components/camel-atomix/pom.xml | 5 +
components/camel-avro-rpc/pom.xml | 2 +-
components/camel-avro/pom.xml | 2 +-
components/camel-consul/pom.xml | 5 +
components/camel-csv/pom.xml | 2 +-
components/camel-cxf-transport/pom.xml | 2 +-
components/camel-cxf/pom.xml | 2 +-
components/camel-etcd/pom.xml | 5 +
components/camel-ftp/pom.xml | 2 +-
components/camel-hazelcast/pom.xml | 5 +
components/camel-jaxb/pom.xml | 2 +-
components/camel-jetty-common/pom.xml | 2 +-
components/camel-jetty/pom.xml | 2 +-
components/camel-jms/pom.xml | 5 +
.../camel/component/jms/temp/JmsReconnectTest.java | 2 +-
components/camel-jooq/pom.xml | 2 +-
components/camel-jpa/pom.xml | 5 +
components/camel-lzf/pom.xml | 2 +-
components/camel-mail/pom.xml | 5 +
components/camel-metrics/pom.xml | 2 +-
components/camel-micrometer/pom.xml | 2 +-
.../camel-mock/src/main/docs/mock-component.adoc | 4 +-
components/camel-resteasy/pom.xml | 2 +-
.../camel-resteasy/src/test/resources/pom.xml | 2 +-
components/camel-servlet/pom.xml | 2 +-
components/camel-spring-javaconfig/pom.xml | 2 +-
.../spring/javaconfig/CamelConfiguration.java | 2 +-
.../{camel-spring => camel-spring-xml}/pom.xml | 91 +--
.../apache/camel/model-jaxbcontext-factory-spring | 2 +
.../services/org/apache/camel/other.properties} | 6 +-
.../camel/spring/xml}/beanPostProcessor.json | 2 +-
.../org/apache/camel/spring/xml}/camelContext.json | 10 +-
.../apache/camel/spring/xml}/consumerTemplate.json | 2 +-
.../org/apache/camel/spring/xml}/endpoint.json | 2 +-
.../org/apache/camel/spring/xml}/errorHandler.json | 6 +-
.../apache/camel/spring/xml}/fluentTemplate.json | 2 +-
.../org/apache/camel/spring/xml}/jaxb.index | 5 +
.../camel/spring/xml/keyStoreParameters.json | 19 +
.../camel/spring/xml}/redeliveryPolicyProfile.json | 2 +-
.../org/apache/camel/spring/xml}/restContext.json | 2 +-
.../org/apache/camel/spring/xml}/routeContext.json | 2 +-
.../camel/spring/xml}/routeTemplateContext.json | 2 +-
.../camel/spring/xml/secureRandomParameters.json | 17 +
.../camel/spring/xml/sslContextParameters.json | 19 +
.../org/apache/camel/spring/xml}/template.json | 2 +-
.../org/apache/camel/spring/xml}/threadPool.json | 2 +-
.../src/generated/resources/spring-xml.json | 15 +
.../camel-spring-xml/src/main/docs/spring-xml.adoc | 38 ++
.../camel/spring/xml}/CamelBeanPostProcessor.java | 7 +-
.../xml}/CamelConsumerTemplateFactoryBean.java | 2 +-
.../camel/spring/xml}/CamelContextFactoryBean.java | 8 +-
.../spring/xml}/CamelEndpointFactoryBean.java | 2 +-
.../CamelFluentProducerTemplateFactoryBean.java | 2 +-
.../xml}/CamelProducerTemplateFactoryBean.java | 2 +-
.../xml}/CamelRedeliveryPolicyFactoryBean.java | 2 +-
.../spring/xml}/CamelRestContextFactoryBean.java | 2 +-
.../spring/xml}/CamelRouteContextFactoryBean.java | 2 +-
.../xml}/CamelRouteTemplateContextFactoryBean.java | 2 +-
.../spring/xml}/CamelThreadPoolFactoryBean.java | 2 +-
.../spring/xml}/ContextScanRouteBuilderFinder.java | 3 +-
.../camel/spring/xml}/ErrorHandlerDefinition.java | 2 +-
.../apache/camel/spring/xml}/ErrorHandlerType.java | 4 +-
.../xml}/KeyManagersParametersFactoryBean.java | 2 +-
.../spring/xml}/KeyStoreParametersFactoryBean.java | 2 +-
.../spring/xml}/PackageScanRouteBuilderFinder.java | 3 +-
.../SSLContextClientParametersFactoryBean.java | 2 +-
.../xml}/SSLContextParametersFactoryBean.java | 2 +-
.../SSLContextServerParametersFactoryBean.java | 2 +-
.../xml}/SecureRandomParametersFactoryBean.java | 2 +-
.../spring/xml}/SpringModelJAXBContextFactory.java | 8 +-
.../xml}/TrustManagersParametersFactoryBean.java | 2 +-
.../spring/xml}/XmlCamelContextConfigurer.java | 2 +-
.../spring/xml}/handler/BeanDefinitionParser.java | 2 +-
.../spring/xml}/handler/CamelNamespaceHandler.java | 36 +-
.../xml}/handler/ErrorHandlerDefinitionParser.java | 6 +-
.../apache/camel/spring/xml}/handler/package.html | 0
.../org/apache/camel/spring/xml}/package-info.java | 2 +-
.../src/main/resources/META-INF/spring.handlers | 4 +-
.../src/main/resources/META-INF/spring.schemas | 0
.../src/test/data/message1.xml | 0
.../src/test/data/message2.xml | 0
.../src/test/data/staff.xml | 0
.../src/test/java/a/b/c/Test.java | 0
.../component/bean/AutowireConstructorBean.java | 0
.../bean/AutowireConstructorRouteTest.java | 0
.../bean/AutowireConstructorRouteTwoTest.java | 0
.../component/bean/AutowireConstructorTwoBean.java | 0
.../camel/component/bean/BeanBindingTest.java | 0
.../apache/camel/component/bean/BeanRouteTest.java | 0
.../component/bean/BeanWithRecipientListTest.java | 0
.../apache/camel/component/bean/ExampleBean.java | 0
.../component/bean/MyBeanBindingConsumer.java | 0
.../apache/camel/component/bean/MyBeanCounter.java | 0
.../apache/camel/component/bean/RouterBean.java | 0
.../bean/SpringRouteMethodCallStaticTest.java | 0
.../camel/component/cron/SpringCronRouteTest.java | 0
.../camel/component/dataset/SpringDataSetTest.java | 0
.../apache/camel/component/event/DummyEvent.java | 0
.../camel/component/event/EventRouteTest.java | 0
.../camel/component/event/MistypedPackageTest.java | 0
.../component/log/CustomExchangeFormatterTest.java | 0
.../camel/component/log/SpringLogMarkerTest.java | 0
.../camel/component/log/SpringLogMaskTest.java | 0
.../apache/camel/component/log/SpringLogTest.java | 0
.../camel/component/log/TestExchangeFormatter.java | 0
.../BaseSpringPropertiesComponentTest.java | 0
...elSpringPropertyPlaceholderConfigurer2Test.java | 0
...ingPropertyPlaceholderConfigurerNestedTest.java | 0
...melSpringPropertyPlaceholderConfigurerTest.java | 0
.../camel/component/properties/HelloBean.java | 0
.../camel/component/properties/MyErrorBean.java | 0
.../SpringAttributeNewLineRouteContextRefTest.java | 0
.../properties/SpringAttributeNewLineTest.java | 0
.../properties/SpringBuilderRefBeanInjectTest.java | 0
.../properties/SpringBuilderRefPropertiesTest.java | 0
.../SpringBuilderRefPropertyInjectTest.java | 0
...rorHandlerInlinedPropertiesPlaceholderTest.java | 0
...pringErrorHandlerPropertiesPlaceholderTest.java | 0
.../SpringOptionalPropertiesDslTest.java | 0
.../SpringOptionalPropertiesDslTokenizeTest.java | 0
.../properties/SpringPackagePropertiesTest.java | 0
.../SpringPackageScanPropertiesTest.java | 0
.../SpringPropertiesAfterTransactedDSL2Test.java | 0
.../SpringPropertiesAfterTransactedDSLTest.java | 0
.../properties/SpringPropertiesComponent3Test.java | 0
...pertiesComponentEIPChoiceConvertBodyToTest.java | 0
...ingPropertiesComponentEIPConvertBodyToTest.java | 0
.../SpringPropertiesComponentFunctionTest.java | 0
...SpringPropertiesComponentInterceptFromTest.java | 0
...pringPropertiesComponentOnExceptionRefTest.java | 0
.../SpringPropertiesComponentOnExceptionTest.java | 0
.../SpringPropertiesComponentRefTest.java | 0
.../properties/SpringPropertiesComponentTest.java | 2 +-
.../properties/SpringPropertiesRouteFromTest.java | 0
.../properties/SpringPropertiesRouteIdTest.java | 0
...pringPropertyPlaceholderOnExceptionRefTest.java | 0
.../properties/route/SpringSimpleRoute.java | 0
.../properties/route2/SpringBeanInjectRoute.java | 0
.../route2/SpringPropertyInjectRoute.java | 0
.../apache/camel/component/rest/RestRefTest.java | 0
.../rest/SpringFromRestConfigurationTest.java | 0
.../rest/SpringFromRestDuplicateTest.java | 0
.../rest/SpringFromRestGetEmbeddedRouteTest.java | 0
.../rest/SpringFromRestGetInterceptTest.java | 0
.../rest/SpringFromRestGetOnExceptionTest.java | 0
.../SpringFromRestGetRouteOnExceptionTest.java | 0
.../component/rest/SpringFromRestGetTest.java | 0
.../rest/SpringFromRestIdAndDescriptionTest.java | 0
.../rest/SpringFromRestUriPrefixTest.java | 0
.../validator/SpringValidatorRouteTest.java | 0
.../component/xslt/SpringXsltRouteFileTest.java | 0
.../camel/component/xslt/SpringXsltRouteTest.java | 0
.../language/SpringSimpleEmptyStringTest.java | 0
.../camel/language/SpringSimpleExpressionTest.java | 0
.../camel/language/SpringSimpleNewlineTest.java | 0
.../SpringSimplePropertyPlaceholderClashTest.java | 0
.../camel/language/SpringSimpleRegexTest.java | 0
.../camel/language/SpringSimpleWeirdIssueTest.java | 0
.../SpringTokenXMLPairNamespaceSplitTest.java | 0
.../camel/language/SpringXMLTokenSplitTest.java | 0
.../camel/language/spel/SpelNonSpringTest.java | 0
.../camel/language/spel/SpelResourceTest.java | 0
.../apache/camel/language/spel/SpelRouteTest.java | 0
.../apache/camel/language/spel/SpelSpringTest.java | 0
.../org/apache/camel/language/spel/SpelTest.java | 0
.../spel/SpringSimpleMultiLineExpressionTest.java | 0
.../org/apache/camel/language/spel/bean/Dummy.java | 0
.../camel/processor/RemoveHeadersExcludeTest.java | 0
.../spring/ApplicationContextClassLoaderTest.java | 0
.../spring/ApplicationContextTestSupport.java | 0
.../test/java/org/apache/camel/spring/BeanA.java | 0
.../test/java/org/apache/camel/spring/BeanB.java | 0
.../test/java/org/apache/camel/spring/BeanC.java | 0
.../apache/camel/spring/CamelContextAwareBean.java | 0
.../apache/camel/spring/CamelContextAwareTest.java | 0
.../camel/spring/CamelContextFactoryBeanTest.java | 2 +
.../camel/spring/CamelGlobalOptionsTest.java | 0
.../camel/spring/CamelLoadRoutesFromXMLTest.java | 0
.../spring/CircularComponentCreationTest.java | 0
.../spring/CircularComponentInjectionTest.java | 0
.../spring/CustomProcessorWithNamespacesTest.java | 0
.../apache/camel/spring/DefaultJMXAgentTest.java | 0
.../camel/spring/DefaultStreamCachingTest.java | 0
.../apache/camel/spring/DisableJmxAgentTest.java | 0
.../java/org/apache/camel/spring/DummyBean.java | 0
.../camel/spring/DummyLifecycleStrategy.java | 0
.../spring/DumpModelAsXmlPlaceholdersTest.java | 0
.../apache/camel/spring/EndpointReferenceTest.java | 0
.../apache/camel/spring/EndpointToIdRefTest.java | 0
.../java/org/apache/camel/spring/InjectedBean.java | 0
.../org/apache/camel/spring/InjectedBeanTest.java | 0
.../camel/spring/JMXAgentPropertiesTest.java | 0
.../spring/LifecycleStrategyInjectionTest.java | 0
.../MultipleLifecycleStrategyInjectionTest.java | 0
.../apache/camel/spring/NodeIdReferenceTest.java | 0
.../spring/NoopPlatformTransactionManager.java | 0
.../apache/camel/spring/RegistryInjectionTest.java | 0
.../RouteRefCamelContextFactoryBeanTest.java | 0
.../RoutingUsingCamelContextFactoryTest.java | 0
.../spring/SendMessageOnRouteStartAndStopTest.java | 0
.../org/apache/camel/spring/ShutdownOrderBean.java | 0
.../spring/SpringBeanIoCStaticMethodTest.java | 0
.../SpringBeanPostProcessorDisabledTest.java | 0
.../spring/SpringBeanPostProcessorEnabledTest.java | 0
.../SpringCamelContextShutdownAfterBeanTest.java | 0
.../SpringCamelContextShutdownBeforeBeanTest.java | 0
...pringConsumerTemplateOutOfCamelContextTest.java | 0
.../camel/spring/SpringConsumerTemplateTest.java | 0
.../camel/spring/SpringEndpointPropertyTest.java | 0
.../spring/SpringLogDebugBodyMaxCharsTest.java | 0
.../org/apache/camel/spring/SpringMDCTest.java | 0
.../camel/spring/SpringMDCTransactedTest.java | 0
.../SpringMDCWithBreadcrumbDisabledTest.java | 0
.../camel/spring/SpringMDCWithBreadcrumbTest.java | 0
.../camel/spring/SpringRunWithTestSupport.java | 0
.../org/apache/camel/spring/SpringTestSupport.java | 0
.../camel/spring/StartAndStopEventNotifier.java | 0
.../camel/spring/StartAndStopRouteBuilder.java | 0
.../camel/spring/StartupShutdownOrderBaseTest.java | 0
...downSpringCamelContextFactoryBeanOrderTest.java | 1 +
...StartupShutdownSpringCamelContextOrderTest.java | 0
.../camel/spring/aop/ExceptionInterceptor.java | 0
.../org/apache/camel/spring/aop/MyCoolAopBean.java | 0
.../aop/SpringAopClassLevelCamelBeanTest.java | 0
.../camel/spring/bind/BeanAsEndpointTest.java | 0
.../org/apache/camel/spring/bind/ExampleBean.java | 0
.../camel/spring/bind/ProcessorAsEndpointTest.java | 0
.../apache/camel/spring/bind/ProcessorStub.java | 0
.../spring/cloud/ServiceCallConfigurationTest.java | 0
.../camel/spring/cloud/ServiceCallFilterTest.java | 0
.../spring/config/CamelContextAutoStartupTest.java | 0
.../spring/config/CamelSpringPackageTest.java | 0
.../config/ConsumerTemplateAlreadyExistTest.java | 0
.../config/ConsumerTemplateAutoRegisterTest.java | 0
.../ConsumerTemplateHasTwoTemplatesTest.java | 0
.../ConsumerTemplateMaximumCacheSizeTest.java | 0
.../config/CustomExecutorServiceManager.java | 0
.../config/CustomExecutorServiceManagerTest.java | 0
.../spring/config/CustomThreadPoolFactoryTest.java | 0
.../DeadLetterChannelRedeliveryConfigTest.java | 0
.../config/DefaultErrorHandlerConfigTest.java | 0
.../DefaultPackageResolverConfigureTest.java | 0
.../config/DependencyInjectCamelTemplateTest.java | 0
.../DualCamelContextEndpointOutsideTest.java | 0
.../spring/config/DummyErrorHandlerBuilder.java | 0
.../config/EndpointUriSetFromSpringTest.java | 0
.../ErrorHandlerCamelContextRefNotFoundTest.java | 0
.../spring/config/ErrorHandlerConfigTest.java | 0
.../ErrorHandlerRouteContextRefNotFoundTest.java | 0
.../camel/spring/config/ErrorHandlerTest.java | 0
.../FluentProducerTemplateAutoRegisterTest.java | 0
.../camel/spring/config/MyDependsOnBean.java | 0
.../spring/config/MyDependsOnRouteBuilder.java | 0
.../camel/spring/config/MyFailureProcessor.java | 0
.../apache/camel/spring/config/MyProduceBean.java | 0
.../camel/spring/config/NamespacePrefixTest.java | 0
.../OnExceptionNoExceptionConfiguredTest.java | 0
...eRouteRefOnExceptionAndDLCErrorHandlerTest.java | 0
...uteRefOnExceptionAndTwoDLCErrorHandlerTest.java | 0
.../spring/config/OneRouteRefOnExceptionTest.java | 0
...efReverseOnExceptionAndDLCErrorHandlerTest.java | 0
.../config/OneRouteRefReverseOnExceptionTest.java | 0
.../config/ProducerTemplateAlreadyExistTest.java | 0
...oducerTemplateAutoRegisterBeanIdExistsTest.java | 0
.../config/ProducerTemplateAutoRegisterTest.java | 0
...erTemplateAutoRegisterTwoCamelContextsTest.java | 0
.../ProducerTemplateHasTwoTemplatesTest.java | 0
.../ProducerTemplateMaximumCacheSizeTest.java | 0
...plateMixedAutoRegisterTwoCamelContextsTest.java | 0
.../config/RouteAutoStartupPropertiesTest.java | 0
.../camel/spring/config/RouteBuilderRef2Test.java | 0
.../camel/spring/config/RouteBuilderRefTest.java | 0
.../spring/config/RouteRefIncludeXmlFileTest.java | 0
.../RouteRefMultipleCamelContextRefsTest.java | 0
.../spring/config/RouteRefMultipleRefsTest.java | 0
.../spring/config/RouteRefMultipleRoutesTest.java | 0
...rtyPlaceholderMultipleCamelContextRefsTest.java | 0
.../apache/camel/spring/config/RouteRefTest.java | 0
...lContextCustomDefaultThreadPoolProfileTest.java | 0
...ingCamelContextCustomThreadPoolProfileTest.java | 0
.../config/SpringCamelContextDependsOnTest.java | 0
.../config/SpringCamelContextNoDependsOnTest.java | 0
...xtSimpleCustomDefaultThreadPoolProfileTest.java | 0
.../SpringCamelContextThreadPoolProfilesTest.java | 0
...ntextThreadPoolProfilesWithPlaceholderTest.java | 0
.../SpringErrorHandlerConfigFallbackTest.java | 0
.../config/SpringErrorHandlerConfigTest.java | 0
.../SpringProduceInjectedPrototypeBeanTest.java | 0
.../SpringProduceInjectedSingletonBeanTest.java | 0
.../camel/spring/config/SpringRouteNoFromTest.java | 0
.../spring/config/SpringRouteNoOutputTest.java | 0
.../camel/spring/config/TemplateUsingBean.java | 0
...oRouteRefOnExceptionAndDLCErrorHandlerTest.java | 0
.../spring/config/TwoRouteRefOnExceptionTest.java | 0
...efReverseOnExceptionAndDLCErrorHandlerTest.java | 0
.../config/TwoRouteRefReverseOnExceptionTest.java | 0
.../camel/spring/config/XmlConfigTestSupport.java | 2 +-
.../config/routebuilder/AbstractRouteBuilder.java | 0
.../config/routebuilder/my/MyRouteBuilder.java | 0
...teExclusionFromWithinSpringTestSupportTest.java | 0
.../config/scan/SpringComponentScanTest.java | 0
...ingComponentScanWithDeprecatedPackagesTest.java | 0
.../spring/config/scan/component/MyProcessor.java | 0
.../config/scan/route/MyExcludedRouteBuilder.java | 0
.../spring/config/scan/route/MyRouteBuilder.java | 0
...anOnExceptionAndDLCErrorHandlerReverseTest.java | 0
...ntextScanOnExceptionAndDLCErrorHandlerTest.java | 0
.../spring/contextscan/normalorder/BarRoute.java | 0
.../spring/contextscan/normalorder/FooRoute.java | 0
.../spring/contextscan/reverseorder/AFooRoute.java | 0
.../spring/contextscan/reverseorder/ZBarRoute.java | 0
.../spring/converter/ResourceConverterTest.java | 0
.../spring/example/AnotherFooEventConsumer.java | 0
.../spring/example/ContentBasedRouteTest.java | 0
.../org/apache/camel/spring/example/DummyBean.java | 0
.../camel/spring/example/FooEventConsumer.java | 0
.../camel/spring/example/FooEventRouteTest.java | 0
.../apache/camel/spring/example/MyConsumer.java | 0
.../apache/camel/spring/example/MyProcessor.java | 0
.../org/apache/camel/spring/example/MySender.java | 0
.../apache/camel/spring/example/MyVmConsumer.java | 0
.../camel/spring/example/PojoConsumerTest.java | 0
.../camel/spring/example/PojoSenderTest.java | 0
.../camel/spring/example/PojoVmConsumerTest.java | 0
.../camel/spring/example/SimpleRouteTest.java | 0
.../spring/example/SpringExpressionTrimTest.java | 0
.../spring/example/SpringXPathFilterTest.java | 0
.../camel/spring/example/test1/MyRouteBuilder.java | 0
.../SpringFileAntPathMatcherFileFilterTest.java | 0
.../file/SpringFileConsumerPreMoveIssueTest.java | 0
.../spring/file/SpringFileConsumerPreMoveTest.java | 0
.../spring/file/SpringFileLanguageCBRTest.java | 0
.../camel/spring/file/SpringFileRouteTest.java | 0
.../file/SpringSimpleFileNameWithQuoteTest.java | 0
.../spring/health/HealthCheckRegistryTest.java | 0
.../org/apache/camel/spring/impl/FooService.java | 0
...melContextAllowUseOriginalMessageFalseTest.java | 0
...amelContextAllowUseOriginalMessageTrueTest.java | 0
.../SpringProduceConsumeImplicitPropertyTest.java | 0
.../camel/spring/impl/SpringRefDataFormatTest.java | 0
.../spring/impl/SpringRoutePolicyFactoryTest.java | 0
.../impl/SpringRoutePolicyRefCallbackTest.java | 0
.../impl/SpringSupervisingRouteControllerTest.java | 0
...TypeConverterRegistryStatisticsEnabledTest.java | 0
.../impl/converter/SpringTypeConvertersTest.java | 0
.../transformer/SpringTransformerRouteTest.java | 0
.../impl/validator/SpringValidatorRouteTest.java | 0
.../interceptor/AnnotatedBookServiceImpl.java | 0
.../spring/interceptor/AnnotatedBookStore.java | 0
.../camel/spring/interceptor/AnnotatedConsume.java | 0
.../spring/interceptor/AnnotatedConsumeImpl.java | 0
.../camel/spring/interceptor/AnnotatedRoute.java | 0
.../camel/spring/interceptor/BookService.java | 0
.../interceptor/ContainerWideInterceptor.java | 0
.../interceptor/ContainerWideInterceptorTest.java | 0
.../spring/interceptor/DelayerInterceptorTest.java | 0
.../MixedPropagationTransactedTest.java | 0
.../MixedStreamCachingInterceptorTest.java | 0
.../MixedTransactionPropagationTest.java | 0
.../NoStreamCachingInterceptorTest.java | 0
...eWithTwoRoutesContextScopedOnExceptionTest.java | 0
.../SpringAdviceWithTwoRoutesOnExceptionTest.java | 0
.../interceptor/SpringAdviceWithTwoRoutesTest.java | 0
.../SpringInterceptorStrategyOrderedTest.java | 0
...ransactionalClientDataSourceTransactedTest.java | 0
...ctionalClientDataSourceUsingTransactedTest.java | 0
...hOnExceptionAndRollbackUsingTransactedTest.java | 0
...dOnExceptionAndRollbackUsingTransactedTest.java | 0
.../interceptor/StreamCachingInterceptorTest.java | 0
.../TransactedInterceptSendToEndpointTest.java | 0
...InterceptUsingAdviceWithSendToEndpointTest.java | 0
.../TransactedStackSizeBreakOnExceptionTest.java | 0
.../TransactedStackSizeParallelProcessingTest.java | 0
.../interceptor/TransactedStackSizeTest.java | 0
.../TransactionClientDataSourceSupport.java | 0
.../TransactionalClientDataSourceAsyncTest.java | 0
.../TransactionalClientDataSourceHandledTest.java | 0
...ransactionalClientDataSourceLookupTypeTest.java | 0
.../TransactionalClientDataSourceMDCTest.java | 0
...alClientDataSourceMinimalConfigurationTest.java | 0
...entDataSourceMixedTransactedRedeliveryTest.java | 0
...ctionalClientDataSourceMixedTransactedTest.java | 0
...sactionalClientDataSourceNotTransactedTest.java | 0
...lClientDataSourceOnExceptionRedeliveryTest.java | 0
...ransactionalClientDataSourceRedeliveryTest.java | 0
.../TransactionalClientDataSourceTest.java | 0
...ransactionalClientDataSourceTransactedTest.java | 0
...taSourceTransactedWithChoiceRedeliveryTest.java | 0
...alClientDataSourceTransactedWithChoiceTest.java | 0
...urceTransactedWithFileLocalOnExceptionTest.java | 0
...ataSourceTransactedWithFileOnExceptionTest.java | 0
...onalClientDataSourceTransactedWithFileTest.java | 0
...taSourceTransactedWithLocalOnExceptionTest.java | 0
...lientDataSourceTransactionErrorHandlerTest.java | 0
...lientDataSourceWithDefaultErrorHandlerTest.java | 0
...tDataSourceWithNoErrorHandlerConfigureTest.java | 0
...ourceWithOnExceptionHandledAndRollbackTest.java | 0
...ptionHandledAndRollbackUsingTransactedTest.java | 0
...rceWithOnExceptionMinimalConfigurationTest.java | 0
...lientDataSourceWithOnExceptionRollbackTest.java | 0
...ctionalClientDataSourceWithOnExceptionTest.java | 0
...ClientDataSourceWithSpringRouteBuilderTest.java | 0
...actedErrorHandlerOnExceptionRedeliveryTest.java | 0
.../TransactionalClientWithAnnotatedBeanTest.java | 0
.../TransactionalClientWithRollbackTest.java | 0
.../route/DataSourceSpringRouteBuilder.java | 0
.../issues/AdviceWithTransactionIssueTest.java | 0
.../apache/camel/spring/issues/Camel14624Test.java | 0
.../CamelContextModelErrorHandlerIssueTest.java | 4 +-
.../issues/CamelRouteRefInjectionIssueTest.java | 0
...dSpringOnExceptionErrorHandlerRefIssueTest.java | 0
...xceptionNotHandledErrorHandlerRefIssueTest.java | 0
...otHandledErrorHandlerRefIssueTwoRoutesTest.java | 0
...HandledRouteScopedErrorHandlerRefIssueTest.java | 0
...uteScopedErrorHandlerRefIssueTwoRoutesTest.java | 0
...ceptionRouteScopedErrorHandlerRefIssueTest.java | 0
...uteScopedErrorHandlerRefIssueTwoRoutesTest.java | 0
.../apache/camel/spring/issues/CoolService.java | 0
.../camel/spring/issues/CustomIdIssuesTest.java | 0
.../issues/FileWireTapWithXMLPayloadIssueTest.java | 0
.../apache/camel/spring/issues/MyCoolRoute.java | 0
.../apache/camel/spring/issues/MyCoolStuff.java | 0
.../apache/camel/spring/issues/MyFactoryBean.java | 0
.../apache/camel/spring/issues/MyHelloBean.java | 0
.../spring/issues/MyInjectionRouteBuilder.java | 0
.../apache/camel/spring/issues/MyProcessor.java | 0
.../apache/camel/spring/issues/MyRouteBuilder.java | 0
.../apache/camel/spring/issues/MyStatefulBean.java | 0
.../issues/ProduceSplitMethodCallIssueTest.java | 0
...RedeliveryErrorHandlerTwoXmlFilesIssueTest.java | 0
.../spring/issues/SampleInitializingBean.java | 0
.../issues/SampleInitializingRouteBuilder.java | 0
.../spring/issues/SampleRouteBuilderContainer.java | 0
...viceWithContextScopedErrorHandlerIssueTest.java | 0
...AdviceWithRouteScopedErrorHandlerIssueTest.java | 0
...ingAdviceWithTwoRoutesOnExceptionIssueTest.java | 0
.../spring/issues/SpringCatchNestedFailTest.java | 0
...ngCharlesSplitAndTryCatchRollbackIssueTest.java | 0
.../issues/SpringExceptionCamel4022Test.java | 0
.../spring/issues/SpringFinallyNestedFailTest.java | 0
.../issues/SpringInitializationIssueTest.java | 0
...stanceFactoryBeanCamelContextScanIssueTest.java | 0
.../issues/SpringInstanceFactoryBeanIssueTest.java | 0
...ngMultipleErrorHandlerOnExceptionIssueTest.java | 0
.../SpringOnExceptionErrorHandlerRefIssueTest.java | 0
...ExceptionErrorHandlerRefIssueTwoRoutesTest.java | 0
...xceptionNotHandledErrorHandlerRefIssueTest.java | 0
...otHandledErrorHandlerRefIssueTwoRoutesTest.java | 0
...HandledRouteScopedErrorHandlerRefIssueTest.java | 0
...uteScopedErrorHandlerRefIssueTwoRoutesTest.java | 0
...ceptionRouteScopedErrorHandlerRefIssueTest.java | 0
...uteScopedErrorHandlerRefIssueTwoRoutesTest.java | 0
.../camel/spring/issues/SpringPackageTest.java | 0
.../SpringPropertiesAvailableEverywhereTest.java | 0
...ngPropertyPlaceholderFileEndpointIssueTest.java | 0
.../issues/SpringPropertyPlaceholderIssueTest.java | 0
.../issues/SpringRenameFileOnCommitIssueTest.java | 0
...uteScopedErrorHandlerRefIssueTwoRoutesTest.java | 0
.../issues/SpringRouteIdAutoAssignClashIssue.java | 0
.../issues/SpringSingletonScopedBeanIssueTest.java | 0
...ringSplitterDetermineErrorHandlerIssueTest.java | 0
...andlerAndContextScopedOnExceptionIssueTest.java | 0
.../SpringTryCatchFinallyAndErrorHandlerTest.java | 0
.../issues/SpringTryCatchWithSplitIssueTest.java | 0
.../spring/issues/SpringTryNestedFailTest.java | 0
.../SpringTwoCamelContextDirectEndpointTest.java | 0
.../camel/spring/issues/contextscan/MyRoute.java | 0
.../SpringRouteIsComponentAnnotatedTest.java | 0
.../spring/issues/contextscan2/MyOtherRoute.java | 0
.../SpringRouteIsComponentAnnotated2Test.java | 0
.../spring/issues/contextscan3/MyHelloRoute.java | 0
.../spring/issues/packagescan/MyCoolRoute.java | 0
.../packagescan/SkipNonPublicRouteBuilderTest.java | 0
...ualCamelContextManagedAutoAssignedNameTest.java | 0
.../management/DualCamelContextManagedTest.java | 0
.../JmxInstrumentationWithConnectorTest.java | 0
.../ManagedEndpointInjectRefEndpointTest.java | 0
.../spring/management/ManagedRefEndpointTest.java | 0
.../org/apache/camel/spring/management/MyBean.java | 0
.../apache/camel/spring/management/MyBeanRef.java | 0
.../camel/spring/management/MyEventNotifier.java | 0
.../camel/spring/management/MyRouteBuilder.java | 0
.../SpringCamelContextStartingFailedEventTest.java | 0
.../SpringDualLoggingEventNotifierTest.java | 0
.../SpringJmxDumpCBRRoutesAsXmlTest.java | 0
...pringJmxDumpRoutesAsXmlIncludeHostNameTest.java | 0
.../management/SpringJmxDumpRoutesAsXmlTest.java | 0
.../SpringJmxEndpointInjectBeanRefTest.java | 0
.../SpringJmxEndpointInjectBeanRefTwoTest.java | 0
.../SpringJmxEndpointInjectBeanTest.java | 0
.../SpringJmxRecipientListRegisterAlwaysTest.java | 0
.../management/SpringJmxRecipientListTest.java | 0
.../management/SpringLoggingEventNotifierTest.java | 0
.../management/SpringManagedCamelContextTest.java | 0
.../SpringManagedCustomProcessorTest.java | 0
.../SpringManagedNamePatternFixedTest.java | 0
.../management/SpringManagedNamePatternTest.java | 0
.../management/SpringManagedResourceTest.java | 0
...edRouteRemoveContextScopedErrorHandlerTest.java | 0
...emoveRouteAndContextScopedErrorHandlerTest.java | 0
...agedRouteRemoveRouteScopedErrorHandlerTest.java | 0
.../management/SpringManagedSanitizeTest.java | 0
.../management/SpringManagedSedaEndpointTest.java | 0
.../SpringManagedStatisticsLevelOffTest.java | 0
...SpringManagedStatisticsLevelRoutesOnlyTest.java | 0
.../SpringManagedTransactedProcessorTest.java | 0
.../management/SpringPublishEventNotifierTest.java | 0
.../org/apache/camel/spring/mock/BeanMockTest.java | 0
.../InterceptSendToMockEndpointStrategyTest.java | 0
.../org/apache/camel/spring/mock/MyAssertions.java | 0
.../apache/camel/spring/patterns/FilterTest.java | 0
...LanguageWithSpringPropertyPlaceholderRoute.java | 0
...uageWithSpringPropertyPlaceholderRouteTest.java | 0
.../FileConsumerSpringSchedulerTest.java | 0
...CamelCustomPostProcessorOnRouteBuilderTest.java | 0
.../spring/postprocessor/MagicAnnotation.java | 0
.../MagicAnnotationPostProcessor.java | 0
.../MyRouteBuilderWithAutowiredPojo.java | 0
...pringCustomPostProcessorOnRouteBuilderTest.java | 0
.../camel/spring/postprocessor/TestPojo.java | 0
.../DualSpringManagedThreadsThreadPoolTest.java | 0
.../JavaDslTransactedNoTXManagerTest.java | 0
.../camel/spring/processor/MyAggregator.java | 0
.../apache/camel/spring/processor/MyCoolBean.java | 0
.../apache/camel/spring/processor/MyProcessor.java | 0
.../camel/spring/processor/MyProduceBean.java | 0
.../spring/processor/MySingleThreadExecutor.java | 0
.../camel/spring/processor/SetHeaderProcessor.java | 0
.../processor/SpringAggregateFromWireTapTest.java | 0
.../SpringAggregatorWithCustomStrategyTest.java | 0
.../SpringBatchResequencerAllowDuplicatesTest.java | 0
.../SpringBatchResequencerJMSPriorityTest.java | 0
.../processor/SpringCBRHeaderPredicateTest.java | 0
...ingCamelContextLogExhaustedMessageBodyTest.java | 0
.../camel/spring/processor/SpringChoiceTest.java | 0
.../SpringClaimCheckEipGetAndRemoveSetTest.java | 0
.../processor/SpringClaimCheckEipGetSetTest.java | 0
.../SpringClaimCheckEipPushPopBodyTest.java | 0
...ringClaimCheckEipPushPopHeadersPatternTest.java | 0
.../SpringClaimCheckEipPushPopHeadersTest.java | 0
...SpringClaimCheckEipPushPopRemoveHeaderTest.java | 0
.../processor/SpringClaimCheckEipPushPopTest.java | 0
.../processor/SpringComplexBlockWithEndTest.java | 0
.../spring/processor/SpringConvertBodyTest.java | 0
.../processor/SpringCustomExpressionTest.java | 0
.../processor/SpringCustomPredicateTest.java | 0
.../SpringCustomProcessorFactoryTest.java | 0
.../processor/SpringCustomRefLoadBalanceTest.java | 0
...gDeadLetterChannelInvalidDeadLetterUriTest.java | 0
...etterChannelInvalidOptionDeadLetterUriTest.java | 0
...etterChannelLogExhaustedMessageHistoryTest.java | 0
.../SpringDeadLetterChannelNewExceptionTest.java | 0
.../SpringDeadLetterChannelNoRedeliveryTest.java | 0
...DeadLetterChannelNotHandleNewExceptionTest.java | 0
.../SpringDeadLetterChannelOnPrepareTestTest.java | 0
...ingDeadLetterChannelUseOriginalBodyNewTest.java | 0
...SpringDeadLetterChannelUseOriginalBodyTest.java | 0
...adLetterChannelUseOriginalBodyWithFileTest.java | 0
...efaultErrorHandlerExchangeFormatterRefTest.java | 0
...ErrorHandlerLogExhaustedMessageHistoryTest.java | 0
...SpringDefaultErrorHandlerOnPrepareTestTest.java | 0
.../SpringDefaultErrorHandlerRetryWhileTest.java | 0
.../processor/SpringDelayerPerRouteTest.java | 0
.../camel/spring/processor/SpringDelayerTest.java | 0
...ringDoubleLoadBalancerMisconfigurationTest.java | 0
.../spring/processor/SpringDynamicRouterTest.java | 0
.../processor/SpringEnrichExpressionTest.java | 0
.../SpringEnricherAggregateOnExceptionTest.java | 0
.../spring/processor/SpringEnricherRefTest.java | 0
.../camel/spring/processor/SpringEnricherTest.java | 0
...ingErrorHandlerRedeliveryPolicyProfileTest.java | 0
...SpringEventNotifierExchangeSentExampleTest.java | 0
...ingFailOverLoadBalanceAutoStartupFalseTest.java | 0
.../processor/SpringFailOverLoadBalanceTest.java | 0
.../SpringFailoverMaximumFailoverAttemptsTest.java | 0
.../SpringFailoverRoundRobinStickyTest.java | 0
.../processor/SpringFailoverRoundRobinTest.java | 0
.../spring/processor/SpringFilterNoChildTest.java | 0
.../camel/spring/processor/SpringFilterTest.java | 0
.../spring/processor/SpringFromEndpointTest.java | 0
.../processor/SpringFromMultipleEndpointTest.java | 0
...dempotentConsumerNoSkipDuplicateFilterTest.java | 0
...pringIdempotentConsumerNoSkipDuplicateTest.java | 0
...pringIdempotentConsumerRemoveOnFailureTest.java | 0
.../processor/SpringIdempotentConsumerTest.java | 0
.../SpringInheritErrorHandlerDefaultTest.java | 0
.../SpringInheritErrorHandlerFalseTest.java | 0
.../SpringInheritErrorHandlerTrueTest.java | 0
.../SpringInterceptFromEndpointRefTest.java | 0
.../spring/processor/SpringInterceptFromTest.java | 0
.../processor/SpringInterceptFromUriRegexTest.java | 0
.../SpringInterceptFromUriSimpleLogTest.java | 0
.../SpringInterceptFromUriWildcardTest.java | 0
.../SpringInterceptFromWhenNoStopTest.java | 0
.../processor/SpringInterceptFromWhenTest.java | 0
.../SpringInterceptFromWhenWithChoiceTest.java | 0
.../processor/SpringInterceptFromWithStopTest.java | 0
.../SpringInterceptSendToEndpointDynamicTest.java | 0
...ngInterceptSendToEndpointInOnExceptionTest.java | 0
.../SpringInterceptSendToEndpointSkipTest.java | 0
.../SpringInterceptSendToEndpointTest.java | 0
.../SpringInterceptSendToEndpointWhenTest.java | 0
.../SpringInterceptSimpleRouteStopTest.java | 0
.../processor/SpringInterceptSimpleRouteTest.java | 0
.../SpringInterceptSimpleRouteWhenStopTest.java | 0
.../SpringInterceptSimpleRouteWhenTest.java | 0
.../spring/processor/SpringLogEipMaskTest.java | 0
.../spring/processor/SpringLogProcessorTest.java | 0
.../SpringLogProcessorWithProvidedLoggerTest.java | 0
.../camel/spring/processor/SpringLoopCopyTest.java | 0
.../spring/processor/SpringLoopDoWhileTest.java | 0
.../spring/processor/SpringLoopNoCopyTest.java | 0
.../camel/spring/processor/SpringLoopTest.java | 0
.../SpringManagedThreadsThreadPoolTest.java | 0
.../processor/SpringMarkRollbackOnlyTest.java | 0
.../SpringMessageHistoryDumpRoutingTest.java | 0
.../spring/processor/SpringMethodCallTest.java | 0
.../processor/SpringMulticastAggregatorTest.java | 0
.../SpringMulticastNoStopOnExceptionTest.java | 0
.../processor/SpringMulticastOnPrepareTest.java | 0
.../SpringMulticastStopOnExceptionTest.java | 0
.../SpringMulticastSubUnitOfWorkTest.java | 0
.../spring/processor/SpringMulticastTest.java | 0
.../processor/SpringNestedChoiceIssueTest.java | 0
.../spring/processor/SpringNormalizerTest.java | 0
...letionAndInterceptAndOnExceptionGlobalTest.java | 0
.../SpringOnCompletionAndInterceptGlobalTest.java | 0
.../SpringOnCompletionAndInterceptTest.java | 0
.../processor/SpringOnCompletionGlobalTest.java | 0
.../processor/SpringOnCompletionModeTest.java | 0
.../SpringOnCompletionOnCompleteOnlyTest.java | 0
.../SpringOnCompletionOnFailureOnlyTest.java | 0
...ompletionRouteScopeOverrideGlobalScopeTest.java | 0
.../spring/processor/SpringOnCompletionTest.java | 0
.../SpringOnCompletionUseOriginalBodyTest.java | 0
.../processor/SpringOnCompletionWhenTest.java | 0
.../SpringOnExceptionContinueToRouteTest.java | 0
.../processor/SpringPolicyPerProcessorTest.java | 0
.../spring/processor/SpringPolicyPerRouteTest.java | 0
.../processor/SpringPollEnrichExpressionTest.java | 0
.../processor/SpringPollEnricherRefTest.java | 0
.../spring/processor/SpringPollEnricherTest.java | 0
.../processor/SpringRandomLoadBalanceTest.java | 0
...SpringRecipientListAggregationStrategyTest.java | 0
...pringRecipientListDoNotStopOnExceptionTest.java | 0
...ingRecipientListIgnoreInvalidEndpointsTest.java | 0
.../SpringRecipientListOnPrepareTest.java | 0
...ecipientListParallelOptionalPropertiesTest.java | 0
.../SpringRecipientListParallelStreamingTest.java | 0
.../processor/SpringRecipientListParallelTest.java | 0
.../SpringRecipientListStopOnExceptionTest.java | 0
.../SpringRecipientListSubUnitOfWorkTest.java | 0
.../SpringRecipientListWithArrayHeaderTest.java | 0
...RecipientListWithStringDelimitedHeaderTest.java | 0
...cipientListWithStringDelimitedPropertyTest.java | 0
.../processor/SpringRedeliverToSubRouteTest.java | 0
...veryErrorHandlerNoRedeliveryOnShutdownTest.java | 0
.../spring/processor/SpringRemoveHeaderTest.java | 0
.../processor/SpringRemoveHeadersExcludeTest.java | 0
.../spring/processor/SpringRemoveHeadersTest.java | 0
.../SpringRemovePropertiesWithExclusionTest.java | 0
...SpringRemovePropertiesWithoutExclusionTest.java | 0
.../spring/processor/SpringRemovePropertyTest.java | 0
...ringResequenceStreamRejectOldExchangesTest.java | 0
.../spring/processor/SpringResequencerTest.java | 0
.../camel/spring/processor/SpringRollbackTest.java | 0
.../processor/SpringRoundRobinLoadBalanceTest.java | 0
.../SpringRouteContextProduceBeanTest.java | 0
.../processor/SpringRouteNoAutoStartupTest.java | 0
.../spring/processor/SpringRoutePoliciesTest.java | 0
.../SpringRouteStartupOrderSimpleTest.java | 0
.../processor/SpringRouteStartupOrderTest.java | 0
.../SpringRouteStartupOrderWithDefaultTest.java | 0
.../spring/processor/SpringRouteStopTest.java | 0
.../SpringRouteTopLevelMisconfiguredTest.java | 0
...RouteWithConstantFieldFromExchangeFailTest.java | 0
...ringRouteWithConstantFieldFromExchangeTest.java | 0
...pringRoutingSlipIgnoreInvalidEndpointsTest.java | 0
.../spring/processor/SpringRoutingSlipTest.java | 0
.../camel/spring/processor/SpringSagaRefTest.java | 0
.../camel/spring/processor/SpringSagaTest.java | 0
.../processor/SpringSamplingThrottlerTest.java | 0
.../processor/SpringScheduledThreadPoolTest.java | 0
.../spring/processor/SpringScriptExternalTest.java | 0
.../camel/spring/processor/SpringScriptTest.java | 0
.../camel/spring/processor/SpringSetBodyTest.java | 0
.../processor/SpringSetExchangePatternTest.java | 0
.../SpringSetExchangePatternWithCustomIdTest.java | 0
.../processor/SpringSetHeaderNameDynamicTest.java | 0
.../spring/processor/SpringSetHeaderTest.java | 0
.../processor/SpringSetHeaderWithConstantTest.java | 0
.../SpringSetHeaderXPathResultTypeTest.java | 0
.../SpringSetPropertyNameDynamicTest.java | 0
.../spring/processor/SpringSetPropertyTest.java | 0
.../SpringShutdownCompleteAllTasksTest.java | 0
.../SpringShutdownCompleteCurrentTaskOnlyTest.java | 0
.../SpringSimpleProcessorIdAwareTest.java | 0
.../processor/SpringSimpleResultTypeRouteTest.java | 0
.../camel/spring/processor/SpringSortBodyTest.java | 0
.../spring/processor/SpringSortExpressionTest.java | 0
.../processor/SpringSplitCustomExpressionTest.java | 0
.../processor/SpringSplitGroupMultiLinesTest.java | 0
.../processor/SpringSplitGroupSkipFirstTest.java | 0
.../processor/SpringSplitSubUnitOfWorkTest.java | 0
.../SpringSplitTokenizerGroupDynamicTest.java | 0
.../spring/processor/SpringSplitterBodyTest.java | 0
.../processor/SpringSplitterMethodCallTest.java | 0
.../SpringSplitterNoStopOnExceptionTest.java | 0
.../processor/SpringSplitterOnPrepareTest.java | 0
.../SpringSplitterStopOnExceptionTest.java | 0
...ngSplitterWithCustomThreadPoolExecutorTest.java | 0
.../processor/SpringStaticRecipientListTest.java | 0
.../camel/spring/processor/SpringStepTest.java | 0
.../processor/SpringStickyLoadBalanceTest.java | 0
.../processor/SpringStreamCachingPerRouteTest.java | 0
.../processor/SpringStreamCachingStrategyTest.java | 0
.../processor/SpringStreamResequencerTest.java | 0
.../camel/spring/processor/SpringTestHelper.java | 0
.../processor/SpringThreadNamePatternTest.java | 0
...ringThreadsCoreAndMaxPoolKeepAliveTimeTest.java | 0
.../processor/SpringThreadsCoreAndMaxPoolTest.java | 0
.../processor/SpringThreadsCorePoolTest.java | 0
.../spring/processor/SpringThreadsDefaultTest.java | 0
...ngThreadsExternalThreadPoolFactoryBeanTest.java | 0
.../SpringThreadsThreadPoolFactoryBeanTest.java | 0
.../processor/SpringThrottlerGroupingTest.java | 0
.../processor/SpringThrottlerMethodCallTest.java | 0
.../spring/processor/SpringThrottlerTest.java | 0
.../SpringThrottlerThreadPoolProfileTest.java | 0
.../SpringThrottlingInflightRoutePolicyTest.java | 0
.../processor/SpringThrowExceptionMessageTest.java | 0
.../spring/processor/SpringThrowExceptionTest.java | 0
.../processor/SpringToDynamicIgnoreTest.java | 0
.../SpringToDynamicLanguageXPathTest.java | 0
.../spring/processor/SpringToDynamicTest.java | 0
.../spring/processor/SpringTokenizerTest.java | 0
.../processor/SpringTopicLoadBalanceTest.java | 0
.../camel/spring/processor/SpringTraceTest.java | 0
.../processor/SpringTraceUsingPropertyTest.java | 0
.../spring/processor/SpringTransformTest.java | 0
.../processor/SpringTryCatchMisconfiguredTest.java | 0
...ingTryCatchMustHaveExceptionConfiguredTest.java | 0
.../SpringTryProcessorMultipleExceptionTest.java | 0
.../processor/SpringTryProcessorOnWhenTest.java | 0
.../spring/processor/SpringValidateRegExpTest.java | 0
.../spring/processor/SpringValidateSimpleTest.java | 0
.../SpringWeightedRandomLoadBalanceTest.java | 0
.../SpringWeightedRoundRobinLoadBalanceTest.java | 0
.../processor/SpringWireTapExpressionTest.java | 0
.../processor/SpringWireTapNewExchangeTest.java | 0
.../processor/SpringWireTapOnPrepareTest.java | 0
.../camel/spring/processor/SpringWireTapTest.java | 0
.../SpringWireTapUsingFireAndForgetCopyTest.java | 0
.../SpringWireTapUsingFireAndForgetTest.java | 0
.../processor/SpringWireTapVoidBeanTest.java | 0
.../spring/processor/SpringXPathFilterTest.java | 0
...ilterWithNamespaceOnImportRouteContextTest.java | 0
...XPathFilterWithNamespaceOnRouteContextTest.java | 0
.../SpringXPathFilterWithNamespaceTest.java | 0
...gXPathHeaderNameResultTypeAndNamespaceTest.java | 0
.../processor/SpringXPathHeaderNameTest.java | 0
.../spring/processor/SpringXPathHeaderTest.java | 0
.../processor/TransformWithExpressionTest.java | 0
.../apache/camel/spring/processor/XsltTest.java | 0
.../SpringAggregateCompleteAllOnStopTest.java | 0
.../SpringAggregateCompletionIntervalTest.java | 0
.../aggregator/SpringAggregateControllerTest.java | 0
.../SpringAggregateDiscardOnTimeoutTest.java | 0
.../SpringAggregateExpressionSizeFallbackTest.java | 0
.../SpringAggregateExpressionSizeTest.java | 0
...ringAggregateExpressionTimeoutFallbackTest.java | 0
...ringAggregateExpressionTimeoutPerGroupTest.java | 0
.../SpringAggregateExpressionTimeoutTest.java | 0
.../SpringAggregateForceCompletionOnStopTest.java | 0
...roupedExchangeCompletionExpressionSizeTest.java | 0
.../SpringAggregateSimplePredicateEagerTest.java | 0
.../SpringAggregateSimplePredicateTest.java | 0
.../aggregator/SpringAggregateSimpleSizeTest.java | 0
.../SpringAggregateSimpleTimeoutTest.java | 0
.../SpringAggregateThreadPoolProfileTest.java | 0
...ggregationStrategyBeanAdapterAllowNullTest.java | 0
...gationStrategyBeanAdapterRefMethodNameTest.java | 0
...pringAggregationStrategyBeanAdapterRefTest.java | 0
.../processor/aggregator/SpringAggregatorTest.java | 0
...yncDeadLetterChannelExecutorServiceRefTest.java | 0
.../FileConsumerIdempotentLoadStoreTest.java | 0
.../idempotent/FileConsumerIdempotentTest.java | 0
.../camel/spring/processor/idempotent/MyCache.java | 0
.../idempotent/MySpringIdempotentCacheManager.java | 0
.../idempotent/SpringCacheIdempotentTest.java | 0
.../SpringParentChildInterceptStrategyTest.java | 0
.../DeadLetterChannelHandledExampleTest.java | 0
.../onexception/OrderFailedException.java | 0
.../spring/processor/onexception/OrderService.java | 0
.../onexception/RedeliveryPolicyReTest.java | 0
.../SpringContextScopeOnExceptionTest.java | 0
...adLetterChannelOnExceptionOnRedeliveryTest.java | 0
.../SpringOnExceptionContinueSubRouteTest.java | 0
.../SpringOnExceptionContinueSubSubRouteTest.java | 0
.../onexception/SpringOnExceptionContinueTest.java | 0
...ngOnExceptionFromChoiceUseOriginalBodyTest.java | 0
...ringOnExceptionLoadBalancerDoubleIssueTest.java | 0
...pringOnExceptionNotNormalizedClassNameTest.java | 0
...nExceptionOccurredProcessorOnExceptionTest.java | 0
.../SpringOnExceptionOccurredProcessorTest.java | 0
.../onexception/SpringOnExceptionSubRouteTest.java | 0
...ceptionSubRouteWithDefaultErrorHandlerTest.java | 0
.../SpringOnExceptionUseOriginalBodyTest.java | 0
.../SpringOnExceptionUseOriginalMessageTest.java | 0
.../SpringOnExceptionWithRouteAndContinueTest.java | 0
.../LowestQuoteAggregationStrategy.java | 0
.../spring/processor/scattergather/MyVendor.java | 0
.../processor/scattergather/ScatterGatherTest.java | 0
.../spring/produce/FluentProduceTemplateTest.java | 0
.../apache/camel/spring/produce/MyCoolBean.java | 0
.../camel/spring/produce/MyCoolBeanTest.java | 0
.../apache/camel/spring/produce/MyListener.java | 0
.../camel/spring/produce/MyListenerService.java | 0
.../camel/spring/produce/ProduceTemplateTest.java | 0
.../ProduceTemplateWithTwoCamelContextTest.java | 0
.../apache/camel/spring/produce/ProduceTest.java | 0
.../camel/spring/produce/generics/MyService.java | 0
.../spring/produce/generics/MyServiceImpl.java | 0
.../spring/produce/generics/MyServiceInvoker.java | 0
.../spring/produce/generics/MyServiceSupport.java | 0
.../spring/produce/generics/MyServiceTest.java | 0
.../spring/routebuilder/CamelRouteBuilderTest.java | 0
.../camel/spring/routebuilder/MyOtherRoute.java | 0
.../apache/camel/spring/routebuilder/MyRoute.java | 0
.../routebuilder/SpringRouteTemplateRefTest.java | 0
.../routebuilder/SpringRouteTemplateTest.java | 0
.../scan/DefaultPackageScanClassResolverTest.java | 0
.../camel/spring/scan/PackageScanFiltersTest.java | 0
.../scan/PatternBasedPackageScanFilterTest.java | 0
.../apache/camel/spring/scan/ScanTestSupport.java | 0
.../org/apache/camel/spring/scan/ScannableOne.java | 0
.../org/apache/camel/spring/scan/ScannableTwo.java | 0
.../apache/camel/spring/scan/a/ScanTargetOne.java | 0
.../apache/camel/spring/scan/b/ScanTargetTwo.java | 0
.../apache/camel/spring/scan/c/NotAScanTarget.java | 0
.../camel/spring/scan/c/ScanTargetThree.java | 0
.../BridgePropertyPlaceholderConfigurerTest.java | 0
...PropertyPlaceholderConfigurerUtilIssueTest.java | 0
.../spring/spi/ParentContextRegistryTest.java | 0
.../camel/spring/util/EndpointHelperTest.java | 0
.../camel/spring/xml/ConfiguredRouteBuilder.java | 0
.../camel/spring/xml/ConfiguredRouteBuilder2.java | 0
.../spring/xml/SpringXmlRouteBuilderTest.java | 0
.../handler/ErrorHandlerDefinitionParserTest.java | 4 +-
.../spring/xml}/handler/MyErrorProcessor.java | 2 +-
.../spring/KeyStoreParametersFactoryBeanTest.java | 1 +
.../SSLContextParametersFactoryBeanTest.java | 1 +
.../SecureRandomParametersFactoryBeanTest.java | 0
.../src/test/resources/META-INF/LICENSE.txt | 0
.../src/test/resources/META-INF/NOTICE.txt | 0
.../services/org/apache/camel/component/file_test | 0
.../services/org/apache/camel/component/timer_test | 0
.../services/org/apache/camel/language/bean_test | 0
.../services/org/apache/camel/language/file_test | 0
.../org/apache/camel/language/resolver/default | 0
.../resources/META-INF/spring/camel-context.xml | 0
.../src/test/resources/META-INF/spring/dummy.xml | 0
.../src/test/resources/custom.properties | 0
.../src/test/resources/log4j2.properties | 0
.../src/test/resources/mycamel-1.properties | 0
.../src/test/resources/mycamel-2.properties | 0
.../src/test/resources/myspel.txt | 0
.../bean/AutowireConstructorRouteTest.xml | 0
.../bean/AutowireConstructorRouteTwoTest.xml | 0
.../bean/BeanWithRecipientListTest-context.xml | 0
.../bean/SpringRouteMethodCallStaticTest.xml | 0
.../camel/component/bean/beanBindingTest.xml | 0
.../apache/camel/component/bean/camelContext.xml | 0
.../org/apache/camel/component/cron/cron.xml | 0
.../dataset/SpringDataSetTest-context.xml | 0
.../apache/camel/component/event/camelContext.xml | 0
.../camel/component/event/mistypedPackage.xml | 0
.../log/SpringCustomLogMaskTest-context.xml | 0
.../component/log/SpringLogMarkerTest-context.xml | 0
.../component/log/SpringLogMaskTest-context.xml | 0
.../camel/component/log/SpringLogTest-context.xml | 0
.../log/custom-exchange-formatter-context.xml | 0
...melSpringPropertyPlaceholderConfigurer2Test.xml | 0
...melSpringPropertyPlaceholderConfigurer3Test.xml | 0
...ringPropertyPlaceholderConfigurerNestedTest.xml | 0
...amelSpringPropertyPlaceholderConfigurerTest.xml | 0
.../SpringAttributeNewLineRouteContextRefTest.xml | 0
.../properties/SpringAttributeNewLineTest.xml | 0
.../properties/SpringBuilderRefBeanInjectTest.xml | 0
.../properties/SpringBuilderRefPropertiesTest.xml | 0
.../SpringBuilderRefPropertyInjectTest.xml | 0
...rrorHandlerInlinedPropertiesPlaceholderTest.xml | 0
...SpringErrorHandlerPropertiesPlaceholderTest.xml | 0
.../properties/SpringOptionalPropertiesDslTest.xml | 0
.../SpringOptionalPropertiesDslTokenizeTest.xml | 0
.../properties/SpringPackagePropertiesTest.xml | 0
.../properties/SpringPackageScanPropertiesTest.xml | 0
.../SpringPropertiesAfterTransactedDSL2Test.xml | 0
.../SpringPropertiesAfterTransactedDSLTest.xml | 0
.../properties/SpringPropertiesComponent3Test.xml | 0
...opertiesComponentEIPChoiceConvertBodyToTest.xml | 0
...ringPropertiesComponentEIPConvertBodyToTest.xml | 0
.../SpringPropertiesComponentFunctionTest.xml | 0
.../SpringPropertiesComponentInterceptFromTest.xml | 0
...SpringPropertiesComponentOnExceptionRefTest.xml | 0
.../SpringPropertiesComponentOnExceptionTest.xml | 0
.../SpringPropertiesComponentRefTest.xml | 0
.../properties/SpringPropertiesComponentTest.xml | 0
.../properties/SpringPropertiesRouteFromTest.xml | 0
.../properties/SpringPropertiesRouteIdTest.xml | 0
...SpringPropertyPlaceholderOnExceptionRefTest.xml | 0
.../camel/component/properties/cheese.properties | 0
.../camel/component/properties/myprop.properties | 0
.../camel/component/properties/nested.properties | 0
.../apache/camel/component/rest/RestRefTest.xml | 0
.../rest/SpringFromRestConfigurationTest.xml | 0
.../component/rest/SpringFromRestDuplicateTest.xml | 0
.../rest/SpringFromRestGetEmbeddedRouteTest.xml | 0
.../rest/SpringFromRestGetInterceptTest.xml | 0
.../rest/SpringFromRestGetOnExceptionTest.xml | 0
.../rest/SpringFromRestGetRouteOnExceptionTest.xml | 0
.../camel/component/rest/SpringFromRestGetTest.xml | 0
.../rest/SpringFromRestIdAndDescriptionTest.xml | 0
.../component/rest/SpringFromRestUriPrefixTest.xml | 0
.../camel/component/validator/camelContext.xml | 0
.../apache/camel/component/validator/schema.xsd | 0
.../component/xslt/SpringXsltRouteFileTest.xml | 0
.../camel/component/xslt/SpringXsltRouteTest.xml | 0
.../apache/camel/component/xslt/mytransform.xsl | 0
.../camel/language/SpringSimpleEmptyStringTest.xml | 0
.../camel/language/SpringSimpleExpressionTest.xml | 0
.../SpringSimpleMultiLineExpressionTest.xml | 0
...gSimplePropertyPlaceholderClashTest-context.xml | 0
.../camel/language/SpringSimpleWeirdIssueTest.xml | 0
.../SpringTokenXMLPairNamespaceSplitTest.xml | 0
.../camel/language/SpringXMLTokenSplitTest.xml | 0
...simplePropertiesPlaceholderClashTest.properties | 0
.../camel/language/spel/SpelSpringTest-context.xml | 0
.../apache/camel/language/springSimpleNewline.xml | 0
.../camel/language/springSimpleRegexContext.xml | 0
.../org/apache/camel/osgi/camelContext.xml | 0
.../org/apache/camel/processor/camel-context.xml | 0
.../CircularComponentCreationComplexTest.xml | 0
.../spring/CircularComponentCreationSimpleTest.xml | 0
.../CircularComponentInjectionTest-context.xml | 0
.../spring/DumpModelAsXmlPlaceholdersTest.xml | 0
.../apache/camel/spring/EndpointToIdRefTest.xml | 0
.../camel/spring/NodeIdReferenceTest-context.xml | 0
.../org/apache/camel/spring/RegistryInjection.xml | 0
.../spring/SendMessageOnRouteStartAndStopTest.xml | 0
.../camel/spring/SpringBeanIoCStaticMethodTest.xml | 0
.../spring/SpringBeanPostProcessorDisabledTest.xml | 0
.../spring/SpringBeanPostProcessorEnabledTest.xml | 0
.../SpringCamelContextShutdownAfterBeanTest.xml | 0
.../SpringCamelContextShutdownBeforeBeanTest.xml | 0
...nsumerTemplateOutOfCamelContextTest-context.xml | 0
.../spring/SpringConsumerTemplateTest-context.xml | 0
.../camel/spring/SpringEndpointPropertyTest.xml | 0
.../spring/SpringLogDebugBodyMaxCharsTest.xml | 0
.../org/apache/camel/spring/SpringMDCTest.xml | 0
.../spring/SpringMDCWithBreadcrumbDisabledTest.xml | 0
.../camel/spring/SpringMDCWithBreadcrumbTest.xml | 0
.../aop/SpringAopClassLevelCamelBeanTest.xml | 0
.../apache/camel/spring/bind/beanAsEndpoint.xml | 0
.../camel/spring/bind/processorAsEndpoint.xml | 0
.../apache/camel/spring/camelContextAwareBean.xml | 0
.../camel/spring/camelContextRouteBuilderRef.xml | 0
.../org/apache/camel/spring/camelGlobalOptions.xml | 0
.../camel/spring/camelLoadRoutesFromXMLTest.xml | 0
.../spring/cloud/ServiceCallConfigurationTest.xml | 0
.../camel/spring/cloud/ServiceCallFilterTest.xml | 0
.../config/CamelContextAutoStartupTestFalse.xml | 0
.../config/CamelContextAutoStartupTestTrue.xml | 0
.../ConsumerTemplateAlreadyExistTest-context.xml | 0
.../ConsumerTemplateAutoRegisterTest-context.xml | 0
...ConsumerTemplateHasTwoTemplatesTest-context.xml | 0
...onsumerTemplateMaximumCacheSizeTest-context.xml | 0
.../CustomExecutorServiceManagerTest-context.xml | 0
.../config/CustomThreadPoolFactoryTest-context.xml | 0
...adLetterChannelRedeliveryConfigTest-context.xml | 0
.../DefaultErrorHandlerConfigTest-context.xml | 0
.../DependencyInjectCamelTemplateTest-context.xml | 0
.../config/DualCamelContextEndpointOutsideTest.xml | 0
.../EndpointUriSetFromSpringTest-context.xml | 0
.../ErrorHandlerCamelContextRefNotFoundTest.xml | 0
.../config/ErrorHandlerConfigTest-context.xml | 0
.../ErrorHandlerRouteContextRefNotFoundTest.xml | 0
...entProducerTemplateAutoRegisterTest-context.xml | 0
.../spring/config/NamespacePrefixTest-context.xml | 0
.../OnExceptionNoExceptionConfiguredTest.xml | 0
.../camel/spring/config/OneRouteRefOnException.xml | 0
.../OneRouteRefOnExceptionAndDLCErrorHandler.xml | 0
...OneRouteRefOnExceptionAndTwoDLCErrorHandler.xml | 0
.../config/OneRouteRefReverseOnException.xml | 0
...outeRefReverseOnExceptionAndDLCErrorHandler.xml | 0
.../camel/spring/config/PackageResolverTest.xml | 0
.../ProducerTemplateAlreadyExistTest-context.xml | 0
...emplateAutoRegisterBeanIdExistsTest-context.xml | 0
.../ProducerTemplateAutoRegisterTest-context.xml | 0
...ateAutoRegisterTwoCamelContextsTest-context.xml | 0
...ProducerTemplateHasTwoTemplatesTest-context.xml | 0
...roducerTemplateMaximumCacheSizeTest-context.xml | 0
...xedAutoRegisterTwoCamelContextsTest-context.xml | 0
.../spring/config/RouteAutoStartupFalseTest.xml | 0
.../spring/config/RouteAutoStartupTrueTest.xml | 0
.../spring/config/RouteRefIncludeXmlFileTest.xml | 0
.../RouteRefMultipleCamelContextRefsTest.xml | 0
.../spring/config/RouteRefMultipleRefsTest.xml | 0
.../spring/config/RouteRefMultipleRoutesTest.xml | 0
...ertyPlaceholderMultipleCamelContextRefsTest.xml | 0
.../apache/camel/spring/config/RouteRefTest.xml | 0
...elContextCustomDefaultThreadPoolProfileTest.xml | 0
...ringCamelContextCustomThreadPoolProfileTest.xml | 0
.../config/SpringCamelContextDependsOnTest.xml | 0
.../config/SpringCamelContextNoDependsOnTest.xml | 0
...extSimpleCustomDefaultThreadPoolProfileTest.xml | 0
.../SpringCamelContextThreadPoolProfilesTest.xml | 0
...ontextThreadPoolProfilesWithPlaceholderTest.xml | 0
.../SpringErrorHandlerConfigFallbackTest.xml | 0
.../spring/config/SpringErrorHandlerConfigTest.xml | 0
.../SpringProduceInjectedPrototypeBeanTest.xml | 0
.../SpringProduceInjectedSingletonBeanTest.xml | 0
.../camel/spring/config/SpringRouteNoFromTest.xml | 0
.../spring/config/SpringRouteNoOutputTest.xml | 0
.../camel/spring/config/TwoRouteRefOnException.xml | 0
.../TwoRouteRefOnExceptionAndDLCErrorHandler.xml | 0
.../config/TwoRouteRefReverseOnException.xml | 0
...outeRefReverseOnExceptionAndDLCErrorHandler.xml | 0
.../apache/camel/spring/config/errorHandler.xml | 0
.../apache/camel/spring/config/myCoolRoutes.xml | 0
.../org/apache/camel/spring/config/pool.properties | 0
.../apache/camel/spring/config/route.properties | 0
.../camel/spring/config/routeBuilderPackage.xml | 0
.../apache/camel/spring/config/routeBuilderRef.xml | 0
.../camel/spring/config/routeBuilderRef2.xml | 0
.../camel/spring/config/scan/componentScan.xml | 0
.../config/scan/componentScanWithPackages.xml | 0
.../scan/explicitlyDefinedRouteExclusion.xml | 0
.../apache/camel/spring/context-with-endpoint.xml | 0
.../ContextScanOnExceptionAndDLCErrorHandler.xml | 0
...extScanOnExceptionAndDLCErrorHandlerReverse.xml | 0
.../apache/camel/spring/converter/testresource.txt | 0
.../camel/spring/debug/applicationContext.xml | 0
.../org/apache/camel/spring/defaultJmxConfig.xml | 0
.../org/apache/camel/spring/disableJmxConfig.xml | 0
.../camel/spring/disableJmxTheOldWayConfig.xml | 0
.../org/apache/camel/spring/endpointReference.xml | 0
.../camel/spring/example/contentBasedRoute.xml | 0
.../apache/camel/spring/example/expressionTrim.xml | 0
.../apache/camel/spring/example/fooEventRoute.xml | 0
.../apache/camel/spring/example/pojoConsumer.xml | 0
.../org/apache/camel/spring/example/pojoSender.xml | 0
.../apache/camel/spring/example/pojoVmConsumer.xml | 0
.../apache/camel/spring/example/simpleRoute.xml | 0
.../apache/camel/spring/example/xpathFilter.xml | 0
.../resources/org/apache/camel/spring/examples.xml | 0
...ingFileAntPathMatcherFileFilterTest-context.xml | 0
.../file/SpringFileConsumerPreMoveIssueTest.xml | 0
.../spring/file/SpringFileConsumerPreMoveTest.xml | 0
.../spring/file/SpringFileLanguageCBRTest.xml | 0
.../spring/file/SpringFileRouteTest-context.xml | 0
.../SpringSimpleFileNameWithQuoteTest-context.xml | 0
.../spring/health/HealthCheckRegistryTest.xml | 0
...amelContextAllowUseOriginalMessageFalseTest.xml | 0
...CamelContextAllowUseOriginalMessageTrueTest.xml | 0
.../SpringProduceConsumeImplicitPropertyTest.xml | 0
.../camel/spring/impl/SpringRefDataFormatTest.xml | 0
.../spring/impl/SpringRoutePolicyFactoryTest.xml | 0
.../impl/SpringRoutePolicyRefCallbackTest.xml | 0
.../impl/SpringSupervisingRouteControllerTest.xml | 0
...gTypeConverterRegistryStatisticsEnabledTest.xml | 0
.../impl/converter/SpringTypeConvertersTest.xml | 0
.../transformer/SpringTransformerRouteTest.xml | 0
.../impl/validator/SpringValidatorRouteTest.xml | 0
.../org/apache/camel/spring/injectedBean.xml | 0
.../interceptor/ContainerWideInterceptorTest.xml | 0
.../interceptor/InterceptorStrategyOrderedTest.xml | 0
.../MixedTransactionPropagationTest.xml | 0
...ceWithTwoRoutesContextScopedOnExceptionTest.xml | 0
.../SpringAdviceWithTwoRoutesOnExceptionTest.xml | 0
.../interceptor/SpringAdviceWithTwoRoutesTest.xml | 0
.../spring/interceptor/delayerInterceptorTest.xml | 0
.../interceptor/mixedPropagationTransactedTest.xml | 0
.../mixedStreamCachingInterceptorTest.xml | 0
.../interceptor/noStreamCachingInterceptorTest.xml | 0
.../springTransactionalClientDataSource.xml | 0
...ctionalClientDataSourceMinimalConfiguration.xml | 0
...ransactionalClientDataSourceUsingTransacted.xml | 0
...taWithOnExceptionAndRollbackUsingTransacted.xml | 0
...ScopedOnExceptionAndRollbackUsingTransacted.xml | 0
.../spring/interceptor/streamCachingOnRoute.xml | 0
.../interceptor/transactionalClientDataSource.xml | 0
...ionalClientDataSourceWithSpringRouteBuilder.xml | 0
.../transactionalClientWithAnnotatedBeanTest.xml | 0
.../issues/AdviceWithTransactionIssueTest.xml | 0
.../CamelContextModelErrorHandlerIssueTest.xml | 0
.../issues/CamelRouteRefInjectionIssueTest.xml | 0
...edSpringOnExceptionErrorHandlerRefIssueTest.xml | 0
...ExceptionNotHandledErrorHandlerRefIssueTest.xml | 0
...NotHandledErrorHandlerRefIssueTwoRoutesTest.xml | 0
...tHandledRouteScopedErrorHandlerRefIssueTest.xml | 0
...outeScopedErrorHandlerRefIssueTwoRoutesTest.xml | 0
...xceptionRouteScopedErrorHandlerRefIssueTest.xml | 0
...outeScopedErrorHandlerRefIssueTwoRoutesTest.xml | 0
.../camel/spring/issues/CustomIdIssueTest.xml | 0
.../camel/spring/issues/EndpointIdIssueTest.xml | 0
.../issues/FileWireTapWithXMLPayloadIssueTest.xml | 0
.../issues/ProduceSplitMethodCallIssueTest.xml | 0
...edeliveryErrorHandlerTwoXmlFilesIssueTest-1.xml | 0
...edeliveryErrorHandlerTwoXmlFilesIssueTest-2.xml | 0
.../spring/issues/RouteIdAutoAssignClashIssue.xml | 0
...dviceWithContextScopedErrorHandlerIssueTest.xml | 0
...gAdviceWithRouteScopedErrorHandlerIssueTest.xml | 0
...ringAdviceWithTwoRoutesOnExceptionIssueTest.xml | 0
.../spring/issues/SpringCatchNestedFailTest.xml | 0
...ingCharlesSplitAndTryCatchRollbackIssueTest.xml | 0
.../spring/issues/SpringExceptionCamel4022Test.xml | 0
.../spring/issues/SpringFinallyNestedFailTest.xml | 0
.../issues/SpringInitializationIssueTest.xml | 0
...nstanceFactoryBeanCamelContextScanIssueTest.xml | 0
.../issues/SpringInstanceFactoryBeanIssueTest.xml | 0
...ingMultipleErrorHandlerOnExceptionIssueTest.xml | 0
.../SpringOnExceptionErrorHandlerRefIssueTest.xml | 0
...nExceptionErrorHandlerRefIssueTwoRoutesTest.xml | 0
...ExceptionNotHandledErrorHandlerRefIssueTest.xml | 0
...NotHandledErrorHandlerRefIssueTwoRoutesTest.xml | 0
...tHandledRouteScopedErrorHandlerRefIssueTest.xml | 0
...outeScopedErrorHandlerRefIssueTwoRoutesTest.xml | 0
...xceptionRouteScopedErrorHandlerRefIssueTest.xml | 0
...outeScopedErrorHandlerRefIssueTwoRoutesTest.xml | 0
.../camel/spring/issues/SpringPackageTest.xml | 0
.../SpringPropertiesAvailableEverywhereTest.xml | 0
...ingPropertyPlaceholderFileEndpointIssueTest.xml | 0
.../issues/SpringPropertyPlaceholderIssueTest.xml | 0
.../issues/SpringRenameFileOnCommitIssueTest.xml | 0
...outeScopedErrorHandlerRefIssueTwoRoutesTest.xml | 0
.../issues/SpringSingletonScopedBeanIssueTest.xml | 0
...pringSplitterDetermineErrorHandlerIssueTest.xml | 0
...HandlerAndContextScopedOnExceptionIssueTest.xml | 0
.../SpringTryCatchFinallyAndErrorHandlerTest.xml | 0
.../issues/SpringTryCatchWithSplitIssueTest.xml | 0
.../spring/issues/SpringTryNestedFailTest.xml | 0
.../SpringTwoCamelContextDirectEndpointTest.xml | 0
.../SpringRouteIsComponentAnnotatedTest.xml | 0
.../SpringRouteIsComponentAnnotated2Test.xml | 0
.../apache/camel/spring/issues/myprop.properties | 0
.../spring/issues/packagescan/camelContext.xml | 0
.../org/apache/camel/spring/issues/validate.xsd | 0
.../org/apache/camel/spring/jmx.properties | 0
.../camel/spring/jmxConfigUsingProperties.xml | 0
.../camel/spring/lifecycleStrategyInjection.xml | 0
.../ManagedEndpointInjectRefEndpointTest.xml | 0
.../spring/management/ManagedRefEndpointTest.xml | 0
.../ManagedStatisticsLevelRoutesOnlyTest.xml | 0
.../SpringCamelContextStartingFailedEventTest.xml | 0
.../SpringDualLoggingEventNotifierTest.xml | 0
.../management/SpringJmxDumpCBRRouteAsXmlTest.xml | 0
.../SpringJmxDumpRouteAsXmlIncludeHostNameTest.xml | 0
.../management/SpringJmxDumpRouteAsXmlTest.xml | 0
.../SpringJmxEndpointInjectBeanRefTest.xml | 0
.../SpringJmxEndpointInjectBeanRefTwoTest.xml | 0
.../management/SpringJmxEndpointInjectBeanTest.xml | 0
.../management/SpringJmxRecipientListTest.xml | 0
.../SpringJmxRecipientListTestRegisterAlways.xml | 0
.../management/SpringLoggingEventNotifierTest.xml | 0
.../management/SpringManagedCamelContextTest.xml | 0
.../SpringManagedCustomProcessorTest.xml | 0
.../SpringManagedNamePatternFixedTest.xml | 0
.../management/SpringManagedNamePatternTest.xml | 0
.../management/SpringManagedResourceTest.xml | 0
...gedRouteRemoveContextScopedErrorHandlerTest.xml | 0
...RemoveRouteAndContextScopedErrorHandlerTest.xml | 0
...nagedRouteRemoveRouteScopedErrorHandlerTest.xml | 0
.../management/SpringManagedSanitizeTest.xml | 0
.../management/SpringManagedSedaEndpointTest.xml | 0
.../SpringManagedStatisticsLevelOffTest.xml | 0
.../SpringManagedTransactedProcessorTest.xml | 0
.../management/SpringPublishEventNotifierTest.xml | 0
...dualCamelContextManagedAutoAssignedNameTest.xml | 0
.../management/dualCamelContextManagedTest.xml | 0
.../management/jmxInstrumentationWithConnector.xml | 0
.../InterceptSendToMockEndpointStrategyTest.xml | 0
.../org/apache/camel/spring/mock/camel-route.xml | 0
.../org/apache/camel/spring/mock/spring.xml | 0
.../spring/multipleLifecycleStrategyInjection.xml | 0
.../resources/org/apache/camel/spring/myRoutes.xml | 0
.../org/apache/camel/spring/myUpdatedRoutes.xml | 0
.../camel/spring/patterns/FilterTest-context.xml | 0
...hSpringPropertyPlaceholderRouteTest-context.xml | 0
.../spring/placeholder/bundle-context.properties | 0
.../FileConsumerSpringSchedulerTest.xml | 0
.../camelCustomPostProcessorOnRouteBuilderTest.xml | 0
...SpringCustomPostProcessorOnRouteBuilderTest.xml | 0
.../BatchResequencerAllowDuplicatesTest.xml | 0
.../processor/BatchResequencerJMSPriorityTest.xml | 0
.../spring/processor/CBRHeaderPredicateTest.xml | 0
.../processor/ClaimCheckEipGetAndRemoveSetTest.xml | 0
.../spring/processor/ClaimCheckEipGetSetTest.xml | 0
.../processor/ClaimCheckEipPushPopBodyTest.xml | 0
.../ClaimCheckEipPushPopHeadersPatternTest.xml | 0
.../processor/ClaimCheckEipPushPopHeadersTest.xml | 0
.../ClaimCheckEipPushPopRemoveHeaderTest.xml | 0
.../spring/processor/ClaimCheckEipPushPopTest.xml | 0
.../processor/CustomProcessorFactoryTest.xml | 0
...LetterChannelLogExhaustedMessageHistoryTest.xml | 0
.../DeadLetterChannelNewExceptionTest.xml | 0
.../DeadLetterChannelNotHandleNewExceptionTest.xml | 0
.../processor/DeadLetterChannelOnPrepareTest.xml | 0
...DefaultErrorHandlerExchangeFormatterRefTest.xml | 0
...tErrorHandlerLogExhaustedMessageHistoryTest.xml | 0
.../processor/DefaultErrorHandlerOnPrepareTest.xml | 0
.../DefaultErrorHandlerRetryWhileTest.xml | 0
.../DoubleLoadBalancerMisconfigurationTest.xml | 0
.../EventNotifierExchangeSentExampleTest.xml | 0
.../FailOverLoadBalanceAutoStartupFalseTest.xml | 0
.../FailoverMaximumFailoverAttemptsTest.xml | 0
.../processor/FailoverRoundRobinStickyTest.xml | 0
.../spring/processor/FailoverRoundRobinTest.xml | 0
.../processor/InheritErrorHandlerDefaultTest.xml | 0
.../processor/InheritErrorHandlerFalseTest.xml | 0
.../processor/InheritErrorHandlerTrueTest.xml | 0
.../processor/MessageHistoryDumpRoutingTest.xml | 0
.../spring/processor/MulticastOnPrepareTest.xml | 0
.../processor/OnExceptionContinueToRouteTest.xml | 0
.../spring/processor/PolicyPerProcessorTest.xml | 0
.../camel/spring/processor/PolicyPerRouteTest.xml | 0
.../RecipientListAggregationStrategyTest.xml | 0
.../RecipientListDoNotStopOnExceptionTest.xml | 0
.../processor/RecipientListOnPrepareTest.xml | 0
.../processor/RecipientListStopOnExceptionTest.xml | 0
.../spring/processor/RedeliverToSubRouteTest.xml | 0
.../spring/processor/RouteNoAutoStartupTest.xml | 0
.../processor/RouteStartupOrderSimpleTest.xml | 0
.../spring/processor/RouteStartupOrderTest.xml | 0
.../processor/RouteStartupOrderWithDefaultTest.xml | 0
.../RouteWithConstantFieldFromExchangeFailTest.xml | 0
.../RouteWithConstantFieldFromExchangeTest.xml | 0
.../processor/ShutdownCompleteAllTasksTest.xml | 0
.../ShutdownCompleteCurrentTaskOnlyTest.xml | 0
.../processor/SimpleProcessorIdAwareTest.xml | 0
.../spring/processor/SplitCustomExpressionTest.xml | 0
.../spring/processor/SplitGroupMultiLinesTest.xml | 0
.../spring/processor/SplitGroupSkipFirstTest.xml | 0
.../spring/processor/SplitterOnPrepareTest.xml | 0
.../processor/SpringAggregateFromWireTapTest.xml | 0
...ringCamelContextLogExhaustedMessageBodyTest.xml | 0
.../processor/SpringComplexBlockWithEndTest.xml | 0
.../processor/SpringCustomExpressionTest.xml | 0
.../spring/processor/SpringCustomPredicateTest.xml | 0
.../processor/SpringCustomRefLoadBalanceTest.xml | 0
...ngDeadLetterChannelInvalidDeadLetterUriTest.xml | 0
...LetterChannelInvalidOptionDeadLetterUriTest.xml | 0
.../SpringDeadLetterChannelNoRedeliveryTest.xml | 0
...ringDeadLetterChannelUseOriginalBodyNewTest.xml | 0
.../SpringDeadLetterChannelUseOriginalBodyTest.xml | 0
...etterChannelUseOriginalExchangeWithFileTest.xml | 0
.../SpringDualManagedThreadsThreadPoolTest.xml | 0
.../spring/processor/SpringDynamicRouterTest.xml | 0
.../SpringEnricherAggregateOnExceptionTest.xml | 0
...ringErrorHandlerRedeliveryPolicyProfileTest.xml | 0
...IdempotentConsumerNoSkipDuplicateFilterTest.xml | 0
...SpringIdempotentConsumerNoSkipDuplicateTest.xml | 0
...SpringIdempotentConsumerRemoveOnFailureTest.xml | 0
.../processor/SpringIdempotentConsumerTest.xml | 0
.../SpringInterceptFromEndpointRefTest.xml | 0
.../spring/processor/SpringInterceptFromTest.xml | 0
.../processor/SpringInterceptFromUriRegexTest.xml | 0
.../SpringInterceptFromUriSimpleLogTest.xml | 0
.../SpringInterceptFromUriWildcardTest.xml | 0
.../SpringInterceptFromWhenNoStopTest.xml | 0
.../processor/SpringInterceptFromWhenTest.xml | 0
.../SpringInterceptFromWhenWithChoiceTest.xml | 0
.../processor/SpringInterceptFromWithStopTest.xml | 0
.../SpringInterceptSimpleRouteStopTest.xml | 0
.../processor/SpringInterceptSimpleRouteTest.xml | 0
.../SpringInterceptSimpleRouteWhenStopTest.xml | 0
.../SpringInterceptSimpleRouteWhenTest.xml | 0
.../camel/spring/processor/SpringLoopCopyTest.xml | 0
.../spring/processor/SpringLoopDoWhileTest.xml | 0
.../spring/processor/SpringLoopNoCopyTest.xml | 0
.../SpringManagedThreadsThreadPoolTest.xml | 0
.../spring/processor/SpringMethodCallTest.xml | 0
.../SpringMulticastAggregatorTest-context.xml | 0
.../SpringMulticastNoStopOnExceptionTest.xml | 0
.../SpringMulticastStopOnExceptionTest.xml | 0
.../processor/SpringMulticastSubUnitOfWorkTest.xml | 0
.../processor/SpringNestedChoiceIssueTest.xml | 0
...pletionAndInterceptAndOnExceptionGlobalTest.xml | 0
.../SpringOnCompletionAndInterceptGlobalTest.xml | 0
.../SpringOnCompletionAndInterceptTest.xml | 0
.../processor/SpringOnCompletionGlobalTest.xml | 0
.../processor/SpringOnCompletionModeTest.xml | 0
.../SpringOnCompletionOnCompleteOnlyTest.xml | 0
.../SpringOnCompletionOnFailureOnlyTest.xml | 0
...CompletionRouteScopeOverrideGlobalScopeTest.xml | 0
.../spring/processor/SpringOnCompletionTest.xml | 0
.../SpringOnCompletionUseOriginalBodyTest.xml | 0
.../processor/SpringOnCompletionWhenTest.xml | 0
...RecipientListParallelOptionalPropertiesTest.xml | 0
.../SpringRecipientListParallelStreamingTest.xml | 0
.../processor/SpringRecipientListParallelTest.xml | 0
.../SpringRecipientListSubUnitOfWorkTest.xml | 0
...iveryErrorHandlerNoRedeliveryOnShutdownTest.xml | 0
.../SpringRouteContextProduceBeanTest.xml | 0
.../spring/processor/SpringRoutePoliciesTest.xml | 0
.../camel/spring/processor/SpringRouteStopTest.xml | 0
...gRouteTopLevelOnCompletionMisconfiguredTest.xml | 0
...ngRouteTopLevelOnExceptionMisconfiguredTest.xml | 0
...ingRouteTopLevelTransactedMisconfiguredTest.xml | 0
.../processor/SpringScheduledThreadPoolTest.xml | 0
.../processor/SpringSetHeaderTest-context.xml | 0
.../SpringSetHeaderWithConstantTest-context.xml | 0
.../SpringSetHeaderXPathResultTypeTest.xml | 0
.../processor/SpringSimpleResultTypeRouteTest.xml | 0
.../processor/SpringSplitSubUnitOfWorkTest.xml | 0
.../SpringSplitTokenizerGroupDynamicTest.xml | 0
.../spring/processor/SpringSplitterBodyTest.xml | 0
.../SpringSplitterNoStopOnExceptionTest.xml | 0
.../SpringSplitterStopOnExceptionTest.xml | 0
.../processor/SpringStreamCachingStrategyTest.xml | 0
.../processor/SpringThreadNamePatternTest.xml | 0
.../processor/SpringThrowExceptionMessageTest.xml | 0
.../spring/processor/SpringThrowExceptionTest.xml | 0
.../spring/processor/SpringToDynamicIgnoreTest.xml | 0
.../processor/SpringToDynamicLanguageXPathTest.xml | 0
.../camel/spring/processor/SpringToDynamicTest.xml | 0
.../spring/processor/SpringTraceTest-context.xml | 0
.../SpringTraceUsingPropertyTest-context.xml | 0
.../SpringTryCatchMisconfiguredFinallyTest.xml | 0
.../processor/SpringTryCatchMisconfiguredTest.xml | 0
...ringTryCatchMustHaveExceptionConfiguredTest.xml | 0
.../SpringTryProcessorMultipleExceptionTest.xml | 0
.../processor/SpringTryProcessorOnWhenTest.xml | 0
.../processor/SpringWireTapExpressionTest.xml | 0
.../processor/SpringWireTapNewExchangeTest.xml | 0
.../camel/spring/processor/SpringWireTapTest.xml | 0
.../SpringWireTapUsingFireAndForgetCopyTest.xml | 0
.../SpringWireTapUsingFireAndForgetTest.xml | 0
.../spring/processor/SpringWireTapVoidBeanTest.xml | 0
.../processor/SpringXPathHeaderTest-context.xml | 0
.../ThreadsCoreAndMaxPoolKeepAliveTimeTest.xml | 0
.../spring/processor/ThreadsCoreAndMaxPoolTest.xml | 0
.../camel/spring/processor/ThreadsCorePoolTest.xml | 0
.../camel/spring/processor/ThreadsDefaultTest.xml | 0
.../ThreadsExternalThreadPoolFactoryBeanTest.xml | 0
.../processor/ThreadsThreadPoolFactoryBeanTest.xml | 0
.../spring/processor/ThrottlerGroupingTest.xml | 0
.../spring/processor/ThrottlerMethodCallTest.xml | 0
.../processor/ThrottlerThreadPoolProfileTest.xml | 0
.../ThrottlingInflightRoutePolicyTest.xml | 0
.../camel/spring/processor/ValidateSimpleTest.xml | 0
.../spring/processor/WireTapOnPrepareTest.xml | 0
.../camel/spring/processor/XsltTest-context.xml | 0
.../processor/aggregator-custom-strategy.xml | 0
.../apache/camel/spring/processor/aggregator.xml | 0
.../SpringAggregateCompleteAllOnStopTest.xml | 0
.../SpringAggregateCompletionIntervalTest.xml | 0
.../aggregator/SpringAggregateControllerTest.xml | 0
.../SpringAggregateDiscardOnTimeoutTest.xml | 0
.../SpringAggregateExpressionSizeFallbackTest.xml | 0
.../SpringAggregateExpressionSizeTest.xml | 0
...pringAggregateExpressionTimeoutFallbackTest.xml | 0
...pringAggregateExpressionTimeoutPerGroupTest.xml | 0
.../SpringAggregateExpressionTimeoutTest.xml | 0
.../SpringAggregateForceCompletionOnStopTest.xml | 0
...GroupedExchangeCompletionExpressionSizeTest.xml | 0
.../SpringAggregateSimplePredicateEagerTest.xml | 0
.../SpringAggregateSimplePredicateTest.xml | 0
.../aggregator/SpringAggregateSimpleSizeTest.xml | 0
.../SpringAggregateSimpleTimeoutTest.xml | 0
.../SpringAggregateThreadPoolProfileTest.xml | 0
...AggregationStrategyBeanAdapterAllowNullTest.xml | 0
...egationStrategyBeanAdapterRefMethodNameTest.xml | 0
...SpringAggregationStrategyBeanAdapterRefTest.xml | 0
...syncDeadLetterChannelExecutorServiceRefTest.xml | 0
.../org/apache/camel/spring/processor/choice.xml | 0
.../apache/camel/spring/processor/convertBody.xml | 0
.../org/apache/camel/spring/processor/delayer.xml | 0
.../camel/spring/processor/delayerperroute.xml | 0
.../spring/processor/enrichExpressionTest.xml | 0
.../org/apache/camel/spring/processor/enricher.xml | 0
.../apache/camel/spring/processor/enricherref.xml | 0
.../org/apache/camel/spring/processor/example.xsl | 0
.../camel/spring/processor/failOverLoadBalance.xml | 0
.../org/apache/camel/spring/processor/filter.xml | 0
.../camel/spring/processor/filterNoChild.xml | 0
.../camel/spring/processor/fromEndpointTest.xml | 0
.../spring/processor/fromMultipleEndpointTest.xml | 0
.../idempotent/SpringCacheIdempotentTest.xml | 0
.../idempotent/fileConsumerIdempotentTest.xml | 0
.../SpringParentChildInterceptStrategyTest.xml | 0
.../spring/processor/interceptSendToEndpoint.xml | 0
.../processor/interceptSendToEndpointDynamic.xml | 0
.../interceptSendToEndpointInOnExceptionTest.xml | 0
.../processor/interceptSendToEndpointSkip.xml | 0
.../processor/interceptSendToEndpointWhen.xml | 0
.../spring/processor/logEipCustomFormatterTest.xml | 0
.../camel/spring/processor/logEipMaskTest.xml | 0
.../camel/spring/processor/logProcessorTest.xml | 0
.../logProcessorWithProvidedLoggerTest.xml | 0
.../org/apache/camel/spring/processor/loop.xml | 0
.../camel/spring/processor/markrollbackonly.xml | 0
.../apache/camel/spring/processor/multicast.xml | 0
.../camel/spring/processor/myprop.properties | 0
.../camel/spring/processor/mysimplescript.txt | 0
.../apache/camel/spring/processor/normalizer.xml | 0
...eadLetterChannelOnExceptionOnRedeliveryTest.xml | 0
.../OnExceptionContinueSubRouteTest.xml | 0
.../OnExceptionContinueSubSubRouteTest.xml | 0
.../onexception/OnExceptionContinueTest.xml | 0
.../OnExceptionLoadBalancerDoubleIssueTest.xml | 0
...OnExceptionOccurredProcessorOnExceptionTest.xml | 0
.../OnExceptionOccurredProcessorTest.xml | 0
.../OnExceptionWithRouteAndContinueTest.xml | 0
.../onexception/RedeliveryPolicyRefTest.xml | 0
.../SpringContextScopeOnExceptionTest.xml | 0
...ingOnExceptionFromChoiceUseOriginalBodyTest.xml | 0
.../SpringOnExceptionUseOriginalBodyTest.xml | 0
.../SpringOnExceptionUseOriginalMessageTest.xml | 0
.../deadLetterChannelHandledExampleTest.xml | 0
.../onExceptionNotNormalizedClassNameTest.xml | 0
.../onexception/onExceptionSubRouteTest.xml | 0
...xceptionSubRouteWithDefaultErrorHandlerTest.xml | 0
.../spring/processor/pollEnrichExpressionTest.xml | 0
.../apache/camel/spring/processor/pollEnricher.xml | 0
.../camel/spring/processor/pollEnricherRef.xml | 0
.../camel/spring/processor/randomLoadBalance.xml | 0
.../recipientListIgnoreInvalidEndpoints.xml | 0
.../processor/recipientListWithArrayHeader.xml | 0
.../recipientListWithStringDelimitedHeader.xml | 0
.../recipientListWithStringDelimitedProperty.xml | 0
.../apache/camel/spring/processor/removeHeader.xml | 0
.../camel/spring/processor/removeHeaders.xml | 0
.../spring/processor/removeHeadersExclude.xml | 0
.../processor/removePropertiesWithExclusion.xml | 0
.../processor/removePropertiesWithoutExclusion.xml | 0
.../camel/spring/processor/removeProperty.xml | 0
.../apache/camel/spring/processor/resequencer.xml | 0
.../spring/processor/resequencerRejectOld.xml | 0
.../org/apache/camel/spring/processor/rollback.xml | 0
.../spring/processor/roundRobinLoadBalance.xml | 0
.../apache/camel/spring/processor/routingSlip.xml | 0
.../routingSlipIgnoreInvalidEndpoints.xml | 0
.../org/apache/camel/spring/processor/saga.xml | 0
.../org/apache/camel/spring/processor/sagaRef.xml | 0
.../camel/spring/processor/samplingThrottler.xml | 0
.../processor/samplingThrottlerWithDefault.xml | 0
.../processor/scattergather/scatter-gather.xml | 0
.../camel/spring/processor/script-external.xml | 0
.../org/apache/camel/spring/processor/script.xml | 0
.../org/apache/camel/spring/processor/setBody.xml | 0
.../camel/spring/processor/setExchangePattern.xml | 0
.../processor/setExchangePatternWithCustomId.xml | 0
.../spring/processor/setHeaderNameDynamic.xml | 0
.../apache/camel/spring/processor/setProperty.xml | 0
.../spring/processor/setPropertyNameDynamic.xml | 0
.../apache/camel/spring/processor/sortBodyTest.xml | 0
.../camel/spring/processor/sortExpressionTest.xml | 0
.../spring/processor/splitterMethodCallTest.xml | 0
.../spring/processor/splitterTokenizerTest.xml | 0
.../splitterWithCustomThreadPoolExecutor.xml | 0
.../camel/spring/processor/staticRecipientList.xml | 0
.../org/apache/camel/spring/processor/step.xml | 0
.../camel/spring/processor/stickyLoadBalance.xml | 0
.../camel/spring/processor/streamResequencer.xml | 0
.../spring/processor/streamcachingperroute.xml | 0
.../apache/camel/spring/processor/throttler.xml | 0
.../camel/spring/processor/topicLoadBalance.xml | 0
.../apache/camel/spring/processor/transform.xml | 0
.../processor/transformWithExpressionContext.xml | 0
.../org/apache/camel/spring/processor/validate.xml | 0
.../spring/processor/weightedRandomLoadBalance.xml | 0
.../processor/weightedRoundRobinLoadBalance.xml | 0
.../spring/processor/xPathHeaderNameContext.xml | 0
...PathHeaderNameResultTypeAndNamespaceContext.xml | 0
.../xpathChoiceWithNamespaceOnRouteContext.xml | 0
...oiceWithNamespaceOnRouteContextRouteContext.xml | 0
.../apache/camel/spring/processor/xpathFilter.xml | 0
.../spring/processor/xpathFilterWithNamespace.xml | 0
.../xpathFilterWithNamespaceOnRouteContext.xml | 0
.../produce/FluentProduceTemplateTest-context.xml | 0
.../spring/produce/MyCoolBeanTest-context.xml | 0
.../spring/produce/ProduceTemplateTest-context.xml | 0
...duceTemplateWithTwoCamelContextTest-context.xml | 0
.../camel/spring/produce/ProduceTest-context.xml | 0
.../produce/generics/MyServiceTest-context.xml | 0
.../camel/spring/routeRefCamelContextFactory.xml | 0
.../routebuilder/SpringRouteTemplateRefTest.xml | 0
.../routebuilder/SpringRouteTemplateTest.xml | 0
.../spring/routebuilder/camelRouteBuilder.xml | 0
.../camel/spring/routebuilder/myTemplates.xml | 0
.../spring/routingUsingCamelContextFactory.xml | 0
.../apache/camel/spring/routingUsingProcessor.xml | 0
.../spi/bridgePropertyPlaceholderConfigurer.xml | 0
...ridgePropertyPlaceholderConfigurerUtilIssue.xml | 0
.../spring/spi/parentContextRegistryTestChild.xml | 0
.../spring/spi/parentContextRegistryTestParent.xml | 0
.../org/apache/camel/spring/streamCaching.xml | 0
.../camel/spring/util/EndpointHelperTest.xml | 0
.../camel/spring/xml/buildCustomProcessor.xml | 0
.../spring/xml/buildCustomProcessorWithFilter.xml | 0
.../camel/spring/xml/buildDynamicRecipientList.xml | 0
.../camel/spring/xml/buildIdempotentConsumer.xml | 0
.../apache/camel/spring/xml/buildSimpleRoute.xml | 0
.../spring/xml/buildSimpleRouteWithChoice.xml | 0
.../xml/buildSimpleRouteWithHeaderPredicate.xml | 0
.../org/apache/camel/spring/xml/buildSplitter.xml | 0
.../camel/spring/xml/buildStaticRecipientList.xml | 0
.../org/apache/camel/spring/xml/buildWireTap.xml | 0
.../xml}/handler/ErrorHandlerDefinitionParser.xml | 2 +-
.../KeyStoreParametersFactoryBeanTest-context.xml | 0
...SSLContextParametersFactoryBeanTest-context.xml | 0
...cureRandomParametersFactoryBeanTest-context.xml | 0
.../src/test/resources/sql/init.sql | 0
components/camel-spring/pom.xml | 667 +--------------------
.../services/org/apache/camel/component.properties | 2 +-
.../services/org/apache/camel/language.properties | 2 +-
.../org/apache/camel/util/spring/jaxb.index | 6 -
.../camel-spring/src/main/docs/spring-summary.adoc | 7 +-
.../apache/camel/spring/GenericBeansException.java | 36 --
.../apache/camel/spring/SpringCamelContext.java | 29 +-
.../spring/remoting/CamelProxyFactoryBean.java | 163 -----
.../spring/remoting/CamelServiceExporter.java | 134 -----
.../org/apache/camel/spring/remoting/package.html | 27 -
.../org/apache/camel/spring/util/MainRunner.java | 122 ----
.../camel/spring/config/AnotherCamelProxyTest.java | 44 --
.../spring/config/CamelContextFactoryBeanTest.java | 144 -----
.../apache/camel/spring/config/CamelProxyTest.java | 51 --
.../spring/config/CamelProxyUsingRefTest.java | 42 --
.../apache/camel/spring/config/MyProxySender.java | 29 -
.../org/apache/camel/spring/remoting/Bean.java | 40 --
.../org/apache/camel/spring/remoting/Echo.java | 22 -
.../org/apache/camel/spring/remoting/EchoPojo.java | 33 -
.../camel/spring/remoting/EchoPojoDirect.java | 32 -
.../apache/camel/spring/remoting/EchoService.java | 29 -
.../remoting/EchoSpringRemotingPojoDirectTest.java | 63 --
...choSpringRemotingPojoOutOfCamelContextTest.java | 29 -
.../remoting/EchoSpringRemotingPojoTest.java | 52 --
...SpringRemotingThrowingRuntimeExceptionTest.java | 69 ---
.../camel/spring/remoting/IAsyncService.java | 27 -
.../org/apache/camel/spring/remoting/ISay.java | 24 -
.../org/apache/camel/spring/remoting/Invoker.java | 24 -
.../spring/remoting/MyEchoRuntimeException.java | 26 -
.../camel/spring/remoting/MyMultiArgument.java | 30 -
.../spring/remoting/MyMultiArgumentService.java | 33 -
.../remoting/MyMultiArgumentServiceInterface.java | 23 -
.../apache/camel/spring/remoting/SayService.java | 48 --
.../remoting/SpringRemotingBeanConverterTest.java | 47 --
.../spring/remoting/SpringRemotingRouteTest.java | 48 --
.../SpringRemotingTwoCamelContextTest.java | 51 --
.../SpringRemotingWithExportAndProxyTest.java | 29 -
.../remoting/SpringRemotingWithOneWayTest.java | 58 --
...ingWithServiceExportAndNamespacesRouteTest.java | 28 -
.../SpringRemotingWithServiceExportRouteTest.java | 28 -
.../apache/camel/spring/util/MainRunnerTest.java | 41 --
.../camel/spring/camelContextFactoryBean.xml | 64 --
.../camel/spring/config/AnotherCamelProxyTest.xml | 47 --
.../apache/camel/spring/config/CamelProxyTest.xml | 56 --
.../camel/spring/config/CamelProxyUsingRefTest.xml | 51 --
.../SpringRemotingWithOneWayTest-context.xml | 33 -
.../apache/camel/spring/remoting/beanConverter.xml | 42 --
.../camel/spring/remoting/echo-pojo-direct.xml | 36 --
.../remoting/echo-pojo-out-of-camelContext.xml | 38 --
.../org/apache/camel/spring/remoting/echo-pojo.xml | 35 --
.../org/apache/camel/spring/remoting/echo.xml | 38 --
.../remoting/spring-with-exporter-namespace.xml | 52 --
.../spring/remoting/spring-with-exporter-proxy.xml | 42 --
.../camel/spring/remoting/spring-with-exporter.xml | 58 --
.../remoting/spring-with-two-camelcontext.xml | 67 ---
.../org/apache/camel/spring/remoting/spring.xml | 46 --
components/camel-tarfile/pom.xml | 2 +-
components/camel-test-spring-junit5/pom.xml | 2 +-
components/camel-test-spring/pom.xml | 2 +-
components/camel-univocity-parsers/pom.xml | 2 +-
components/camel-xmlsecurity/pom.xml | 2 +-
components/camel-xstream/pom.xml | 2 +-
components/camel-zipfile/pom.xml | 2 +-
components/camel-zookeeper/pom.xml | 5 +
components/pom.xml | 1 +
core/camel-allcomponents/pom.xml | 4 +
.../camel/spring/SpringConsumerTemplateTest.java | 0
.../spring/SpringConsumerTemplateTest-context.xml | 0
.../docs/modules/eips/pages/polling-consumer.adoc | 4 +-
.../InterceptSendToMockEndpointStrategyTest.xml | 0
.../org/apache/camel/spring/mock/camel-route.xml | 0
.../modules/ROOT/pages/mock-component.adoc | 4 +-
.../modules/ROOT/pages/spring-summary.adoc | 7 +-
docs/components/modules/others/nav.adoc | 1 +
.../modules/others/pages/spring-xml.adoc | 40 ++
.../apache/camel/spring/patterns/FilterTest.java | 0
.../camel/spring/patterns/FilterTest-context.xml | 0
.../ROOT/pages/camel-3x-upgrade-guide-3_9.adoc | 17 +
docs/user-manual/modules/ROOT/pages/testing.adoc | 6 +-
parent/pom.xml | 5 +
.../camel/maven/packaging/PrepareCatalogMojo.java | 16 +-
1624 files changed, 762 insertions(+), 3403 deletions(-)
diff --git a/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/pom.xml b/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/pom.xml
index fc2e3db..096ff77 100644
--- a/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/pom.xml
@@ -52,6 +52,10 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-spring-xml</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-spring-main</artifactId>
</dependency>
diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index 3b6bd70..959ea6f 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -1805,6 +1805,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-spring-xml</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-sql</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs.properties b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs.properties
index 728149e..794f50d 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs.properties
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs.properties
@@ -488,6 +488,7 @@ spring-redis-component
spring-security
spring-summary
spring-ws-component
+spring-xml
sql-component
sql-stored-component
ssh-component
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/mock-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/mock-component.adoc
index 7d1425c..aa914e2 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/mock-component.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/mock-component.adoc
@@ -355,7 +355,7 @@ Suppose we have the route in the `camel-route.xml` file:
[source,xml]
.*camel-route.xml*
----
-include::{examplesdir}/components/camel-spring/src/test/resources/org/apache/camel/spring/mock/camel-route.xml[tags=e1]
+include::{examplesdir}/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/mock/camel-route.xml[tags=e1]
----
Then we create a new XML file as follows, where we include the
@@ -366,7 +366,7 @@ Camel to mock all endpoints:
[source,xml]
.*test-camel-route.xml*
----
-include::{examplesdir}/components/camel-spring/src/test/resources/org/apache/camel/spring/mock/InterceptSendToMockEndpointStrategyTest.xml[tags=e1]
+include::{examplesdir}/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/mock/InterceptSendToMockEndpointStrategyTest.xml[tags=e1]
----
Then in your unit test you load the new XML file
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/polling-consumer.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/polling-consumer.adoc
index a398f08..e11434d 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/polling-consumer.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/polling-consumer.adoc
@@ -127,7 +127,7 @@ The example below illustrates
[source,xml]
----
-include::{examplesdir}/components/camel-spring/src/test/resources/org/apache/camel/spring/SpringConsumerTemplateTest-context.xml[tags=e1]
+include::{examplesdir}/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/SpringConsumerTemplateTest-context.xml[tags=e1]
----
Then we can get leverage Spring to inject the *`ConsumerTemplate`* in our
@@ -137,7 +137,7 @@ together.
[source,java]
----
-include::{examplesdir}/components/camel-spring/src/test/java/org/apache/camel/spring/SpringConsumerTemplateTest.java[tags=e1]
+include::{examplesdir}/components/camel-spring-xml/src/test/java/org/apache/camel/spring/SpringConsumerTemplateTest.java[tags=e1]
----
[[PollingConsumer-TimerBasedPollingConsumer]]
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/spring-summary.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/spring-summary.adoc
index b42241a..aebd039 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/spring-summary.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/spring-summary.adoc
@@ -16,7 +16,7 @@ Spring Framework in a number of ways.
* Allows Spring to dependency inject Component
instances or the CamelContext instance itself
and auto-expose Spring beans as components and endpoints.
-* Camel works with Spring XML processing with the XML Configuration
+* Camel works with Spring XML processing with the XML DSL via `camel-spring-xml` component
* Camel Spring XML Schema's is defined at xref:manual::xml-reference.adoc[XML
Reference]
* Camel provides powerful Bean Integration
@@ -392,8 +392,7 @@ note about Spring Integration Testing under Transactional Client.
== Cron Component Support
-Camel-spring can be used as implementation of the Camel Cron component.
-
+The `camel-spring` module can be used as implementation of the Camel Cron component.
Maven users will need to add the following additional dependency to their `pom.xml`:
@@ -407,7 +406,7 @@ Maven users will need to add the following additional dependency to their `pom.x
</dependency>
------------------------------------------------------------
-Users can then use the cron component inside routes of their Spring or Spring-boot application:
+Users can then use the cron component inside routes of their Spring or Spring Boot application:
[source,xml]
----
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/spring-xml.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/spring-xml.adoc
new file mode 100644
index 0000000..1bc067d
--- /dev/null
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/spring-xml.adoc
@@ -0,0 +1,38 @@
+[[spring-xml-other]]
+= Spring Xml Component
+:docTitle: Spring Xml
+:artifactId: camel-spring-xml
+:description: Camel Spring with XML DSL
+:since: 3.9
+:supportLevel: Stable
+include::{cq-version}@camel-quarkus:ROOT:partial$reference/others/spring-xml.adoc[opts=optional]
+
+*Since Camel {since}*
+
+The Spring XML component provides the XML DSL when using Spring XML (eg `<beans>`)
+
+Maven users will need to add the following dependency to
+their `pom.xml` for this component:
+
+[source,xml]
+------------------------------------------------------------
+<dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-spring-xml</artifactId>
+ <version>x.x.x</version>
+ <!-- use the same version as your Camel core version -->
+</dependency>
+------------------------------------------------------------
+
+== Options
+
+
+// component options: START
+// component options: END
+
+
+
+// endpoint options: START
+// endpoint options: END
+
+include::camel-spring-boot::page$spring-xml-starter.adoc[]
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models.properties b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models.properties
index 9761c9a..7b05bcb 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models.properties
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models.properties
@@ -82,6 +82,7 @@ joor
json
jsonApi
jsonpath
+keyStoreParameters
kubernetesServiceDiscovery
language
loadBalance
@@ -152,6 +153,7 @@ rss
saga
sample
script
+secureRandomParameters
secureXML
security
securityDefinitions
@@ -170,6 +172,7 @@ soapjaxb
sort
spel
split
+sslContextParameters
staticServiceDiscovery
step
sticky
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/beanPostProcessor.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/beanPostProcessor.json
index 0325ebe..cba6c42 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/beanPostProcessor.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/beanPostProcessor.json
@@ -6,7 +6,7 @@
"description": "Spring specific DefaultCamelBeanPostProcessor which uses Spring BeanPostProcessor to post process beans.",
"deprecated": false,
"label": "spring,configuration",
- "javaType": "org.apache.camel.spring.CamelBeanPostProcessor",
+ "javaType": "org.apache.camel.spring.xml.CamelBeanPostProcessor",
"input": false,
"output": false
},
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/camelContext.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/camelContext.json
index 0e0c891..5dcf5af 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/camelContext.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/camelContext.json
@@ -6,7 +6,7 @@
"description": "CamelContext using XML configuration.",
"deprecated": false,
"label": "spring,configuration",
- "javaType": "org.apache.camel.spring.CamelContextFactoryBean",
+ "javaType": "org.apache.camel.spring.xml.CamelContextFactoryBean",
"input": false,
"output": false
},
@@ -52,7 +52,7 @@
"jmxAgent": { "kind": "element", "displayName": "JMX Agent", "required": false, "type": "object", "javaType": "org.apache.camel.core.xml.CamelJMXAgentDefinition", "deprecated": false, "autowired": false, "secret": false, "description": "Configuration of JMX Agent." },
"routeController": { "kind": "element", "displayName": "Route Controller", "required": false, "type": "object", "javaType": "org.apache.camel.core.xml.CamelRouteControllerDefinition", "deprecated": false, "autowired": false, "secret": false, "description": "Configuration of route controller." },
"beansFactory": { "kind": "element", "displayName": "Beans Factory", "required": true, "type": "array", "javaType": "java.util.List<org.apache.camel.core.xml.AbstractCamelFactoryBean<java.lang.Object>>", "oneOf": [ "consumerTemplate", "fluentTemplate", "template" ], "deprecated": false, "autowired": false, "secret": false, "description": "Miscellaneous configurations" },
- "beans": { "kind": "element", "displayName": "Beans", "required": true, "type": "array", "javaType": "java.util.List<java.lang.Object>", "oneOf": [ "errorHandler", "export", "proxy" ], "deprecated": false, "autowired": false, "secret": false, "description": "Miscellaneous configurations" },
+ "beans": { "kind": "element", "displayName": "Beans", "required": true, "type": "array", "javaType": "java.util.List<java.lang.Object>", "oneOf": [ "errorHandler" ], "deprecated": false, "autowired": false, "secret": false, "description": "Miscellaneous configurations" },
"defaultServiceCallConfiguration": { "kind": "element", "displayName": "Default Service Call Configuration", "required": false, "type": "object", "javaType": "org.apache.camel.model.cloud.ServiceCallConfigurationDefinition", "deprecated": false, "autowired": false, "secret": false, "description": "ServiceCall EIP default configuration" },
"serviceCallConfiguration": { "kind": "element", "displayName": "Service Call Configuration", "required": false, "type": "array", "javaType": "java.util.List<org.apache.camel.model.cloud.ServiceCallConfigurationDefinition>", "deprecated": false, "autowired": false, "secret": false, "description": "ServiceCall EIP configurations" },
"defaultHystrixConfiguration": { "kind": "element", "displayName": "Default Hystrix Configuration", "required": false, "type": "object", "javaType": "org.apache.camel.model.HystrixConfigurationDefinition", "deprecated": false, "autowired": false, "secret": false, "description": "Hystrix EIP default configuration" },
@@ -66,12 +66,12 @@
"routeContextRef": { "kind": "element", "displayName": "Route Context Ref", "required": false, "type": "array", "javaType": "java.util.List<org.apache.camel.model.RouteContextRefDefinition>", "deprecated": false, "autowired": false, "secret": false, "description": "Refers to XML routes to include as routes in this CamelContext." },
"restContextRef": { "kind": "element", "displayName": "Rest Context Ref", "required": false, "type": "array", "javaType": "java.util.List<org.apache.camel.model.RestContextRefDefinition>", "deprecated": false, "autowired": false, "secret": false, "description": "Refers to XML rest-dsl to include as REST services in this CamelContext." },
"threadPoolProfile": { "kind": "element", "displayName": "Thread Pool Profile", "required": false, "type": "array", "javaType": "java.util.List<org.apache.camel.model.ThreadPoolProfileDefinition>", "deprecated": false, "autowired": false, "secret": false, "description": "Configuration of thread pool profiles." },
- "threadPool": { "kind": "element", "displayName": "Thread Pool", "required": false, "type": "array", "javaType": "java.util.List<org.apache.camel.spring.CamelThreadPoolFactoryBean>", "deprecated": false, "autowired": false, "secret": false, "description": "Configuration of thread pool" },
- "endpoint": { "kind": "element", "displayName": "Endpoint", "required": false, "type": "array", "javaType": "java.util.List<org.apache.camel.spring.CamelEndpointFactoryBean>", "deprecated": false, "autowired": false, "secret": false, "description": "Configuration of endpoints" },
+ "threadPool": { "kind": "element", "displayName": "Thread Pool", "required": false, "type": "array", "javaType": "java.util.List<org.apache.camel.spring.xml.CamelThreadPoolFactoryBean>", "deprecated": false, "autowired": false, "secret": false, "description": "Configuration of thread pool" },
+ "endpoint": { "kind": "element", "displayName": "Endpoint", "required": false, "type": "array", "javaType": "java.util.List<org.apache.camel.spring.xml.CamelEndpointFactoryBean>", "deprecated": false, "autowired": false, "secret": false, "description": "Configuration of endpoints" },
"dataFormats": { "kind": "element", "displayName": "Data Formats", "required": false, "type": "object", "javaType": "org.apache.camel.model.dataformat.DataFormatsDefinition", "deprecated": false, "autowired": false, "secret": false, "description": "Configuration of data formats." },
"transformers": { "kind": "element", "displayName": "Transformers", "required": false, "type": "object", "javaType": "org.apache.camel.model.transformer.TransformersDefinition", "deprecated": false, "autowired": false, "secret": false, "description": "Configuration of transformers." },
"validators": { "kind": "element", "displayName": "Validators", "required": false, "type": "object", "javaType": "org.apache.camel.model.validator.ValidatorsDefinition", "deprecated": false, "autowired": false, "secret": false, "description": "Configuration of validators." },
- "redeliveryPolicyProfile": { "kind": "element", "displayName": "Redelivery Policy Profile", "required": false, "type": "array", "javaType": "java.util.List<org.apache.camel.spring.CamelRedeliveryPolicyFactoryBean>", "deprecated": false, "autowired": false, "secret": false, "description": "Configuration of redelivery settings." },
+ "redeliveryPolicyProfile": { "kind": "element", "displayName": "Redelivery Policy Profile", "required": false, "type": "array", "javaType": "java.util.List<org.apache.camel.spring.xml.CamelRedeliveryPolicyFactoryBean>", "deprecated": false, "autowired": false, "secret": false, "description": "Configuration of redelivery settings." },
"onException": { "kind": "element", "displayName": "On Exception", "required": false, "type": "array", "javaType": "java.util.List<org.apache.camel.model.OnExceptionDefinition>", "deprecated": false, "autowired": false, "secret": false, "description": "Configuration of error handlers that triggers on exceptions thrown." },
"onCompletion": { "kind": "element", "displayName": "On Completion", "required": false, "type": "array", "javaType": "java.util.List<org.apache.camel.model.OnCompletionDefinition>", "deprecated": false, "autowired": false, "secret": false, "description": "Configuration of sub routes to run at the completion of routing." },
"intercept": { "kind": "element", "displayName": "Intercept", "required": false, "type": "array", "javaType": "java.util.List<org.apache.camel.model.InterceptDefinition>", "deprecated": false, "autowired": false, "secret": false, "description": "Configuration of interceptors." },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/consumerTemplate.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/consumerTemplate.json
index 000e5eb..e4e2db9 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/consumerTemplate.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/consumerTemplate.json
@@ -6,7 +6,7 @@
"description": "Configures a ConsumerTemplate",
"deprecated": false,
"label": "spring,configuration",
- "javaType": "org.apache.camel.spring.CamelConsumerTemplateFactoryBean",
+ "javaType": "org.apache.camel.spring.xml.CamelConsumerTemplateFactoryBean",
"input": false,
"output": false
},
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/endpoint.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/endpoint.json
index 859ba4b..7100511 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/endpoint.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/endpoint.json
@@ -6,7 +6,7 @@
"description": "Camel endpoint configuration",
"deprecated": false,
"label": "spring,configuration,endpoint",
- "javaType": "org.apache.camel.spring.CamelEndpointFactoryBean",
+ "javaType": "org.apache.camel.spring.xml.CamelEndpointFactoryBean",
"input": false,
"output": false
},
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/errorHandler.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/errorHandler.json
index 17129fa..ca07cae 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/errorHandler.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/errorHandler.json
@@ -6,12 +6,12 @@
"description": "Error handler settings",
"deprecated": false,
"label": "spring,configuration,error",
- "javaType": "org.apache.camel.spring.ErrorHandlerDefinition",
+ "javaType": "org.apache.camel.spring.xml.ErrorHandlerDefinition",
"input": false,
"output": false
},
"properties": {
- "type": { "kind": "attribute", "displayName": "Type", "required": true, "type": "enum", "javaType": "org.apache.camel.spring.ErrorHandlerType", "enum": [ "dead-letter-channel", "default-error-handler", "no-error-handler", "transaction-error-handler" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "DefaultErrorHandler", "description": "The type of the error handler" },
+ "type": { "kind": "attribute", "displayName": "Type", "required": true, "type": "enum", "javaType": "org.apache.camel.spring.xml.ErrorHandlerType", "enum": [ "dead-letter-channel", "default-error-handler", "no-error-handler", "transaction-error-handler" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "DefaultErrorHandler", "description": "The type of the error handler" },
"deadLetterUri": { "kind": "attribute", "displayName": "Dead Letter Uri", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The dead letter endpoint uri for the Dead Letter error handler." },
"deadLetterHandleNewException": { "kind": "attribute", "displayName": "Dead Letter Handle New Exception", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Whether the dead letter channel should handle (and ignore) any new exception that may been thrown during sending the message to the dead letter endpoint. The default value is true which means any such kind of exception is handled and ignor [...]
"level": { "kind": "attribute", "displayName": "Level", "required": false, "type": "enum", "javaType": "org.apache.camel.LoggingLevel", "enum": [ "debug", "error", "info", "off", "trace", "warn" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "ERROR", "description": "Logging level to use when using the logging error handler type." },
@@ -27,7 +27,7 @@
"retryWhileRef": { "kind": "attribute", "displayName": "Retry While Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets a reference to an retry while expression. Will continue retrying until expression evaluates to false." },
"redeliveryPolicyRef": { "kind": "attribute", "displayName": "Redelivery Policy Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets a reference to a RedeliveryPolicy to be used for redelivery settings." },
"executorServiceRef": { "kind": "attribute", "displayName": "Executor Service Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets a reference to a thread pool to be used by the error handler" },
- "redeliveryPolicy": { "kind": "element", "displayName": "Redelivery Policy", "required": false, "type": "object", "javaType": "org.apache.camel.spring.CamelRedeliveryPolicyFactoryBean", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the redelivery settings" },
+ "redeliveryPolicy": { "kind": "element", "displayName": "Redelivery Policy", "required": false, "type": "object", "javaType": "org.apache.camel.spring.xml.CamelRedeliveryPolicyFactoryBean", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the redelivery settings" },
"id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The id of this node" }
}
}
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/fluentTemplate.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/fluentTemplate.json
index 6818326..d349a14 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/fluentTemplate.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/fluentTemplate.json
@@ -6,7 +6,7 @@
"description": "Configures a org.apache.camel.FluentProducerTemplate",
"deprecated": false,
"label": "spring,configuration",
- "javaType": "org.apache.camel.spring.CamelFluentProducerTemplateFactoryBean",
+ "javaType": "org.apache.camel.spring.xml.CamelFluentProducerTemplateFactoryBean",
"input": false,
"output": false
},
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/keyStoreParameters.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/keyStoreParameters.json
new file mode 100644
index 0000000..1958609
--- /dev/null
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/keyStoreParameters.json
@@ -0,0 +1,19 @@
+{
+ "model": {
+ "kind": "model",
+ "name": "keyStoreParameters",
+ "title": "Key Store Parameters",
+ "deprecated": false,
+ "javaType": "org.apache.camel.spring.xml.KeyStoreParametersFactoryBean",
+ "input": false,
+ "output": false
+ },
+ "properties": {
+ "type": { "kind": "attribute", "displayName": "Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The optional type of the key store to load. See Appendix A in the Java Cryptography Architecture Standard Algorithm Name Documentation for more information on standard names." },
+ "password": { "kind": "attribute", "displayName": "Password", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The optional password for reading\/opening\/verifying the key store" },
+ "provider": { "kind": "attribute", "displayName": "Provider", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The optional provider identifier for instantiating the key store" },
+ "resource": { "kind": "attribute", "displayName": "Resource", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The optional file path, class path resource, or URL of the resource used to load the key store" },
+ "camelContextId": { "kind": "attribute", "displayName": "Camel Context Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Id of CamelContext to use if there are multiple CamelContexts in the same JVM" },
+ "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The id of this node" }
+ }
+}
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/redeliveryPolicyProfile.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/redeliveryPolicyProfile.json
index 04f7127..38cabee 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/redeliveryPolicyProfile.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/redeliveryPolicyProfile.json
@@ -6,7 +6,7 @@
"description": "Configuration of redelivery policy.",
"deprecated": false,
"label": "spring,configuration",
- "javaType": "org.apache.camel.spring.CamelRedeliveryPolicyFactoryBean",
+ "javaType": "org.apache.camel.spring.xml.CamelRedeliveryPolicyFactoryBean",
"input": false,
"output": false
},
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/restContext.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/restContext.json
index 4d40edf..2011fc4 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/restContext.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/restContext.json
@@ -6,7 +6,7 @@
"description": "Configuration of REST services using rest-dsl using XML",
"deprecated": false,
"label": "spring,configuration,rest",
- "javaType": "org.apache.camel.spring.CamelRestContextFactoryBean",
+ "javaType": "org.apache.camel.spring.xml.CamelRestContextFactoryBean",
"input": false,
"output": false
},
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/routeContext.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/routeContext.json
index abbf563..8abcf7d 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/routeContext.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/routeContext.json
@@ -6,7 +6,7 @@
"description": "Configuration of routes using XML",
"deprecated": false,
"label": "spring,configuration,routing",
- "javaType": "org.apache.camel.spring.CamelRouteContextFactoryBean",
+ "javaType": "org.apache.camel.spring.xml.CamelRouteContextFactoryBean",
"input": false,
"output": false
},
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/routeTemplateContext.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/routeTemplateContext.json
index b3cf2ed..0501ac8 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/routeTemplateContext.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/routeTemplateContext.json
@@ -6,7 +6,7 @@
"description": "Configuration of route templates using XML",
"deprecated": false,
"label": "spring,configuration,routing",
- "javaType": "org.apache.camel.spring.CamelRouteTemplateContextFactoryBean",
+ "javaType": "org.apache.camel.spring.xml.CamelRouteTemplateContextFactoryBean",
"input": false,
"output": false
},
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/secureRandomParameters.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/secureRandomParameters.json
new file mode 100644
index 0000000..3bc9029
--- /dev/null
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/secureRandomParameters.json
@@ -0,0 +1,17 @@
+{
+ "model": {
+ "kind": "model",
+ "name": "secureRandomParameters",
+ "title": "Secure Random Parameters",
+ "deprecated": false,
+ "javaType": "org.apache.camel.spring.xml.SecureRandomParametersFactoryBean",
+ "input": false,
+ "output": false
+ },
+ "properties": {
+ "algorithm": { "kind": "attribute", "displayName": "Algorithm", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The Random Number Generator algorithm identifier for the SecureRandom factory method used to create the SecureRandom represented by this object's configuration. See Appendix A in the Java Cryptography Architecture API Specification and Reference guide for information about standar [...]
+ "provider": { "kind": "attribute", "displayName": "Provider", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The optional provider identifier for the SecureRandom factory method used to create the SecureRandom represented by this object's configuration." },
+ "camelContextId": { "kind": "attribute", "displayName": "Camel Context Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Id of CamelContext to use if there are multiple CamelContexts in the same JVM" },
+ "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The id of this node" }
+ }
+}
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/sslContextParameters.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/sslContextParameters.json
new file mode 100644
index 0000000..a097cae
--- /dev/null
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/sslContextParameters.json
@@ -0,0 +1,19 @@
+{
+ "model": {
+ "kind": "model",
+ "name": "sslContextParameters",
+ "title": "Ssl Context Parameters",
+ "deprecated": false,
+ "javaType": "org.apache.camel.spring.xml.SSLContextParametersFactoryBean",
+ "input": false,
+ "output": false
+ },
+ "properties": {
+ "provider": { "kind": "attribute", "displayName": "Provider", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The optional provider identifier for the JSSE implementation to use when constructing an SSLContext." },
+ "secureSocketProtocol": { "kind": "attribute", "displayName": "Secure Socket Protocol", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The optional protocol for the secure sockets created by the SSLContext represented by this instance's configuration. See Appendix A in the Java Secure Socket Extension Reference Guide for information about standard protocol names." },
+ "certAlias": { "kind": "attribute", "displayName": "Cert Alias", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "An optional certificate alias to use. This is useful when the keystore has multiple certificates." },
+ "sessionTimeout": { "kind": "attribute", "displayName": "Session Timeout", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The optional SSLSessionContext timeout time for javax.net.ssl.SSLSession in seconds." },
+ "camelContextId": { "kind": "attribute", "displayName": "Camel Context Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Id of CamelContext to use if there are multiple CamelContexts in the same JVM" },
+ "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The id of this node" }
+ }
+}
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/template.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/template.json
index d2be114..6f63999 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/template.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/template.json
@@ -6,7 +6,7 @@
"description": "Configures a ProducerTemplate",
"deprecated": false,
"label": "spring,configuration",
- "javaType": "org.apache.camel.spring.CamelProducerTemplateFactoryBean",
+ "javaType": "org.apache.camel.spring.xml.CamelProducerTemplateFactoryBean",
"input": false,
"output": false
},
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/threadPool.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/threadPool.json
index 2474126..c6533dd 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/threadPool.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/threadPool.json
@@ -6,7 +6,7 @@
"description": "Configuration of thread pools",
"deprecated": false,
"label": "spring,configuration",
- "javaType": "org.apache.camel.spring.CamelThreadPoolFactoryBean",
+ "javaType": "org.apache.camel.spring.xml.CamelThreadPoolFactoryBean",
"input": false,
"output": false
},
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties
index 4a38753..aa9f1a3 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties
@@ -31,6 +31,7 @@ shiro
spring-javaconfig
spring-main
spring-security
+spring-xml
swagger-java
test
test-cdi
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/spring-xml.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/spring-xml.json
new file mode 100644
index 0000000..85f1358
--- /dev/null
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/spring-xml.json
@@ -0,0 +1,15 @@
+{
+ "other": {
+ "kind": "other",
+ "name": "spring-xml",
+ "title": "Spring Xml",
+ "description": "Camel Spring with XML DSL",
+ "deprecated": false,
+ "firstVersion": "3.9.0",
+ "label": "spring",
+ "supportLevel": "Stable",
+ "groupId": "org.apache.camel",
+ "artifactId": "camel-spring-xml",
+ "version": "3.8.0-SNAPSHOT"
+ }
+}
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
index d7cdfbd..a2b4c7b 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
@@ -715,7 +715,13 @@ Evaluate a JsonPath expression against a JSON message body.
</xs:annotation>
</xs:element>
- <xs:element name="keyStoreParameters" type="tns:keyStoreParametersFactoryBean"/>
+ <xs:element name="keyStoreParameters" type="tns:keyStoreParametersFactoryBean">
+ <xs:annotation>
+ <xs:documentation xml:lang="en"><![CDATA[
+null
+ ]]></xs:documentation>
+ </xs:annotation>
+ </xs:element>
<xs:element name="kubernetesServiceDiscovery" type="tns:kubernetesServiceCallServiceDiscoveryConfiguration">
<xs:annotation>
@@ -1334,7 +1340,13 @@ Executes a script from a language which does not change the message body.
</xs:annotation>
</xs:element>
- <xs:element name="secureRandomParameters" type="tns:secureRandomParametersFactoryBean"/>
+ <xs:element name="secureRandomParameters" type="tns:secureRandomParametersFactoryBean">
+ <xs:annotation>
+ <xs:documentation xml:lang="en"><![CDATA[
+null
+ ]]></xs:documentation>
+ </xs:annotation>
+ </xs:element>
<xs:element name="secureXML" type="tns:xmlSecurityDataFormat">
<xs:annotation>
@@ -1481,7 +1493,13 @@ Splits a single message into many sub-messages.
</xs:annotation>
</xs:element>
- <xs:element name="sslContextParameters" type="tns:sslContextParametersFactoryBean"/>
+ <xs:element name="sslContextParameters" type="tns:sslContextParametersFactoryBean">
+ <xs:annotation>
+ <xs:documentation xml:lang="en"><![CDATA[
+null
+ ]]></xs:documentation>
+ </xs:annotation>
+ </xs:element>
<xs:element name="staticServiceDiscovery" type="tns:staticServiceCallServiceDiscoveryConfiguration">
<xs:annotation>
@@ -2795,10 +2813,37 @@ value: false
<xs:complexContent>
<xs:extension base="tns:abstractJsseUtilFactoryBean">
<xs:sequence/>
- <xs:attribute name="type" type="xs:string"/>
- <xs:attribute name="password" type="xs:string"/>
- <xs:attribute name="provider" type="xs:string"/>
- <xs:attribute name="resource" type="xs:string"/>
+ <xs:attribute name="type" type="xs:string">
+ <xs:annotation>
+ <xs:documentation xml:lang="en"><![CDATA[
+The optional type of the key store to load. See Appendix A in the Java
+Cryptography Architecture Standard Algorithm Name Documentation for more
+information on standard names.
+ ]]></xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="password" type="xs:string">
+ <xs:annotation>
+ <xs:documentation xml:lang="en"><![CDATA[
+The optional password for reading/opening/verifying the key store.
+ ]]></xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="provider" type="xs:string">
+ <xs:annotation>
+ <xs:documentation xml:lang="en"><![CDATA[
+The optional provider identifier for instantiating the key store.
+ ]]></xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="resource" type="xs:string">
+ <xs:annotation>
+ <xs:documentation xml:lang="en"><![CDATA[
+The optional file path, class path resource, or URL of the resource used to load
+the key store.
+ ]]></xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -2807,8 +2852,25 @@ value: false
<xs:complexContent>
<xs:extension base="tns:abstractJsseUtilFactoryBean">
<xs:sequence/>
- <xs:attribute name="algorithm" type="xs:string" use="required"/>
- <xs:attribute name="provider" type="xs:string"/>
+ <xs:attribute name="algorithm" type="xs:string" use="required">
+ <xs:annotation>
+ <xs:documentation xml:lang="en"><![CDATA[
+The Random Number Generator algorithm identifier for the SecureRandom factory
+method used to create the SecureRandom represented by this object's
+configuration. See Appendix A in the Java Cryptography Architecture API
+Specification and Reference guide for information about standard RNG algorithm
+names.
+ ]]></xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="provider" type="xs:string">
+ <xs:annotation>
+ <xs:documentation xml:lang="en"><![CDATA[
+The optional provider identifier for the SecureRandom factory method used to
+create the SecureRandom represented by this object's configuration.
+ ]]></xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -13892,11 +13954,7 @@ password, application or accessCode.
<xs:element ref="tns:fluentTemplate"/>
<xs:element ref="tns:consumerTemplate"/>
</xs:choice>
- <xs:choice maxOccurs="unbounded" minOccurs="0">
- <xs:element ref="tns:proxy"/>
- <xs:element ref="tns:export"/>
- <xs:element ref="tns:errorHandler"/>
- </xs:choice>
+ <xs:element maxOccurs="unbounded" minOccurs="0" ref="tns:errorHandler"/>
<xs:element minOccurs="0" name="defaultServiceCallConfiguration" type="tns:serviceCallConfigurationDefinition"/>
<xs:element maxOccurs="unbounded" minOccurs="0" ref="tns:serviceCallConfiguration"/>
<xs:element minOccurs="0" name="defaultHystrixConfiguration" type="tns:hystrixConfigurationDefinition"/>
@@ -14537,10 +14595,39 @@ Sets a reference to a thread pool to be used by the error handler.
<xs:element minOccurs="0" name="clientParameters" type="tns:sslContextClientParametersFactoryBean"/>
<xs:element minOccurs="0" name="serverParameters" type="tns:sslContextServerParametersFactoryBean"/>
</xs:all>
- <xs:attribute name="sessionTimeout" type="xs:string"/>
- <xs:attribute name="provider" type="xs:string"/>
- <xs:attribute name="secureSocketProtocol" type="xs:string"/>
- <xs:attribute name="certAlias" type="xs:string"/>
+ <xs:attribute name="sessionTimeout" type="xs:string">
+ <xs:annotation>
+ <xs:documentation xml:lang="en"><![CDATA[
+The optional SSLSessionContext timeout time for javax.net.ssl.SSLSession in
+seconds.
+ ]]></xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="provider" type="xs:string">
+ <xs:annotation>
+ <xs:documentation xml:lang="en"><![CDATA[
+The optional provider identifier for the JSSE implementation to use when
+constructing an SSLContext.
+ ]]></xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="secureSocketProtocol" type="xs:string">
+ <xs:annotation>
+ <xs:documentation xml:lang="en"><![CDATA[
+The optional protocol for the secure sockets created by the SSLContext
+represented by this instance's configuration. See Appendix A in the Java Secure
+Socket Extension Reference Guide for information about standard protocol names.
+ ]]></xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="certAlias" type="xs:string">
+ <xs:annotation>
+ <xs:documentation xml:lang="en"><![CDATA[
+An optional certificate alias to use. This is useful when the keystore has
+multiple certificates.
+ ]]></xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -14578,6 +14665,83 @@ Sets a reference to a thread pool to be used by the error handler.
</xs:complexContent>
</xs:complexType>
+ <xs:simpleType name="beanScope">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="Singleton"/>
+ <xs:enumeration value="Request"/>
+ <xs:enumeration value="Prototype"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="exchangePattern">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="InOnly"/>
+ <xs:enumeration value="InOut"/>
+ <xs:enumeration value="InOptionalOut"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="loggingLevel">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="TRACE"/>
+ <xs:enumeration value="DEBUG"/>
+ <xs:enumeration value="INFO"/>
+ <xs:enumeration value="WARN"/>
+ <xs:enumeration value="ERROR"/>
+ <xs:enumeration value="OFF"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="managementStatisticsLevel">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="Extended"/>
+ <xs:enumeration value="Default"/>
+ <xs:enumeration value="RoutesOnly"/>
+ <xs:enumeration value="Off"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="shutdownRoute">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="Default"/>
+ <xs:enumeration value="Defer"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="shutdownRunningTask">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="CompleteCurrentTaskOnly"/>
+ <xs:enumeration value="CompleteAllTasks"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="startupSummaryLevel">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="Classic"/>
+ <xs:enumeration value="Verbose"/>
+ <xs:enumeration value="Default"/>
+ <xs:enumeration value="Brief"/>
+ <xs:enumeration value="Oneline"/>
+ <xs:enumeration value="Off"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="typeConverterExists">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="Override"/>
+ <xs:enumeration value="Ignore"/>
+ <xs:enumeration value="Fail"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="waitForTaskToComplete">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="Never"/>
+ <xs:enumeration value="IfReplyExpected"/>
+ <xs:enumeration value="Always"/>
+ </xs:restriction>
+ </xs:simpleType>
+
<xs:simpleType name="claimCheckOperation">
<xs:restriction base="xs:string">
<xs:enumeration value="Get"/>
@@ -14695,50 +14859,6 @@ Sets a reference to a thread pool to be used by the error handler.
</xs:restriction>
</xs:simpleType>
- <xs:simpleType name="startupSummaryLevel">
- <xs:restriction base="xs:string">
- <xs:enumeration value="Classic"/>
- <xs:enumeration value="Verbose"/>
- <xs:enumeration value="Default"/>
- <xs:enumeration value="Brief"/>
- <xs:enumeration value="Oneline"/>
- <xs:enumeration value="Off"/>
- </xs:restriction>
- </xs:simpleType>
-
- <xs:simpleType name="shutdownRoute">
- <xs:restriction base="xs:string">
- <xs:enumeration value="Default"/>
- <xs:enumeration value="Defer"/>
- </xs:restriction>
- </xs:simpleType>
-
- <xs:simpleType name="shutdownRunningTask">
- <xs:restriction base="xs:string">
- <xs:enumeration value="CompleteCurrentTaskOnly"/>
- <xs:enumeration value="CompleteAllTasks"/>
- </xs:restriction>
- </xs:simpleType>
-
- <xs:simpleType name="typeConverterExists">
- <xs:restriction base="xs:string">
- <xs:enumeration value="Override"/>
- <xs:enumeration value="Ignore"/>
- <xs:enumeration value="Fail"/>
- </xs:restriction>
- </xs:simpleType>
-
- <xs:simpleType name="loggingLevel">
- <xs:restriction base="xs:string">
- <xs:enumeration value="TRACE"/>
- <xs:enumeration value="DEBUG"/>
- <xs:enumeration value="INFO"/>
- <xs:enumeration value="WARN"/>
- <xs:enumeration value="ERROR"/>
- <xs:enumeration value="OFF"/>
- </xs:restriction>
- </xs:simpleType>
-
<xs:simpleType name="errorHandlerType">
<xs:restriction base="xs:string">
<xs:enumeration value="DefaultErrorHandler"/>
diff --git a/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java b/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
index 387fcba..f2a0d7d 100644
--- a/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
+++ b/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
@@ -1106,15 +1106,10 @@ public class CamelCatalogTest {
@Test
public void testSpringCamelContext() throws Exception {
- String json = catalog.modelJSonSchema("camelContext");
- assertNotNull(json);
-
- // validate we can parse the json
- ObjectMapper mapper = new ObjectMapper();
- JsonNode tree = mapper.readTree(json);
- assertNotNull(tree);
+ String xml = catalog.springSchemaAsXml();
+ assertNotNull(xml);
- assertTrue(json.contains("CamelContext using XML configuration"));
+ assertTrue(xml.contains("CamelContext using XML configuration"));
}
@Test
diff --git a/components/camel-apns/pom.xml b/components/camel-apns/pom.xml
index 191316b..b8ecf91 100644
--- a/components/camel-apns/pom.xml
+++ b/components/camel-apns/pom.xml
@@ -88,7 +88,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
+ <artifactId>camel-spring-xml</artifactId>
<scope>test</scope>
</dependency>
diff --git a/components/camel-asn1/pom.xml b/components/camel-asn1/pom.xml
index 206b155..93b09f6 100644
--- a/components/camel-asn1/pom.xml
+++ b/components/camel-asn1/pom.xml
@@ -58,7 +58,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
+ <artifactId>camel-spring-xml</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-atomix/pom.xml b/components/camel-atomix/pom.xml
index 781d33f..bb18e61 100644
--- a/components/camel-atomix/pom.xml
+++ b/components/camel-atomix/pom.xml
@@ -119,6 +119,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-spring-main</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId>
<scope>test</scope>
diff --git a/components/camel-avro-rpc/pom.xml b/components/camel-avro-rpc/pom.xml
index 9ec2b61..b318d5fc 100644
--- a/components/camel-avro-rpc/pom.xml
+++ b/components/camel-avro-rpc/pom.xml
@@ -89,7 +89,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
+ <artifactId>camel-spring-xml</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-avro/pom.xml b/components/camel-avro/pom.xml
index 3f2553f..194c47c 100644
--- a/components/camel-avro/pom.xml
+++ b/components/camel-avro/pom.xml
@@ -77,7 +77,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
+ <artifactId>camel-spring-xml</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-consul/pom.xml b/components/camel-consul/pom.xml
index 74af63a..6d18ddd 100644
--- a/components/camel-consul/pom.xml
+++ b/components/camel-consul/pom.xml
@@ -147,6 +147,11 @@
<artifactId>camel-test-spring-junit5</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-spring-main</artifactId>
+ <scope>test</scope>
+ </dependency>
<!-- test infra -->
<dependency>
diff --git a/components/camel-csv/pom.xml b/components/camel-csv/pom.xml
index db38c18..5fc3ef3 100644
--- a/components/camel-csv/pom.xml
+++ b/components/camel-csv/pom.xml
@@ -48,7 +48,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
+ <artifactId>camel-spring-xml</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-cxf-transport/pom.xml b/components/camel-cxf-transport/pom.xml
index 311801b..17fc522 100644
--- a/components/camel-cxf-transport/pom.xml
+++ b/components/camel-cxf-transport/pom.xml
@@ -84,7 +84,7 @@
<!-- for testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
+ <artifactId>camel-spring-xml</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-cxf/pom.xml b/components/camel-cxf/pom.xml
index b960926..edfc768 100644
--- a/components/camel-cxf/pom.xml
+++ b/components/camel-cxf/pom.xml
@@ -83,7 +83,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
+ <artifactId>camel-spring-xml</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
diff --git a/components/camel-etcd/pom.xml b/components/camel-etcd/pom.xml
index 6e0fab8..6dc8abb 100644
--- a/components/camel-etcd/pom.xml
+++ b/components/camel-etcd/pom.xml
@@ -66,6 +66,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-spring-main</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-http</artifactId>
<scope>test</scope>
</dependency>
diff --git a/components/camel-ftp/pom.xml b/components/camel-ftp/pom.xml
index 940a2fa..fbaefa7 100644
--- a/components/camel-ftp/pom.xml
+++ b/components/camel-ftp/pom.xml
@@ -94,7 +94,7 @@
<!-- for unit testing AntPathMatcher -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
+ <artifactId>camel-spring-xml</artifactId>
<scope>test</scope>
</dependency>
diff --git a/components/camel-hazelcast/pom.xml b/components/camel-hazelcast/pom.xml
index ee55972..0182c7bb 100644
--- a/components/camel-hazelcast/pom.xml
+++ b/components/camel-hazelcast/pom.xml
@@ -74,6 +74,11 @@
<artifactId>camel-test-spring-junit5</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-spring-main</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
diff --git a/components/camel-jaxb/pom.xml b/components/camel-jaxb/pom.xml
index 78dcb8f..f062265 100644
--- a/components/camel-jaxb/pom.xml
+++ b/components/camel-jaxb/pom.xml
@@ -109,7 +109,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
+ <artifactId>camel-spring-xml</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-jetty-common/pom.xml b/components/camel-jetty-common/pom.xml
index 02b0e37..0972b4b 100644
--- a/components/camel-jetty-common/pom.xml
+++ b/components/camel-jetty-common/pom.xml
@@ -111,7 +111,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
+ <artifactId>camel-spring-xml</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-jetty/pom.xml b/components/camel-jetty/pom.xml
index a08404f..decdc19 100644
--- a/components/camel-jetty/pom.xml
+++ b/components/camel-jetty/pom.xml
@@ -110,7 +110,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
+ <artifactId>camel-spring-xml</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-jms/pom.xml b/components/camel-jms/pom.xml
index 6acef0c..8804281 100644
--- a/components/camel-jms/pom.xml
+++ b/components/camel-jms/pom.xml
@@ -82,6 +82,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-spring-xml</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-management</artifactId>
<scope>test</scope>
</dependency>
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/JmsReconnectTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/JmsReconnectTest.java
index f185d81..de9b3ca 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/JmsReconnectTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/JmsReconnectTest.java
@@ -22,7 +22,7 @@ import org.apache.camel.Produce;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.JmsComponent;
import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.spring.CamelBeanPostProcessor;
+import org.apache.camel.spring.xml.CamelBeanPostProcessor;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-jooq/pom.xml b/components/camel-jooq/pom.xml
index a3f9c31..df6774d 100644
--- a/components/camel-jooq/pom.xml
+++ b/components/camel-jooq/pom.xml
@@ -62,7 +62,7 @@
<!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
+ <artifactId>camel-spring-xml</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-jpa/pom.xml b/components/camel-jpa/pom.xml
index ac1440f..3c9a01f 100644
--- a/components/camel-jpa/pom.xml
+++ b/components/camel-jpa/pom.xml
@@ -73,6 +73,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-spring-xml</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<scope>test</scope>
diff --git a/components/camel-lzf/pom.xml b/components/camel-lzf/pom.xml
index 23c2933..e429c1e 100644
--- a/components/camel-lzf/pom.xml
+++ b/components/camel-lzf/pom.xml
@@ -53,7 +53,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
+ <artifactId>camel-spring-xml</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-mail/pom.xml b/components/camel-mail/pom.xml
index 9bf8d31..e279570 100644
--- a/components/camel-mail/pom.xml
+++ b/components/camel-mail/pom.xml
@@ -66,6 +66,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-spring-main</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.jvnet.mock-javamail</groupId>
<artifactId>mock-javamail</artifactId>
<version>${mock-javamail-version}</version>
diff --git a/components/camel-metrics/pom.xml b/components/camel-metrics/pom.xml
index db22d73..d39ee42 100644
--- a/components/camel-metrics/pom.xml
+++ b/components/camel-metrics/pom.xml
@@ -77,7 +77,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
+ <artifactId>camel-spring-xml</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-micrometer/pom.xml b/components/camel-micrometer/pom.xml
index 950d9ef..8f99acd 100644
--- a/components/camel-micrometer/pom.xml
+++ b/components/camel-micrometer/pom.xml
@@ -69,7 +69,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
+ <artifactId>camel-spring-xml</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-mock/src/main/docs/mock-component.adoc b/components/camel-mock/src/main/docs/mock-component.adoc
index 7d1425c..aa914e2 100644
--- a/components/camel-mock/src/main/docs/mock-component.adoc
+++ b/components/camel-mock/src/main/docs/mock-component.adoc
@@ -355,7 +355,7 @@ Suppose we have the route in the `camel-route.xml` file:
[source,xml]
.*camel-route.xml*
----
-include::{examplesdir}/components/camel-spring/src/test/resources/org/apache/camel/spring/mock/camel-route.xml[tags=e1]
+include::{examplesdir}/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/mock/camel-route.xml[tags=e1]
----
Then we create a new XML file as follows, where we include the
@@ -366,7 +366,7 @@ Camel to mock all endpoints:
[source,xml]
.*test-camel-route.xml*
----
-include::{examplesdir}/components/camel-spring/src/test/resources/org/apache/camel/spring/mock/InterceptSendToMockEndpointStrategyTest.xml[tags=e1]
+include::{examplesdir}/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/mock/InterceptSendToMockEndpointStrategyTest.xml[tags=e1]
----
Then in your unit test you load the new XML file
diff --git a/components/camel-resteasy/pom.xml b/components/camel-resteasy/pom.xml
index d786987..384067e 100644
--- a/components/camel-resteasy/pom.xml
+++ b/components/camel-resteasy/pom.xml
@@ -124,7 +124,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
+ <artifactId>camel-spring-xml</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-resteasy/src/test/resources/pom.xml b/components/camel-resteasy/src/test/resources/pom.xml
index b91885e..1355055 100644
--- a/components/camel-resteasy/src/test/resources/pom.xml
+++ b/components/camel-resteasy/src/test/resources/pom.xml
@@ -81,7 +81,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
+ <artifactId>camel-spring-xml</artifactId>
<version>3.0.0-SNAPSHOT</version>
</dependency>
<dependency>
diff --git a/components/camel-servlet/pom.xml b/components/camel-servlet/pom.xml
index 43cabab..5a87c98 100644
--- a/components/camel-servlet/pom.xml
+++ b/components/camel-servlet/pom.xml
@@ -59,7 +59,7 @@
<!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
+ <artifactId>camel-spring-xml</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-spring-javaconfig/pom.xml b/components/camel-spring-javaconfig/pom.xml
index 406e303..d2c6265 100644
--- a/components/camel-spring-javaconfig/pom.xml
+++ b/components/camel-spring-javaconfig/pom.xml
@@ -46,7 +46,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
+ <artifactId>camel-spring-xml</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
diff --git a/components/camel-spring-javaconfig/src/main/java/org/apache/camel/spring/javaconfig/CamelConfiguration.java b/components/camel-spring-javaconfig/src/main/java/org/apache/camel/spring/javaconfig/CamelConfiguration.java
index c26210a..4a5b38d 100644
--- a/components/camel-spring-javaconfig/src/main/java/org/apache/camel/spring/javaconfig/CamelConfiguration.java
+++ b/components/camel-spring-javaconfig/src/main/java/org/apache/camel/spring/javaconfig/CamelConfiguration.java
@@ -24,8 +24,8 @@ import org.apache.camel.CamelContext;
import org.apache.camel.ConsumerTemplate;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.spring.CamelBeanPostProcessor;
import org.apache.camel.spring.SpringCamelContext;
+import org.apache.camel.spring.xml.CamelBeanPostProcessor;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.BeanFactoryAware;
import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
diff --git a/components/camel-spring/pom.xml b/components/camel-spring-xml/pom.xml
similarity index 93%
copy from components/camel-spring/pom.xml
copy to components/camel-spring-xml/pom.xml
index 2c058f7..49e5c1c 100644
--- a/components/camel-spring/pom.xml
+++ b/components/camel-spring-xml/pom.xml
@@ -26,13 +26,16 @@
<version>3.8.0-SNAPSHOT</version>
</parent>
- <artifactId>camel-spring</artifactId>
+ <artifactId>camel-spring-xml</artifactId>
<packaging>jar</packaging>
- <name>Camel :: Spring</name>
+ <name>Camel :: Spring XML</name>
<description>Camel Spring with XML DSL</description>
<properties>
+ <firstVersion>3.9.0</firstVersion>
+ <label>spring</label>
+ <supportLevel>Stable</supportLevel>
<camel.osgi.import>
javax.xml.bind*;version="[2.2,3.0)",
*
@@ -42,7 +45,7 @@
<dependencies>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-core-engine</artifactId>
+ <artifactId>camel-spring</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -54,53 +57,8 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-bean</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-health</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-main</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-management-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-core-xml</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-cron</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-expression</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-tx</artifactId>
- </dependency>
<!-- for testing -->
<dependency>
@@ -156,6 +114,16 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-bean</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-cron</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<scope>test</scope>
@@ -237,7 +205,7 @@
<artifactItems>
<artifactItem>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
+ <artifactId>camel-spring-xml</artifactId>
<version>${project.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
@@ -379,6 +347,7 @@
<type>jar</type>
<classifier>sources</classifier>
<overWrite>true</overWrite>
+ <includes>**/*</includes>
<outputDirectory>target/sources/camel-api</outputDirectory>
</artifactItem>
<artifactItem>
@@ -388,7 +357,8 @@
<type>jar</type>
<classifier>sources</classifier>
<overWrite>true</overWrite>
- <excludes>**/*nDefinitionConfigurer.java</excludes>
+ <includes>**/*</includes>
+ <excludes>**/*DefinitionConfigurer.java</excludes>
<outputDirectory>target/sources/camel-core-model</outputDirectory>
</artifactItem>
<artifactItem>
@@ -398,6 +368,7 @@
<type>jar</type>
<classifier>sources</classifier>
<overWrite>true</overWrite>
+ <includes>**/*</includes>
<outputDirectory>target/sources/camel-core-xml</outputDirectory>
</artifactItem>
<artifactItem>
@@ -407,6 +378,7 @@
<type>jar</type>
<classifier>sources</classifier>
<overWrite>true</overWrite>
+ <includes>**/*</includes>
<outputDirectory>target/sources/camel-util</outputDirectory>
</artifactItem>
</artifactItems>
@@ -451,21 +423,24 @@
<mkdir dir="${project.build.directory}/schema-src" />
<copy todir="${project.build.directory}/schema-src">
<fileset dir="${basedir}/src/main/java">
- <include name="org/apache/camel/spring/Camel*.java" />
- <include name="org/apache/camel/spring/ErrorHandler*.java" />
- <include name="org/apache/camel/spring/package-info.java" />
- <include name="org/apache/camel/util/spring/**/*.java" />
+ <include name="org/apache/camel/spring/xml/package-info.java" />
+ <include name="org/apache/camel/spring/xml/CamelBeanPostProcessor.java" />
+ <include name="org/apache/camel/spring/xml/ErrorHandler*.java" />
+ <include name="org/apache/camel/spring/xml/*FactoryBean.java" />
</fileset>
<fileset dir="${project.build.directory}/sources/camel-core-xml">
<include name="org/apache/camel/core/xml/*.java" />
<include name="org/apache/camel/core/xml/util/**/*.java" />
</fileset>
<fileset dir="${project.build.directory}/sources/camel-api">
+ <include name="org/apache/camel/BeanScope.java" />
<include name="org/apache/camel/ExchangePattern.java" />
<include name="org/apache/camel/LoggingLevel.java" />
<include name="org/apache/camel/ManagementStatisticsLevel.java" />
<include name="org/apache/camel/ShutdownRoute.java" />
<include name="org/apache/camel/ShutdownRunningTask.java" />
+ <include name="org/apache/camel/StartupSummaryLevel.java" />
+ <include name="org/apache/camel/TypeConverterExists.java" />
<include name="org/apache/camel/WaitForTaskToComplete.java" />
</fileset>
<fileset dir="${project.build.directory}/sources/camel-core-model">
@@ -647,10 +622,6 @@
<packages>org.apache.camel.spring</packages>
</group>
<group>
- <title>Spring remoting classes</title>
- <packages>org.apache.camel.spring.remoting</packages>
- </group>
- <group>
<title>Camel Components</title>
<packages>org.apache.camel.component:org.apache.camel.component.*</packages>
</group>
@@ -671,8 +642,8 @@
<packages>org.apache.camel.spring.processor.idempotent</packages>
</group>
<group>
- <title>Spring XML Namespace handling code</title>
- <packages>org.apache.camel.spring.handler</packages>
+ <title>Spring XML DSL</title>
+ <packages>org.apache.camel.spring.xml.handler</packages>
</group>
<group>
<title>Utility classes</title>
diff --git a/components/camel-spring-xml/src/generated/resources/META-INF/services/org/apache/camel/model-jaxbcontext-factory-spring b/components/camel-spring-xml/src/generated/resources/META-INF/services/org/apache/camel/model-jaxbcontext-factory-spring
new file mode 100644
index 0000000..af59ce9
--- /dev/null
+++ b/components/camel-spring-xml/src/generated/resources/META-INF/services/org/apache/camel/model-jaxbcontext-factory-spring
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.spring.xml.SpringModelJAXBContextFactory
diff --git a/components/camel-spring/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-spring-xml/src/generated/resources/META-INF/services/org/apache/camel/other.properties
similarity index 66%
copy from components/camel-spring/src/generated/resources/META-INF/services/org/apache/camel/component.properties
copy to components/camel-spring-xml/src/generated/resources/META-INF/services/org/apache/camel/other.properties
index cbfe296..78b1484 100644
--- a/components/camel-spring/src/generated/resources/META-INF/services/org/apache/camel/component.properties
+++ b/components/camel-spring-xml/src/generated/resources/META-INF/services/org/apache/camel/other.properties
@@ -1,7 +1,7 @@
# Generated by camel build tools - do NOT edit this file!
-components=spring-event
+name=spring-xml
groupId=org.apache.camel
-artifactId=camel-spring
+artifactId=camel-spring-xml
version=3.8.0-SNAPSHOT
-projectName=Camel :: Spring
+projectName=Camel :: Spring XML
projectDescription=Camel Spring with XML DSL
diff --git a/components/camel-spring/src/generated/resources/org/apache/camel/spring/beanPostProcessor.json b/components/camel-spring-xml/src/generated/resources/org/apache/camel/spring/xml/beanPostProcessor.json
similarity index 84%
rename from components/camel-spring/src/generated/resources/org/apache/camel/spring/beanPostProcessor.json
rename to components/camel-spring-xml/src/generated/resources/org/apache/camel/spring/xml/beanPostProcessor.json
index 0325ebe..cba6c42 100644
--- a/components/camel-spring/src/generated/resources/org/apache/camel/spring/beanPostProcessor.json
+++ b/components/camel-spring-xml/src/generated/resources/org/apache/camel/spring/xml/beanPostProcessor.json
@@ -6,7 +6,7 @@
"description": "Spring specific DefaultCamelBeanPostProcessor which uses Spring BeanPostProcessor to post process beans.",
"deprecated": false,
"label": "spring,configuration",
- "javaType": "org.apache.camel.spring.CamelBeanPostProcessor",
+ "javaType": "org.apache.camel.spring.xml.CamelBeanPostProcessor",
"input": false,
"output": false
},
diff --git a/components/camel-spring/src/generated/resources/org/apache/camel/spring/camelContext.json b/components/camel-spring-xml/src/generated/resources/org/apache/camel/spring/xml/camelContext.json
similarity index 97%
rename from components/camel-spring/src/generated/resources/org/apache/camel/spring/camelContext.json
rename to components/camel-spring-xml/src/generated/resources/org/apache/camel/spring/xml/camelContext.json
index 0e0c891..5dcf5af 100644
--- a/components/camel-spring/src/generated/resources/org/apache/camel/spring/camelContext.json
+++ b/components/camel-spring-xml/src/generated/resources/org/apache/camel/spring/xml/camelContext.json
@@ -6,7 +6,7 @@
"description": "CamelContext using XML configuration.",
"deprecated": false,
"label": "spring,configuration",
- "javaType": "org.apache.camel.spring.CamelContextFactoryBean",
+ "javaType": "org.apache.camel.spring.xml.CamelContextFactoryBean",
"input": false,
"output": false
},
@@ -52,7 +52,7 @@
"jmxAgent": { "kind": "element", "displayName": "JMX Agent", "required": false, "type": "object", "javaType": "org.apache.camel.core.xml.CamelJMXAgentDefinition", "deprecated": false, "autowired": false, "secret": false, "description": "Configuration of JMX Agent." },
"routeController": { "kind": "element", "displayName": "Route Controller", "required": false, "type": "object", "javaType": "org.apache.camel.core.xml.CamelRouteControllerDefinition", "deprecated": false, "autowired": false, "secret": false, "description": "Configuration of route controller." },
"beansFactory": { "kind": "element", "displayName": "Beans Factory", "required": true, "type": "array", "javaType": "java.util.List<org.apache.camel.core.xml.AbstractCamelFactoryBean<java.lang.Object>>", "oneOf": [ "consumerTemplate", "fluentTemplate", "template" ], "deprecated": false, "autowired": false, "secret": false, "description": "Miscellaneous configurations" },
- "beans": { "kind": "element", "displayName": "Beans", "required": true, "type": "array", "javaType": "java.util.List<java.lang.Object>", "oneOf": [ "errorHandler", "export", "proxy" ], "deprecated": false, "autowired": false, "secret": false, "description": "Miscellaneous configurations" },
+ "beans": { "kind": "element", "displayName": "Beans", "required": true, "type": "array", "javaType": "java.util.List<java.lang.Object>", "oneOf": [ "errorHandler" ], "deprecated": false, "autowired": false, "secret": false, "description": "Miscellaneous configurations" },
"defaultServiceCallConfiguration": { "kind": "element", "displayName": "Default Service Call Configuration", "required": false, "type": "object", "javaType": "org.apache.camel.model.cloud.ServiceCallConfigurationDefinition", "deprecated": false, "autowired": false, "secret": false, "description": "ServiceCall EIP default configuration" },
"serviceCallConfiguration": { "kind": "element", "displayName": "Service Call Configuration", "required": false, "type": "array", "javaType": "java.util.List<org.apache.camel.model.cloud.ServiceCallConfigurationDefinition>", "deprecated": false, "autowired": false, "secret": false, "description": "ServiceCall EIP configurations" },
"defaultHystrixConfiguration": { "kind": "element", "displayName": "Default Hystrix Configuration", "required": false, "type": "object", "javaType": "org.apache.camel.model.HystrixConfigurationDefinition", "deprecated": false, "autowired": false, "secret": false, "description": "Hystrix EIP default configuration" },
@@ -66,12 +66,12 @@
"routeContextRef": { "kind": "element", "displayName": "Route Context Ref", "required": false, "type": "array", "javaType": "java.util.List<org.apache.camel.model.RouteContextRefDefinition>", "deprecated": false, "autowired": false, "secret": false, "description": "Refers to XML routes to include as routes in this CamelContext." },
"restContextRef": { "kind": "element", "displayName": "Rest Context Ref", "required": false, "type": "array", "javaType": "java.util.List<org.apache.camel.model.RestContextRefDefinition>", "deprecated": false, "autowired": false, "secret": false, "description": "Refers to XML rest-dsl to include as REST services in this CamelContext." },
"threadPoolProfile": { "kind": "element", "displayName": "Thread Pool Profile", "required": false, "type": "array", "javaType": "java.util.List<org.apache.camel.model.ThreadPoolProfileDefinition>", "deprecated": false, "autowired": false, "secret": false, "description": "Configuration of thread pool profiles." },
- "threadPool": { "kind": "element", "displayName": "Thread Pool", "required": false, "type": "array", "javaType": "java.util.List<org.apache.camel.spring.CamelThreadPoolFactoryBean>", "deprecated": false, "autowired": false, "secret": false, "description": "Configuration of thread pool" },
- "endpoint": { "kind": "element", "displayName": "Endpoint", "required": false, "type": "array", "javaType": "java.util.List<org.apache.camel.spring.CamelEndpointFactoryBean>", "deprecated": false, "autowired": false, "secret": false, "description": "Configuration of endpoints" },
+ "threadPool": { "kind": "element", "displayName": "Thread Pool", "required": false, "type": "array", "javaType": "java.util.List<org.apache.camel.spring.xml.CamelThreadPoolFactoryBean>", "deprecated": false, "autowired": false, "secret": false, "description": "Configuration of thread pool" },
+ "endpoint": { "kind": "element", "displayName": "Endpoint", "required": false, "type": "array", "javaType": "java.util.List<org.apache.camel.spring.xml.CamelEndpointFactoryBean>", "deprecated": false, "autowired": false, "secret": false, "description": "Configuration of endpoints" },
"dataFormats": { "kind": "element", "displayName": "Data Formats", "required": false, "type": "object", "javaType": "org.apache.camel.model.dataformat.DataFormatsDefinition", "deprecated": false, "autowired": false, "secret": false, "description": "Configuration of data formats." },
"transformers": { "kind": "element", "displayName": "Transformers", "required": false, "type": "object", "javaType": "org.apache.camel.model.transformer.TransformersDefinition", "deprecated": false, "autowired": false, "secret": false, "description": "Configuration of transformers." },
"validators": { "kind": "element", "displayName": "Validators", "required": false, "type": "object", "javaType": "org.apache.camel.model.validator.ValidatorsDefinition", "deprecated": false, "autowired": false, "secret": false, "description": "Configuration of validators." },
- "redeliveryPolicyProfile": { "kind": "element", "displayName": "Redelivery Policy Profile", "required": false, "type": "array", "javaType": "java.util.List<org.apache.camel.spring.CamelRedeliveryPolicyFactoryBean>", "deprecated": false, "autowired": false, "secret": false, "description": "Configuration of redelivery settings." },
+ "redeliveryPolicyProfile": { "kind": "element", "displayName": "Redelivery Policy Profile", "required": false, "type": "array", "javaType": "java.util.List<org.apache.camel.spring.xml.CamelRedeliveryPolicyFactoryBean>", "deprecated": false, "autowired": false, "secret": false, "description": "Configuration of redelivery settings." },
"onException": { "kind": "element", "displayName": "On Exception", "required": false, "type": "array", "javaType": "java.util.List<org.apache.camel.model.OnExceptionDefinition>", "deprecated": false, "autowired": false, "secret": false, "description": "Configuration of error handlers that triggers on exceptions thrown." },
"onCompletion": { "kind": "element", "displayName": "On Completion", "required": false, "type": "array", "javaType": "java.util.List<org.apache.camel.model.OnCompletionDefinition>", "deprecated": false, "autowired": false, "secret": false, "description": "Configuration of sub routes to run at the completion of routing." },
"intercept": { "kind": "element", "displayName": "Intercept", "required": false, "type": "array", "javaType": "java.util.List<org.apache.camel.model.InterceptDefinition>", "deprecated": false, "autowired": false, "secret": false, "description": "Configuration of interceptors." },
diff --git a/components/camel-spring/src/generated/resources/org/apache/camel/spring/consumerTemplate.json b/components/camel-spring-xml/src/generated/resources/org/apache/camel/spring/xml/consumerTemplate.json
similarity index 93%
rename from components/camel-spring/src/generated/resources/org/apache/camel/spring/consumerTemplate.json
rename to components/camel-spring-xml/src/generated/resources/org/apache/camel/spring/xml/consumerTemplate.json
index 000e5eb..e4e2db9 100644
--- a/components/camel-spring/src/generated/resources/org/apache/camel/spring/consumerTemplate.json
+++ b/components/camel-spring-xml/src/generated/resources/org/apache/camel/spring/xml/consumerTemplate.json
@@ -6,7 +6,7 @@
"description": "Configures a ConsumerTemplate",
"deprecated": false,
"label": "spring,configuration",
- "javaType": "org.apache.camel.spring.CamelConsumerTemplateFactoryBean",
+ "javaType": "org.apache.camel.spring.xml.CamelConsumerTemplateFactoryBean",
"input": false,
"output": false
},
diff --git a/components/camel-spring/src/generated/resources/org/apache/camel/spring/endpoint.json b/components/camel-spring-xml/src/generated/resources/org/apache/camel/spring/xml/endpoint.json
similarity index 93%
rename from components/camel-spring/src/generated/resources/org/apache/camel/spring/endpoint.json
rename to components/camel-spring-xml/src/generated/resources/org/apache/camel/spring/xml/endpoint.json
index 859ba4b..7100511 100644
--- a/components/camel-spring/src/generated/resources/org/apache/camel/spring/endpoint.json
+++ b/components/camel-spring-xml/src/generated/resources/org/apache/camel/spring/xml/endpoint.json
@@ -6,7 +6,7 @@
"description": "Camel endpoint configuration",
"deprecated": false,
"label": "spring,configuration,endpoint",
- "javaType": "org.apache.camel.spring.CamelEndpointFactoryBean",
+ "javaType": "org.apache.camel.spring.xml.CamelEndpointFactoryBean",
"input": false,
"output": false
},
diff --git a/components/camel-spring/src/generated/resources/org/apache/camel/spring/errorHandler.json b/components/camel-spring-xml/src/generated/resources/org/apache/camel/spring/xml/errorHandler.json
similarity index 95%
rename from components/camel-spring/src/generated/resources/org/apache/camel/spring/errorHandler.json
rename to components/camel-spring-xml/src/generated/resources/org/apache/camel/spring/xml/errorHandler.json
index 17129fa..ca07cae 100644
--- a/components/camel-spring/src/generated/resources/org/apache/camel/spring/errorHandler.json
+++ b/components/camel-spring-xml/src/generated/resources/org/apache/camel/spring/xml/errorHandler.json
@@ -6,12 +6,12 @@
"description": "Error handler settings",
"deprecated": false,
"label": "spring,configuration,error",
- "javaType": "org.apache.camel.spring.ErrorHandlerDefinition",
+ "javaType": "org.apache.camel.spring.xml.ErrorHandlerDefinition",
"input": false,
"output": false
},
"properties": {
- "type": { "kind": "attribute", "displayName": "Type", "required": true, "type": "enum", "javaType": "org.apache.camel.spring.ErrorHandlerType", "enum": [ "dead-letter-channel", "default-error-handler", "no-error-handler", "transaction-error-handler" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "DefaultErrorHandler", "description": "The type of the error handler" },
+ "type": { "kind": "attribute", "displayName": "Type", "required": true, "type": "enum", "javaType": "org.apache.camel.spring.xml.ErrorHandlerType", "enum": [ "dead-letter-channel", "default-error-handler", "no-error-handler", "transaction-error-handler" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "DefaultErrorHandler", "description": "The type of the error handler" },
"deadLetterUri": { "kind": "attribute", "displayName": "Dead Letter Uri", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The dead letter endpoint uri for the Dead Letter error handler." },
"deadLetterHandleNewException": { "kind": "attribute", "displayName": "Dead Letter Handle New Exception", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Whether the dead letter channel should handle (and ignore) any new exception that may been thrown during sending the message to the dead letter endpoint. The default value is true which means any such kind of exception is handled and ignor [...]
"level": { "kind": "attribute", "displayName": "Level", "required": false, "type": "enum", "javaType": "org.apache.camel.LoggingLevel", "enum": [ "debug", "error", "info", "off", "trace", "warn" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "ERROR", "description": "Logging level to use when using the logging error handler type." },
@@ -27,7 +27,7 @@
"retryWhileRef": { "kind": "attribute", "displayName": "Retry While Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets a reference to an retry while expression. Will continue retrying until expression evaluates to false." },
"redeliveryPolicyRef": { "kind": "attribute", "displayName": "Redelivery Policy Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets a reference to a RedeliveryPolicy to be used for redelivery settings." },
"executorServiceRef": { "kind": "attribute", "displayName": "Executor Service Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets a reference to a thread pool to be used by the error handler" },
- "redeliveryPolicy": { "kind": "element", "displayName": "Redelivery Policy", "required": false, "type": "object", "javaType": "org.apache.camel.spring.CamelRedeliveryPolicyFactoryBean", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the redelivery settings" },
+ "redeliveryPolicy": { "kind": "element", "displayName": "Redelivery Policy", "required": false, "type": "object", "javaType": "org.apache.camel.spring.xml.CamelRedeliveryPolicyFactoryBean", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the redelivery settings" },
"id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The id of this node" }
}
}
diff --git a/components/camel-spring/src/generated/resources/org/apache/camel/spring/fluentTemplate.json b/components/camel-spring-xml/src/generated/resources/org/apache/camel/spring/xml/fluentTemplate.json
similarity index 94%
rename from components/camel-spring/src/generated/resources/org/apache/camel/spring/fluentTemplate.json
rename to components/camel-spring-xml/src/generated/resources/org/apache/camel/spring/xml/fluentTemplate.json
index 6818326..d349a14 100644
--- a/components/camel-spring/src/generated/resources/org/apache/camel/spring/fluentTemplate.json
+++ b/components/camel-spring-xml/src/generated/resources/org/apache/camel/spring/xml/fluentTemplate.json
@@ -6,7 +6,7 @@
"description": "Configures a org.apache.camel.FluentProducerTemplate",
"deprecated": false,
"label": "spring,configuration",
- "javaType": "org.apache.camel.spring.CamelFluentProducerTemplateFactoryBean",
+ "javaType": "org.apache.camel.spring.xml.CamelFluentProducerTemplateFactoryBean",
"input": false,
"output": false
},
diff --git a/components/camel-spring/src/generated/resources/org/apache/camel/spring/jaxb.index b/components/camel-spring-xml/src/generated/resources/org/apache/camel/spring/xml/jaxb.index
similarity index 71%
rename from components/camel-spring/src/generated/resources/org/apache/camel/spring/jaxb.index
rename to components/camel-spring-xml/src/generated/resources/org/apache/camel/spring/xml/jaxb.index
index d800beb..f7926d6 100644
--- a/components/camel-spring/src/generated/resources/org/apache/camel/spring/jaxb.index
+++ b/components/camel-spring-xml/src/generated/resources/org/apache/camel/spring/xml/jaxb.index
@@ -12,3 +12,8 @@ CamelRouteTemplateContextFactoryBean
CamelThreadPoolFactoryBean
ErrorHandlerDefinition
ErrorHandlerType
+KeyStoreParametersFactoryBean
+SSLContextClientParametersFactoryBean
+SSLContextParametersFactoryBean
+SSLContextServerParametersFactoryBean
+SecureRandomParametersFactoryBean
diff --git a/components/camel-spring-xml/src/generated/resources/org/apache/camel/spring/xml/keyStoreParameters.json b/components/camel-spring-xml/src/generated/resources/org/apache/camel/spring/xml/keyStoreParameters.json
new file mode 100644
index 0000000..1958609
--- /dev/null
+++ b/components/camel-spring-xml/src/generated/resources/org/apache/camel/spring/xml/keyStoreParameters.json
@@ -0,0 +1,19 @@
+{
+ "model": {
+ "kind": "model",
+ "name": "keyStoreParameters",
+ "title": "Key Store Parameters",
+ "deprecated": false,
+ "javaType": "org.apache.camel.spring.xml.KeyStoreParametersFactoryBean",
+ "input": false,
+ "output": false
+ },
+ "properties": {
+ "type": { "kind": "attribute", "displayName": "Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The optional type of the key store to load. See Appendix A in the Java Cryptography Architecture Standard Algorithm Name Documentation for more information on standard names." },
+ "password": { "kind": "attribute", "displayName": "Password", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The optional password for reading\/opening\/verifying the key store" },
+ "provider": { "kind": "attribute", "displayName": "Provider", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The optional provider identifier for instantiating the key store" },
+ "resource": { "kind": "attribute", "displayName": "Resource", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The optional file path, class path resource, or URL of the resource used to load the key store" },
+ "camelContextId": { "kind": "attribute", "displayName": "Camel Context Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Id of CamelContext to use if there are multiple CamelContexts in the same JVM" },
+ "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The id of this node" }
+ }
+}
diff --git a/components/camel-spring/src/generated/resources/org/apache/camel/spring/redeliveryPolicyProfile.json b/components/camel-spring-xml/src/generated/resources/org/apache/camel/spring/xml/redeliveryPolicyProfile.json
similarity index 99%
rename from components/camel-spring/src/generated/resources/org/apache/camel/spring/redeliveryPolicyProfile.json
rename to components/camel-spring-xml/src/generated/resources/org/apache/camel/spring/xml/redeliveryPolicyProfile.json
index 04f7127..38cabee 100644
--- a/components/camel-spring/src/generated/resources/org/apache/camel/spring/redeliveryPolicyProfile.json
+++ b/components/camel-spring-xml/src/generated/resources/org/apache/camel/spring/xml/redeliveryPolicyProfile.json
@@ -6,7 +6,7 @@
"description": "Configuration of redelivery policy.",
"deprecated": false,
"label": "spring,configuration",
- "javaType": "org.apache.camel.spring.CamelRedeliveryPolicyFactoryBean",
+ "javaType": "org.apache.camel.spring.xml.CamelRedeliveryPolicyFactoryBean",
"input": false,
"output": false
},
diff --git a/components/camel-spring/src/generated/resources/org/apache/camel/spring/restContext.json b/components/camel-spring-xml/src/generated/resources/org/apache/camel/spring/xml/restContext.json
similarity index 91%
rename from components/camel-spring/src/generated/resources/org/apache/camel/spring/restContext.json
rename to components/camel-spring-xml/src/generated/resources/org/apache/camel/spring/xml/restContext.json
index 4d40edf..2011fc4 100644
--- a/components/camel-spring/src/generated/resources/org/apache/camel/spring/restContext.json
+++ b/components/camel-spring-xml/src/generated/resources/org/apache/camel/spring/xml/restContext.json
@@ -6,7 +6,7 @@
"description": "Configuration of REST services using rest-dsl using XML",
"deprecated": false,
"label": "spring,configuration,rest",
- "javaType": "org.apache.camel.spring.CamelRestContextFactoryBean",
+ "javaType": "org.apache.camel.spring.xml.CamelRestContextFactoryBean",
"input": false,
"output": false
},
diff --git a/components/camel-spring/src/generated/resources/org/apache/camel/spring/routeContext.json b/components/camel-spring-xml/src/generated/resources/org/apache/camel/spring/xml/routeContext.json
similarity index 90%
rename from components/camel-spring/src/generated/resources/org/apache/camel/spring/routeContext.json
rename to components/camel-spring-xml/src/generated/resources/org/apache/camel/spring/xml/routeContext.json
index abbf563..8abcf7d 100644
--- a/components/camel-spring/src/generated/resources/org/apache/camel/spring/routeContext.json
+++ b/components/camel-spring-xml/src/generated/resources/org/apache/camel/spring/xml/routeContext.json
@@ -6,7 +6,7 @@
"description": "Configuration of routes using XML",
"deprecated": false,
"label": "spring,configuration,routing",
- "javaType": "org.apache.camel.spring.CamelRouteContextFactoryBean",
+ "javaType": "org.apache.camel.spring.xml.CamelRouteContextFactoryBean",
"input": false,
"output": false
},
diff --git a/components/camel-spring/src/generated/resources/org/apache/camel/spring/routeTemplateContext.json b/components/camel-spring-xml/src/generated/resources/org/apache/camel/spring/xml/routeTemplateContext.json
similarity index 90%
rename from components/camel-spring/src/generated/resources/org/apache/camel/spring/routeTemplateContext.json
rename to components/camel-spring-xml/src/generated/resources/org/apache/camel/spring/xml/routeTemplateContext.json
index b3cf2ed..0501ac8 100644
--- a/components/camel-spring/src/generated/resources/org/apache/camel/spring/routeTemplateContext.json
+++ b/components/camel-spring-xml/src/generated/resources/org/apache/camel/spring/xml/routeTemplateContext.json
@@ -6,7 +6,7 @@
"description": "Configuration of route templates using XML",
"deprecated": false,
"label": "spring,configuration,routing",
- "javaType": "org.apache.camel.spring.CamelRouteTemplateContextFactoryBean",
+ "javaType": "org.apache.camel.spring.xml.CamelRouteTemplateContextFactoryBean",
"input": false,
"output": false
},
diff --git a/components/camel-spring-xml/src/generated/resources/org/apache/camel/spring/xml/secureRandomParameters.json b/components/camel-spring-xml/src/generated/resources/org/apache/camel/spring/xml/secureRandomParameters.json
new file mode 100644
index 0000000..3bc9029
--- /dev/null
+++ b/components/camel-spring-xml/src/generated/resources/org/apache/camel/spring/xml/secureRandomParameters.json
@@ -0,0 +1,17 @@
+{
+ "model": {
+ "kind": "model",
+ "name": "secureRandomParameters",
+ "title": "Secure Random Parameters",
+ "deprecated": false,
+ "javaType": "org.apache.camel.spring.xml.SecureRandomParametersFactoryBean",
+ "input": false,
+ "output": false
+ },
+ "properties": {
+ "algorithm": { "kind": "attribute", "displayName": "Algorithm", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The Random Number Generator algorithm identifier for the SecureRandom factory method used to create the SecureRandom represented by this object's configuration. See Appendix A in the Java Cryptography Architecture API Specification and Reference guide for information about standar [...]
+ "provider": { "kind": "attribute", "displayName": "Provider", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The optional provider identifier for the SecureRandom factory method used to create the SecureRandom represented by this object's configuration." },
+ "camelContextId": { "kind": "attribute", "displayName": "Camel Context Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Id of CamelContext to use if there are multiple CamelContexts in the same JVM" },
+ "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The id of this node" }
+ }
+}
diff --git a/components/camel-spring-xml/src/generated/resources/org/apache/camel/spring/xml/sslContextParameters.json b/components/camel-spring-xml/src/generated/resources/org/apache/camel/spring/xml/sslContextParameters.json
new file mode 100644
index 0000000..a097cae
--- /dev/null
+++ b/components/camel-spring-xml/src/generated/resources/org/apache/camel/spring/xml/sslContextParameters.json
@@ -0,0 +1,19 @@
+{
+ "model": {
+ "kind": "model",
+ "name": "sslContextParameters",
+ "title": "Ssl Context Parameters",
+ "deprecated": false,
+ "javaType": "org.apache.camel.spring.xml.SSLContextParametersFactoryBean",
+ "input": false,
+ "output": false
+ },
+ "properties": {
+ "provider": { "kind": "attribute", "displayName": "Provider", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The optional provider identifier for the JSSE implementation to use when constructing an SSLContext." },
+ "secureSocketProtocol": { "kind": "attribute", "displayName": "Secure Socket Protocol", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The optional protocol for the secure sockets created by the SSLContext represented by this instance's configuration. See Appendix A in the Java Secure Socket Extension Reference Guide for information about standard protocol names." },
+ "certAlias": { "kind": "attribute", "displayName": "Cert Alias", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "An optional certificate alias to use. This is useful when the keystore has multiple certificates." },
+ "sessionTimeout": { "kind": "attribute", "displayName": "Session Timeout", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The optional SSLSessionContext timeout time for javax.net.ssl.SSLSession in seconds." },
+ "camelContextId": { "kind": "attribute", "displayName": "Camel Context Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Id of CamelContext to use if there are multiple CamelContexts in the same JVM" },
+ "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The id of this node" }
+ }
+}
diff --git a/components/camel-spring/src/generated/resources/org/apache/camel/spring/template.json b/components/camel-spring-xml/src/generated/resources/org/apache/camel/spring/xml/template.json
similarity index 94%
rename from components/camel-spring/src/generated/resources/org/apache/camel/spring/template.json
rename to components/camel-spring-xml/src/generated/resources/org/apache/camel/spring/xml/template.json
index d2be114..6f63999 100644
--- a/components/camel-spring/src/generated/resources/org/apache/camel/spring/template.json
+++ b/components/camel-spring-xml/src/generated/resources/org/apache/camel/spring/xml/template.json
@@ -6,7 +6,7 @@
"description": "Configures a ProducerTemplate",
"deprecated": false,
"label": "spring,configuration",
- "javaType": "org.apache.camel.spring.CamelProducerTemplateFactoryBean",
+ "javaType": "org.apache.camel.spring.xml.CamelProducerTemplateFactoryBean",
"input": false,
"output": false
},
diff --git a/components/camel-spring/src/generated/resources/org/apache/camel/spring/threadPool.json b/components/camel-spring-xml/src/generated/resources/org/apache/camel/spring/xml/threadPool.json
similarity index 97%
rename from components/camel-spring/src/generated/resources/org/apache/camel/spring/threadPool.json
rename to components/camel-spring-xml/src/generated/resources/org/apache/camel/spring/xml/threadPool.json
index 2474126..c6533dd 100644
--- a/components/camel-spring/src/generated/resources/org/apache/camel/spring/threadPool.json
+++ b/components/camel-spring-xml/src/generated/resources/org/apache/camel/spring/xml/threadPool.json
@@ -6,7 +6,7 @@
"description": "Configuration of thread pools",
"deprecated": false,
"label": "spring,configuration",
- "javaType": "org.apache.camel.spring.CamelThreadPoolFactoryBean",
+ "javaType": "org.apache.camel.spring.xml.CamelThreadPoolFactoryBean",
"input": false,
"output": false
},
diff --git a/components/camel-spring-xml/src/generated/resources/spring-xml.json b/components/camel-spring-xml/src/generated/resources/spring-xml.json
new file mode 100644
index 0000000..85f1358
--- /dev/null
+++ b/components/camel-spring-xml/src/generated/resources/spring-xml.json
@@ -0,0 +1,15 @@
+{
+ "other": {
+ "kind": "other",
+ "name": "spring-xml",
+ "title": "Spring Xml",
+ "description": "Camel Spring with XML DSL",
+ "deprecated": false,
+ "firstVersion": "3.9.0",
+ "label": "spring",
+ "supportLevel": "Stable",
+ "groupId": "org.apache.camel",
+ "artifactId": "camel-spring-xml",
+ "version": "3.8.0-SNAPSHOT"
+ }
+}
diff --git a/components/camel-spring-xml/src/main/docs/spring-xml.adoc b/components/camel-spring-xml/src/main/docs/spring-xml.adoc
new file mode 100644
index 0000000..1bc067d
--- /dev/null
+++ b/components/camel-spring-xml/src/main/docs/spring-xml.adoc
@@ -0,0 +1,38 @@
+[[spring-xml-other]]
+= Spring Xml Component
+:docTitle: Spring Xml
+:artifactId: camel-spring-xml
+:description: Camel Spring with XML DSL
+:since: 3.9
+:supportLevel: Stable
+include::{cq-version}@camel-quarkus:ROOT:partial$reference/others/spring-xml.adoc[opts=optional]
+
+*Since Camel {since}*
+
+The Spring XML component provides the XML DSL when using Spring XML (eg `<beans>`)
+
+Maven users will need to add the following dependency to
+their `pom.xml` for this component:
+
+[source,xml]
+------------------------------------------------------------
+<dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-spring-xml</artifactId>
+ <version>x.x.x</version>
+ <!-- use the same version as your Camel core version -->
+</dependency>
+------------------------------------------------------------
+
+== Options
+
+
+// component options: START
+// component options: END
+
+
+
+// endpoint options: START
+// endpoint options: END
+
+include::camel-spring-boot::page$spring-xml-starter.adoc[]
diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/CamelBeanPostProcessor.java b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/CamelBeanPostProcessor.java
similarity index 97%
rename from components/camel-spring/src/main/java/org/apache/camel/spring/CamelBeanPostProcessor.java
rename to components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/CamelBeanPostProcessor.java
index 1e7ffdd..9a34cf3 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/spring/CamelBeanPostProcessor.java
+++ b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/CamelBeanPostProcessor.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.spring;
+package org.apache.camel.spring.xml;
import java.util.LinkedHashSet;
import java.util.Map;
@@ -37,6 +37,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanInstantiationException;
import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.BeanCreationException;
import org.springframework.beans.factory.config.BeanPostProcessor;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
@@ -174,7 +175,7 @@ public class CamelBeanPostProcessor
if (e instanceof BeansException) {
throw (BeansException) e;
}
- throw new GenericBeansException("Error post processing bean: " + beanName, e);
+ throw new BeanCreationException("Error post processing bean: " + beanName, e);
}
}
@@ -187,7 +188,7 @@ public class CamelBeanPostProcessor
if (e instanceof BeansException) {
throw (BeansException) e;
}
- throw new GenericBeansException("Error post processing bean: " + beanName, e);
+ throw new BeanCreationException("Error post processing bean: " + beanName, e);
}
}
diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/CamelConsumerTemplateFactoryBean.java b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/CamelConsumerTemplateFactoryBean.java
similarity index 98%
rename from components/camel-spring/src/main/java/org/apache/camel/spring/CamelConsumerTemplateFactoryBean.java
rename to components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/CamelConsumerTemplateFactoryBean.java
index f5039f3..b3f6801 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/spring/CamelConsumerTemplateFactoryBean.java
+++ b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/CamelConsumerTemplateFactoryBean.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.spring;
+package org.apache.camel.spring.xml;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/CamelContextFactoryBean.java
similarity index 99%
rename from components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
rename to components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/CamelContextFactoryBean.java
index e91072e..090544f 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
+++ b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/CamelContextFactoryBean.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.spring;
+package org.apache.camel.spring.xml;
import java.util.ArrayList;
import java.util.List;
@@ -42,9 +42,7 @@ import org.apache.camel.core.xml.AbstractCamelContextFactoryBean;
import org.apache.camel.core.xml.AbstractCamelFactoryBean;
import org.apache.camel.core.xml.CamelJMXAgentDefinition;
import org.apache.camel.core.xml.CamelPropertyPlaceholderDefinition;
-import org.apache.camel.core.xml.CamelProxyFactoryDefinition;
import org.apache.camel.core.xml.CamelRouteControllerDefinition;
-import org.apache.camel.core.xml.CamelServiceExporterDefinition;
import org.apache.camel.core.xml.CamelStreamCachingStrategyDefinition;
import org.apache.camel.model.ContextScanDefinition;
import org.apache.camel.model.FaultToleranceConfigurationDefinition;
@@ -73,8 +71,8 @@ import org.apache.camel.model.validator.ValidatorsDefinition;
import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.PackageScanFilter;
import org.apache.camel.spi.Registry;
+import org.apache.camel.spring.SpringCamelContext;
import org.apache.camel.spring.spi.BridgePropertyPlaceholderConfigurer;
-import org.apache.camel.spring.spi.XmlCamelContextConfigurer;
import org.apache.camel.support.CamelContextHelper;
import org.apache.camel.util.StopWatch;
import org.slf4j.Logger;
@@ -208,8 +206,6 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Spr
@XmlElement(name = "consumerTemplate", type = CamelConsumerTemplateFactoryBean.class) })
private List<AbstractCamelFactoryBean<?>> beansFactory;
@XmlElements({
- @XmlElement(name = "proxy", type = CamelProxyFactoryDefinition.class),
- @XmlElement(name = "export", type = CamelServiceExporterDefinition.class),
@XmlElement(name = "errorHandler", type = ErrorHandlerDefinition.class) })
private List<?> beans;
@XmlElement(name = "defaultServiceCallConfiguration")
diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/CamelEndpointFactoryBean.java b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/CamelEndpointFactoryBean.java
similarity index 98%
rename from components/camel-spring/src/main/java/org/apache/camel/spring/CamelEndpointFactoryBean.java
rename to components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/CamelEndpointFactoryBean.java
index 34b2a7e..0428eef 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/spring/CamelEndpointFactoryBean.java
+++ b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/CamelEndpointFactoryBean.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.spring;
+package org.apache.camel.spring.xml;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/CamelFluentProducerTemplateFactoryBean.java b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/CamelFluentProducerTemplateFactoryBean.java
similarity index 98%
rename from components/camel-spring/src/main/java/org/apache/camel/spring/CamelFluentProducerTemplateFactoryBean.java
rename to components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/CamelFluentProducerTemplateFactoryBean.java
index fc9692f..7897a58 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/spring/CamelFluentProducerTemplateFactoryBean.java
+++ b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/CamelFluentProducerTemplateFactoryBean.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.spring;
+package org.apache.camel.spring.xml;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/CamelProducerTemplateFactoryBean.java b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/CamelProducerTemplateFactoryBean.java
similarity index 98%
rename from components/camel-spring/src/main/java/org/apache/camel/spring/CamelProducerTemplateFactoryBean.java
rename to components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/CamelProducerTemplateFactoryBean.java
index 65e5649..5feaead 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/spring/CamelProducerTemplateFactoryBean.java
+++ b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/CamelProducerTemplateFactoryBean.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.spring;
+package org.apache.camel.spring.xml;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/CamelRedeliveryPolicyFactoryBean.java b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/CamelRedeliveryPolicyFactoryBean.java
similarity index 98%
rename from components/camel-spring/src/main/java/org/apache/camel/spring/CamelRedeliveryPolicyFactoryBean.java
rename to components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/CamelRedeliveryPolicyFactoryBean.java
index c048a55..b4bb6ef 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/spring/CamelRedeliveryPolicyFactoryBean.java
+++ b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/CamelRedeliveryPolicyFactoryBean.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.spring;
+package org.apache.camel.spring.xml;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/CamelRestContextFactoryBean.java b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/CamelRestContextFactoryBean.java
similarity index 98%
rename from components/camel-spring/src/main/java/org/apache/camel/spring/CamelRestContextFactoryBean.java
rename to components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/CamelRestContextFactoryBean.java
index 1c087bb..9cfca69 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/spring/CamelRestContextFactoryBean.java
+++ b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/CamelRestContextFactoryBean.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.spring;
+package org.apache.camel.spring.xml;
import java.util.ArrayList;
import java.util.List;
diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/CamelRouteContextFactoryBean.java b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/CamelRouteContextFactoryBean.java
similarity index 98%
rename from components/camel-spring/src/main/java/org/apache/camel/spring/CamelRouteContextFactoryBean.java
rename to components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/CamelRouteContextFactoryBean.java
index d92515a..3362e56 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/spring/CamelRouteContextFactoryBean.java
+++ b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/CamelRouteContextFactoryBean.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.spring;
+package org.apache.camel.spring.xml;
import java.util.ArrayList;
import java.util.List;
diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/CamelRouteTemplateContextFactoryBean.java b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/CamelRouteTemplateContextFactoryBean.java
similarity index 98%
rename from components/camel-spring/src/main/java/org/apache/camel/spring/CamelRouteTemplateContextFactoryBean.java
rename to components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/CamelRouteTemplateContextFactoryBean.java
index 6d92c8a..c28683b 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/spring/CamelRouteTemplateContextFactoryBean.java
+++ b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/CamelRouteTemplateContextFactoryBean.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.spring;
+package org.apache.camel.spring.xml;
import java.util.ArrayList;
import java.util.List;
diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/CamelThreadPoolFactoryBean.java b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/CamelThreadPoolFactoryBean.java
similarity index 98%
rename from components/camel-spring/src/main/java/org/apache/camel/spring/CamelThreadPoolFactoryBean.java
rename to components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/CamelThreadPoolFactoryBean.java
index 4b8cbea..40f5a9b 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/spring/CamelThreadPoolFactoryBean.java
+++ b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/CamelThreadPoolFactoryBean.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.spring;
+package org.apache.camel.spring.xml;
import java.util.concurrent.ExecutorService;
diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/ContextScanRouteBuilderFinder.java b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/ContextScanRouteBuilderFinder.java
similarity index 97%
rename from components/camel-spring/src/main/java/org/apache/camel/spring/ContextScanRouteBuilderFinder.java
rename to components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/ContextScanRouteBuilderFinder.java
index c45f652..5809251 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/spring/ContextScanRouteBuilderFinder.java
+++ b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/ContextScanRouteBuilderFinder.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.spring;
+package org.apache.camel.spring.xml;
import java.util.List;
import java.util.Map;
@@ -22,6 +22,7 @@ import java.util.Map.Entry;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.spi.PackageScanFilter;
+import org.apache.camel.spring.SpringCamelContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.ApplicationContext;
diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/ErrorHandlerDefinition.java b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/ErrorHandlerDefinition.java
similarity index 99%
rename from components/camel-spring/src/main/java/org/apache/camel/spring/ErrorHandlerDefinition.java
rename to components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/ErrorHandlerDefinition.java
index 7aef446..1d1141a 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/spring/ErrorHandlerDefinition.java
+++ b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/ErrorHandlerDefinition.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.spring;
+package org.apache.camel.spring.xml;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/ErrorHandlerType.java b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/ErrorHandlerType.java
similarity index 97%
rename from components/camel-spring/src/main/java/org/apache/camel/spring/ErrorHandlerType.java
rename to components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/ErrorHandlerType.java
index dddc6ee..d082475 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/spring/ErrorHandlerType.java
+++ b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/ErrorHandlerType.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.spring;
+package org.apache.camel.spring.xml;
import javax.xml.bind.annotation.XmlEnum;
import javax.xml.bind.annotation.XmlType;
@@ -30,7 +30,7 @@ import org.apache.camel.spring.spi.TransactionErrorHandlerBuilder;
*/
@Metadata(label = "spring,configuration,error")
@XmlType
-@XmlEnum(String.class)
+@XmlEnum
public enum ErrorHandlerType {
DefaultErrorHandler,
diff --git a/components/camel-spring/src/main/java/org/apache/camel/util/spring/KeyManagersParametersFactoryBean.java b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/KeyManagersParametersFactoryBean.java
similarity index 98%
rename from components/camel-spring/src/main/java/org/apache/camel/util/spring/KeyManagersParametersFactoryBean.java
rename to components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/KeyManagersParametersFactoryBean.java
index b6358db..3bc88cb 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/util/spring/KeyManagersParametersFactoryBean.java
+++ b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/KeyManagersParametersFactoryBean.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.util.spring;
+package org.apache.camel.spring.xml;
import javax.xml.bind.annotation.XmlTransient;
diff --git a/components/camel-spring/src/main/java/org/apache/camel/util/spring/KeyStoreParametersFactoryBean.java b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/KeyStoreParametersFactoryBean.java
similarity index 98%
rename from components/camel-spring/src/main/java/org/apache/camel/util/spring/KeyStoreParametersFactoryBean.java
rename to components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/KeyStoreParametersFactoryBean.java
index 0a93ea0..7a7aa6a 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/util/spring/KeyStoreParametersFactoryBean.java
+++ b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/KeyStoreParametersFactoryBean.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.util.spring;
+package org.apache.camel.spring.xml;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/PackageScanRouteBuilderFinder.java b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/PackageScanRouteBuilderFinder.java
similarity index 98%
rename from components/camel-spring/src/main/java/org/apache/camel/spring/PackageScanRouteBuilderFinder.java
rename to components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/PackageScanRouteBuilderFinder.java
index 6f5b778..5d5e874 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/spring/PackageScanRouteBuilderFinder.java
+++ b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/PackageScanRouteBuilderFinder.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.spring;
+package org.apache.camel.spring.xml;
import java.lang.reflect.Modifier;
import java.util.List;
@@ -23,6 +23,7 @@ import java.util.Set;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.spi.PackageScanClassResolver;
+import org.apache.camel.spring.SpringCamelContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.config.BeanPostProcessor;
diff --git a/components/camel-spring/src/main/java/org/apache/camel/util/spring/SSLContextClientParametersFactoryBean.java b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/SSLContextClientParametersFactoryBean.java
similarity index 98%
rename from components/camel-spring/src/main/java/org/apache/camel/util/spring/SSLContextClientParametersFactoryBean.java
rename to components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/SSLContextClientParametersFactoryBean.java
index c574ba1..ce87eeb 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/util/spring/SSLContextClientParametersFactoryBean.java
+++ b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/SSLContextClientParametersFactoryBean.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.util.spring;
+package org.apache.camel.spring.xml;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
diff --git a/components/camel-spring/src/main/java/org/apache/camel/util/spring/SSLContextParametersFactoryBean.java b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/SSLContextParametersFactoryBean.java
similarity index 98%
rename from components/camel-spring/src/main/java/org/apache/camel/util/spring/SSLContextParametersFactoryBean.java
rename to components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/SSLContextParametersFactoryBean.java
index c0f7e7b..d11e60a 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/util/spring/SSLContextParametersFactoryBean.java
+++ b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/SSLContextParametersFactoryBean.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.util.spring;
+package org.apache.camel.spring.xml;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
diff --git a/components/camel-spring/src/main/java/org/apache/camel/util/spring/SSLContextServerParametersFactoryBean.java b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/SSLContextServerParametersFactoryBean.java
similarity index 98%
rename from components/camel-spring/src/main/java/org/apache/camel/util/spring/SSLContextServerParametersFactoryBean.java
rename to components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/SSLContextServerParametersFactoryBean.java
index 56b65c6..7676730 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/util/spring/SSLContextServerParametersFactoryBean.java
+++ b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/SSLContextServerParametersFactoryBean.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.util.spring;
+package org.apache.camel.spring.xml;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
diff --git a/components/camel-spring/src/main/java/org/apache/camel/util/spring/SecureRandomParametersFactoryBean.java b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/SecureRandomParametersFactoryBean.java
similarity index 98%
rename from components/camel-spring/src/main/java/org/apache/camel/util/spring/SecureRandomParametersFactoryBean.java
rename to components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/SecureRandomParametersFactoryBean.java
index 5676747..70b08ca 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/util/spring/SecureRandomParametersFactoryBean.java
+++ b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/SecureRandomParametersFactoryBean.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.util.spring;
+package org.apache.camel.spring.xml;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/SpringModelJAXBContextFactory.java b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/SpringModelJAXBContextFactory.java
similarity index 84%
rename from components/camel-spring/src/main/java/org/apache/camel/spring/SpringModelJAXBContextFactory.java
rename to components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/SpringModelJAXBContextFactory.java
index c1cae44..6cb1edd 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/spring/SpringModelJAXBContextFactory.java
+++ b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/SpringModelJAXBContextFactory.java
@@ -14,16 +14,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.spring;
+package org.apache.camel.spring.xml;
+import org.apache.camel.spi.ModelJAXBContextFactory;
+import org.apache.camel.spi.annotations.JdkService;
import org.apache.camel.xml.jaxb.DefaultModelJAXBContextFactory;
+@JdkService(ModelJAXBContextFactory.FACTORY + "-spring")
public class SpringModelJAXBContextFactory extends DefaultModelJAXBContextFactory {
public static final String ADDITIONAL_JAXB_CONTEXT_PACKAGES = ":"
+ "org.apache.camel.core.xml:"
- + "org.apache.camel.spring:"
- + "org.apache.camel.util.spring:";
+ + "org.apache.camel.spring.xml:";
@Override
protected String getPackages() {
diff --git a/components/camel-spring/src/main/java/org/apache/camel/util/spring/TrustManagersParametersFactoryBean.java b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/TrustManagersParametersFactoryBean.java
similarity index 98%
rename from components/camel-spring/src/main/java/org/apache/camel/util/spring/TrustManagersParametersFactoryBean.java
rename to components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/TrustManagersParametersFactoryBean.java
index 22c096e..7d53361 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/util/spring/TrustManagersParametersFactoryBean.java
+++ b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/TrustManagersParametersFactoryBean.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.util.spring;
+package org.apache.camel.spring.xml;
import javax.xml.bind.annotation.XmlTransient;
diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/spi/XmlCamelContextConfigurer.java b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/XmlCamelContextConfigurer.java
similarity index 97%
rename from components/camel-spring/src/main/java/org/apache/camel/spring/spi/XmlCamelContextConfigurer.java
rename to components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/XmlCamelContextConfigurer.java
index f787f79..dada06d 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/spring/spi/XmlCamelContextConfigurer.java
+++ b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/XmlCamelContextConfigurer.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.spring.spi;
+package org.apache.camel.spring.xml;
import org.apache.camel.spring.SpringCamelContext;
import org.springframework.context.ApplicationContext;
diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/handler/BeanDefinitionParser.java b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/handler/BeanDefinitionParser.java
similarity index 99%
rename from components/camel-spring/src/main/java/org/apache/camel/spring/handler/BeanDefinitionParser.java
rename to components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/handler/BeanDefinitionParser.java
index 3681da9..df80126 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/spring/handler/BeanDefinitionParser.java
+++ b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/handler/BeanDefinitionParser.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.spring.handler;
+package org.apache.camel.spring.xml.handler;
import org.w3c.dom.Attr;
import org.w3c.dom.Element;
diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/handler/CamelNamespaceHandler.java
similarity index 96%
rename from components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
rename to components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/handler/CamelNamespaceHandler.java
index 01273c7..d7272be 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
+++ b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/handler/CamelNamespaceHandler.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.spring.handler;
+package org.apache.camel.spring.xml.handler;
import java.lang.reflect.Method;
import java.util.HashMap;
@@ -39,27 +39,25 @@ import org.apache.camel.core.xml.CamelStreamCachingStrategyDefinition;
import org.apache.camel.impl.engine.DefaultCamelContextNameStrategy;
import org.apache.camel.spi.CamelContextNameStrategy;
import org.apache.camel.spi.NamespaceAware;
-import org.apache.camel.spring.CamelBeanPostProcessor;
-import org.apache.camel.spring.CamelConsumerTemplateFactoryBean;
-import org.apache.camel.spring.CamelContextFactoryBean;
-import org.apache.camel.spring.CamelEndpointFactoryBean;
-import org.apache.camel.spring.CamelFluentProducerTemplateFactoryBean;
-import org.apache.camel.spring.CamelProducerTemplateFactoryBean;
-import org.apache.camel.spring.CamelRedeliveryPolicyFactoryBean;
-import org.apache.camel.spring.CamelRestContextFactoryBean;
-import org.apache.camel.spring.CamelRouteContextFactoryBean;
-import org.apache.camel.spring.CamelRouteTemplateContextFactoryBean;
-import org.apache.camel.spring.CamelThreadPoolFactoryBean;
-import org.apache.camel.spring.SpringModelJAXBContextFactory;
-import org.apache.camel.spring.remoting.CamelProxyFactoryBean;
-import org.apache.camel.spring.remoting.CamelServiceExporter;
+import org.apache.camel.spring.xml.CamelBeanPostProcessor;
+import org.apache.camel.spring.xml.CamelConsumerTemplateFactoryBean;
+import org.apache.camel.spring.xml.CamelContextFactoryBean;
+import org.apache.camel.spring.xml.CamelEndpointFactoryBean;
+import org.apache.camel.spring.xml.CamelFluentProducerTemplateFactoryBean;
+import org.apache.camel.spring.xml.CamelProducerTemplateFactoryBean;
+import org.apache.camel.spring.xml.CamelRedeliveryPolicyFactoryBean;
+import org.apache.camel.spring.xml.CamelRestContextFactoryBean;
+import org.apache.camel.spring.xml.CamelRouteContextFactoryBean;
+import org.apache.camel.spring.xml.CamelRouteTemplateContextFactoryBean;
+import org.apache.camel.spring.xml.CamelThreadPoolFactoryBean;
+import org.apache.camel.spring.xml.KeyStoreParametersFactoryBean;
+import org.apache.camel.spring.xml.SSLContextParametersFactoryBean;
+import org.apache.camel.spring.xml.SecureRandomParametersFactoryBean;
+import org.apache.camel.spring.xml.SpringModelJAXBContextFactory;
import org.apache.camel.support.builder.Namespaces;
import org.apache.camel.support.builder.xml.NamespacesHelper;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.StringHelper;
-import org.apache.camel.util.spring.KeyStoreParametersFactoryBean;
-import org.apache.camel.util.spring.SSLContextParametersFactoryBean;
-import org.apache.camel.util.spring.SecureRandomParametersFactoryBean;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.BeanCreationException;
@@ -141,11 +139,9 @@ public class CamelNamespaceHandler extends NamespaceHandlerSupport {
addBeanDefinitionParser("secureRandomParameters", SecureRandomParametersFactoryBean.class, true, true);
registerBeanDefinitionParser("sslContextParameters", new SSLContextParametersFactoryBeanBeanDefinitionParser());
- addBeanDefinitionParser("proxy", CamelProxyFactoryBean.class, true, false);
addBeanDefinitionParser("template", CamelProducerTemplateFactoryBean.class, true, false);
addBeanDefinitionParser("fluentTemplate", CamelFluentProducerTemplateFactoryBean.class, true, false);
addBeanDefinitionParser("consumerTemplate", CamelConsumerTemplateFactoryBean.class, true, false);
- addBeanDefinitionParser("export", CamelServiceExporter.class, true, false);
addBeanDefinitionParser("threadPool", CamelThreadPoolFactoryBean.class, true, true);
addBeanDefinitionParser("redeliveryPolicyProfile", CamelRedeliveryPolicyFactoryBean.class, true, true);
diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/handler/ErrorHandlerDefinitionParser.java b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/handler/ErrorHandlerDefinitionParser.java
similarity index 98%
rename from components/camel-spring/src/main/java/org/apache/camel/spring/handler/ErrorHandlerDefinitionParser.java
rename to components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/handler/ErrorHandlerDefinitionParser.java
index b7d7f4e..68c5454 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/spring/handler/ErrorHandlerDefinitionParser.java
+++ b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/handler/ErrorHandlerDefinitionParser.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.spring.handler;
+package org.apache.camel.spring.xml.handler;
import org.w3c.dom.Attr;
import org.w3c.dom.Element;
@@ -22,8 +22,8 @@ import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import org.apache.camel.spring.CamelRedeliveryPolicyFactoryBean;
-import org.apache.camel.spring.ErrorHandlerType;
+import org.apache.camel.spring.xml.CamelRedeliveryPolicyFactoryBean;
+import org.apache.camel.spring.xml.ErrorHandlerType;
import org.apache.camel.util.ObjectHelper;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/handler/package.html b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/handler/package.html
similarity index 100%
rename from components/camel-spring/src/main/java/org/apache/camel/spring/handler/package.html
rename to components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/handler/package.html
diff --git a/components/camel-spring/src/main/java/org/apache/camel/util/spring/package-info.java b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/package-info.java
similarity index 96%
rename from components/camel-spring/src/main/java/org/apache/camel/util/spring/package-info.java
rename to components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/package-info.java
index d3dabcd..aaaf9e8 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/util/spring/package-info.java
+++ b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/package-info.java
@@ -16,4 +16,4 @@
*/
@javax.xml.bind.annotation.XmlSchema(namespace = "http://camel.apache.org/schema/spring",
elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package org.apache.camel.util.spring;
+package org.apache.camel.spring.xml;
diff --git a/components/camel-spring/src/main/resources/META-INF/spring.handlers b/components/camel-spring-xml/src/main/resources/META-INF/spring.handlers
similarity index 84%
rename from components/camel-spring/src/main/resources/META-INF/spring.handlers
rename to components/camel-spring-xml/src/main/resources/META-INF/spring.handlers
index 285f296..27eaa3b 100644
--- a/components/camel-spring/src/main/resources/META-INF/spring.handlers
+++ b/components/camel-spring-xml/src/main/resources/META-INF/spring.handlers
@@ -15,5 +15,5 @@
# limitations under the License.
#
-http\://camel.apache.org/schema/spring=org.apache.camel.spring.handler.CamelNamespaceHandler
-http\://camel.apache.org/schema/spring/v${camel.schema.version}=org.apache.camel.spring.handler.CamelNamespaceHandler
+http\://camel.apache.org/schema/spring=org.apache.camel.spring.xml.handler.CamelNamespaceHandler
+http\://camel.apache.org/schema/spring/v${camel.schema.version}=org.apache.camel.spring.xml.handler.CamelNamespaceHandler
diff --git a/components/camel-spring/src/main/resources/META-INF/spring.schemas b/components/camel-spring-xml/src/main/resources/META-INF/spring.schemas
similarity index 100%
rename from components/camel-spring/src/main/resources/META-INF/spring.schemas
rename to components/camel-spring-xml/src/main/resources/META-INF/spring.schemas
diff --git a/components/camel-spring/src/test/data/message1.xml b/components/camel-spring-xml/src/test/data/message1.xml
similarity index 100%
rename from components/camel-spring/src/test/data/message1.xml
rename to components/camel-spring-xml/src/test/data/message1.xml
diff --git a/components/camel-spring/src/test/data/message2.xml b/components/camel-spring-xml/src/test/data/message2.xml
similarity index 100%
rename from components/camel-spring/src/test/data/message2.xml
rename to components/camel-spring-xml/src/test/data/message2.xml
diff --git a/components/camel-spring/src/test/data/staff.xml b/components/camel-spring-xml/src/test/data/staff.xml
similarity index 100%
rename from components/camel-spring/src/test/data/staff.xml
rename to components/camel-spring-xml/src/test/data/staff.xml
diff --git a/components/camel-spring/src/test/java/a/b/c/Test.java b/components/camel-spring-xml/src/test/java/a/b/c/Test.java
similarity index 100%
rename from components/camel-spring/src/test/java/a/b/c/Test.java
rename to components/camel-spring-xml/src/test/java/a/b/c/Test.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/bean/AutowireConstructorBean.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/bean/AutowireConstructorBean.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/bean/AutowireConstructorBean.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/bean/AutowireConstructorBean.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/bean/AutowireConstructorRouteTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/bean/AutowireConstructorRouteTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/bean/AutowireConstructorRouteTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/bean/AutowireConstructorRouteTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/bean/AutowireConstructorRouteTwoTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/bean/AutowireConstructorRouteTwoTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/bean/AutowireConstructorRouteTwoTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/bean/AutowireConstructorRouteTwoTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/bean/AutowireConstructorTwoBean.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/bean/AutowireConstructorTwoBean.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/bean/AutowireConstructorTwoBean.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/bean/AutowireConstructorTwoBean.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/bean/BeanBindingTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/bean/BeanBindingTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/bean/BeanBindingTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/bean/BeanBindingTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/bean/BeanRouteTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/bean/BeanRouteTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/bean/BeanRouteTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/bean/BeanRouteTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/bean/BeanWithRecipientListTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/bean/BeanWithRecipientListTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/bean/BeanWithRecipientListTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/bean/BeanWithRecipientListTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/bean/ExampleBean.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/bean/ExampleBean.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/bean/ExampleBean.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/bean/ExampleBean.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/bean/MyBeanBindingConsumer.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/bean/MyBeanBindingConsumer.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/bean/MyBeanBindingConsumer.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/bean/MyBeanBindingConsumer.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/bean/MyBeanCounter.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/bean/MyBeanCounter.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/bean/MyBeanCounter.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/bean/MyBeanCounter.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/bean/RouterBean.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/bean/RouterBean.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/bean/RouterBean.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/bean/RouterBean.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/bean/SpringRouteMethodCallStaticTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/bean/SpringRouteMethodCallStaticTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/bean/SpringRouteMethodCallStaticTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/bean/SpringRouteMethodCallStaticTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/cron/SpringCronRouteTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/cron/SpringCronRouteTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/cron/SpringCronRouteTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/cron/SpringCronRouteTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/dataset/SpringDataSetTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/dataset/SpringDataSetTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/dataset/SpringDataSetTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/dataset/SpringDataSetTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/event/DummyEvent.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/event/DummyEvent.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/event/DummyEvent.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/event/DummyEvent.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/event/EventRouteTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/event/EventRouteTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/event/EventRouteTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/event/EventRouteTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/event/MistypedPackageTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/event/MistypedPackageTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/event/MistypedPackageTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/event/MistypedPackageTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/log/CustomExchangeFormatterTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/log/CustomExchangeFormatterTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/log/CustomExchangeFormatterTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/log/CustomExchangeFormatterTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/log/SpringLogMarkerTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/log/SpringLogMarkerTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/log/SpringLogMarkerTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/log/SpringLogMarkerTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/log/SpringLogMaskTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/log/SpringLogMaskTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/log/SpringLogMaskTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/log/SpringLogMaskTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/log/SpringLogTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/log/SpringLogTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/log/SpringLogTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/log/SpringLogTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/log/TestExchangeFormatter.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/log/TestExchangeFormatter.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/log/TestExchangeFormatter.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/log/TestExchangeFormatter.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/properties/BaseSpringPropertiesComponentTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/BaseSpringPropertiesComponentTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/properties/BaseSpringPropertiesComponentTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/BaseSpringPropertiesComponentTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/properties/CamelSpringPropertyPlaceholderConfigurer2Test.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/CamelSpringPropertyPlaceholderConfigurer2Test.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/properties/CamelSpringPropertyPlaceholderConfigurer2Test.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/CamelSpringPropertyPlaceholderConfigurer2Test.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/properties/CamelSpringPropertyPlaceholderConfigurerNestedTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/CamelSpringPropertyPlaceholderConfigurerNestedTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/properties/CamelSpringPropertyPlaceholderConfigurerNestedTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/CamelSpringPropertyPlaceholderConfigurerNestedTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/properties/CamelSpringPropertyPlaceholderConfigurerTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/CamelSpringPropertyPlaceholderConfigurerTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/properties/CamelSpringPropertyPlaceholderConfigurerTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/CamelSpringPropertyPlaceholderConfigurerTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/properties/HelloBean.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/HelloBean.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/properties/HelloBean.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/HelloBean.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/properties/MyErrorBean.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/MyErrorBean.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/properties/MyErrorBean.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/MyErrorBean.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringAttributeNewLineRouteContextRefTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/SpringAttributeNewLineRouteContextRefTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringAttributeNewLineRouteContextRefTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/SpringAttributeNewLineRouteContextRefTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringAttributeNewLineTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/SpringAttributeNewLineTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringAttributeNewLineTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/SpringAttributeNewLineTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringBuilderRefBeanInjectTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/SpringBuilderRefBeanInjectTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringBuilderRefBeanInjectTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/SpringBuilderRefBeanInjectTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringBuilderRefPropertiesTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/SpringBuilderRefPropertiesTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringBuilderRefPropertiesTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/SpringBuilderRefPropertiesTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringBuilderRefPropertyInjectTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/SpringBuilderRefPropertyInjectTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringBuilderRefPropertyInjectTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/SpringBuilderRefPropertyInjectTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringErrorHandlerInlinedPropertiesPlaceholderTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/SpringErrorHandlerInlinedPropertiesPlaceholderTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringErrorHandlerInlinedPropertiesPlaceholderTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/SpringErrorHandlerInlinedPropertiesPlaceholderTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringErrorHandlerPropertiesPlaceholderTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/SpringErrorHandlerPropertiesPlaceholderTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringErrorHandlerPropertiesPlaceholderTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/SpringErrorHandlerPropertiesPlaceholderTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringOptionalPropertiesDslTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/SpringOptionalPropertiesDslTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringOptionalPropertiesDslTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/SpringOptionalPropertiesDslTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringOptionalPropertiesDslTokenizeTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/SpringOptionalPropertiesDslTokenizeTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringOptionalPropertiesDslTokenizeTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/SpringOptionalPropertiesDslTokenizeTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPackagePropertiesTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/SpringPackagePropertiesTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPackagePropertiesTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/SpringPackagePropertiesTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPackageScanPropertiesTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/SpringPackageScanPropertiesTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPackageScanPropertiesTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/SpringPackageScanPropertiesTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPropertiesAfterTransactedDSL2Test.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/SpringPropertiesAfterTransactedDSL2Test.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPropertiesAfterTransactedDSL2Test.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/SpringPropertiesAfterTransactedDSL2Test.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPropertiesAfterTransactedDSLTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/SpringPropertiesAfterTransactedDSLTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPropertiesAfterTransactedDSLTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/SpringPropertiesAfterTransactedDSLTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPropertiesComponent3Test.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/SpringPropertiesComponent3Test.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPropertiesComponent3Test.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/SpringPropertiesComponent3Test.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPropertiesComponentEIPChoiceConvertBodyToTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/SpringPropertiesComponentEIPChoiceConvertBodyToTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPropertiesComponentEIPChoiceConvertBodyToTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/SpringPropertiesComponentEIPChoiceConvertBodyToTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPropertiesComponentEIPConvertBodyToTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/SpringPropertiesComponentEIPConvertBodyToTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPropertiesComponentEIPConvertBodyToTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/SpringPropertiesComponentEIPConvertBodyToTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPropertiesComponentFunctionTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/SpringPropertiesComponentFunctionTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPropertiesComponentFunctionTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/SpringPropertiesComponentFunctionTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPropertiesComponentInterceptFromTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/SpringPropertiesComponentInterceptFromTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPropertiesComponentInterceptFromTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/SpringPropertiesComponentInterceptFromTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPropertiesComponentOnExceptionRefTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/SpringPropertiesComponentOnExceptionRefTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPropertiesComponentOnExceptionRefTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/SpringPropertiesComponentOnExceptionRefTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPropertiesComponentOnExceptionTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/SpringPropertiesComponentOnExceptionTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPropertiesComponentOnExceptionTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/SpringPropertiesComponentOnExceptionTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPropertiesComponentRefTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/SpringPropertiesComponentRefTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPropertiesComponentRefTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/SpringPropertiesComponentRefTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPropertiesComponentTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/SpringPropertiesComponentTest.java
similarity index 96%
rename from components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPropertiesComponentTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/SpringPropertiesComponentTest.java
index b794357..12bce9a 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPropertiesComponentTest.java
+++ b/components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/SpringPropertiesComponentTest.java
@@ -17,7 +17,7 @@
package org.apache.camel.component.properties;
import org.apache.camel.CamelContext;
-import org.apache.camel.spring.CamelContextFactoryBean;
+import org.apache.camel.spring.xml.CamelContextFactoryBean;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPropertiesRouteFromTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/SpringPropertiesRouteFromTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPropertiesRouteFromTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/SpringPropertiesRouteFromTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPropertiesRouteIdTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/SpringPropertiesRouteIdTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPropertiesRouteIdTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/SpringPropertiesRouteIdTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPropertyPlaceholderOnExceptionRefTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/SpringPropertyPlaceholderOnExceptionRefTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPropertyPlaceholderOnExceptionRefTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/SpringPropertyPlaceholderOnExceptionRefTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/properties/route/SpringSimpleRoute.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/route/SpringSimpleRoute.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/properties/route/SpringSimpleRoute.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/route/SpringSimpleRoute.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/properties/route2/SpringBeanInjectRoute.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/route2/SpringBeanInjectRoute.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/properties/route2/SpringBeanInjectRoute.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/route2/SpringBeanInjectRoute.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/properties/route2/SpringPropertyInjectRoute.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/route2/SpringPropertyInjectRoute.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/properties/route2/SpringPropertyInjectRoute.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/route2/SpringPropertyInjectRoute.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/rest/RestRefTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/rest/RestRefTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/rest/RestRefTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/rest/RestRefTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestConfigurationTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/rest/SpringFromRestConfigurationTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestConfigurationTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/rest/SpringFromRestConfigurationTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestDuplicateTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/rest/SpringFromRestDuplicateTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestDuplicateTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/rest/SpringFromRestDuplicateTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestGetEmbeddedRouteTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/rest/SpringFromRestGetEmbeddedRouteTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestGetEmbeddedRouteTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/rest/SpringFromRestGetEmbeddedRouteTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestGetInterceptTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/rest/SpringFromRestGetInterceptTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestGetInterceptTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/rest/SpringFromRestGetInterceptTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestGetOnExceptionTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/rest/SpringFromRestGetOnExceptionTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestGetOnExceptionTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/rest/SpringFromRestGetOnExceptionTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestGetRouteOnExceptionTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/rest/SpringFromRestGetRouteOnExceptionTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestGetRouteOnExceptionTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/rest/SpringFromRestGetRouteOnExceptionTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestGetTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/rest/SpringFromRestGetTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestGetTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/rest/SpringFromRestGetTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestIdAndDescriptionTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/rest/SpringFromRestIdAndDescriptionTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestIdAndDescriptionTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/rest/SpringFromRestIdAndDescriptionTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestUriPrefixTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/rest/SpringFromRestUriPrefixTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestUriPrefixTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/rest/SpringFromRestUriPrefixTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/validator/SpringValidatorRouteTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/validator/SpringValidatorRouteTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/validator/SpringValidatorRouteTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/validator/SpringValidatorRouteTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/xslt/SpringXsltRouteFileTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/xslt/SpringXsltRouteFileTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/xslt/SpringXsltRouteFileTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/xslt/SpringXsltRouteFileTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/xslt/SpringXsltRouteTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/xslt/SpringXsltRouteTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/component/xslt/SpringXsltRouteTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/component/xslt/SpringXsltRouteTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/language/SpringSimpleEmptyStringTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/language/SpringSimpleEmptyStringTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/language/SpringSimpleEmptyStringTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/language/SpringSimpleEmptyStringTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/language/SpringSimpleExpressionTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/language/SpringSimpleExpressionTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/language/SpringSimpleExpressionTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/language/SpringSimpleExpressionTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/language/SpringSimpleNewlineTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/language/SpringSimpleNewlineTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/language/SpringSimpleNewlineTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/language/SpringSimpleNewlineTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/language/SpringSimplePropertyPlaceholderClashTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/language/SpringSimplePropertyPlaceholderClashTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/language/SpringSimplePropertyPlaceholderClashTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/language/SpringSimplePropertyPlaceholderClashTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/language/SpringSimpleRegexTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/language/SpringSimpleRegexTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/language/SpringSimpleRegexTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/language/SpringSimpleRegexTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/language/SpringSimpleWeirdIssueTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/language/SpringSimpleWeirdIssueTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/language/SpringSimpleWeirdIssueTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/language/SpringSimpleWeirdIssueTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/language/SpringTokenXMLPairNamespaceSplitTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/language/SpringTokenXMLPairNamespaceSplitTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/language/SpringTokenXMLPairNamespaceSplitTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/language/SpringTokenXMLPairNamespaceSplitTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/language/SpringXMLTokenSplitTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/language/SpringXMLTokenSplitTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/language/SpringXMLTokenSplitTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/language/SpringXMLTokenSplitTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/language/spel/SpelNonSpringTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/language/spel/SpelNonSpringTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/language/spel/SpelNonSpringTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/language/spel/SpelNonSpringTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/language/spel/SpelResourceTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/language/spel/SpelResourceTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/language/spel/SpelResourceTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/language/spel/SpelResourceTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/language/spel/SpelRouteTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/language/spel/SpelRouteTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/language/spel/SpelRouteTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/language/spel/SpelRouteTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/language/spel/SpelSpringTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/language/spel/SpelSpringTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/language/spel/SpelSpringTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/language/spel/SpelSpringTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/language/spel/SpelTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/language/spel/SpelTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/language/spel/SpelTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/language/spel/SpelTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/language/spel/SpringSimpleMultiLineExpressionTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/language/spel/SpringSimpleMultiLineExpressionTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/language/spel/SpringSimpleMultiLineExpressionTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/language/spel/SpringSimpleMultiLineExpressionTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/language/spel/bean/Dummy.java b/components/camel-spring-xml/src/test/java/org/apache/camel/language/spel/bean/Dummy.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/language/spel/bean/Dummy.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/language/spel/bean/Dummy.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/processor/RemoveHeadersExcludeTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/processor/RemoveHeadersExcludeTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/processor/RemoveHeadersExcludeTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/processor/RemoveHeadersExcludeTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/ApplicationContextClassLoaderTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/ApplicationContextClassLoaderTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/ApplicationContextClassLoaderTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/ApplicationContextClassLoaderTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/ApplicationContextTestSupport.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/ApplicationContextTestSupport.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/ApplicationContextTestSupport.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/ApplicationContextTestSupport.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/BeanA.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/BeanA.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/BeanA.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/BeanA.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/BeanB.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/BeanB.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/BeanB.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/BeanB.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/BeanC.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/BeanC.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/BeanC.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/BeanC.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/CamelContextAwareBean.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/CamelContextAwareBean.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/CamelContextAwareBean.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/CamelContextAwareBean.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/CamelContextAwareTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/CamelContextAwareTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/CamelContextAwareTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/CamelContextAwareTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/CamelContextFactoryBeanTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/CamelContextFactoryBeanTest.java
similarity index 97%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/CamelContextFactoryBeanTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/CamelContextFactoryBeanTest.java
index a804b7e..53c425f 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/CamelContextFactoryBeanTest.java
+++ b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/CamelContextFactoryBeanTest.java
@@ -22,6 +22,8 @@ import java.util.List;
import org.apache.camel.spi.ModelJAXBContextFactory;
import org.apache.camel.spi.UuidGenerator;
+import org.apache.camel.spring.xml.CamelContextFactoryBean;
+import org.apache.camel.spring.xml.CamelEndpointFactoryBean;
import org.apache.camel.support.DefaultUuidGenerator;
import org.apache.camel.support.SimpleUuidGenerator;
import org.apache.camel.xml.jaxb.DefaultModelJAXBContextFactory;
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/CamelGlobalOptionsTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/CamelGlobalOptionsTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/CamelGlobalOptionsTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/CamelGlobalOptionsTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/CamelLoadRoutesFromXMLTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/CamelLoadRoutesFromXMLTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/CamelLoadRoutesFromXMLTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/CamelLoadRoutesFromXMLTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/CircularComponentCreationTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/CircularComponentCreationTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/CircularComponentCreationTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/CircularComponentCreationTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/CircularComponentInjectionTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/CircularComponentInjectionTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/CircularComponentInjectionTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/CircularComponentInjectionTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/CustomProcessorWithNamespacesTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/CustomProcessorWithNamespacesTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/CustomProcessorWithNamespacesTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/CustomProcessorWithNamespacesTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/DefaultJMXAgentTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/DefaultJMXAgentTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/DefaultJMXAgentTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/DefaultJMXAgentTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/DefaultStreamCachingTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/DefaultStreamCachingTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/DefaultStreamCachingTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/DefaultStreamCachingTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/DisableJmxAgentTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/DisableJmxAgentTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/DisableJmxAgentTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/DisableJmxAgentTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/DummyBean.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/DummyBean.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/DummyBean.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/DummyBean.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/DummyLifecycleStrategy.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/DummyLifecycleStrategy.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/DummyLifecycleStrategy.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/DummyLifecycleStrategy.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/DumpModelAsXmlPlaceholdersTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/DumpModelAsXmlPlaceholdersTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/DumpModelAsXmlPlaceholdersTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/DumpModelAsXmlPlaceholdersTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/EndpointReferenceTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/EndpointReferenceTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/EndpointReferenceTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/EndpointReferenceTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/EndpointToIdRefTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/EndpointToIdRefTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/EndpointToIdRefTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/EndpointToIdRefTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/InjectedBean.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/InjectedBean.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/InjectedBean.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/InjectedBean.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/InjectedBeanTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/InjectedBeanTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/InjectedBeanTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/InjectedBeanTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/JMXAgentPropertiesTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/JMXAgentPropertiesTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/JMXAgentPropertiesTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/JMXAgentPropertiesTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/LifecycleStrategyInjectionTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/LifecycleStrategyInjectionTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/LifecycleStrategyInjectionTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/LifecycleStrategyInjectionTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/MultipleLifecycleStrategyInjectionTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/MultipleLifecycleStrategyInjectionTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/MultipleLifecycleStrategyInjectionTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/MultipleLifecycleStrategyInjectionTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/NodeIdReferenceTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/NodeIdReferenceTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/NodeIdReferenceTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/NodeIdReferenceTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/NoopPlatformTransactionManager.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/NoopPlatformTransactionManager.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/NoopPlatformTransactionManager.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/NoopPlatformTransactionManager.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/RegistryInjectionTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/RegistryInjectionTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/RegistryInjectionTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/RegistryInjectionTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/RouteRefCamelContextFactoryBeanTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/RouteRefCamelContextFactoryBeanTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/RouteRefCamelContextFactoryBeanTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/RouteRefCamelContextFactoryBeanTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/RoutingUsingCamelContextFactoryTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/RoutingUsingCamelContextFactoryTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/RoutingUsingCamelContextFactoryTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/RoutingUsingCamelContextFactoryTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/SendMessageOnRouteStartAndStopTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/SendMessageOnRouteStartAndStopTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/SendMessageOnRouteStartAndStopTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/SendMessageOnRouteStartAndStopTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/ShutdownOrderBean.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/ShutdownOrderBean.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/ShutdownOrderBean.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/ShutdownOrderBean.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/SpringBeanIoCStaticMethodTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/SpringBeanIoCStaticMethodTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/SpringBeanIoCStaticMethodTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/SpringBeanIoCStaticMethodTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/SpringBeanPostProcessorDisabledTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/SpringBeanPostProcessorDisabledTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/SpringBeanPostProcessorDisabledTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/SpringBeanPostProcessorDisabledTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/SpringBeanPostProcessorEnabledTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/SpringBeanPostProcessorEnabledTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/SpringBeanPostProcessorEnabledTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/SpringBeanPostProcessorEnabledTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/SpringCamelContextShutdownAfterBeanTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/SpringCamelContextShutdownAfterBeanTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/SpringCamelContextShutdownAfterBeanTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/SpringCamelContextShutdownAfterBeanTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/SpringCamelContextShutdownBeforeBeanTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/SpringCamelContextShutdownBeforeBeanTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/SpringCamelContextShutdownBeforeBeanTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/SpringCamelContextShutdownBeforeBeanTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/SpringConsumerTemplateOutOfCamelContextTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/SpringConsumerTemplateOutOfCamelContextTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/SpringConsumerTemplateOutOfCamelContextTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/SpringConsumerTemplateOutOfCamelContextTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/SpringConsumerTemplateTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/SpringConsumerTemplateTest.java
similarity index 100%
copy from components/camel-spring/src/test/java/org/apache/camel/spring/SpringConsumerTemplateTest.java
copy to components/camel-spring-xml/src/test/java/org/apache/camel/spring/SpringConsumerTemplateTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/SpringEndpointPropertyTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/SpringEndpointPropertyTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/SpringEndpointPropertyTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/SpringEndpointPropertyTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/SpringLogDebugBodyMaxCharsTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/SpringLogDebugBodyMaxCharsTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/SpringLogDebugBodyMaxCharsTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/SpringLogDebugBodyMaxCharsTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/SpringMDCTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/SpringMDCTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/SpringMDCTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/SpringMDCTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/SpringMDCTransactedTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/SpringMDCTransactedTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/SpringMDCTransactedTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/SpringMDCTransactedTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/SpringMDCWithBreadcrumbDisabledTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/SpringMDCWithBreadcrumbDisabledTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/SpringMDCWithBreadcrumbDisabledTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/SpringMDCWithBreadcrumbDisabledTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/SpringMDCWithBreadcrumbTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/SpringMDCWithBreadcrumbTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/SpringMDCWithBreadcrumbTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/SpringMDCWithBreadcrumbTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/SpringRunWithTestSupport.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/SpringRunWithTestSupport.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/SpringRunWithTestSupport.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/SpringRunWithTestSupport.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/SpringTestSupport.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/SpringTestSupport.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/SpringTestSupport.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/SpringTestSupport.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/StartAndStopEventNotifier.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/StartAndStopEventNotifier.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/StartAndStopEventNotifier.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/StartAndStopEventNotifier.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/StartAndStopRouteBuilder.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/StartAndStopRouteBuilder.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/StartAndStopRouteBuilder.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/StartAndStopRouteBuilder.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/StartupShutdownOrderBaseTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/StartupShutdownOrderBaseTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/StartupShutdownOrderBaseTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/StartupShutdownOrderBaseTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/StartupShutdownSpringCamelContextFactoryBeanOrderTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/StartupShutdownSpringCamelContextFactoryBeanOrderTest.java
similarity index 96%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/StartupShutdownSpringCamelContextFactoryBeanOrderTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/StartupShutdownSpringCamelContextFactoryBeanOrderTest.java
index 1795149..5ee3417 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/StartupShutdownSpringCamelContextFactoryBeanOrderTest.java
+++ b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/StartupShutdownSpringCamelContextFactoryBeanOrderTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.spring;
+import org.apache.camel.spring.xml.CamelContextFactoryBean;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.Bean;
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/StartupShutdownSpringCamelContextOrderTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/StartupShutdownSpringCamelContextOrderTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/StartupShutdownSpringCamelContextOrderTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/StartupShutdownSpringCamelContextOrderTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/aop/ExceptionInterceptor.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/aop/ExceptionInterceptor.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/aop/ExceptionInterceptor.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/aop/ExceptionInterceptor.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/aop/MyCoolAopBean.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/aop/MyCoolAopBean.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/aop/MyCoolAopBean.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/aop/MyCoolAopBean.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/aop/SpringAopClassLevelCamelBeanTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/aop/SpringAopClassLevelCamelBeanTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/aop/SpringAopClassLevelCamelBeanTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/aop/SpringAopClassLevelCamelBeanTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/bind/BeanAsEndpointTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/bind/BeanAsEndpointTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/bind/BeanAsEndpointTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/bind/BeanAsEndpointTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/bind/ExampleBean.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/bind/ExampleBean.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/bind/ExampleBean.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/bind/ExampleBean.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/bind/ProcessorAsEndpointTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/bind/ProcessorAsEndpointTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/bind/ProcessorAsEndpointTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/bind/ProcessorAsEndpointTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/bind/ProcessorStub.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/bind/ProcessorStub.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/bind/ProcessorStub.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/bind/ProcessorStub.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/cloud/ServiceCallConfigurationTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/cloud/ServiceCallConfigurationTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/cloud/ServiceCallConfigurationTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/cloud/ServiceCallConfigurationTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/cloud/ServiceCallFilterTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/cloud/ServiceCallFilterTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/cloud/ServiceCallFilterTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/cloud/ServiceCallFilterTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelContextAutoStartupTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/CamelContextAutoStartupTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelContextAutoStartupTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/CamelContextAutoStartupTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelSpringPackageTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/CamelSpringPackageTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelSpringPackageTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/CamelSpringPackageTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateAlreadyExistTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/ConsumerTemplateAlreadyExistTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateAlreadyExistTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/ConsumerTemplateAlreadyExistTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateAutoRegisterTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/ConsumerTemplateAutoRegisterTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateAutoRegisterTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/ConsumerTemplateAutoRegisterTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateHasTwoTemplatesTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/ConsumerTemplateHasTwoTemplatesTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateHasTwoTemplatesTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/ConsumerTemplateHasTwoTemplatesTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateMaximumCacheSizeTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/ConsumerTemplateMaximumCacheSizeTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateMaximumCacheSizeTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/ConsumerTemplateMaximumCacheSizeTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/CustomExecutorServiceManager.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/CustomExecutorServiceManager.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/CustomExecutorServiceManager.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/CustomExecutorServiceManager.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/CustomExecutorServiceManagerTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/CustomExecutorServiceManagerTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/CustomExecutorServiceManagerTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/CustomExecutorServiceManagerTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/CustomThreadPoolFactoryTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/CustomThreadPoolFactoryTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/CustomThreadPoolFactoryTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/CustomThreadPoolFactoryTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/DeadLetterChannelRedeliveryConfigTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/DeadLetterChannelRedeliveryConfigTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/DeadLetterChannelRedeliveryConfigTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/DeadLetterChannelRedeliveryConfigTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/DefaultErrorHandlerConfigTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/DefaultErrorHandlerConfigTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/DefaultErrorHandlerConfigTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/DefaultErrorHandlerConfigTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/DefaultPackageResolverConfigureTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/DefaultPackageResolverConfigureTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/DefaultPackageResolverConfigureTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/DefaultPackageResolverConfigureTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/DependencyInjectCamelTemplateTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/DependencyInjectCamelTemplateTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/DependencyInjectCamelTemplateTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/DependencyInjectCamelTemplateTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/DualCamelContextEndpointOutsideTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/DualCamelContextEndpointOutsideTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/DualCamelContextEndpointOutsideTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/DualCamelContextEndpointOutsideTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/DummyErrorHandlerBuilder.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/DummyErrorHandlerBuilder.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/DummyErrorHandlerBuilder.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/DummyErrorHandlerBuilder.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/EndpointUriSetFromSpringTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/EndpointUriSetFromSpringTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/EndpointUriSetFromSpringTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/EndpointUriSetFromSpringTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/ErrorHandlerCamelContextRefNotFoundTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/ErrorHandlerCamelContextRefNotFoundTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/ErrorHandlerCamelContextRefNotFoundTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/ErrorHandlerCamelContextRefNotFoundTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/ErrorHandlerConfigTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/ErrorHandlerConfigTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/ErrorHandlerConfigTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/ErrorHandlerConfigTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/ErrorHandlerRouteContextRefNotFoundTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/ErrorHandlerRouteContextRefNotFoundTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/ErrorHandlerRouteContextRefNotFoundTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/ErrorHandlerRouteContextRefNotFoundTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/ErrorHandlerTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/ErrorHandlerTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/ErrorHandlerTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/ErrorHandlerTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/FluentProducerTemplateAutoRegisterTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/FluentProducerTemplateAutoRegisterTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/FluentProducerTemplateAutoRegisterTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/FluentProducerTemplateAutoRegisterTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/MyDependsOnBean.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/MyDependsOnBean.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/MyDependsOnBean.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/MyDependsOnBean.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/MyDependsOnRouteBuilder.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/MyDependsOnRouteBuilder.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/MyDependsOnRouteBuilder.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/MyDependsOnRouteBuilder.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/MyFailureProcessor.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/MyFailureProcessor.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/MyFailureProcessor.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/MyFailureProcessor.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/MyProduceBean.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/MyProduceBean.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/MyProduceBean.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/MyProduceBean.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/NamespacePrefixTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/NamespacePrefixTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/NamespacePrefixTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/NamespacePrefixTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/OnExceptionNoExceptionConfiguredTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/OnExceptionNoExceptionConfiguredTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/OnExceptionNoExceptionConfiguredTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/OnExceptionNoExceptionConfiguredTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/OneRouteRefOnExceptionAndDLCErrorHandlerTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/OneRouteRefOnExceptionAndDLCErrorHandlerTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/OneRouteRefOnExceptionAndDLCErrorHandlerTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/OneRouteRefOnExceptionAndDLCErrorHandlerTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/OneRouteRefOnExceptionAndTwoDLCErrorHandlerTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/OneRouteRefOnExceptionAndTwoDLCErrorHandlerTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/OneRouteRefOnExceptionAndTwoDLCErrorHandlerTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/OneRouteRefOnExceptionAndTwoDLCErrorHandlerTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/OneRouteRefOnExceptionTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/OneRouteRefOnExceptionTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/OneRouteRefOnExceptionTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/OneRouteRefOnExceptionTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/OneRouteRefReverseOnExceptionAndDLCErrorHandlerTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/OneRouteRefReverseOnExceptionAndDLCErrorHandlerTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/OneRouteRefReverseOnExceptionAndDLCErrorHandlerTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/OneRouteRefReverseOnExceptionAndDLCErrorHandlerTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/OneRouteRefReverseOnExceptionTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/OneRouteRefReverseOnExceptionTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/OneRouteRefReverseOnExceptionTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/OneRouteRefReverseOnExceptionTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAlreadyExistTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/ProducerTemplateAlreadyExistTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAlreadyExistTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/ProducerTemplateAlreadyExistTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAutoRegisterBeanIdExistsTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/ProducerTemplateAutoRegisterBeanIdExistsTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAutoRegisterBeanIdExistsTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/ProducerTemplateAutoRegisterBeanIdExistsTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAutoRegisterTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/ProducerTemplateAutoRegisterTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAutoRegisterTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/ProducerTemplateAutoRegisterTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAutoRegisterTwoCamelContextsTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/ProducerTemplateAutoRegisterTwoCamelContextsTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAutoRegisterTwoCamelContextsTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/ProducerTemplateAutoRegisterTwoCamelContextsTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateHasTwoTemplatesTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/ProducerTemplateHasTwoTemplatesTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateHasTwoTemplatesTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/ProducerTemplateHasTwoTemplatesTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateMaximumCacheSizeTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/ProducerTemplateMaximumCacheSizeTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateMaximumCacheSizeTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/ProducerTemplateMaximumCacheSizeTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateMixedAutoRegisterTwoCamelContextsTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/ProducerTemplateMixedAutoRegisterTwoCamelContextsTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateMixedAutoRegisterTwoCamelContextsTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/ProducerTemplateMixedAutoRegisterTwoCamelContextsTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteAutoStartupPropertiesTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/RouteAutoStartupPropertiesTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteAutoStartupPropertiesTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/RouteAutoStartupPropertiesTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteBuilderRef2Test.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/RouteBuilderRef2Test.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteBuilderRef2Test.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/RouteBuilderRef2Test.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteBuilderRefTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/RouteBuilderRefTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteBuilderRefTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/RouteBuilderRefTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteRefIncludeXmlFileTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/RouteRefIncludeXmlFileTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteRefIncludeXmlFileTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/RouteRefIncludeXmlFileTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteRefMultipleCamelContextRefsTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/RouteRefMultipleCamelContextRefsTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteRefMultipleCamelContextRefsTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/RouteRefMultipleCamelContextRefsTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteRefMultipleRefsTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/RouteRefMultipleRefsTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteRefMultipleRefsTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/RouteRefMultipleRefsTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteRefMultipleRoutesTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/RouteRefMultipleRoutesTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteRefMultipleRoutesTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/RouteRefMultipleRoutesTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteRefPropertyPlaceholderMultipleCamelContextRefsTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/RouteRefPropertyPlaceholderMultipleCamelContextRefsTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteRefPropertyPlaceholderMultipleCamelContextRefsTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/RouteRefPropertyPlaceholderMultipleCamelContextRefsTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteRefTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/RouteRefTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteRefTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/RouteRefTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextCustomDefaultThreadPoolProfileTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/SpringCamelContextCustomDefaultThreadPoolProfileTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextCustomDefaultThreadPoolProfileTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/SpringCamelContextCustomDefaultThreadPoolProfileTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextCustomThreadPoolProfileTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/SpringCamelContextCustomThreadPoolProfileTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextCustomThreadPoolProfileTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/SpringCamelContextCustomThreadPoolProfileTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextDependsOnTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/SpringCamelContextDependsOnTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextDependsOnTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/SpringCamelContextDependsOnTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextNoDependsOnTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/SpringCamelContextNoDependsOnTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextNoDependsOnTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/SpringCamelContextNoDependsOnTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextSimpleCustomDefaultThreadPoolProfileTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/SpringCamelContextSimpleCustomDefaultThreadPoolProfileTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextSimpleCustomDefaultThreadPoolProfileTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/SpringCamelContextSimpleCustomDefaultThreadPoolProfileTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextThreadPoolProfilesTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/SpringCamelContextThreadPoolProfilesTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextThreadPoolProfilesTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/SpringCamelContextThreadPoolProfilesTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextThreadPoolProfilesWithPlaceholderTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/SpringCamelContextThreadPoolProfilesWithPlaceholderTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextThreadPoolProfilesWithPlaceholderTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/SpringCamelContextThreadPoolProfilesWithPlaceholderTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringErrorHandlerConfigFallbackTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/SpringErrorHandlerConfigFallbackTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringErrorHandlerConfigFallbackTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/SpringErrorHandlerConfigFallbackTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringErrorHandlerConfigTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/SpringErrorHandlerConfigTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringErrorHandlerConfigTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/SpringErrorHandlerConfigTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringProduceInjectedPrototypeBeanTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/SpringProduceInjectedPrototypeBeanTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringProduceInjectedPrototypeBeanTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/SpringProduceInjectedPrototypeBeanTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringProduceInjectedSingletonBeanTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/SpringProduceInjectedSingletonBeanTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringProduceInjectedSingletonBeanTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/SpringProduceInjectedSingletonBeanTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringRouteNoFromTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/SpringRouteNoFromTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringRouteNoFromTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/SpringRouteNoFromTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringRouteNoOutputTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/SpringRouteNoOutputTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringRouteNoOutputTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/SpringRouteNoOutputTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/TemplateUsingBean.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/TemplateUsingBean.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/TemplateUsingBean.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/TemplateUsingBean.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/TwoRouteRefOnExceptionAndDLCErrorHandlerTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/TwoRouteRefOnExceptionAndDLCErrorHandlerTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/TwoRouteRefOnExceptionAndDLCErrorHandlerTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/TwoRouteRefOnExceptionAndDLCErrorHandlerTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/TwoRouteRefOnExceptionTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/TwoRouteRefOnExceptionTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/TwoRouteRefOnExceptionTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/TwoRouteRefOnExceptionTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/TwoRouteRefReverseOnExceptionAndDLCErrorHandlerTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/TwoRouteRefReverseOnExceptionAndDLCErrorHandlerTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/TwoRouteRefReverseOnExceptionAndDLCErrorHandlerTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/TwoRouteRefReverseOnExceptionAndDLCErrorHandlerTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/TwoRouteRefReverseOnExceptionTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/TwoRouteRefReverseOnExceptionTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/TwoRouteRefReverseOnExceptionTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/TwoRouteRefReverseOnExceptionTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/XmlConfigTestSupport.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/XmlConfigTestSupport.java
similarity index 98%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/XmlConfigTestSupport.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/XmlConfigTestSupport.java
index 6ca185f..deb0b49 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/config/XmlConfigTestSupport.java
+++ b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/XmlConfigTestSupport.java
@@ -30,7 +30,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
public class XmlConfigTestSupport extends TestSupport {
- protected static final Logger LOG = LoggerFactory.getLogger(CamelContextFactoryBeanTest.class);
+ protected static final Logger LOG = LoggerFactory.getLogger(XmlConfigTestSupport.class);
protected void assertValidContext(CamelContext context) {
assertNotNull(context, "No context found!");
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/routebuilder/AbstractRouteBuilder.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/routebuilder/AbstractRouteBuilder.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/routebuilder/AbstractRouteBuilder.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/routebuilder/AbstractRouteBuilder.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/routebuilder/my/MyRouteBuilder.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/routebuilder/my/MyRouteBuilder.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/routebuilder/my/MyRouteBuilder.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/routebuilder/my/MyRouteBuilder.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/scan/RouteExclusionFromWithinSpringTestSupportTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/scan/RouteExclusionFromWithinSpringTestSupportTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/scan/RouteExclusionFromWithinSpringTestSupportTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/scan/RouteExclusionFromWithinSpringTestSupportTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/scan/SpringComponentScanTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/scan/SpringComponentScanTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/scan/SpringComponentScanTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/scan/SpringComponentScanTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/scan/SpringComponentScanWithDeprecatedPackagesTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/scan/SpringComponentScanWithDeprecatedPackagesTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/scan/SpringComponentScanWithDeprecatedPackagesTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/scan/SpringComponentScanWithDeprecatedPackagesTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/scan/component/MyProcessor.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/scan/component/MyProcessor.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/scan/component/MyProcessor.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/scan/component/MyProcessor.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/scan/route/MyExcludedRouteBuilder.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/scan/route/MyExcludedRouteBuilder.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/scan/route/MyExcludedRouteBuilder.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/scan/route/MyExcludedRouteBuilder.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/scan/route/MyRouteBuilder.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/scan/route/MyRouteBuilder.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/config/scan/route/MyRouteBuilder.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/scan/route/MyRouteBuilder.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/contextscan/ContextScanOnExceptionAndDLCErrorHandlerReverseTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/contextscan/ContextScanOnExceptionAndDLCErrorHandlerReverseTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/contextscan/ContextScanOnExceptionAndDLCErrorHandlerReverseTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/contextscan/ContextScanOnExceptionAndDLCErrorHandlerReverseTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/contextscan/ContextScanOnExceptionAndDLCErrorHandlerTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/contextscan/ContextScanOnExceptionAndDLCErrorHandlerTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/contextscan/ContextScanOnExceptionAndDLCErrorHandlerTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/contextscan/ContextScanOnExceptionAndDLCErrorHandlerTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/contextscan/normalorder/BarRoute.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/contextscan/normalorder/BarRoute.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/contextscan/normalorder/BarRoute.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/contextscan/normalorder/BarRoute.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/contextscan/normalorder/FooRoute.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/contextscan/normalorder/FooRoute.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/contextscan/normalorder/FooRoute.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/contextscan/normalorder/FooRoute.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/contextscan/reverseorder/AFooRoute.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/contextscan/reverseorder/AFooRoute.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/contextscan/reverseorder/AFooRoute.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/contextscan/reverseorder/AFooRoute.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/contextscan/reverseorder/ZBarRoute.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/contextscan/reverseorder/ZBarRoute.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/contextscan/reverseorder/ZBarRoute.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/contextscan/reverseorder/ZBarRoute.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/converter/ResourceConverterTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/converter/ResourceConverterTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/converter/ResourceConverterTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/converter/ResourceConverterTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/example/AnotherFooEventConsumer.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/example/AnotherFooEventConsumer.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/example/AnotherFooEventConsumer.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/example/AnotherFooEventConsumer.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/example/ContentBasedRouteTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/example/ContentBasedRouteTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/example/ContentBasedRouteTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/example/ContentBasedRouteTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/example/DummyBean.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/example/DummyBean.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/example/DummyBean.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/example/DummyBean.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/example/FooEventConsumer.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/example/FooEventConsumer.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/example/FooEventConsumer.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/example/FooEventConsumer.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/example/FooEventRouteTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/example/FooEventRouteTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/example/FooEventRouteTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/example/FooEventRouteTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/example/MyConsumer.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/example/MyConsumer.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/example/MyConsumer.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/example/MyConsumer.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/example/MyProcessor.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/example/MyProcessor.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/example/MyProcessor.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/example/MyProcessor.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/example/MySender.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/example/MySender.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/example/MySender.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/example/MySender.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/example/MyVmConsumer.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/example/MyVmConsumer.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/example/MyVmConsumer.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/example/MyVmConsumer.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/example/PojoConsumerTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/example/PojoConsumerTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/example/PojoConsumerTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/example/PojoConsumerTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/example/PojoSenderTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/example/PojoSenderTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/example/PojoSenderTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/example/PojoSenderTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/example/PojoVmConsumerTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/example/PojoVmConsumerTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/example/PojoVmConsumerTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/example/PojoVmConsumerTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/example/SimpleRouteTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/example/SimpleRouteTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/example/SimpleRouteTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/example/SimpleRouteTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/example/SpringExpressionTrimTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/example/SpringExpressionTrimTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/example/SpringExpressionTrimTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/example/SpringExpressionTrimTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/example/SpringXPathFilterTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/example/SpringXPathFilterTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/example/SpringXPathFilterTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/example/SpringXPathFilterTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/example/test1/MyRouteBuilder.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/example/test1/MyRouteBuilder.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/example/test1/MyRouteBuilder.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/example/test1/MyRouteBuilder.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/file/SpringFileAntPathMatcherFileFilterTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/file/SpringFileAntPathMatcherFileFilterTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/file/SpringFileAntPathMatcherFileFilterTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/file/SpringFileAntPathMatcherFileFilterTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/file/SpringFileConsumerPreMoveIssueTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/file/SpringFileConsumerPreMoveIssueTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/file/SpringFileConsumerPreMoveIssueTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/file/SpringFileConsumerPreMoveIssueTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/file/SpringFileConsumerPreMoveTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/file/SpringFileConsumerPreMoveTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/file/SpringFileConsumerPreMoveTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/file/SpringFileConsumerPreMoveTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/file/SpringFileLanguageCBRTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/file/SpringFileLanguageCBRTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/file/SpringFileLanguageCBRTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/file/SpringFileLanguageCBRTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/file/SpringFileRouteTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/file/SpringFileRouteTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/file/SpringFileRouteTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/file/SpringFileRouteTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/file/SpringSimpleFileNameWithQuoteTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/file/SpringSimpleFileNameWithQuoteTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/file/SpringSimpleFileNameWithQuoteTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/file/SpringSimpleFileNameWithQuoteTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/health/HealthCheckRegistryTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/health/HealthCheckRegistryTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/health/HealthCheckRegistryTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/health/HealthCheckRegistryTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/impl/FooService.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/impl/FooService.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/impl/FooService.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/impl/FooService.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/impl/SpringDefaultCamelContextAllowUseOriginalMessageFalseTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/impl/SpringDefaultCamelContextAllowUseOriginalMessageFalseTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/impl/SpringDefaultCamelContextAllowUseOriginalMessageFalseTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/impl/SpringDefaultCamelContextAllowUseOriginalMessageFalseTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/impl/SpringDefaultCamelContextAllowUseOriginalMessageTrueTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/impl/SpringDefaultCamelContextAllowUseOriginalMessageTrueTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/impl/SpringDefaultCamelContextAllowUseOriginalMessageTrueTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/impl/SpringDefaultCamelContextAllowUseOriginalMessageTrueTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/impl/SpringProduceConsumeImplicitPropertyTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/impl/SpringProduceConsumeImplicitPropertyTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/impl/SpringProduceConsumeImplicitPropertyTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/impl/SpringProduceConsumeImplicitPropertyTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/impl/SpringRefDataFormatTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/impl/SpringRefDataFormatTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/impl/SpringRefDataFormatTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/impl/SpringRefDataFormatTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/impl/SpringRoutePolicyFactoryTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/impl/SpringRoutePolicyFactoryTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/impl/SpringRoutePolicyFactoryTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/impl/SpringRoutePolicyFactoryTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/impl/SpringRoutePolicyRefCallbackTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/impl/SpringRoutePolicyRefCallbackTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/impl/SpringRoutePolicyRefCallbackTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/impl/SpringRoutePolicyRefCallbackTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/impl/SpringSupervisingRouteControllerTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/impl/SpringSupervisingRouteControllerTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/impl/SpringSupervisingRouteControllerTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/impl/SpringSupervisingRouteControllerTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/impl/SpringTypeConverterRegistryStatisticsEnabledTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/impl/SpringTypeConverterRegistryStatisticsEnabledTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/impl/SpringTypeConverterRegistryStatisticsEnabledTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/impl/SpringTypeConverterRegistryStatisticsEnabledTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/impl/converter/SpringTypeConvertersTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/impl/converter/SpringTypeConvertersTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/impl/converter/SpringTypeConvertersTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/impl/converter/SpringTypeConvertersTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/impl/transformer/SpringTransformerRouteTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/impl/transformer/SpringTransformerRouteTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/impl/transformer/SpringTransformerRouteTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/impl/transformer/SpringTransformerRouteTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/impl/validator/SpringValidatorRouteTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/impl/validator/SpringValidatorRouteTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/impl/validator/SpringValidatorRouteTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/impl/validator/SpringValidatorRouteTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/AnnotatedBookServiceImpl.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/AnnotatedBookServiceImpl.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/AnnotatedBookServiceImpl.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/AnnotatedBookServiceImpl.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/AnnotatedBookStore.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/AnnotatedBookStore.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/AnnotatedBookStore.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/AnnotatedBookStore.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/AnnotatedConsume.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/AnnotatedConsume.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/AnnotatedConsume.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/AnnotatedConsume.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/AnnotatedConsumeImpl.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/AnnotatedConsumeImpl.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/AnnotatedConsumeImpl.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/AnnotatedConsumeImpl.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/AnnotatedRoute.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/AnnotatedRoute.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/AnnotatedRoute.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/AnnotatedRoute.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/BookService.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/BookService.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/BookService.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/BookService.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/ContainerWideInterceptor.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/ContainerWideInterceptor.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/ContainerWideInterceptor.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/ContainerWideInterceptor.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/ContainerWideInterceptorTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/ContainerWideInterceptorTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/ContainerWideInterceptorTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/ContainerWideInterceptorTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/DelayerInterceptorTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/DelayerInterceptorTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/DelayerInterceptorTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/DelayerInterceptorTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/MixedPropagationTransactedTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/MixedPropagationTransactedTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/MixedPropagationTransactedTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/MixedPropagationTransactedTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/MixedStreamCachingInterceptorTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/MixedStreamCachingInterceptorTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/MixedStreamCachingInterceptorTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/MixedStreamCachingInterceptorTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/MixedTransactionPropagationTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/MixedTransactionPropagationTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/MixedTransactionPropagationTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/MixedTransactionPropagationTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/NoStreamCachingInterceptorTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/NoStreamCachingInterceptorTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/NoStreamCachingInterceptorTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/NoStreamCachingInterceptorTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/SpringAdviceWithTwoRoutesContextScopedOnExceptionTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/SpringAdviceWithTwoRoutesContextScopedOnExceptionTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/SpringAdviceWithTwoRoutesContextScopedOnExceptionTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/SpringAdviceWithTwoRoutesContextScopedOnExceptionTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/SpringAdviceWithTwoRoutesOnExceptionTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/SpringAdviceWithTwoRoutesOnExceptionTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/SpringAdviceWithTwoRoutesOnExceptionTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/SpringAdviceWithTwoRoutesOnExceptionTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/SpringAdviceWithTwoRoutesTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/SpringAdviceWithTwoRoutesTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/SpringAdviceWithTwoRoutesTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/SpringAdviceWithTwoRoutesTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/SpringInterceptorStrategyOrderedTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/SpringInterceptorStrategyOrderedTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/SpringInterceptorStrategyOrderedTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/SpringInterceptorStrategyOrderedTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/SpringTransactionalClientDataSourceTransactedTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/SpringTransactionalClientDataSourceTransactedTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/SpringTransactionalClientDataSourceTransactedTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/SpringTransactionalClientDataSourceTransactedTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/SpringTransactionalClientDataSourceUsingTransactedTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/SpringTransactionalClientDataSourceUsingTransactedTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/SpringTransactionalClientDataSourceUsingTransactedTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/SpringTransactionalClientDataSourceUsingTransactedTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/SpringTransactionalClientDataWithOnExceptionAndRollbackUsingTransactedTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/SpringTransactionalClientDataWithOnExceptionAndRollbackUsingTransactedTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/SpringTransactionalClientDataWithOnExceptionAndRollbackUsingTransactedTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/SpringTransactionalClientDataWithOnExceptionAndRollbackUsingTransactedTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/SpringTransactionalClientDataWithRouteScopedOnExceptionAndRollbackUsingTransactedTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/SpringTransactionalClientDataWithRouteScopedOnExceptionAndRollbackUsingTransactedTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/SpringTransactionalClientDataWithRouteScopedOnExceptionAndRollbackUsingTransactedTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/SpringTransactionalClientDataWithRouteScopedOnExceptionAndRollbackUsingTransactedTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/StreamCachingInterceptorTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/StreamCachingInterceptorTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/StreamCachingInterceptorTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/StreamCachingInterceptorTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactedInterceptSendToEndpointTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactedInterceptSendToEndpointTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactedInterceptSendToEndpointTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactedInterceptSendToEndpointTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactedInterceptUsingAdviceWithSendToEndpointTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactedInterceptUsingAdviceWithSendToEndpointTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactedInterceptUsingAdviceWithSendToEndpointTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactedInterceptUsingAdviceWithSendToEndpointTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactedStackSizeBreakOnExceptionTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactedStackSizeBreakOnExceptionTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactedStackSizeBreakOnExceptionTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactedStackSizeBreakOnExceptionTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactedStackSizeParallelProcessingTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactedStackSizeParallelProcessingTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactedStackSizeParallelProcessingTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactedStackSizeParallelProcessingTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactedStackSizeTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactedStackSizeTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactedStackSizeTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactedStackSizeTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionClientDataSourceSupport.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionClientDataSourceSupport.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionClientDataSourceSupport.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionClientDataSourceSupport.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceAsyncTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceAsyncTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceAsyncTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceAsyncTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceHandledTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceHandledTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceHandledTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceHandledTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceLookupTypeTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceLookupTypeTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceLookupTypeTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceLookupTypeTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceMDCTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceMDCTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceMDCTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceMDCTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceMinimalConfigurationTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceMinimalConfigurationTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceMinimalConfigurationTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceMinimalConfigurationTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceMixedTransactedRedeliveryTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceMixedTransactedRedeliveryTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceMixedTransactedRedeliveryTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceMixedTransactedRedeliveryTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceMixedTransactedTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceMixedTransactedTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceMixedTransactedTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceMixedTransactedTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceNotTransactedTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceNotTransactedTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceNotTransactedTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceNotTransactedTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceOnExceptionRedeliveryTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceOnExceptionRedeliveryTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceOnExceptionRedeliveryTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceOnExceptionRedeliveryTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceRedeliveryTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceRedeliveryTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceRedeliveryTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceRedeliveryTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithChoiceRedeliveryTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithChoiceRedeliveryTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithChoiceRedeliveryTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithChoiceRedeliveryTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithChoiceTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithChoiceTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithChoiceTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithChoiceTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithFileLocalOnExceptionTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithFileLocalOnExceptionTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithFileLocalOnExceptionTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithFileLocalOnExceptionTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithFileOnExceptionTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithFileOnExceptionTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithFileOnExceptionTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithFileOnExceptionTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithFileTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithFileTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithFileTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithFileTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithLocalOnExceptionTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithLocalOnExceptionTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithLocalOnExceptionTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithLocalOnExceptionTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactionErrorHandlerTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactionErrorHandlerTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactionErrorHandlerTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactionErrorHandlerTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithDefaultErrorHandlerTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithDefaultErrorHandlerTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithDefaultErrorHandlerTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithDefaultErrorHandlerTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithNoErrorHandlerConfigureTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithNoErrorHandlerConfigureTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithNoErrorHandlerConfigureTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithNoErrorHandlerConfigureTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithOnExceptionHandledAndRollbackTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithOnExceptionHandledAndRollbackTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithOnExceptionHandledAndRollbackTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithOnExceptionHandledAndRollbackTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithOnExceptionHandledAndRollbackUsingTransactedTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithOnExceptionHandledAndRollbackUsingTransactedTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithOnExceptionHandledAndRollbackUsingTransactedTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithOnExceptionHandledAndRollbackUsingTransactedTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithOnExceptionMinimalConfigurationTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithOnExceptionMinimalConfigurationTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithOnExceptionMinimalConfigurationTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithOnExceptionMinimalConfigurationTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithOnExceptionRollbackTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithOnExceptionRollbackTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithOnExceptionRollbackTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithOnExceptionRollbackTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithOnExceptionTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithOnExceptionTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithOnExceptionTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithOnExceptionTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithSpringRouteBuilderTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithSpringRouteBuilderTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithSpringRouteBuilderTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithSpringRouteBuilderTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithTransactedErrorHandlerOnExceptionRedeliveryTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithTransactedErrorHandlerOnExceptionRedeliveryTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithTransactedErrorHandlerOnExceptionRedeliveryTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithTransactedErrorHandlerOnExceptionRedeliveryTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientWithAnnotatedBeanTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientWithAnnotatedBeanTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientWithAnnotatedBeanTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientWithAnnotatedBeanTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientWithRollbackTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientWithRollbackTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientWithRollbackTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientWithRollbackTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/route/DataSourceSpringRouteBuilder.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/route/DataSourceSpringRouteBuilder.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/route/DataSourceSpringRouteBuilder.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/route/DataSourceSpringRouteBuilder.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/AdviceWithTransactionIssueTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/AdviceWithTransactionIssueTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/AdviceWithTransactionIssueTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/AdviceWithTransactionIssueTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/Camel14624Test.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/Camel14624Test.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/Camel14624Test.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/Camel14624Test.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/CamelContextModelErrorHandlerIssueTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/CamelContextModelErrorHandlerIssueTest.java
similarity index 95%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/CamelContextModelErrorHandlerIssueTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/CamelContextModelErrorHandlerIssueTest.java
index 89d2e3e..5ae6217 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/CamelContextModelErrorHandlerIssueTest.java
+++ b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/CamelContextModelErrorHandlerIssueTest.java
@@ -23,8 +23,8 @@ import javax.xml.bind.JAXBContext;
import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
-import org.apache.camel.spring.CamelContextFactoryBean;
-import org.apache.camel.spring.SpringModelJAXBContextFactory;
+import org.apache.camel.spring.xml.CamelContextFactoryBean;
+import org.apache.camel.spring.xml.SpringModelJAXBContextFactory;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/CamelRouteRefInjectionIssueTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/CamelRouteRefInjectionIssueTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/CamelRouteRefInjectionIssueTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/CamelRouteRefInjectionIssueTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionErrorHandlerRefIssueTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionErrorHandlerRefIssueTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionErrorHandlerRefIssueTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionErrorHandlerRefIssueTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledErrorHandlerRefIssueTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledErrorHandlerRefIssueTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledErrorHandlerRefIssueTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledErrorHandlerRefIssueTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionRouteScopedErrorHandlerRefIssueTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionRouteScopedErrorHandlerRefIssueTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionRouteScopedErrorHandlerRefIssueTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionRouteScopedErrorHandlerRefIssueTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/CoolService.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/CoolService.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/CoolService.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/CoolService.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/CustomIdIssuesTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/CustomIdIssuesTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/CustomIdIssuesTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/CustomIdIssuesTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/FileWireTapWithXMLPayloadIssueTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/FileWireTapWithXMLPayloadIssueTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/FileWireTapWithXMLPayloadIssueTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/FileWireTapWithXMLPayloadIssueTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/MyCoolRoute.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/MyCoolRoute.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/MyCoolRoute.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/MyCoolRoute.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/MyCoolStuff.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/MyCoolStuff.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/MyCoolStuff.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/MyCoolStuff.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/MyFactoryBean.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/MyFactoryBean.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/MyFactoryBean.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/MyFactoryBean.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/MyHelloBean.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/MyHelloBean.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/MyHelloBean.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/MyHelloBean.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/MyInjectionRouteBuilder.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/MyInjectionRouteBuilder.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/MyInjectionRouteBuilder.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/MyInjectionRouteBuilder.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/MyProcessor.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/MyProcessor.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/MyProcessor.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/MyProcessor.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/MyRouteBuilder.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/MyRouteBuilder.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/MyRouteBuilder.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/MyRouteBuilder.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/MyStatefulBean.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/MyStatefulBean.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/MyStatefulBean.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/MyStatefulBean.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/ProduceSplitMethodCallIssueTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/ProduceSplitMethodCallIssueTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/ProduceSplitMethodCallIssueTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/ProduceSplitMethodCallIssueTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/RedeliveryErrorHandlerTwoXmlFilesIssueTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/RedeliveryErrorHandlerTwoXmlFilesIssueTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/RedeliveryErrorHandlerTwoXmlFilesIssueTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/RedeliveryErrorHandlerTwoXmlFilesIssueTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SampleInitializingBean.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SampleInitializingBean.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/SampleInitializingBean.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SampleInitializingBean.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SampleInitializingRouteBuilder.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SampleInitializingRouteBuilder.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/SampleInitializingRouteBuilder.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SampleInitializingRouteBuilder.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SampleRouteBuilderContainer.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SampleRouteBuilderContainer.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/SampleRouteBuilderContainer.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SampleRouteBuilderContainer.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringAdviceWithContextScopedErrorHandlerIssueTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringAdviceWithContextScopedErrorHandlerIssueTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringAdviceWithContextScopedErrorHandlerIssueTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringAdviceWithContextScopedErrorHandlerIssueTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringAdviceWithRouteScopedErrorHandlerIssueTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringAdviceWithRouteScopedErrorHandlerIssueTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringAdviceWithRouteScopedErrorHandlerIssueTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringAdviceWithRouteScopedErrorHandlerIssueTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringAdviceWithTwoRoutesOnExceptionIssueTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringAdviceWithTwoRoutesOnExceptionIssueTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringAdviceWithTwoRoutesOnExceptionIssueTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringAdviceWithTwoRoutesOnExceptionIssueTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringCatchNestedFailTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringCatchNestedFailTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringCatchNestedFailTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringCatchNestedFailTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringCharlesSplitAndTryCatchRollbackIssueTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringCharlesSplitAndTryCatchRollbackIssueTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringCharlesSplitAndTryCatchRollbackIssueTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringCharlesSplitAndTryCatchRollbackIssueTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringExceptionCamel4022Test.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringExceptionCamel4022Test.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringExceptionCamel4022Test.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringExceptionCamel4022Test.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringFinallyNestedFailTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringFinallyNestedFailTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringFinallyNestedFailTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringFinallyNestedFailTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringInitializationIssueTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringInitializationIssueTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringInitializationIssueTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringInitializationIssueTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringInstanceFactoryBeanCamelContextScanIssueTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringInstanceFactoryBeanCamelContextScanIssueTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringInstanceFactoryBeanCamelContextScanIssueTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringInstanceFactoryBeanCamelContextScanIssueTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringInstanceFactoryBeanIssueTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringInstanceFactoryBeanIssueTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringInstanceFactoryBeanIssueTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringInstanceFactoryBeanIssueTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringMultipleErrorHandlerOnExceptionIssueTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringMultipleErrorHandlerOnExceptionIssueTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringMultipleErrorHandlerOnExceptionIssueTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringMultipleErrorHandlerOnExceptionIssueTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringOnExceptionErrorHandlerRefIssueTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringOnExceptionErrorHandlerRefIssueTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringOnExceptionErrorHandlerRefIssueTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringOnExceptionErrorHandlerRefIssueTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringOnExceptionErrorHandlerRefIssueTwoRoutesTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringOnExceptionErrorHandlerRefIssueTwoRoutesTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringOnExceptionErrorHandlerRefIssueTwoRoutesTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringOnExceptionErrorHandlerRefIssueTwoRoutesTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringOnExceptionNotHandledErrorHandlerRefIssueTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringOnExceptionNotHandledErrorHandlerRefIssueTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringOnExceptionNotHandledErrorHandlerRefIssueTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringOnExceptionNotHandledErrorHandlerRefIssueTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringOnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringOnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringOnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringOnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringOnExceptionRouteScopedErrorHandlerRefIssueTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringOnExceptionRouteScopedErrorHandlerRefIssueTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringOnExceptionRouteScopedErrorHandlerRefIssueTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringOnExceptionRouteScopedErrorHandlerRefIssueTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringOnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringOnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringOnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringOnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringPackageTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringPackageTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringPackageTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringPackageTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringPropertiesAvailableEverywhereTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringPropertiesAvailableEverywhereTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringPropertiesAvailableEverywhereTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringPropertiesAvailableEverywhereTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringPropertyPlaceholderFileEndpointIssueTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringPropertyPlaceholderFileEndpointIssueTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringPropertyPlaceholderFileEndpointIssueTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringPropertyPlaceholderFileEndpointIssueTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringPropertyPlaceholderIssueTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringPropertyPlaceholderIssueTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringPropertyPlaceholderIssueTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringPropertyPlaceholderIssueTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringRenameFileOnCommitIssueTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringRenameFileOnCommitIssueTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringRenameFileOnCommitIssueTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringRenameFileOnCommitIssueTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringRouteContextOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringRouteContextOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringRouteContextOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringRouteContextOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringRouteIdAutoAssignClashIssue.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringRouteIdAutoAssignClashIssue.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringRouteIdAutoAssignClashIssue.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringRouteIdAutoAssignClashIssue.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringSingletonScopedBeanIssueTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringSingletonScopedBeanIssueTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringSingletonScopedBeanIssueTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringSingletonScopedBeanIssueTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringSplitterDetermineErrorHandlerIssueTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringSplitterDetermineErrorHandlerIssueTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringSplitterDetermineErrorHandlerIssueTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringSplitterDetermineErrorHandlerIssueTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringTransactionErrorHandlerAndContextScopedOnExceptionIssueTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringTransactionErrorHandlerAndContextScopedOnExceptionIssueTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringTransactionErrorHandlerAndContextScopedOnExceptionIssueTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringTransactionErrorHandlerAndContextScopedOnExceptionIssueTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringTryCatchFinallyAndErrorHandlerTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringTryCatchFinallyAndErrorHandlerTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringTryCatchFinallyAndErrorHandlerTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringTryCatchFinallyAndErrorHandlerTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringTryCatchWithSplitIssueTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringTryCatchWithSplitIssueTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringTryCatchWithSplitIssueTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringTryCatchWithSplitIssueTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringTryNestedFailTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringTryNestedFailTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringTryNestedFailTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringTryNestedFailTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringTwoCamelContextDirectEndpointTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringTwoCamelContextDirectEndpointTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringTwoCamelContextDirectEndpointTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringTwoCamelContextDirectEndpointTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/contextscan/MyRoute.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/contextscan/MyRoute.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/contextscan/MyRoute.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/contextscan/MyRoute.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/contextscan/SpringRouteIsComponentAnnotatedTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/contextscan/SpringRouteIsComponentAnnotatedTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/contextscan/SpringRouteIsComponentAnnotatedTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/contextscan/SpringRouteIsComponentAnnotatedTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/contextscan2/MyOtherRoute.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/contextscan2/MyOtherRoute.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/contextscan2/MyOtherRoute.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/contextscan2/MyOtherRoute.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/contextscan2/SpringRouteIsComponentAnnotated2Test.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/contextscan2/SpringRouteIsComponentAnnotated2Test.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/contextscan2/SpringRouteIsComponentAnnotated2Test.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/contextscan2/SpringRouteIsComponentAnnotated2Test.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/contextscan3/MyHelloRoute.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/contextscan3/MyHelloRoute.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/contextscan3/MyHelloRoute.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/contextscan3/MyHelloRoute.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/packagescan/MyCoolRoute.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/packagescan/MyCoolRoute.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/packagescan/MyCoolRoute.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/packagescan/MyCoolRoute.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/packagescan/SkipNonPublicRouteBuilderTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/packagescan/SkipNonPublicRouteBuilderTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/issues/packagescan/SkipNonPublicRouteBuilderTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/packagescan/SkipNonPublicRouteBuilderTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/DualCamelContextManagedAutoAssignedNameTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/DualCamelContextManagedAutoAssignedNameTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/management/DualCamelContextManagedAutoAssignedNameTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/DualCamelContextManagedAutoAssignedNameTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/DualCamelContextManagedTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/DualCamelContextManagedTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/management/DualCamelContextManagedTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/DualCamelContextManagedTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/JmxInstrumentationWithConnectorTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/JmxInstrumentationWithConnectorTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/management/JmxInstrumentationWithConnectorTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/JmxInstrumentationWithConnectorTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/ManagedEndpointInjectRefEndpointTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/ManagedEndpointInjectRefEndpointTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/management/ManagedEndpointInjectRefEndpointTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/ManagedEndpointInjectRefEndpointTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/ManagedRefEndpointTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/ManagedRefEndpointTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/management/ManagedRefEndpointTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/ManagedRefEndpointTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/MyBean.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/MyBean.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/management/MyBean.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/MyBean.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/MyBeanRef.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/MyBeanRef.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/management/MyBeanRef.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/MyBeanRef.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/MyEventNotifier.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/MyEventNotifier.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/management/MyEventNotifier.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/MyEventNotifier.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/MyRouteBuilder.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/MyRouteBuilder.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/management/MyRouteBuilder.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/MyRouteBuilder.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringCamelContextStartingFailedEventTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringCamelContextStartingFailedEventTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringCamelContextStartingFailedEventTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringCamelContextStartingFailedEventTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringDualLoggingEventNotifierTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringDualLoggingEventNotifierTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringDualLoggingEventNotifierTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringDualLoggingEventNotifierTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxDumpCBRRoutesAsXmlTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxDumpCBRRoutesAsXmlTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxDumpCBRRoutesAsXmlTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxDumpCBRRoutesAsXmlTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxDumpRoutesAsXmlIncludeHostNameTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxDumpRoutesAsXmlIncludeHostNameTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxDumpRoutesAsXmlIncludeHostNameTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxDumpRoutesAsXmlIncludeHostNameTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxDumpRoutesAsXmlTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxDumpRoutesAsXmlTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxDumpRoutesAsXmlTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxDumpRoutesAsXmlTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanRefTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanRefTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanRefTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanRefTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanRefTwoTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanRefTwoTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanRefTwoTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanRefTwoTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxRecipientListRegisterAlwaysTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxRecipientListRegisterAlwaysTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxRecipientListRegisterAlwaysTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxRecipientListRegisterAlwaysTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxRecipientListTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxRecipientListTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxRecipientListTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxRecipientListTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringLoggingEventNotifierTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringLoggingEventNotifierTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringLoggingEventNotifierTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringLoggingEventNotifierTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedCamelContextTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedCamelContextTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedCamelContextTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedCamelContextTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedCustomProcessorTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedCustomProcessorTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedCustomProcessorTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedCustomProcessorTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedNamePatternFixedTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedNamePatternFixedTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedNamePatternFixedTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedNamePatternFixedTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedNamePatternTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedNamePatternTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedNamePatternTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedNamePatternTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedResourceTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedResourceTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedResourceTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedResourceTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedRouteRemoveContextScopedErrorHandlerTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedRouteRemoveContextScopedErrorHandlerTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedRouteRemoveContextScopedErrorHandlerTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedRouteRemoveContextScopedErrorHandlerTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedRouteRemoveRouteAndContextScopedErrorHandlerTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedRouteRemoveRouteAndContextScopedErrorHandlerTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedRouteRemoveRouteAndContextScopedErrorHandlerTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedRouteRemoveRouteAndContextScopedErrorHandlerTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedRouteRemoveRouteScopedErrorHandlerTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedRouteRemoveRouteScopedErrorHandlerTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedRouteRemoveRouteScopedErrorHandlerTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedRouteRemoveRouteScopedErrorHandlerTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedSanitizeTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedSanitizeTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedSanitizeTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedSanitizeTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedSedaEndpointTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedSedaEndpointTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedSedaEndpointTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedSedaEndpointTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedStatisticsLevelOffTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedStatisticsLevelOffTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedStatisticsLevelOffTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedStatisticsLevelOffTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedStatisticsLevelRoutesOnlyTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedStatisticsLevelRoutesOnlyTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedStatisticsLevelRoutesOnlyTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedStatisticsLevelRoutesOnlyTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedTransactedProcessorTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedTransactedProcessorTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedTransactedProcessorTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedTransactedProcessorTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringPublishEventNotifierTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringPublishEventNotifierTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringPublishEventNotifierTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringPublishEventNotifierTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/mock/BeanMockTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/mock/BeanMockTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/mock/BeanMockTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/mock/BeanMockTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/mock/InterceptSendToMockEndpointStrategyTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/mock/InterceptSendToMockEndpointStrategyTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/mock/InterceptSendToMockEndpointStrategyTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/mock/InterceptSendToMockEndpointStrategyTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/mock/MyAssertions.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/mock/MyAssertions.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/mock/MyAssertions.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/mock/MyAssertions.java
diff --git a/docs/user-manual/modules/ROOT/examples/components/camel-spring/src/test/java/org/apache/camel/spring/patterns/FilterTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/patterns/FilterTest.java
similarity index 100%
rename from docs/user-manual/modules/ROOT/examples/components/camel-spring/src/test/java/org/apache/camel/spring/patterns/FilterTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/patterns/FilterTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/placeholder/SimpleLanguageWithSpringPropertyPlaceholderRoute.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/placeholder/SimpleLanguageWithSpringPropertyPlaceholderRoute.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/placeholder/SimpleLanguageWithSpringPropertyPlaceholderRoute.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/placeholder/SimpleLanguageWithSpringPropertyPlaceholderRoute.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/placeholder/SimpleLanguageWithSpringPropertyPlaceholderRouteTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/placeholder/SimpleLanguageWithSpringPropertyPlaceholderRouteTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/placeholder/SimpleLanguageWithSpringPropertyPlaceholderRouteTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/placeholder/SimpleLanguageWithSpringPropertyPlaceholderRouteTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/pollingconsumer/FileConsumerSpringSchedulerTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/pollingconsumer/FileConsumerSpringSchedulerTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/pollingconsumer/FileConsumerSpringSchedulerTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/pollingconsumer/FileConsumerSpringSchedulerTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/postprocessor/CamelCustomPostProcessorOnRouteBuilderTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/postprocessor/CamelCustomPostProcessorOnRouteBuilderTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/postprocessor/CamelCustomPostProcessorOnRouteBuilderTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/postprocessor/CamelCustomPostProcessorOnRouteBuilderTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/postprocessor/MagicAnnotation.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/postprocessor/MagicAnnotation.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/postprocessor/MagicAnnotation.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/postprocessor/MagicAnnotation.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/postprocessor/MagicAnnotationPostProcessor.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/postprocessor/MagicAnnotationPostProcessor.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/postprocessor/MagicAnnotationPostProcessor.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/postprocessor/MagicAnnotationPostProcessor.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/postprocessor/MyRouteBuilderWithAutowiredPojo.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/postprocessor/MyRouteBuilderWithAutowiredPojo.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/postprocessor/MyRouteBuilderWithAutowiredPojo.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/postprocessor/MyRouteBuilderWithAutowiredPojo.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/postprocessor/PlainSpringCustomPostProcessorOnRouteBuilderTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/postprocessor/PlainSpringCustomPostProcessorOnRouteBuilderTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/postprocessor/PlainSpringCustomPostProcessorOnRouteBuilderTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/postprocessor/PlainSpringCustomPostProcessorOnRouteBuilderTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/postprocessor/TestPojo.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/postprocessor/TestPojo.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/postprocessor/TestPojo.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/postprocessor/TestPojo.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/DualSpringManagedThreadsThreadPoolTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/DualSpringManagedThreadsThreadPoolTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/DualSpringManagedThreadsThreadPoolTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/DualSpringManagedThreadsThreadPoolTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/JavaDslTransactedNoTXManagerTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/JavaDslTransactedNoTXManagerTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/JavaDslTransactedNoTXManagerTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/JavaDslTransactedNoTXManagerTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/MyAggregator.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/MyAggregator.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/MyAggregator.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/MyAggregator.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/MyCoolBean.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/MyCoolBean.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/MyCoolBean.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/MyCoolBean.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/MyProcessor.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/MyProcessor.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/MyProcessor.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/MyProcessor.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/MyProduceBean.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/MyProduceBean.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/MyProduceBean.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/MyProduceBean.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/MySingleThreadExecutor.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/MySingleThreadExecutor.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/MySingleThreadExecutor.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/MySingleThreadExecutor.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SetHeaderProcessor.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SetHeaderProcessor.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SetHeaderProcessor.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SetHeaderProcessor.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringAggregateFromWireTapTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringAggregateFromWireTapTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringAggregateFromWireTapTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringAggregateFromWireTapTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringAggregatorWithCustomStrategyTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringAggregatorWithCustomStrategyTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringAggregatorWithCustomStrategyTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringAggregatorWithCustomStrategyTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringBatchResequencerAllowDuplicatesTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringBatchResequencerAllowDuplicatesTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringBatchResequencerAllowDuplicatesTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringBatchResequencerAllowDuplicatesTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringBatchResequencerJMSPriorityTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringBatchResequencerJMSPriorityTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringBatchResequencerJMSPriorityTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringBatchResequencerJMSPriorityTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringCBRHeaderPredicateTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringCBRHeaderPredicateTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringCBRHeaderPredicateTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringCBRHeaderPredicateTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringCamelContextLogExhaustedMessageBodyTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringCamelContextLogExhaustedMessageBodyTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringCamelContextLogExhaustedMessageBodyTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringCamelContextLogExhaustedMessageBodyTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringChoiceTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringChoiceTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringChoiceTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringChoiceTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringClaimCheckEipGetAndRemoveSetTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringClaimCheckEipGetAndRemoveSetTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringClaimCheckEipGetAndRemoveSetTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringClaimCheckEipGetAndRemoveSetTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringClaimCheckEipGetSetTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringClaimCheckEipGetSetTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringClaimCheckEipGetSetTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringClaimCheckEipGetSetTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringClaimCheckEipPushPopBodyTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringClaimCheckEipPushPopBodyTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringClaimCheckEipPushPopBodyTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringClaimCheckEipPushPopBodyTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringClaimCheckEipPushPopHeadersPatternTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringClaimCheckEipPushPopHeadersPatternTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringClaimCheckEipPushPopHeadersPatternTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringClaimCheckEipPushPopHeadersPatternTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringClaimCheckEipPushPopHeadersTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringClaimCheckEipPushPopHeadersTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringClaimCheckEipPushPopHeadersTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringClaimCheckEipPushPopHeadersTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringClaimCheckEipPushPopRemoveHeaderTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringClaimCheckEipPushPopRemoveHeaderTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringClaimCheckEipPushPopRemoveHeaderTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringClaimCheckEipPushPopRemoveHeaderTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringClaimCheckEipPushPopTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringClaimCheckEipPushPopTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringClaimCheckEipPushPopTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringClaimCheckEipPushPopTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringComplexBlockWithEndTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringComplexBlockWithEndTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringComplexBlockWithEndTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringComplexBlockWithEndTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringConvertBodyTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringConvertBodyTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringConvertBodyTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringConvertBodyTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringCustomExpressionTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringCustomExpressionTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringCustomExpressionTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringCustomExpressionTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringCustomPredicateTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringCustomPredicateTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringCustomPredicateTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringCustomPredicateTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringCustomProcessorFactoryTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringCustomProcessorFactoryTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringCustomProcessorFactoryTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringCustomProcessorFactoryTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringCustomRefLoadBalanceTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringCustomRefLoadBalanceTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringCustomRefLoadBalanceTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringCustomRefLoadBalanceTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelInvalidDeadLetterUriTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelInvalidDeadLetterUriTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelInvalidDeadLetterUriTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelInvalidDeadLetterUriTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelInvalidOptionDeadLetterUriTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelInvalidOptionDeadLetterUriTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelInvalidOptionDeadLetterUriTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelInvalidOptionDeadLetterUriTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelLogExhaustedMessageHistoryTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelLogExhaustedMessageHistoryTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelLogExhaustedMessageHistoryTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelLogExhaustedMessageHistoryTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelNewExceptionTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelNewExceptionTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelNewExceptionTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelNewExceptionTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelNoRedeliveryTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelNoRedeliveryTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelNoRedeliveryTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelNoRedeliveryTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelNotHandleNewExceptionTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelNotHandleNewExceptionTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelNotHandleNewExceptionTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelNotHandleNewExceptionTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelOnPrepareTestTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelOnPrepareTestTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelOnPrepareTestTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelOnPrepareTestTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalBodyNewTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalBodyNewTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalBodyNewTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalBodyNewTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalBodyTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalBodyTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalBodyTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalBodyTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalBodyWithFileTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalBodyWithFileTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalBodyWithFileTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalBodyWithFileTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDefaultErrorHandlerExchangeFormatterRefTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringDefaultErrorHandlerExchangeFormatterRefTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDefaultErrorHandlerExchangeFormatterRefTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringDefaultErrorHandlerExchangeFormatterRefTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDefaultErrorHandlerLogExhaustedMessageHistoryTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringDefaultErrorHandlerLogExhaustedMessageHistoryTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDefaultErrorHandlerLogExhaustedMessageHistoryTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringDefaultErrorHandlerLogExhaustedMessageHistoryTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDefaultErrorHandlerOnPrepareTestTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringDefaultErrorHandlerOnPrepareTestTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDefaultErrorHandlerOnPrepareTestTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringDefaultErrorHandlerOnPrepareTestTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDefaultErrorHandlerRetryWhileTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringDefaultErrorHandlerRetryWhileTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDefaultErrorHandlerRetryWhileTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringDefaultErrorHandlerRetryWhileTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDelayerPerRouteTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringDelayerPerRouteTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDelayerPerRouteTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringDelayerPerRouteTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDelayerTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringDelayerTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDelayerTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringDelayerTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDoubleLoadBalancerMisconfigurationTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringDoubleLoadBalancerMisconfigurationTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDoubleLoadBalancerMisconfigurationTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringDoubleLoadBalancerMisconfigurationTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDynamicRouterTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringDynamicRouterTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDynamicRouterTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringDynamicRouterTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringEnrichExpressionTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringEnrichExpressionTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringEnrichExpressionTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringEnrichExpressionTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringEnricherAggregateOnExceptionTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringEnricherAggregateOnExceptionTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringEnricherAggregateOnExceptionTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringEnricherAggregateOnExceptionTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringEnricherRefTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringEnricherRefTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringEnricherRefTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringEnricherRefTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringEnricherTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringEnricherTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringEnricherTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringEnricherTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringErrorHandlerRedeliveryPolicyProfileTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringErrorHandlerRedeliveryPolicyProfileTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringErrorHandlerRedeliveryPolicyProfileTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringErrorHandlerRedeliveryPolicyProfileTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringEventNotifierExchangeSentExampleTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringEventNotifierExchangeSentExampleTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringEventNotifierExchangeSentExampleTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringEventNotifierExchangeSentExampleTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringFailOverLoadBalanceAutoStartupFalseTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringFailOverLoadBalanceAutoStartupFalseTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringFailOverLoadBalanceAutoStartupFalseTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringFailOverLoadBalanceAutoStartupFalseTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringFailOverLoadBalanceTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringFailOverLoadBalanceTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringFailOverLoadBalanceTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringFailOverLoadBalanceTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringFailoverMaximumFailoverAttemptsTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringFailoverMaximumFailoverAttemptsTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringFailoverMaximumFailoverAttemptsTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringFailoverMaximumFailoverAttemptsTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringFailoverRoundRobinStickyTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringFailoverRoundRobinStickyTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringFailoverRoundRobinStickyTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringFailoverRoundRobinStickyTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringFailoverRoundRobinTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringFailoverRoundRobinTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringFailoverRoundRobinTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringFailoverRoundRobinTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringFilterNoChildTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringFilterNoChildTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringFilterNoChildTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringFilterNoChildTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringFilterTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringFilterTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringFilterTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringFilterTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringFromEndpointTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringFromEndpointTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringFromEndpointTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringFromEndpointTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringFromMultipleEndpointTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringFromMultipleEndpointTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringFromMultipleEndpointTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringFromMultipleEndpointTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringIdempotentConsumerNoSkipDuplicateFilterTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringIdempotentConsumerNoSkipDuplicateFilterTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringIdempotentConsumerNoSkipDuplicateFilterTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringIdempotentConsumerNoSkipDuplicateFilterTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringIdempotentConsumerNoSkipDuplicateTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringIdempotentConsumerNoSkipDuplicateTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringIdempotentConsumerNoSkipDuplicateTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringIdempotentConsumerNoSkipDuplicateTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringIdempotentConsumerRemoveOnFailureTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringIdempotentConsumerRemoveOnFailureTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringIdempotentConsumerRemoveOnFailureTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringIdempotentConsumerRemoveOnFailureTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringIdempotentConsumerTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringIdempotentConsumerTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringIdempotentConsumerTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringIdempotentConsumerTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInheritErrorHandlerDefaultTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringInheritErrorHandlerDefaultTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInheritErrorHandlerDefaultTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringInheritErrorHandlerDefaultTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInheritErrorHandlerFalseTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringInheritErrorHandlerFalseTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInheritErrorHandlerFalseTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringInheritErrorHandlerFalseTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInheritErrorHandlerTrueTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringInheritErrorHandlerTrueTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInheritErrorHandlerTrueTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringInheritErrorHandlerTrueTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromEndpointRefTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromEndpointRefTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromEndpointRefTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromEndpointRefTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromUriRegexTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromUriRegexTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromUriRegexTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromUriRegexTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromUriSimpleLogTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromUriSimpleLogTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromUriSimpleLogTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromUriSimpleLogTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromUriWildcardTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromUriWildcardTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromUriWildcardTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromUriWildcardTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromWhenNoStopTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromWhenNoStopTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromWhenNoStopTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromWhenNoStopTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromWhenTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromWhenTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromWhenTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromWhenTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromWhenWithChoiceTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromWhenWithChoiceTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromWhenWithChoiceTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromWhenWithChoiceTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromWithStopTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromWithStopTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromWithStopTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromWithStopTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptSendToEndpointDynamicTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringInterceptSendToEndpointDynamicTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptSendToEndpointDynamicTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringInterceptSendToEndpointDynamicTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptSendToEndpointInOnExceptionTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringInterceptSendToEndpointInOnExceptionTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptSendToEndpointInOnExceptionTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringInterceptSendToEndpointInOnExceptionTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptSendToEndpointSkipTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringInterceptSendToEndpointSkipTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptSendToEndpointSkipTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringInterceptSendToEndpointSkipTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptSendToEndpointTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringInterceptSendToEndpointTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptSendToEndpointTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringInterceptSendToEndpointTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptSendToEndpointWhenTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringInterceptSendToEndpointWhenTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptSendToEndpointWhenTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringInterceptSendToEndpointWhenTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptSimpleRouteStopTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringInterceptSimpleRouteStopTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptSimpleRouteStopTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringInterceptSimpleRouteStopTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptSimpleRouteTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringInterceptSimpleRouteTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptSimpleRouteTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringInterceptSimpleRouteTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptSimpleRouteWhenStopTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringInterceptSimpleRouteWhenStopTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptSimpleRouteWhenStopTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringInterceptSimpleRouteWhenStopTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptSimpleRouteWhenTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringInterceptSimpleRouteWhenTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptSimpleRouteWhenTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringInterceptSimpleRouteWhenTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringLogEipMaskTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringLogEipMaskTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringLogEipMaskTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringLogEipMaskTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringLogProcessorTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringLogProcessorTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringLogProcessorTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringLogProcessorTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringLogProcessorWithProvidedLoggerTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringLogProcessorWithProvidedLoggerTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringLogProcessorWithProvidedLoggerTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringLogProcessorWithProvidedLoggerTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringLoopCopyTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringLoopCopyTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringLoopCopyTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringLoopCopyTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringLoopDoWhileTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringLoopDoWhileTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringLoopDoWhileTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringLoopDoWhileTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringLoopNoCopyTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringLoopNoCopyTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringLoopNoCopyTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringLoopNoCopyTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringLoopTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringLoopTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringLoopTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringLoopTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringManagedThreadsThreadPoolTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringManagedThreadsThreadPoolTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringManagedThreadsThreadPoolTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringManagedThreadsThreadPoolTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringMarkRollbackOnlyTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringMarkRollbackOnlyTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringMarkRollbackOnlyTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringMarkRollbackOnlyTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringMessageHistoryDumpRoutingTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringMessageHistoryDumpRoutingTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringMessageHistoryDumpRoutingTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringMessageHistoryDumpRoutingTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringMethodCallTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringMethodCallTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringMethodCallTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringMethodCallTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringMulticastAggregatorTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringMulticastAggregatorTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringMulticastAggregatorTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringMulticastAggregatorTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringMulticastNoStopOnExceptionTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringMulticastNoStopOnExceptionTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringMulticastNoStopOnExceptionTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringMulticastNoStopOnExceptionTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringMulticastOnPrepareTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringMulticastOnPrepareTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringMulticastOnPrepareTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringMulticastOnPrepareTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringMulticastStopOnExceptionTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringMulticastStopOnExceptionTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringMulticastStopOnExceptionTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringMulticastStopOnExceptionTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringMulticastSubUnitOfWorkTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringMulticastSubUnitOfWorkTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringMulticastSubUnitOfWorkTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringMulticastSubUnitOfWorkTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringMulticastTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringMulticastTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringMulticastTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringMulticastTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringNestedChoiceIssueTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringNestedChoiceIssueTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringNestedChoiceIssueTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringNestedChoiceIssueTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringNormalizerTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringNormalizerTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringNormalizerTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringNormalizerTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionAndInterceptAndOnExceptionGlobalTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionAndInterceptAndOnExceptionGlobalTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionAndInterceptAndOnExceptionGlobalTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionAndInterceptAndOnExceptionGlobalTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionAndInterceptGlobalTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionAndInterceptGlobalTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionAndInterceptGlobalTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionAndInterceptGlobalTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionAndInterceptTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionAndInterceptTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionAndInterceptTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionAndInterceptTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionGlobalTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionGlobalTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionGlobalTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionGlobalTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionModeTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionModeTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionModeTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionModeTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionOnCompleteOnlyTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionOnCompleteOnlyTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionOnCompleteOnlyTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionOnCompleteOnlyTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionOnFailureOnlyTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionOnFailureOnlyTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionOnFailureOnlyTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionOnFailureOnlyTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionRouteScopeOverrideGlobalScopeTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionRouteScopeOverrideGlobalScopeTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionRouteScopeOverrideGlobalScopeTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionRouteScopeOverrideGlobalScopeTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionUseOriginalBodyTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionUseOriginalBodyTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionUseOriginalBodyTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionUseOriginalBodyTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionWhenTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionWhenTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionWhenTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionWhenTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringOnExceptionContinueToRouteTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringOnExceptionContinueToRouteTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringOnExceptionContinueToRouteTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringOnExceptionContinueToRouteTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringPolicyPerProcessorTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringPolicyPerProcessorTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringPolicyPerProcessorTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringPolicyPerProcessorTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringPolicyPerRouteTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringPolicyPerRouteTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringPolicyPerRouteTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringPolicyPerRouteTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringPollEnrichExpressionTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringPollEnrichExpressionTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringPollEnrichExpressionTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringPollEnrichExpressionTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringPollEnricherRefTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringPollEnricherRefTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringPollEnricherRefTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringPollEnricherRefTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringPollEnricherTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringPollEnricherTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringPollEnricherTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringPollEnricherTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRandomLoadBalanceTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRandomLoadBalanceTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRandomLoadBalanceTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRandomLoadBalanceTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRecipientListAggregationStrategyTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRecipientListAggregationStrategyTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRecipientListAggregationStrategyTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRecipientListAggregationStrategyTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRecipientListDoNotStopOnExceptionTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRecipientListDoNotStopOnExceptionTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRecipientListDoNotStopOnExceptionTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRecipientListDoNotStopOnExceptionTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRecipientListIgnoreInvalidEndpointsTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRecipientListIgnoreInvalidEndpointsTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRecipientListIgnoreInvalidEndpointsTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRecipientListIgnoreInvalidEndpointsTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRecipientListOnPrepareTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRecipientListOnPrepareTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRecipientListOnPrepareTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRecipientListOnPrepareTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRecipientListParallelOptionalPropertiesTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRecipientListParallelOptionalPropertiesTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRecipientListParallelOptionalPropertiesTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRecipientListParallelOptionalPropertiesTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRecipientListParallelStreamingTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRecipientListParallelStreamingTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRecipientListParallelStreamingTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRecipientListParallelStreamingTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRecipientListParallelTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRecipientListParallelTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRecipientListParallelTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRecipientListParallelTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRecipientListStopOnExceptionTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRecipientListStopOnExceptionTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRecipientListStopOnExceptionTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRecipientListStopOnExceptionTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRecipientListSubUnitOfWorkTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRecipientListSubUnitOfWorkTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRecipientListSubUnitOfWorkTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRecipientListSubUnitOfWorkTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRecipientListWithArrayHeaderTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRecipientListWithArrayHeaderTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRecipientListWithArrayHeaderTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRecipientListWithArrayHeaderTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRecipientListWithStringDelimitedHeaderTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRecipientListWithStringDelimitedHeaderTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRecipientListWithStringDelimitedHeaderTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRecipientListWithStringDelimitedHeaderTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRecipientListWithStringDelimitedPropertyTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRecipientListWithStringDelimitedPropertyTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRecipientListWithStringDelimitedPropertyTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRecipientListWithStringDelimitedPropertyTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRedeliverToSubRouteTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRedeliverToSubRouteTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRedeliverToSubRouteTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRedeliverToSubRouteTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRedeliveryErrorHandlerNoRedeliveryOnShutdownTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRedeliveryErrorHandlerNoRedeliveryOnShutdownTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRedeliveryErrorHandlerNoRedeliveryOnShutdownTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRedeliveryErrorHandlerNoRedeliveryOnShutdownTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRemoveHeaderTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRemoveHeaderTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRemoveHeaderTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRemoveHeaderTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRemoveHeadersExcludeTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRemoveHeadersExcludeTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRemoveHeadersExcludeTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRemoveHeadersExcludeTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRemoveHeadersTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRemoveHeadersTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRemoveHeadersTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRemoveHeadersTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRemovePropertiesWithExclusionTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRemovePropertiesWithExclusionTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRemovePropertiesWithExclusionTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRemovePropertiesWithExclusionTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRemovePropertiesWithoutExclusionTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRemovePropertiesWithoutExclusionTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRemovePropertiesWithoutExclusionTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRemovePropertiesWithoutExclusionTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRemovePropertyTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRemovePropertyTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRemovePropertyTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRemovePropertyTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringResequenceStreamRejectOldExchangesTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringResequenceStreamRejectOldExchangesTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringResequenceStreamRejectOldExchangesTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringResequenceStreamRejectOldExchangesTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringResequencerTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringResequencerTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringResequencerTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringResequencerTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRollbackTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRollbackTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRollbackTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRollbackTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRoundRobinLoadBalanceTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRoundRobinLoadBalanceTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRoundRobinLoadBalanceTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRoundRobinLoadBalanceTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRouteContextProduceBeanTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRouteContextProduceBeanTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRouteContextProduceBeanTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRouteContextProduceBeanTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRouteNoAutoStartupTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRouteNoAutoStartupTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRouteNoAutoStartupTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRouteNoAutoStartupTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRoutePoliciesTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRoutePoliciesTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRoutePoliciesTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRoutePoliciesTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRouteStartupOrderSimpleTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRouteStartupOrderSimpleTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRouteStartupOrderSimpleTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRouteStartupOrderSimpleTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRouteStartupOrderTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRouteStartupOrderTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRouteStartupOrderTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRouteStartupOrderTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRouteStartupOrderWithDefaultTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRouteStartupOrderWithDefaultTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRouteStartupOrderWithDefaultTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRouteStartupOrderWithDefaultTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRouteStopTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRouteStopTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRouteStopTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRouteStopTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRouteTopLevelMisconfiguredTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRouteTopLevelMisconfiguredTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRouteTopLevelMisconfiguredTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRouteTopLevelMisconfiguredTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRouteWithConstantFieldFromExchangeFailTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRouteWithConstantFieldFromExchangeFailTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRouteWithConstantFieldFromExchangeFailTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRouteWithConstantFieldFromExchangeFailTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRouteWithConstantFieldFromExchangeTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRouteWithConstantFieldFromExchangeTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRouteWithConstantFieldFromExchangeTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRouteWithConstantFieldFromExchangeTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRoutingSlipIgnoreInvalidEndpointsTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRoutingSlipIgnoreInvalidEndpointsTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRoutingSlipIgnoreInvalidEndpointsTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRoutingSlipIgnoreInvalidEndpointsTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRoutingSlipTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRoutingSlipTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRoutingSlipTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringRoutingSlipTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSagaRefTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSagaRefTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSagaRefTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSagaRefTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSagaTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSagaTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSagaTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSagaTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSamplingThrottlerTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSamplingThrottlerTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSamplingThrottlerTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSamplingThrottlerTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringScheduledThreadPoolTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringScheduledThreadPoolTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringScheduledThreadPoolTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringScheduledThreadPoolTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringScriptExternalTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringScriptExternalTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringScriptExternalTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringScriptExternalTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringScriptTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringScriptTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringScriptTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringScriptTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetBodyTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSetBodyTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetBodyTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSetBodyTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetExchangePatternTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSetExchangePatternTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetExchangePatternTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSetExchangePatternTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetExchangePatternWithCustomIdTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSetExchangePatternWithCustomIdTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetExchangePatternWithCustomIdTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSetExchangePatternWithCustomIdTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetHeaderNameDynamicTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSetHeaderNameDynamicTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetHeaderNameDynamicTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSetHeaderNameDynamicTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetHeaderTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSetHeaderTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetHeaderTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSetHeaderTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetHeaderWithConstantTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSetHeaderWithConstantTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetHeaderWithConstantTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSetHeaderWithConstantTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetHeaderXPathResultTypeTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSetHeaderXPathResultTypeTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetHeaderXPathResultTypeTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSetHeaderXPathResultTypeTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetPropertyNameDynamicTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSetPropertyNameDynamicTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetPropertyNameDynamicTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSetPropertyNameDynamicTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetPropertyTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSetPropertyTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetPropertyTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSetPropertyTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringShutdownCompleteAllTasksTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringShutdownCompleteAllTasksTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringShutdownCompleteAllTasksTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringShutdownCompleteAllTasksTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringShutdownCompleteCurrentTaskOnlyTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringShutdownCompleteCurrentTaskOnlyTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringShutdownCompleteCurrentTaskOnlyTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringShutdownCompleteCurrentTaskOnlyTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSimpleProcessorIdAwareTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSimpleProcessorIdAwareTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSimpleProcessorIdAwareTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSimpleProcessorIdAwareTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSimpleResultTypeRouteTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSimpleResultTypeRouteTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSimpleResultTypeRouteTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSimpleResultTypeRouteTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSortBodyTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSortBodyTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSortBodyTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSortBodyTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSortExpressionTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSortExpressionTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSortExpressionTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSortExpressionTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSplitCustomExpressionTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSplitCustomExpressionTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSplitCustomExpressionTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSplitCustomExpressionTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSplitGroupMultiLinesTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSplitGroupMultiLinesTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSplitGroupMultiLinesTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSplitGroupMultiLinesTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSplitGroupSkipFirstTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSplitGroupSkipFirstTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSplitGroupSkipFirstTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSplitGroupSkipFirstTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSplitSubUnitOfWorkTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSplitSubUnitOfWorkTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSplitSubUnitOfWorkTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSplitSubUnitOfWorkTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSplitTokenizerGroupDynamicTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSplitTokenizerGroupDynamicTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSplitTokenizerGroupDynamicTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSplitTokenizerGroupDynamicTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSplitterBodyTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSplitterBodyTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSplitterBodyTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSplitterBodyTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSplitterMethodCallTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSplitterMethodCallTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSplitterMethodCallTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSplitterMethodCallTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSplitterNoStopOnExceptionTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSplitterNoStopOnExceptionTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSplitterNoStopOnExceptionTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSplitterNoStopOnExceptionTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSplitterOnPrepareTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSplitterOnPrepareTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSplitterOnPrepareTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSplitterOnPrepareTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSplitterStopOnExceptionTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSplitterStopOnExceptionTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSplitterStopOnExceptionTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSplitterStopOnExceptionTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSplitterWithCustomThreadPoolExecutorTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSplitterWithCustomThreadPoolExecutorTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSplitterWithCustomThreadPoolExecutorTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSplitterWithCustomThreadPoolExecutorTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringStaticRecipientListTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringStaticRecipientListTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringStaticRecipientListTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringStaticRecipientListTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringStepTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringStepTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringStepTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringStepTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringStickyLoadBalanceTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringStickyLoadBalanceTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringStickyLoadBalanceTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringStickyLoadBalanceTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringStreamCachingPerRouteTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringStreamCachingPerRouteTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringStreamCachingPerRouteTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringStreamCachingPerRouteTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringStreamCachingStrategyTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringStreamCachingStrategyTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringStreamCachingStrategyTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringStreamCachingStrategyTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringStreamResequencerTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringStreamResequencerTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringStreamResequencerTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringStreamResequencerTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTestHelper.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringTestHelper.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTestHelper.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringTestHelper.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringThreadNamePatternTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringThreadNamePatternTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringThreadNamePatternTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringThreadNamePatternTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringThreadsCoreAndMaxPoolKeepAliveTimeTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringThreadsCoreAndMaxPoolKeepAliveTimeTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringThreadsCoreAndMaxPoolKeepAliveTimeTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringThreadsCoreAndMaxPoolKeepAliveTimeTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringThreadsCoreAndMaxPoolTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringThreadsCoreAndMaxPoolTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringThreadsCoreAndMaxPoolTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringThreadsCoreAndMaxPoolTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringThreadsCorePoolTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringThreadsCorePoolTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringThreadsCorePoolTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringThreadsCorePoolTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringThreadsDefaultTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringThreadsDefaultTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringThreadsDefaultTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringThreadsDefaultTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringThreadsExternalThreadPoolFactoryBeanTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringThreadsExternalThreadPoolFactoryBeanTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringThreadsExternalThreadPoolFactoryBeanTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringThreadsExternalThreadPoolFactoryBeanTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringThreadsThreadPoolFactoryBeanTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringThreadsThreadPoolFactoryBeanTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringThreadsThreadPoolFactoryBeanTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringThreadsThreadPoolFactoryBeanTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringThrottlerGroupingTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringThrottlerGroupingTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringThrottlerGroupingTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringThrottlerGroupingTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringThrottlerMethodCallTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringThrottlerMethodCallTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringThrottlerMethodCallTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringThrottlerMethodCallTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringThrottlerTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringThrottlerTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringThrottlerTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringThrottlerTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringThrottlerThreadPoolProfileTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringThrottlerThreadPoolProfileTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringThrottlerThreadPoolProfileTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringThrottlerThreadPoolProfileTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringThrottlingInflightRoutePolicyTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringThrottlingInflightRoutePolicyTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringThrottlingInflightRoutePolicyTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringThrottlingInflightRoutePolicyTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringThrowExceptionMessageTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringThrowExceptionMessageTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringThrowExceptionMessageTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringThrowExceptionMessageTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringThrowExceptionTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringThrowExceptionTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringThrowExceptionTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringThrowExceptionTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringToDynamicIgnoreTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringToDynamicIgnoreTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringToDynamicIgnoreTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringToDynamicIgnoreTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringToDynamicLanguageXPathTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringToDynamicLanguageXPathTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringToDynamicLanguageXPathTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringToDynamicLanguageXPathTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringToDynamicTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringToDynamicTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringToDynamicTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringToDynamicTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTokenizerTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringTokenizerTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTokenizerTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringTokenizerTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTopicLoadBalanceTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringTopicLoadBalanceTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTopicLoadBalanceTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringTopicLoadBalanceTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTraceTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringTraceTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTraceTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringTraceTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTraceUsingPropertyTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringTraceUsingPropertyTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTraceUsingPropertyTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringTraceUsingPropertyTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTransformTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringTransformTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTransformTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringTransformTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTryCatchMisconfiguredTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringTryCatchMisconfiguredTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTryCatchMisconfiguredTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringTryCatchMisconfiguredTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTryCatchMustHaveExceptionConfiguredTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringTryCatchMustHaveExceptionConfiguredTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTryCatchMustHaveExceptionConfiguredTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringTryCatchMustHaveExceptionConfiguredTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTryProcessorMultipleExceptionTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringTryProcessorMultipleExceptionTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTryProcessorMultipleExceptionTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringTryProcessorMultipleExceptionTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTryProcessorOnWhenTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringTryProcessorOnWhenTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTryProcessorOnWhenTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringTryProcessorOnWhenTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringValidateRegExpTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringValidateRegExpTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringValidateRegExpTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringValidateRegExpTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringValidateSimpleTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringValidateSimpleTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringValidateSimpleTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringValidateSimpleTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringWeightedRandomLoadBalanceTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringWeightedRandomLoadBalanceTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringWeightedRandomLoadBalanceTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringWeightedRandomLoadBalanceTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringWeightedRoundRobinLoadBalanceTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringWeightedRoundRobinLoadBalanceTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringWeightedRoundRobinLoadBalanceTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringWeightedRoundRobinLoadBalanceTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringWireTapExpressionTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringWireTapExpressionTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringWireTapExpressionTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringWireTapExpressionTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringWireTapNewExchangeTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringWireTapNewExchangeTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringWireTapNewExchangeTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringWireTapNewExchangeTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringWireTapOnPrepareTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringWireTapOnPrepareTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringWireTapOnPrepareTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringWireTapOnPrepareTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringWireTapTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringWireTapTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringWireTapTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringWireTapTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringWireTapUsingFireAndForgetCopyTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringWireTapUsingFireAndForgetCopyTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringWireTapUsingFireAndForgetCopyTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringWireTapUsingFireAndForgetCopyTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringWireTapUsingFireAndForgetTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringWireTapUsingFireAndForgetTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringWireTapUsingFireAndForgetTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringWireTapUsingFireAndForgetTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringWireTapVoidBeanTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringWireTapVoidBeanTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringWireTapVoidBeanTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringWireTapVoidBeanTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringXPathFilterTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringXPathFilterTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringXPathFilterTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringXPathFilterTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringXPathFilterWithNamespaceOnImportRouteContextTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringXPathFilterWithNamespaceOnImportRouteContextTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringXPathFilterWithNamespaceOnImportRouteContextTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringXPathFilterWithNamespaceOnImportRouteContextTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringXPathFilterWithNamespaceOnRouteContextTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringXPathFilterWithNamespaceOnRouteContextTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringXPathFilterWithNamespaceOnRouteContextTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringXPathFilterWithNamespaceOnRouteContextTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringXPathFilterWithNamespaceTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringXPathFilterWithNamespaceTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringXPathFilterWithNamespaceTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringXPathFilterWithNamespaceTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringXPathHeaderNameResultTypeAndNamespaceTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringXPathHeaderNameResultTypeAndNamespaceTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringXPathHeaderNameResultTypeAndNamespaceTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringXPathHeaderNameResultTypeAndNamespaceTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringXPathHeaderNameTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringXPathHeaderNameTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringXPathHeaderNameTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringXPathHeaderNameTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringXPathHeaderTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringXPathHeaderTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringXPathHeaderTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringXPathHeaderTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/TransformWithExpressionTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/TransformWithExpressionTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/TransformWithExpressionTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/TransformWithExpressionTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/XsltTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/XsltTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/XsltTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/XsltTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateCompleteAllOnStopTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateCompleteAllOnStopTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateCompleteAllOnStopTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateCompleteAllOnStopTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateCompletionIntervalTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateCompletionIntervalTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateCompletionIntervalTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateCompletionIntervalTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateControllerTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateControllerTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateControllerTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateControllerTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateDiscardOnTimeoutTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateDiscardOnTimeoutTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateDiscardOnTimeoutTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateDiscardOnTimeoutTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateExpressionSizeFallbackTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateExpressionSizeFallbackTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateExpressionSizeFallbackTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateExpressionSizeFallbackTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateExpressionSizeTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateExpressionSizeTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateExpressionSizeTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateExpressionSizeTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateExpressionTimeoutFallbackTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateExpressionTimeoutFallbackTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateExpressionTimeoutFallbackTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateExpressionTimeoutFallbackTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateExpressionTimeoutPerGroupTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateExpressionTimeoutPerGroupTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateExpressionTimeoutPerGroupTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateExpressionTimeoutPerGroupTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateExpressionTimeoutTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateExpressionTimeoutTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateExpressionTimeoutTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateExpressionTimeoutTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateForceCompletionOnStopTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateForceCompletionOnStopTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateForceCompletionOnStopTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateForceCompletionOnStopTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateGroupedExchangeCompletionExpressionSizeTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateGroupedExchangeCompletionExpressionSizeTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateGroupedExchangeCompletionExpressionSizeTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateGroupedExchangeCompletionExpressionSizeTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateSimplePredicateEagerTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateSimplePredicateEagerTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateSimplePredicateEagerTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateSimplePredicateEagerTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateSimplePredicateTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateSimplePredicateTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateSimplePredicateTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateSimplePredicateTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateSimpleSizeTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateSimpleSizeTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateSimpleSizeTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateSimpleSizeTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateSimpleTimeoutTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateSimpleTimeoutTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateSimpleTimeoutTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateSimpleTimeoutTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateThreadPoolProfileTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateThreadPoolProfileTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateThreadPoolProfileTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateThreadPoolProfileTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregationStrategyBeanAdapterAllowNullTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregationStrategyBeanAdapterAllowNullTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregationStrategyBeanAdapterAllowNullTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregationStrategyBeanAdapterAllowNullTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregationStrategyBeanAdapterRefMethodNameTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregationStrategyBeanAdapterRefMethodNameTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregationStrategyBeanAdapterRefMethodNameTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregationStrategyBeanAdapterRefMethodNameTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregationStrategyBeanAdapterRefTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregationStrategyBeanAdapterRefTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregationStrategyBeanAdapterRefTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregationStrategyBeanAdapterRefTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregatorTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregatorTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregatorTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregatorTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/async/SpringAsyncDeadLetterChannelExecutorServiceRefTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/async/SpringAsyncDeadLetterChannelExecutorServiceRefTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/async/SpringAsyncDeadLetterChannelExecutorServiceRefTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/async/SpringAsyncDeadLetterChannelExecutorServiceRefTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/idempotent/FileConsumerIdempotentLoadStoreTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/idempotent/FileConsumerIdempotentLoadStoreTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/idempotent/FileConsumerIdempotentLoadStoreTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/idempotent/FileConsumerIdempotentLoadStoreTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/idempotent/FileConsumerIdempotentTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/idempotent/FileConsumerIdempotentTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/idempotent/FileConsumerIdempotentTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/idempotent/FileConsumerIdempotentTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/idempotent/MyCache.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/idempotent/MyCache.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/idempotent/MyCache.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/idempotent/MyCache.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/idempotent/MySpringIdempotentCacheManager.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/idempotent/MySpringIdempotentCacheManager.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/idempotent/MySpringIdempotentCacheManager.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/idempotent/MySpringIdempotentCacheManager.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/idempotent/SpringCacheIdempotentTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/idempotent/SpringCacheIdempotentTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/idempotent/SpringCacheIdempotentTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/idempotent/SpringCacheIdempotentTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/intercept/SpringParentChildInterceptStrategyTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/intercept/SpringParentChildInterceptStrategyTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/intercept/SpringParentChildInterceptStrategyTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/intercept/SpringParentChildInterceptStrategyTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/DeadLetterChannelHandledExampleTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/onexception/DeadLetterChannelHandledExampleTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/DeadLetterChannelHandledExampleTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/onexception/DeadLetterChannelHandledExampleTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/OrderFailedException.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/onexception/OrderFailedException.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/OrderFailedException.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/onexception/OrderFailedException.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/OrderService.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/onexception/OrderService.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/OrderService.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/onexception/OrderService.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/RedeliveryPolicyReTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/onexception/RedeliveryPolicyReTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/RedeliveryPolicyReTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/onexception/RedeliveryPolicyReTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringContextScopeOnExceptionTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/onexception/SpringContextScopeOnExceptionTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringContextScopeOnExceptionTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/onexception/SpringContextScopeOnExceptionTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringDeadLetterChannelOnExceptionOnRedeliveryTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/onexception/SpringDeadLetterChannelOnExceptionOnRedeliveryTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringDeadLetterChannelOnExceptionOnRedeliveryTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/onexception/SpringDeadLetterChannelOnExceptionOnRedeliveryTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionContinueSubRouteTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionContinueSubRouteTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionContinueSubRouteTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionContinueSubRouteTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionContinueSubSubRouteTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionContinueSubSubRouteTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionContinueSubSubRouteTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionContinueSubSubRouteTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionContinueTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionContinueTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionContinueTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionContinueTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionFromChoiceUseOriginalBodyTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionFromChoiceUseOriginalBodyTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionFromChoiceUseOriginalBodyTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionFromChoiceUseOriginalBodyTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionLoadBalancerDoubleIssueTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionLoadBalancerDoubleIssueTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionLoadBalancerDoubleIssueTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionLoadBalancerDoubleIssueTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionNotNormalizedClassNameTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionNotNormalizedClassNameTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionNotNormalizedClassNameTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionNotNormalizedClassNameTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionOccurredProcessorOnExceptionTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionOccurredProcessorOnExceptionTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionOccurredProcessorOnExceptionTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionOccurredProcessorOnExceptionTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionOccurredProcessorTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionOccurredProcessorTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionOccurredProcessorTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionOccurredProcessorTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionSubRouteTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionSubRouteTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionSubRouteTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionSubRouteTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionSubRouteWithDefaultErrorHandlerTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionSubRouteWithDefaultErrorHandlerTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionSubRouteWithDefaultErrorHandlerTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionSubRouteWithDefaultErrorHandlerTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionUseOriginalBodyTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionUseOriginalBodyTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionUseOriginalBodyTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionUseOriginalBodyTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionUseOriginalMessageTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionUseOriginalMessageTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionUseOriginalMessageTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionUseOriginalMessageTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionWithRouteAndContinueTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionWithRouteAndContinueTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionWithRouteAndContinueTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionWithRouteAndContinueTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/scattergather/LowestQuoteAggregationStrategy.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/scattergather/LowestQuoteAggregationStrategy.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/scattergather/LowestQuoteAggregationStrategy.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/scattergather/LowestQuoteAggregationStrategy.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/scattergather/MyVendor.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/scattergather/MyVendor.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/scattergather/MyVendor.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/scattergather/MyVendor.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/scattergather/ScatterGatherTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/scattergather/ScatterGatherTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/processor/scattergather/ScatterGatherTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/scattergather/ScatterGatherTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/produce/FluentProduceTemplateTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/produce/FluentProduceTemplateTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/produce/FluentProduceTemplateTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/produce/FluentProduceTemplateTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/produce/MyCoolBean.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/produce/MyCoolBean.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/produce/MyCoolBean.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/produce/MyCoolBean.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/produce/MyCoolBeanTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/produce/MyCoolBeanTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/produce/MyCoolBeanTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/produce/MyCoolBeanTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/produce/MyListener.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/produce/MyListener.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/produce/MyListener.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/produce/MyListener.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/produce/MyListenerService.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/produce/MyListenerService.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/produce/MyListenerService.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/produce/MyListenerService.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/produce/ProduceTemplateTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/produce/ProduceTemplateTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/produce/ProduceTemplateTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/produce/ProduceTemplateTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/produce/ProduceTemplateWithTwoCamelContextTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/produce/ProduceTemplateWithTwoCamelContextTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/produce/ProduceTemplateWithTwoCamelContextTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/produce/ProduceTemplateWithTwoCamelContextTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/produce/ProduceTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/produce/ProduceTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/produce/ProduceTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/produce/ProduceTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/produce/generics/MyService.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/produce/generics/MyService.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/produce/generics/MyService.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/produce/generics/MyService.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/produce/generics/MyServiceImpl.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/produce/generics/MyServiceImpl.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/produce/generics/MyServiceImpl.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/produce/generics/MyServiceImpl.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/produce/generics/MyServiceInvoker.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/produce/generics/MyServiceInvoker.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/produce/generics/MyServiceInvoker.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/produce/generics/MyServiceInvoker.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/produce/generics/MyServiceSupport.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/produce/generics/MyServiceSupport.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/produce/generics/MyServiceSupport.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/produce/generics/MyServiceSupport.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/produce/generics/MyServiceTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/produce/generics/MyServiceTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/produce/generics/MyServiceTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/produce/generics/MyServiceTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/routebuilder/CamelRouteBuilderTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/routebuilder/CamelRouteBuilderTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/routebuilder/CamelRouteBuilderTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/routebuilder/CamelRouteBuilderTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/routebuilder/MyOtherRoute.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/routebuilder/MyOtherRoute.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/routebuilder/MyOtherRoute.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/routebuilder/MyOtherRoute.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/routebuilder/MyRoute.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/routebuilder/MyRoute.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/routebuilder/MyRoute.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/routebuilder/MyRoute.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/routebuilder/SpringRouteTemplateRefTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/routebuilder/SpringRouteTemplateRefTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/routebuilder/SpringRouteTemplateRefTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/routebuilder/SpringRouteTemplateRefTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/routebuilder/SpringRouteTemplateTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/routebuilder/SpringRouteTemplateTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/routebuilder/SpringRouteTemplateTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/routebuilder/SpringRouteTemplateTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/scan/DefaultPackageScanClassResolverTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/scan/DefaultPackageScanClassResolverTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/scan/DefaultPackageScanClassResolverTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/scan/DefaultPackageScanClassResolverTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/scan/PackageScanFiltersTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/scan/PackageScanFiltersTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/scan/PackageScanFiltersTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/scan/PackageScanFiltersTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/scan/PatternBasedPackageScanFilterTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/scan/PatternBasedPackageScanFilterTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/scan/PatternBasedPackageScanFilterTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/scan/PatternBasedPackageScanFilterTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/scan/ScanTestSupport.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/scan/ScanTestSupport.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/scan/ScanTestSupport.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/scan/ScanTestSupport.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/scan/ScannableOne.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/scan/ScannableOne.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/scan/ScannableOne.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/scan/ScannableOne.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/scan/ScannableTwo.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/scan/ScannableTwo.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/scan/ScannableTwo.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/scan/ScannableTwo.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/scan/a/ScanTargetOne.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/scan/a/ScanTargetOne.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/scan/a/ScanTargetOne.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/scan/a/ScanTargetOne.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/scan/b/ScanTargetTwo.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/scan/b/ScanTargetTwo.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/scan/b/ScanTargetTwo.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/scan/b/ScanTargetTwo.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/scan/c/NotAScanTarget.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/scan/c/NotAScanTarget.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/scan/c/NotAScanTarget.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/scan/c/NotAScanTarget.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/scan/c/ScanTargetThree.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/scan/c/ScanTargetThree.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/scan/c/ScanTargetThree.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/scan/c/ScanTargetThree.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/spi/BridgePropertyPlaceholderConfigurerTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/spi/BridgePropertyPlaceholderConfigurerTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/spi/BridgePropertyPlaceholderConfigurerTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/spi/BridgePropertyPlaceholderConfigurerTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/spi/BridgePropertyPlaceholderConfigurerUtilIssueTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/spi/BridgePropertyPlaceholderConfigurerUtilIssueTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/spi/BridgePropertyPlaceholderConfigurerUtilIssueTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/spi/BridgePropertyPlaceholderConfigurerUtilIssueTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/spi/ParentContextRegistryTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/spi/ParentContextRegistryTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/spi/ParentContextRegistryTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/spi/ParentContextRegistryTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/util/EndpointHelperTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/util/EndpointHelperTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/util/EndpointHelperTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/util/EndpointHelperTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/xml/ConfiguredRouteBuilder.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/xml/ConfiguredRouteBuilder.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/xml/ConfiguredRouteBuilder.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/xml/ConfiguredRouteBuilder.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/xml/ConfiguredRouteBuilder2.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/xml/ConfiguredRouteBuilder2.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/xml/ConfiguredRouteBuilder2.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/xml/ConfiguredRouteBuilder2.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/xml/SpringXmlRouteBuilderTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/xml/SpringXmlRouteBuilderTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/xml/SpringXmlRouteBuilderTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/xml/SpringXmlRouteBuilderTest.java
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/handler/ErrorHandlerDefinitionParserTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/xml/handler/ErrorHandlerDefinitionParserTest.java
similarity index 97%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/handler/ErrorHandlerDefinitionParserTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/xml/handler/ErrorHandlerDefinitionParserTest.java
index 9d8e282..61419b1 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/handler/ErrorHandlerDefinitionParserTest.java
+++ b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/xml/handler/ErrorHandlerDefinitionParserTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.spring.handler;
+package org.apache.camel.spring.xml.handler;
import org.apache.camel.Processor;
import org.apache.camel.builder.DeadLetterChannelBuilder;
@@ -36,7 +36,7 @@ public class ErrorHandlerDefinitionParserTest {
@BeforeEach
public void setUp() throws Exception {
- ctx = new ClassPathXmlApplicationContext("org/apache/camel/spring/handler/ErrorHandlerDefinitionParser.xml");
+ ctx = new ClassPathXmlApplicationContext("org/apache/camel/spring/xml/handler/ErrorHandlerDefinitionParser.xml");
}
@AfterEach
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/handler/MyErrorProcessor.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/xml/handler/MyErrorProcessor.java
similarity index 96%
rename from components/camel-spring/src/test/java/org/apache/camel/spring/handler/MyErrorProcessor.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/spring/xml/handler/MyErrorProcessor.java
index 3e708db..687c175 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/handler/MyErrorProcessor.java
+++ b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/xml/handler/MyErrorProcessor.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.spring.handler;
+package org.apache.camel.spring.xml.handler;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
diff --git a/components/camel-spring/src/test/java/org/apache/camel/util/spring/KeyStoreParametersFactoryBeanTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/util/spring/KeyStoreParametersFactoryBeanTest.java
similarity index 96%
rename from components/camel-spring/src/test/java/org/apache/camel/util/spring/KeyStoreParametersFactoryBeanTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/util/spring/KeyStoreParametersFactoryBeanTest.java
index b92fdbc..38a387c 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/util/spring/KeyStoreParametersFactoryBeanTest.java
+++ b/components/camel-spring-xml/src/test/java/org/apache/camel/util/spring/KeyStoreParametersFactoryBeanTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.util.spring;
import javax.annotation.Resource;
+import org.apache.camel.spring.xml.KeyStoreParametersFactoryBean;
import org.apache.camel.support.jsse.KeyStoreParameters;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/components/camel-spring/src/test/java/org/apache/camel/util/spring/SSLContextParametersFactoryBeanTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/util/spring/SSLContextParametersFactoryBeanTest.java
similarity index 98%
rename from components/camel-spring/src/test/java/org/apache/camel/util/spring/SSLContextParametersFactoryBeanTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/util/spring/SSLContextParametersFactoryBeanTest.java
index df27a3f..5541a1c 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/util/spring/SSLContextParametersFactoryBeanTest.java
+++ b/components/camel-spring-xml/src/test/java/org/apache/camel/util/spring/SSLContextParametersFactoryBeanTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.util.spring;
import javax.annotation.Resource;
+import org.apache.camel.spring.xml.SSLContextParametersFactoryBean;
import org.apache.camel.support.jsse.BaseSSLContextParameters;
import org.apache.camel.support.jsse.ClientAuthentication;
import org.apache.camel.support.jsse.SSLContextParameters;
diff --git a/components/camel-spring/src/test/java/org/apache/camel/util/spring/SecureRandomParametersFactoryBeanTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/util/spring/SecureRandomParametersFactoryBeanTest.java
similarity index 100%
rename from components/camel-spring/src/test/java/org/apache/camel/util/spring/SecureRandomParametersFactoryBeanTest.java
rename to components/camel-spring-xml/src/test/java/org/apache/camel/util/spring/SecureRandomParametersFactoryBeanTest.java
diff --git a/components/camel-spring/src/test/resources/META-INF/LICENSE.txt b/components/camel-spring-xml/src/test/resources/META-INF/LICENSE.txt
similarity index 100%
rename from components/camel-spring/src/test/resources/META-INF/LICENSE.txt
rename to components/camel-spring-xml/src/test/resources/META-INF/LICENSE.txt
diff --git a/components/camel-spring/src/test/resources/META-INF/NOTICE.txt b/components/camel-spring-xml/src/test/resources/META-INF/NOTICE.txt
similarity index 100%
rename from components/camel-spring/src/test/resources/META-INF/NOTICE.txt
rename to components/camel-spring-xml/src/test/resources/META-INF/NOTICE.txt
diff --git a/components/camel-spring/src/test/resources/META-INF/services/org/apache/camel/component/file_test b/components/camel-spring-xml/src/test/resources/META-INF/services/org/apache/camel/component/file_test
similarity index 100%
rename from components/camel-spring/src/test/resources/META-INF/services/org/apache/camel/component/file_test
rename to components/camel-spring-xml/src/test/resources/META-INF/services/org/apache/camel/component/file_test
diff --git a/components/camel-spring/src/test/resources/META-INF/services/org/apache/camel/component/timer_test b/components/camel-spring-xml/src/test/resources/META-INF/services/org/apache/camel/component/timer_test
similarity index 100%
rename from components/camel-spring/src/test/resources/META-INF/services/org/apache/camel/component/timer_test
rename to components/camel-spring-xml/src/test/resources/META-INF/services/org/apache/camel/component/timer_test
diff --git a/components/camel-spring/src/test/resources/META-INF/services/org/apache/camel/language/bean_test b/components/camel-spring-xml/src/test/resources/META-INF/services/org/apache/camel/language/bean_test
similarity index 100%
rename from components/camel-spring/src/test/resources/META-INF/services/org/apache/camel/language/bean_test
rename to components/camel-spring-xml/src/test/resources/META-INF/services/org/apache/camel/language/bean_test
diff --git a/components/camel-spring/src/test/resources/META-INF/services/org/apache/camel/language/file_test b/components/camel-spring-xml/src/test/resources/META-INF/services/org/apache/camel/language/file_test
similarity index 100%
rename from components/camel-spring/src/test/resources/META-INF/services/org/apache/camel/language/file_test
rename to components/camel-spring-xml/src/test/resources/META-INF/services/org/apache/camel/language/file_test
diff --git a/components/camel-spring/src/test/resources/META-INF/services/org/apache/camel/language/resolver/default b/components/camel-spring-xml/src/test/resources/META-INF/services/org/apache/camel/language/resolver/default
similarity index 100%
rename from components/camel-spring/src/test/resources/META-INF/services/org/apache/camel/language/resolver/default
rename to components/camel-spring-xml/src/test/resources/META-INF/services/org/apache/camel/language/resolver/default
diff --git a/components/camel-spring/src/test/resources/META-INF/spring/camel-context.xml b/components/camel-spring-xml/src/test/resources/META-INF/spring/camel-context.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/META-INF/spring/camel-context.xml
rename to components/camel-spring-xml/src/test/resources/META-INF/spring/camel-context.xml
diff --git a/components/camel-spring/src/test/resources/META-INF/spring/dummy.xml b/components/camel-spring-xml/src/test/resources/META-INF/spring/dummy.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/META-INF/spring/dummy.xml
rename to components/camel-spring-xml/src/test/resources/META-INF/spring/dummy.xml
diff --git a/components/camel-spring/src/test/resources/custom.properties b/components/camel-spring-xml/src/test/resources/custom.properties
similarity index 100%
rename from components/camel-spring/src/test/resources/custom.properties
rename to components/camel-spring-xml/src/test/resources/custom.properties
diff --git a/components/camel-spring/src/test/resources/log4j2.properties b/components/camel-spring-xml/src/test/resources/log4j2.properties
similarity index 100%
rename from components/camel-spring/src/test/resources/log4j2.properties
rename to components/camel-spring-xml/src/test/resources/log4j2.properties
diff --git a/components/camel-spring/src/test/resources/mycamel-1.properties b/components/camel-spring-xml/src/test/resources/mycamel-1.properties
similarity index 100%
rename from components/camel-spring/src/test/resources/mycamel-1.properties
rename to components/camel-spring-xml/src/test/resources/mycamel-1.properties
diff --git a/components/camel-spring/src/test/resources/mycamel-2.properties b/components/camel-spring-xml/src/test/resources/mycamel-2.properties
similarity index 100%
rename from components/camel-spring/src/test/resources/mycamel-2.properties
rename to components/camel-spring-xml/src/test/resources/mycamel-2.properties
diff --git a/components/camel-spring/src/test/resources/myspel.txt b/components/camel-spring-xml/src/test/resources/myspel.txt
similarity index 100%
rename from components/camel-spring/src/test/resources/myspel.txt
rename to components/camel-spring-xml/src/test/resources/myspel.txt
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/bean/AutowireConstructorRouteTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/bean/AutowireConstructorRouteTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/component/bean/AutowireConstructorRouteTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/component/bean/AutowireConstructorRouteTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/bean/AutowireConstructorRouteTwoTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/bean/AutowireConstructorRouteTwoTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/component/bean/AutowireConstructorRouteTwoTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/component/bean/AutowireConstructorRouteTwoTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/bean/BeanWithRecipientListTest-context.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/bean/BeanWithRecipientListTest-context.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/component/bean/BeanWithRecipientListTest-context.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/component/bean/BeanWithRecipientListTest-context.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/bean/SpringRouteMethodCallStaticTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/bean/SpringRouteMethodCallStaticTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/component/bean/SpringRouteMethodCallStaticTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/component/bean/SpringRouteMethodCallStaticTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/bean/beanBindingTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/bean/beanBindingTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/component/bean/beanBindingTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/component/bean/beanBindingTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/bean/camelContext.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/bean/camelContext.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/component/bean/camelContext.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/component/bean/camelContext.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/cron/cron.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/cron/cron.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/component/cron/cron.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/component/cron/cron.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/dataset/SpringDataSetTest-context.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/dataset/SpringDataSetTest-context.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/component/dataset/SpringDataSetTest-context.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/component/dataset/SpringDataSetTest-context.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/event/camelContext.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/event/camelContext.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/component/event/camelContext.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/component/event/camelContext.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/event/mistypedPackage.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/event/mistypedPackage.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/component/event/mistypedPackage.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/component/event/mistypedPackage.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/log/SpringCustomLogMaskTest-context.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/log/SpringCustomLogMaskTest-context.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/component/log/SpringCustomLogMaskTest-context.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/component/log/SpringCustomLogMaskTest-context.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/log/SpringLogMarkerTest-context.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/log/SpringLogMarkerTest-context.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/component/log/SpringLogMarkerTest-context.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/component/log/SpringLogMarkerTest-context.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/log/SpringLogMaskTest-context.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/log/SpringLogMaskTest-context.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/component/log/SpringLogMaskTest-context.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/component/log/SpringLogMaskTest-context.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/log/SpringLogTest-context.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/log/SpringLogTest-context.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/component/log/SpringLogTest-context.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/component/log/SpringLogTest-context.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/log/custom-exchange-formatter-context.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/log/custom-exchange-formatter-context.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/component/log/custom-exchange-formatter-context.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/component/log/custom-exchange-formatter-context.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/properties/CamelSpringPropertyPlaceholderConfigurer2Test.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/CamelSpringPropertyPlaceholderConfigurer2Test.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/component/properties/CamelSpringPropertyPlaceholderConfigurer2Test.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/CamelSpringPropertyPlaceholderConfigurer2Test.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/properties/CamelSpringPropertyPlaceholderConfigurer3Test.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/CamelSpringPropertyPlaceholderConfigurer3Test.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/component/properties/CamelSpringPropertyPlaceholderConfigurer3Test.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/CamelSpringPropertyPlaceholderConfigurer3Test.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/properties/CamelSpringPropertyPlaceholderConfigurerNestedTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/CamelSpringPropertyPlaceholderConfigurerNestedTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/component/properties/CamelSpringPropertyPlaceholderConfigurerNestedTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/CamelSpringPropertyPlaceholderConfigurerNestedTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/properties/CamelSpringPropertyPlaceholderConfigurerTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/CamelSpringPropertyPlaceholderConfigurerTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/component/properties/CamelSpringPropertyPlaceholderConfigurerTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/CamelSpringPropertyPlaceholderConfigurerTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringAttributeNewLineRouteContextRefTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/SpringAttributeNewLineRouteContextRefTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringAttributeNewLineRouteContextRefTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/SpringAttributeNewLineRouteContextRefTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringAttributeNewLineTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/SpringAttributeNewLineTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringAttributeNewLineTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/SpringAttributeNewLineTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringBuilderRefBeanInjectTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/SpringBuilderRefBeanInjectTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringBuilderRefBeanInjectTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/SpringBuilderRefBeanInjectTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringBuilderRefPropertiesTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/SpringBuilderRefPropertiesTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringBuilderRefPropertiesTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/SpringBuilderRefPropertiesTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringBuilderRefPropertyInjectTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/SpringBuilderRefPropertyInjectTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringBuilderRefPropertyInjectTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/SpringBuilderRefPropertyInjectTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringErrorHandlerInlinedPropertiesPlaceholderTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/SpringErrorHandlerInlinedPropertiesPlaceholderTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringErrorHandlerInlinedPropertiesPlaceholderTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/SpringErrorHandlerInlinedPropertiesPlaceholderTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringErrorHandlerPropertiesPlaceholderTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/SpringErrorHandlerPropertiesPlaceholderTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringErrorHandlerPropertiesPlaceholderTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/SpringErrorHandlerPropertiesPlaceholderTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringOptionalPropertiesDslTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/SpringOptionalPropertiesDslTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringOptionalPropertiesDslTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/SpringOptionalPropertiesDslTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringOptionalPropertiesDslTokenizeTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/SpringOptionalPropertiesDslTokenizeTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringOptionalPropertiesDslTokenizeTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/SpringOptionalPropertiesDslTokenizeTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringPackagePropertiesTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/SpringPackagePropertiesTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringPackagePropertiesTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/SpringPackagePropertiesTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringPackageScanPropertiesTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/SpringPackageScanPropertiesTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringPackageScanPropertiesTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/SpringPackageScanPropertiesTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringPropertiesAfterTransactedDSL2Test.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/SpringPropertiesAfterTransactedDSL2Test.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringPropertiesAfterTransactedDSL2Test.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/SpringPropertiesAfterTransactedDSL2Test.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringPropertiesAfterTransactedDSLTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/SpringPropertiesAfterTransactedDSLTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringPropertiesAfterTransactedDSLTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/SpringPropertiesAfterTransactedDSLTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringPropertiesComponent3Test.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/SpringPropertiesComponent3Test.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringPropertiesComponent3Test.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/SpringPropertiesComponent3Test.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringPropertiesComponentEIPChoiceConvertBodyToTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/SpringPropertiesComponentEIPChoiceConvertBodyToTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringPropertiesComponentEIPChoiceConvertBodyToTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/SpringPropertiesComponentEIPChoiceConvertBodyToTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringPropertiesComponentEIPConvertBodyToTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/SpringPropertiesComponentEIPConvertBodyToTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringPropertiesComponentEIPConvertBodyToTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/SpringPropertiesComponentEIPConvertBodyToTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringPropertiesComponentFunctionTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/SpringPropertiesComponentFunctionTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringPropertiesComponentFunctionTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/SpringPropertiesComponentFunctionTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringPropertiesComponentInterceptFromTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/SpringPropertiesComponentInterceptFromTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringPropertiesComponentInterceptFromTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/SpringPropertiesComponentInterceptFromTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringPropertiesComponentOnExceptionRefTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/SpringPropertiesComponentOnExceptionRefTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringPropertiesComponentOnExceptionRefTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/SpringPropertiesComponentOnExceptionRefTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringPropertiesComponentOnExceptionTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/SpringPropertiesComponentOnExceptionTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringPropertiesComponentOnExceptionTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/SpringPropertiesComponentOnExceptionTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringPropertiesComponentRefTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/SpringPropertiesComponentRefTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringPropertiesComponentRefTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/SpringPropertiesComponentRefTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringPropertiesComponentTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/SpringPropertiesComponentTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringPropertiesComponentTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/SpringPropertiesComponentTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringPropertiesRouteFromTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/SpringPropertiesRouteFromTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringPropertiesRouteFromTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/SpringPropertiesRouteFromTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringPropertiesRouteIdTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/SpringPropertiesRouteIdTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringPropertiesRouteIdTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/SpringPropertiesRouteIdTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringPropertyPlaceholderOnExceptionRefTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/SpringPropertyPlaceholderOnExceptionRefTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringPropertyPlaceholderOnExceptionRefTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/SpringPropertyPlaceholderOnExceptionRefTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/properties/cheese.properties b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/cheese.properties
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/component/properties/cheese.properties
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/cheese.properties
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/properties/myprop.properties b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/myprop.properties
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/component/properties/myprop.properties
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/myprop.properties
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/properties/nested.properties b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/nested.properties
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/component/properties/nested.properties
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/nested.properties
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/rest/RestRefTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/rest/RestRefTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/component/rest/RestRefTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/component/rest/RestRefTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/rest/SpringFromRestConfigurationTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/rest/SpringFromRestConfigurationTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/component/rest/SpringFromRestConfigurationTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/component/rest/SpringFromRestConfigurationTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/rest/SpringFromRestDuplicateTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/rest/SpringFromRestDuplicateTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/component/rest/SpringFromRestDuplicateTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/component/rest/SpringFromRestDuplicateTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/rest/SpringFromRestGetEmbeddedRouteTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/rest/SpringFromRestGetEmbeddedRouteTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/component/rest/SpringFromRestGetEmbeddedRouteTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/component/rest/SpringFromRestGetEmbeddedRouteTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/rest/SpringFromRestGetInterceptTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/rest/SpringFromRestGetInterceptTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/component/rest/SpringFromRestGetInterceptTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/component/rest/SpringFromRestGetInterceptTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/rest/SpringFromRestGetOnExceptionTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/rest/SpringFromRestGetOnExceptionTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/component/rest/SpringFromRestGetOnExceptionTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/component/rest/SpringFromRestGetOnExceptionTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/rest/SpringFromRestGetRouteOnExceptionTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/rest/SpringFromRestGetRouteOnExceptionTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/component/rest/SpringFromRestGetRouteOnExceptionTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/component/rest/SpringFromRestGetRouteOnExceptionTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/rest/SpringFromRestGetTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/rest/SpringFromRestGetTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/component/rest/SpringFromRestGetTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/component/rest/SpringFromRestGetTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/rest/SpringFromRestIdAndDescriptionTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/rest/SpringFromRestIdAndDescriptionTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/component/rest/SpringFromRestIdAndDescriptionTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/component/rest/SpringFromRestIdAndDescriptionTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/rest/SpringFromRestUriPrefixTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/rest/SpringFromRestUriPrefixTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/component/rest/SpringFromRestUriPrefixTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/component/rest/SpringFromRestUriPrefixTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/validator/camelContext.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/validator/camelContext.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/component/validator/camelContext.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/component/validator/camelContext.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/validator/schema.xsd b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/validator/schema.xsd
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/component/validator/schema.xsd
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/component/validator/schema.xsd
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/xslt/SpringXsltRouteFileTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/xslt/SpringXsltRouteFileTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/component/xslt/SpringXsltRouteFileTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/component/xslt/SpringXsltRouteFileTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/xslt/SpringXsltRouteTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/xslt/SpringXsltRouteTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/component/xslt/SpringXsltRouteTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/component/xslt/SpringXsltRouteTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/xslt/mytransform.xsl b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/xslt/mytransform.xsl
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/component/xslt/mytransform.xsl
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/component/xslt/mytransform.xsl
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/language/SpringSimpleEmptyStringTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/language/SpringSimpleEmptyStringTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/language/SpringSimpleEmptyStringTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/language/SpringSimpleEmptyStringTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/language/SpringSimpleExpressionTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/language/SpringSimpleExpressionTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/language/SpringSimpleExpressionTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/language/SpringSimpleExpressionTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/language/SpringSimpleMultiLineExpressionTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/language/SpringSimpleMultiLineExpressionTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/language/SpringSimpleMultiLineExpressionTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/language/SpringSimpleMultiLineExpressionTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/language/SpringSimplePropertyPlaceholderClashTest-context.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/language/SpringSimplePropertyPlaceholderClashTest-context.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/language/SpringSimplePropertyPlaceholderClashTest-context.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/language/SpringSimplePropertyPlaceholderClashTest-context.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/language/SpringSimpleWeirdIssueTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/language/SpringSimpleWeirdIssueTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/language/SpringSimpleWeirdIssueTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/language/SpringSimpleWeirdIssueTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/language/SpringTokenXMLPairNamespaceSplitTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/language/SpringTokenXMLPairNamespaceSplitTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/language/SpringTokenXMLPairNamespaceSplitTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/language/SpringTokenXMLPairNamespaceSplitTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/language/SpringXMLTokenSplitTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/language/SpringXMLTokenSplitTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/language/SpringXMLTokenSplitTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/language/SpringXMLTokenSplitTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/language/simplePropertiesPlaceholderClashTest.properties b/components/camel-spring-xml/src/test/resources/org/apache/camel/language/simplePropertiesPlaceholderClashTest.properties
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/language/simplePropertiesPlaceholderClashTest.properties
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/language/simplePropertiesPlaceholderClashTest.properties
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/language/spel/SpelSpringTest-context.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/language/spel/SpelSpringTest-context.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/language/spel/SpelSpringTest-context.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/language/spel/SpelSpringTest-context.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/language/springSimpleNewline.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/language/springSimpleNewline.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/language/springSimpleNewline.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/language/springSimpleNewline.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/language/springSimpleRegexContext.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/language/springSimpleRegexContext.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/language/springSimpleRegexContext.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/language/springSimpleRegexContext.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/osgi/camelContext.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/osgi/camelContext.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/osgi/camelContext.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/osgi/camelContext.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/processor/camel-context.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/processor/camel-context.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/processor/camel-context.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/processor/camel-context.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/CircularComponentCreationComplexTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/CircularComponentCreationComplexTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/CircularComponentCreationComplexTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/CircularComponentCreationComplexTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/CircularComponentCreationSimpleTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/CircularComponentCreationSimpleTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/CircularComponentCreationSimpleTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/CircularComponentCreationSimpleTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/CircularComponentInjectionTest-context.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/CircularComponentInjectionTest-context.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/CircularComponentInjectionTest-context.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/CircularComponentInjectionTest-context.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/DumpModelAsXmlPlaceholdersTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/DumpModelAsXmlPlaceholdersTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/DumpModelAsXmlPlaceholdersTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/DumpModelAsXmlPlaceholdersTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/EndpointToIdRefTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/EndpointToIdRefTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/EndpointToIdRefTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/EndpointToIdRefTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/NodeIdReferenceTest-context.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/NodeIdReferenceTest-context.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/NodeIdReferenceTest-context.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/NodeIdReferenceTest-context.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/RegistryInjection.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/RegistryInjection.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/RegistryInjection.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/RegistryInjection.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/SendMessageOnRouteStartAndStopTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/SendMessageOnRouteStartAndStopTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/SendMessageOnRouteStartAndStopTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/SendMessageOnRouteStartAndStopTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/SpringBeanIoCStaticMethodTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/SpringBeanIoCStaticMethodTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/SpringBeanIoCStaticMethodTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/SpringBeanIoCStaticMethodTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/SpringBeanPostProcessorDisabledTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/SpringBeanPostProcessorDisabledTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/SpringBeanPostProcessorDisabledTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/SpringBeanPostProcessorDisabledTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/SpringBeanPostProcessorEnabledTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/SpringBeanPostProcessorEnabledTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/SpringBeanPostProcessorEnabledTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/SpringBeanPostProcessorEnabledTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/SpringCamelContextShutdownAfterBeanTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/SpringCamelContextShutdownAfterBeanTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/SpringCamelContextShutdownAfterBeanTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/SpringCamelContextShutdownAfterBeanTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/SpringCamelContextShutdownBeforeBeanTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/SpringCamelContextShutdownBeforeBeanTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/SpringCamelContextShutdownBeforeBeanTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/SpringCamelContextShutdownBeforeBeanTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/SpringConsumerTemplateOutOfCamelContextTest-context.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/SpringConsumerTemplateOutOfCamelContextTest-context.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/SpringConsumerTemplateOutOfCamelContextTest-context.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/SpringConsumerTemplateOutOfCamelContextTest-context.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/SpringConsumerTemplateTest-context.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/SpringConsumerTemplateTest-context.xml
similarity index 100%
copy from components/camel-spring/src/test/resources/org/apache/camel/spring/SpringConsumerTemplateTest-context.xml
copy to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/SpringConsumerTemplateTest-context.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/SpringEndpointPropertyTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/SpringEndpointPropertyTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/SpringEndpointPropertyTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/SpringEndpointPropertyTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/SpringLogDebugBodyMaxCharsTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/SpringLogDebugBodyMaxCharsTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/SpringLogDebugBodyMaxCharsTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/SpringLogDebugBodyMaxCharsTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/SpringMDCTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/SpringMDCTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/SpringMDCTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/SpringMDCTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/SpringMDCWithBreadcrumbDisabledTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/SpringMDCWithBreadcrumbDisabledTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/SpringMDCWithBreadcrumbDisabledTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/SpringMDCWithBreadcrumbDisabledTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/SpringMDCWithBreadcrumbTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/SpringMDCWithBreadcrumbTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/SpringMDCWithBreadcrumbTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/SpringMDCWithBreadcrumbTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/aop/SpringAopClassLevelCamelBeanTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/aop/SpringAopClassLevelCamelBeanTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/aop/SpringAopClassLevelCamelBeanTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/aop/SpringAopClassLevelCamelBeanTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/bind/beanAsEndpoint.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/bind/beanAsEndpoint.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/bind/beanAsEndpoint.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/bind/beanAsEndpoint.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/bind/processorAsEndpoint.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/bind/processorAsEndpoint.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/bind/processorAsEndpoint.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/bind/processorAsEndpoint.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/camelContextAwareBean.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/camelContextAwareBean.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/camelContextAwareBean.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/camelContextAwareBean.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/camelContextRouteBuilderRef.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/camelContextRouteBuilderRef.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/camelContextRouteBuilderRef.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/camelContextRouteBuilderRef.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/camelGlobalOptions.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/camelGlobalOptions.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/camelGlobalOptions.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/camelGlobalOptions.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/camelLoadRoutesFromXMLTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/camelLoadRoutesFromXMLTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/camelLoadRoutesFromXMLTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/camelLoadRoutesFromXMLTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/cloud/ServiceCallConfigurationTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/cloud/ServiceCallConfigurationTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/cloud/ServiceCallConfigurationTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/cloud/ServiceCallConfigurationTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/cloud/ServiceCallFilterTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/cloud/ServiceCallFilterTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/cloud/ServiceCallFilterTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/cloud/ServiceCallFilterTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/CamelContextAutoStartupTestFalse.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/CamelContextAutoStartupTestFalse.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/CamelContextAutoStartupTestFalse.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/CamelContextAutoStartupTestFalse.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/CamelContextAutoStartupTestTrue.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/CamelContextAutoStartupTestTrue.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/CamelContextAutoStartupTestTrue.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/CamelContextAutoStartupTestTrue.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/ConsumerTemplateAlreadyExistTest-context.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/ConsumerTemplateAlreadyExistTest-context.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/ConsumerTemplateAlreadyExistTest-context.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/ConsumerTemplateAlreadyExistTest-context.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/ConsumerTemplateAutoRegisterTest-context.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/ConsumerTemplateAutoRegisterTest-context.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/ConsumerTemplateAutoRegisterTest-context.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/ConsumerTemplateAutoRegisterTest-context.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/ConsumerTemplateHasTwoTemplatesTest-context.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/ConsumerTemplateHasTwoTemplatesTest-context.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/ConsumerTemplateHasTwoTemplatesTest-context.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/ConsumerTemplateHasTwoTemplatesTest-context.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/ConsumerTemplateMaximumCacheSizeTest-context.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/ConsumerTemplateMaximumCacheSizeTest-context.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/ConsumerTemplateMaximumCacheSizeTest-context.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/ConsumerTemplateMaximumCacheSizeTest-context.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/CustomExecutorServiceManagerTest-context.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/CustomExecutorServiceManagerTest-context.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/CustomExecutorServiceManagerTest-context.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/CustomExecutorServiceManagerTest-context.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/CustomThreadPoolFactoryTest-context.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/CustomThreadPoolFactoryTest-context.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/CustomThreadPoolFactoryTest-context.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/CustomThreadPoolFactoryTest-context.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/DeadLetterChannelRedeliveryConfigTest-context.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/DeadLetterChannelRedeliveryConfigTest-context.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/DeadLetterChannelRedeliveryConfigTest-context.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/DeadLetterChannelRedeliveryConfigTest-context.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/DefaultErrorHandlerConfigTest-context.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/DefaultErrorHandlerConfigTest-context.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/DefaultErrorHandlerConfigTest-context.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/DefaultErrorHandlerConfigTest-context.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/DependencyInjectCamelTemplateTest-context.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/DependencyInjectCamelTemplateTest-context.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/DependencyInjectCamelTemplateTest-context.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/DependencyInjectCamelTemplateTest-context.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/DualCamelContextEndpointOutsideTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/DualCamelContextEndpointOutsideTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/DualCamelContextEndpointOutsideTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/DualCamelContextEndpointOutsideTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/EndpointUriSetFromSpringTest-context.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/EndpointUriSetFromSpringTest-context.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/EndpointUriSetFromSpringTest-context.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/EndpointUriSetFromSpringTest-context.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/ErrorHandlerCamelContextRefNotFoundTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/ErrorHandlerCamelContextRefNotFoundTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/ErrorHandlerCamelContextRefNotFoundTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/ErrorHandlerCamelContextRefNotFoundTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/ErrorHandlerConfigTest-context.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/ErrorHandlerConfigTest-context.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/ErrorHandlerConfigTest-context.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/ErrorHandlerConfigTest-context.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/ErrorHandlerRouteContextRefNotFoundTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/ErrorHandlerRouteContextRefNotFoundTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/ErrorHandlerRouteContextRefNotFoundTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/ErrorHandlerRouteContextRefNotFoundTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/FluentProducerTemplateAutoRegisterTest-context.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/FluentProducerTemplateAutoRegisterTest-context.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/FluentProducerTemplateAutoRegisterTest-context.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/FluentProducerTemplateAutoRegisterTest-context.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/NamespacePrefixTest-context.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/NamespacePrefixTest-context.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/NamespacePrefixTest-context.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/NamespacePrefixTest-context.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/OnExceptionNoExceptionConfiguredTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/OnExceptionNoExceptionConfiguredTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/OnExceptionNoExceptionConfiguredTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/OnExceptionNoExceptionConfiguredTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/OneRouteRefOnException.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/OneRouteRefOnException.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/OneRouteRefOnException.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/OneRouteRefOnException.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/OneRouteRefOnExceptionAndDLCErrorHandler.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/OneRouteRefOnExceptionAndDLCErrorHandler.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/OneRouteRefOnExceptionAndDLCErrorHandler.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/OneRouteRefOnExceptionAndDLCErrorHandler.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/OneRouteRefOnExceptionAndTwoDLCErrorHandler.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/OneRouteRefOnExceptionAndTwoDLCErrorHandler.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/OneRouteRefOnExceptionAndTwoDLCErrorHandler.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/OneRouteRefOnExceptionAndTwoDLCErrorHandler.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/OneRouteRefReverseOnException.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/OneRouteRefReverseOnException.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/OneRouteRefReverseOnException.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/OneRouteRefReverseOnException.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/OneRouteRefReverseOnExceptionAndDLCErrorHandler.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/OneRouteRefReverseOnExceptionAndDLCErrorHandler.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/OneRouteRefReverseOnExceptionAndDLCErrorHandler.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/OneRouteRefReverseOnExceptionAndDLCErrorHandler.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/PackageResolverTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/PackageResolverTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/PackageResolverTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/PackageResolverTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/ProducerTemplateAlreadyExistTest-context.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/ProducerTemplateAlreadyExistTest-context.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/ProducerTemplateAlreadyExistTest-context.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/ProducerTemplateAlreadyExistTest-context.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/ProducerTemplateAutoRegisterBeanIdExistsTest-context.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/ProducerTemplateAutoRegisterBeanIdExistsTest-context.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/ProducerTemplateAutoRegisterBeanIdExistsTest-context.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/ProducerTemplateAutoRegisterBeanIdExistsTest-context.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/ProducerTemplateAutoRegisterTest-context.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/ProducerTemplateAutoRegisterTest-context.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/ProducerTemplateAutoRegisterTest-context.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/ProducerTemplateAutoRegisterTest-context.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/ProducerTemplateAutoRegisterTwoCamelContextsTest-context.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/ProducerTemplateAutoRegisterTwoCamelContextsTest-context.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/ProducerTemplateAutoRegisterTwoCamelContextsTest-context.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/ProducerTemplateAutoRegisterTwoCamelContextsTest-context.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/ProducerTemplateHasTwoTemplatesTest-context.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/ProducerTemplateHasTwoTemplatesTest-context.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/ProducerTemplateHasTwoTemplatesTest-context.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/ProducerTemplateHasTwoTemplatesTest-context.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/ProducerTemplateMaximumCacheSizeTest-context.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/ProducerTemplateMaximumCacheSizeTest-context.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/ProducerTemplateMaximumCacheSizeTest-context.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/ProducerTemplateMaximumCacheSizeTest-context.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/ProducerTemplateMixedAutoRegisterTwoCamelContextsTest-context.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/ProducerTemplateMixedAutoRegisterTwoCamelContextsTest-context.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/ProducerTemplateMixedAutoRegisterTwoCamelContextsTest-context.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/ProducerTemplateMixedAutoRegisterTwoCamelContextsTest-context.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/RouteAutoStartupFalseTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/RouteAutoStartupFalseTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/RouteAutoStartupFalseTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/RouteAutoStartupFalseTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/RouteAutoStartupTrueTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/RouteAutoStartupTrueTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/RouteAutoStartupTrueTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/RouteAutoStartupTrueTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/RouteRefIncludeXmlFileTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/RouteRefIncludeXmlFileTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/RouteRefIncludeXmlFileTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/RouteRefIncludeXmlFileTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/RouteRefMultipleCamelContextRefsTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/RouteRefMultipleCamelContextRefsTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/RouteRefMultipleCamelContextRefsTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/RouteRefMultipleCamelContextRefsTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/RouteRefMultipleRefsTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/RouteRefMultipleRefsTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/RouteRefMultipleRefsTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/RouteRefMultipleRefsTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/RouteRefMultipleRoutesTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/RouteRefMultipleRoutesTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/RouteRefMultipleRoutesTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/RouteRefMultipleRoutesTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/RouteRefPropertyPlaceholderMultipleCamelContextRefsTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/RouteRefPropertyPlaceholderMultipleCamelContextRefsTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/RouteRefPropertyPlaceholderMultipleCamelContextRefsTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/RouteRefPropertyPlaceholderMultipleCamelContextRefsTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/RouteRefTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/RouteRefTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/RouteRefTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/RouteRefTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/SpringCamelContextCustomDefaultThreadPoolProfileTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/SpringCamelContextCustomDefaultThreadPoolProfileTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/SpringCamelContextCustomDefaultThreadPoolProfileTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/SpringCamelContextCustomDefaultThreadPoolProfileTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/SpringCamelContextCustomThreadPoolProfileTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/SpringCamelContextCustomThreadPoolProfileTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/SpringCamelContextCustomThreadPoolProfileTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/SpringCamelContextCustomThreadPoolProfileTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/SpringCamelContextDependsOnTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/SpringCamelContextDependsOnTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/SpringCamelContextDependsOnTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/SpringCamelContextDependsOnTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/SpringCamelContextNoDependsOnTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/SpringCamelContextNoDependsOnTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/SpringCamelContextNoDependsOnTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/SpringCamelContextNoDependsOnTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/SpringCamelContextSimpleCustomDefaultThreadPoolProfileTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/SpringCamelContextSimpleCustomDefaultThreadPoolProfileTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/SpringCamelContextSimpleCustomDefaultThreadPoolProfileTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/SpringCamelContextSimpleCustomDefaultThreadPoolProfileTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/SpringCamelContextThreadPoolProfilesTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/SpringCamelContextThreadPoolProfilesTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/SpringCamelContextThreadPoolProfilesTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/SpringCamelContextThreadPoolProfilesTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/SpringCamelContextThreadPoolProfilesWithPlaceholderTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/SpringCamelContextThreadPoolProfilesWithPlaceholderTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/SpringCamelContextThreadPoolProfilesWithPlaceholderTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/SpringCamelContextThreadPoolProfilesWithPlaceholderTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/SpringErrorHandlerConfigFallbackTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/SpringErrorHandlerConfigFallbackTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/SpringErrorHandlerConfigFallbackTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/SpringErrorHandlerConfigFallbackTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/SpringErrorHandlerConfigTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/SpringErrorHandlerConfigTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/SpringErrorHandlerConfigTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/SpringErrorHandlerConfigTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/SpringProduceInjectedPrototypeBeanTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/SpringProduceInjectedPrototypeBeanTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/SpringProduceInjectedPrototypeBeanTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/SpringProduceInjectedPrototypeBeanTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/SpringProduceInjectedSingletonBeanTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/SpringProduceInjectedSingletonBeanTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/SpringProduceInjectedSingletonBeanTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/SpringProduceInjectedSingletonBeanTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/SpringRouteNoFromTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/SpringRouteNoFromTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/SpringRouteNoFromTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/SpringRouteNoFromTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/SpringRouteNoOutputTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/SpringRouteNoOutputTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/SpringRouteNoOutputTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/SpringRouteNoOutputTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/TwoRouteRefOnException.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/TwoRouteRefOnException.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/TwoRouteRefOnException.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/TwoRouteRefOnException.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/TwoRouteRefOnExceptionAndDLCErrorHandler.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/TwoRouteRefOnExceptionAndDLCErrorHandler.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/TwoRouteRefOnExceptionAndDLCErrorHandler.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/TwoRouteRefOnExceptionAndDLCErrorHandler.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/TwoRouteRefReverseOnException.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/TwoRouteRefReverseOnException.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/TwoRouteRefReverseOnException.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/TwoRouteRefReverseOnException.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/TwoRouteRefReverseOnExceptionAndDLCErrorHandler.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/TwoRouteRefReverseOnExceptionAndDLCErrorHandler.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/TwoRouteRefReverseOnExceptionAndDLCErrorHandler.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/TwoRouteRefReverseOnExceptionAndDLCErrorHandler.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/errorHandler.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/errorHandler.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/errorHandler.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/errorHandler.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/myCoolRoutes.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/myCoolRoutes.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/myCoolRoutes.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/myCoolRoutes.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/pool.properties b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/pool.properties
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/pool.properties
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/pool.properties
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/route.properties b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/route.properties
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/route.properties
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/route.properties
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/routeBuilderPackage.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/routeBuilderPackage.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/routeBuilderPackage.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/routeBuilderPackage.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/routeBuilderRef.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/routeBuilderRef.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/routeBuilderRef.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/routeBuilderRef.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/routeBuilderRef2.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/routeBuilderRef2.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/routeBuilderRef2.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/routeBuilderRef2.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/scan/componentScan.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/scan/componentScan.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/scan/componentScan.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/scan/componentScan.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/scan/componentScanWithPackages.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/scan/componentScanWithPackages.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/scan/componentScanWithPackages.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/scan/componentScanWithPackages.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/scan/explicitlyDefinedRouteExclusion.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/scan/explicitlyDefinedRouteExclusion.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/config/scan/explicitlyDefinedRouteExclusion.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/scan/explicitlyDefinedRouteExclusion.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/context-with-endpoint.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/context-with-endpoint.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/context-with-endpoint.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/context-with-endpoint.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/contextscan/ContextScanOnExceptionAndDLCErrorHandler.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/contextscan/ContextScanOnExceptionAndDLCErrorHandler.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/contextscan/ContextScanOnExceptionAndDLCErrorHandler.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/contextscan/ContextScanOnExceptionAndDLCErrorHandler.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/contextscan/ContextScanOnExceptionAndDLCErrorHandlerReverse.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/contextscan/ContextScanOnExceptionAndDLCErrorHandlerReverse.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/contextscan/ContextScanOnExceptionAndDLCErrorHandlerReverse.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/contextscan/ContextScanOnExceptionAndDLCErrorHandlerReverse.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/converter/testresource.txt b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/converter/testresource.txt
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/converter/testresource.txt
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/converter/testresource.txt
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/debug/applicationContext.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/debug/applicationContext.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/debug/applicationContext.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/debug/applicationContext.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/defaultJmxConfig.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/defaultJmxConfig.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/defaultJmxConfig.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/defaultJmxConfig.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/disableJmxConfig.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/disableJmxConfig.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/disableJmxConfig.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/disableJmxConfig.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/disableJmxTheOldWayConfig.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/disableJmxTheOldWayConfig.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/disableJmxTheOldWayConfig.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/disableJmxTheOldWayConfig.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/endpointReference.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/endpointReference.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/endpointReference.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/endpointReference.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/example/contentBasedRoute.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/example/contentBasedRoute.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/example/contentBasedRoute.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/example/contentBasedRoute.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/example/expressionTrim.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/example/expressionTrim.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/example/expressionTrim.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/example/expressionTrim.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/example/fooEventRoute.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/example/fooEventRoute.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/example/fooEventRoute.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/example/fooEventRoute.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/example/pojoConsumer.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/example/pojoConsumer.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/example/pojoConsumer.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/example/pojoConsumer.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/example/pojoSender.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/example/pojoSender.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/example/pojoSender.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/example/pojoSender.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/example/pojoVmConsumer.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/example/pojoVmConsumer.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/example/pojoVmConsumer.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/example/pojoVmConsumer.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/example/simpleRoute.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/example/simpleRoute.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/example/simpleRoute.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/example/simpleRoute.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/example/xpathFilter.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/example/xpathFilter.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/example/xpathFilter.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/example/xpathFilter.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/examples.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/examples.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/examples.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/examples.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/file/SpringFileAntPathMatcherFileFilterTest-context.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/file/SpringFileAntPathMatcherFileFilterTest-context.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/file/SpringFileAntPathMatcherFileFilterTest-context.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/file/SpringFileAntPathMatcherFileFilterTest-context.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/file/SpringFileConsumerPreMoveIssueTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/file/SpringFileConsumerPreMoveIssueTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/file/SpringFileConsumerPreMoveIssueTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/file/SpringFileConsumerPreMoveIssueTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/file/SpringFileConsumerPreMoveTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/file/SpringFileConsumerPreMoveTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/file/SpringFileConsumerPreMoveTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/file/SpringFileConsumerPreMoveTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/file/SpringFileLanguageCBRTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/file/SpringFileLanguageCBRTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/file/SpringFileLanguageCBRTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/file/SpringFileLanguageCBRTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/file/SpringFileRouteTest-context.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/file/SpringFileRouteTest-context.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/file/SpringFileRouteTest-context.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/file/SpringFileRouteTest-context.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/file/SpringSimpleFileNameWithQuoteTest-context.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/file/SpringSimpleFileNameWithQuoteTest-context.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/file/SpringSimpleFileNameWithQuoteTest-context.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/file/SpringSimpleFileNameWithQuoteTest-context.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/health/HealthCheckRegistryTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/health/HealthCheckRegistryTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/health/HealthCheckRegistryTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/health/HealthCheckRegistryTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/impl/SpringDefaultCamelContextAllowUseOriginalMessageFalseTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/impl/SpringDefaultCamelContextAllowUseOriginalMessageFalseTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/impl/SpringDefaultCamelContextAllowUseOriginalMessageFalseTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/impl/SpringDefaultCamelContextAllowUseOriginalMessageFalseTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/impl/SpringDefaultCamelContextAllowUseOriginalMessageTrueTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/impl/SpringDefaultCamelContextAllowUseOriginalMessageTrueTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/impl/SpringDefaultCamelContextAllowUseOriginalMessageTrueTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/impl/SpringDefaultCamelContextAllowUseOriginalMessageTrueTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/impl/SpringProduceConsumeImplicitPropertyTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/impl/SpringProduceConsumeImplicitPropertyTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/impl/SpringProduceConsumeImplicitPropertyTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/impl/SpringProduceConsumeImplicitPropertyTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/impl/SpringRefDataFormatTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/impl/SpringRefDataFormatTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/impl/SpringRefDataFormatTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/impl/SpringRefDataFormatTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/impl/SpringRoutePolicyFactoryTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/impl/SpringRoutePolicyFactoryTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/impl/SpringRoutePolicyFactoryTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/impl/SpringRoutePolicyFactoryTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/impl/SpringRoutePolicyRefCallbackTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/impl/SpringRoutePolicyRefCallbackTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/impl/SpringRoutePolicyRefCallbackTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/impl/SpringRoutePolicyRefCallbackTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/impl/SpringSupervisingRouteControllerTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/impl/SpringSupervisingRouteControllerTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/impl/SpringSupervisingRouteControllerTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/impl/SpringSupervisingRouteControllerTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/impl/SpringTypeConverterRegistryStatisticsEnabledTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/impl/SpringTypeConverterRegistryStatisticsEnabledTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/impl/SpringTypeConverterRegistryStatisticsEnabledTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/impl/SpringTypeConverterRegistryStatisticsEnabledTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/impl/converter/SpringTypeConvertersTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/impl/converter/SpringTypeConvertersTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/impl/converter/SpringTypeConvertersTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/impl/converter/SpringTypeConvertersTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/impl/transformer/SpringTransformerRouteTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/impl/transformer/SpringTransformerRouteTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/impl/transformer/SpringTransformerRouteTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/impl/transformer/SpringTransformerRouteTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/impl/validator/SpringValidatorRouteTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/impl/validator/SpringValidatorRouteTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/impl/validator/SpringValidatorRouteTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/impl/validator/SpringValidatorRouteTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/injectedBean.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/injectedBean.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/injectedBean.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/injectedBean.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/ContainerWideInterceptorTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/ContainerWideInterceptorTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/ContainerWideInterceptorTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/ContainerWideInterceptorTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/InterceptorStrategyOrderedTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/InterceptorStrategyOrderedTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/InterceptorStrategyOrderedTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/InterceptorStrategyOrderedTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/MixedTransactionPropagationTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/MixedTransactionPropagationTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/MixedTransactionPropagationTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/MixedTransactionPropagationTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/SpringAdviceWithTwoRoutesContextScopedOnExceptionTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/SpringAdviceWithTwoRoutesContextScopedOnExceptionTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/SpringAdviceWithTwoRoutesContextScopedOnExceptionTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/SpringAdviceWithTwoRoutesContextScopedOnExceptionTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/SpringAdviceWithTwoRoutesOnExceptionTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/SpringAdviceWithTwoRoutesOnExceptionTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/SpringAdviceWithTwoRoutesOnExceptionTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/SpringAdviceWithTwoRoutesOnExceptionTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/SpringAdviceWithTwoRoutesTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/SpringAdviceWithTwoRoutesTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/SpringAdviceWithTwoRoutesTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/SpringAdviceWithTwoRoutesTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/delayerInterceptorTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/delayerInterceptorTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/delayerInterceptorTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/delayerInterceptorTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/mixedPropagationTransactedTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/mixedPropagationTransactedTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/mixedPropagationTransactedTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/mixedPropagationTransactedTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/mixedStreamCachingInterceptorTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/mixedStreamCachingInterceptorTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/mixedStreamCachingInterceptorTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/mixedStreamCachingInterceptorTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/noStreamCachingInterceptorTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/noStreamCachingInterceptorTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/noStreamCachingInterceptorTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/noStreamCachingInterceptorTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/springTransactionalClientDataSource.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/springTransactionalClientDataSource.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/springTransactionalClientDataSource.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/springTransactionalClientDataSource.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/springTransactionalClientDataSourceMinimalConfiguration.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/springTransactionalClientDataSourceMinimalConfiguration.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/springTransactionalClientDataSourceMinimalConfiguration.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/springTransactionalClientDataSourceMinimalConfiguration.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/springTransactionalClientDataSourceUsingTransacted.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/springTransactionalClientDataSourceUsingTransacted.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/springTransactionalClientDataSourceUsingTransacted.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/springTransactionalClientDataSourceUsingTransacted.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/springTransactionalClientDataWithOnExceptionAndRollbackUsingTransacted.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/springTransactionalClientDataWithOnExceptionAndRollbackUsingTransacted.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/springTransactionalClientDataWithOnExceptionAndRollbackUsingTransacted.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/springTransactionalClientDataWithOnExceptionAndRollbackUsingTransacted.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/springTransactionalClientDataWithRouteScopedOnExceptionAndRollbackUsingTransacted.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/springTransactionalClientDataWithRouteScopedOnExceptionAndRollbackUsingTransacted.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/springTransactionalClientDataWithRouteScopedOnExceptionAndRollbackUsingTransacted.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/springTransactionalClientDataWithRouteScopedOnExceptionAndRollbackUsingTransacted.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/streamCachingOnRoute.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/streamCachingOnRoute.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/streamCachingOnRoute.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/streamCachingOnRoute.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/transactionalClientDataSource.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/transactionalClientDataSource.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/transactionalClientDataSource.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/transactionalClientDataSource.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/transactionalClientDataSourceWithSpringRouteBuilder.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/transactionalClientDataSourceWithSpringRouteBuilder.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/transactionalClientDataSourceWithSpringRouteBuilder.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/transactionalClientDataSourceWithSpringRouteBuilder.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/transactionalClientWithAnnotatedBeanTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/transactionalClientWithAnnotatedBeanTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/transactionalClientWithAnnotatedBeanTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/transactionalClientWithAnnotatedBeanTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/AdviceWithTransactionIssueTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/AdviceWithTransactionIssueTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/issues/AdviceWithTransactionIssueTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/AdviceWithTransactionIssueTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/CamelContextModelErrorHandlerIssueTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/CamelContextModelErrorHandlerIssueTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/issues/CamelContextModelErrorHandlerIssueTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/CamelContextModelErrorHandlerIssueTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/CamelRouteRefInjectionIssueTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/CamelRouteRefInjectionIssueTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/issues/CamelRouteRefInjectionIssueTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/CamelRouteRefInjectionIssueTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionErrorHandlerRefIssueTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionErrorHandlerRefIssueTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionErrorHandlerRefIssueTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionErrorHandlerRefIssueTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledErrorHandlerRefIssueTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledErrorHandlerRefIssueTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledErrorHandlerRefIssueTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledErrorHandlerRefIssueTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionRouteScopedErrorHandlerRefIssueTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionRouteScopedErrorHandlerRefIssueTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionRouteScopedErrorHandlerRefIssueTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionRouteScopedErrorHandlerRefIssueTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/ContextScopedSpringOnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/CustomIdIssueTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/CustomIdIssueTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/issues/CustomIdIssueTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/CustomIdIssueTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/EndpointIdIssueTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/EndpointIdIssueTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/issues/EndpointIdIssueTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/EndpointIdIssueTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/FileWireTapWithXMLPayloadIssueTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/FileWireTapWithXMLPayloadIssueTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/issues/FileWireTapWithXMLPayloadIssueTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/FileWireTapWithXMLPayloadIssueTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/ProduceSplitMethodCallIssueTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/ProduceSplitMethodCallIssueTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/issues/ProduceSplitMethodCallIssueTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/ProduceSplitMethodCallIssueTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/RedeliveryErrorHandlerTwoXmlFilesIssueTest-1.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/RedeliveryErrorHandlerTwoXmlFilesIssueTest-1.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/issues/RedeliveryErrorHandlerTwoXmlFilesIssueTest-1.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/RedeliveryErrorHandlerTwoXmlFilesIssueTest-1.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/RedeliveryErrorHandlerTwoXmlFilesIssueTest-2.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/RedeliveryErrorHandlerTwoXmlFilesIssueTest-2.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/issues/RedeliveryErrorHandlerTwoXmlFilesIssueTest-2.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/RedeliveryErrorHandlerTwoXmlFilesIssueTest-2.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/RouteIdAutoAssignClashIssue.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/RouteIdAutoAssignClashIssue.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/issues/RouteIdAutoAssignClashIssue.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/RouteIdAutoAssignClashIssue.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringAdviceWithContextScopedErrorHandlerIssueTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringAdviceWithContextScopedErrorHandlerIssueTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringAdviceWithContextScopedErrorHandlerIssueTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringAdviceWithContextScopedErrorHandlerIssueTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringAdviceWithRouteScopedErrorHandlerIssueTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringAdviceWithRouteScopedErrorHandlerIssueTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringAdviceWithRouteScopedErrorHandlerIssueTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringAdviceWithRouteScopedErrorHandlerIssueTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringAdviceWithTwoRoutesOnExceptionIssueTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringAdviceWithTwoRoutesOnExceptionIssueTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringAdviceWithTwoRoutesOnExceptionIssueTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringAdviceWithTwoRoutesOnExceptionIssueTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringCatchNestedFailTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringCatchNestedFailTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringCatchNestedFailTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringCatchNestedFailTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringCharlesSplitAndTryCatchRollbackIssueTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringCharlesSplitAndTryCatchRollbackIssueTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringCharlesSplitAndTryCatchRollbackIssueTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringCharlesSplitAndTryCatchRollbackIssueTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringExceptionCamel4022Test.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringExceptionCamel4022Test.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringExceptionCamel4022Test.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringExceptionCamel4022Test.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringFinallyNestedFailTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringFinallyNestedFailTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringFinallyNestedFailTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringFinallyNestedFailTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringInitializationIssueTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringInitializationIssueTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringInitializationIssueTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringInitializationIssueTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringInstanceFactoryBeanCamelContextScanIssueTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringInstanceFactoryBeanCamelContextScanIssueTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringInstanceFactoryBeanCamelContextScanIssueTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringInstanceFactoryBeanCamelContextScanIssueTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringInstanceFactoryBeanIssueTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringInstanceFactoryBeanIssueTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringInstanceFactoryBeanIssueTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringInstanceFactoryBeanIssueTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringMultipleErrorHandlerOnExceptionIssueTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringMultipleErrorHandlerOnExceptionIssueTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringMultipleErrorHandlerOnExceptionIssueTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringMultipleErrorHandlerOnExceptionIssueTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringOnExceptionErrorHandlerRefIssueTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringOnExceptionErrorHandlerRefIssueTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringOnExceptionErrorHandlerRefIssueTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringOnExceptionErrorHandlerRefIssueTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringOnExceptionErrorHandlerRefIssueTwoRoutesTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringOnExceptionErrorHandlerRefIssueTwoRoutesTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringOnExceptionErrorHandlerRefIssueTwoRoutesTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringOnExceptionErrorHandlerRefIssueTwoRoutesTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringOnExceptionNotHandledErrorHandlerRefIssueTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringOnExceptionNotHandledErrorHandlerRefIssueTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringOnExceptionNotHandledErrorHandlerRefIssueTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringOnExceptionNotHandledErrorHandlerRefIssueTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringOnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringOnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringOnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringOnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringOnExceptionRouteScopedErrorHandlerRefIssueTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringOnExceptionRouteScopedErrorHandlerRefIssueTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringOnExceptionRouteScopedErrorHandlerRefIssueTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringOnExceptionRouteScopedErrorHandlerRefIssueTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringOnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringOnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringOnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringOnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringPackageTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringPackageTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringPackageTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringPackageTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringPropertiesAvailableEverywhereTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringPropertiesAvailableEverywhereTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringPropertiesAvailableEverywhereTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringPropertiesAvailableEverywhereTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringPropertyPlaceholderFileEndpointIssueTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringPropertyPlaceholderFileEndpointIssueTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringPropertyPlaceholderFileEndpointIssueTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringPropertyPlaceholderFileEndpointIssueTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringPropertyPlaceholderIssueTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringPropertyPlaceholderIssueTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringPropertyPlaceholderIssueTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringPropertyPlaceholderIssueTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringRenameFileOnCommitIssueTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringRenameFileOnCommitIssueTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringRenameFileOnCommitIssueTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringRenameFileOnCommitIssueTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringRouteContextOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringRouteContextOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringRouteContextOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringRouteContextOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringSingletonScopedBeanIssueTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringSingletonScopedBeanIssueTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringSingletonScopedBeanIssueTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringSingletonScopedBeanIssueTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringSplitterDetermineErrorHandlerIssueTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringSplitterDetermineErrorHandlerIssueTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringSplitterDetermineErrorHandlerIssueTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringSplitterDetermineErrorHandlerIssueTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringTransactionErrorHandlerAndContextScopedOnExceptionIssueTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringTransactionErrorHandlerAndContextScopedOnExceptionIssueTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringTransactionErrorHandlerAndContextScopedOnExceptionIssueTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringTransactionErrorHandlerAndContextScopedOnExceptionIssueTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringTryCatchFinallyAndErrorHandlerTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringTryCatchFinallyAndErrorHandlerTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringTryCatchFinallyAndErrorHandlerTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringTryCatchFinallyAndErrorHandlerTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringTryCatchWithSplitIssueTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringTryCatchWithSplitIssueTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringTryCatchWithSplitIssueTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringTryCatchWithSplitIssueTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringTryNestedFailTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringTryNestedFailTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringTryNestedFailTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringTryNestedFailTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringTwoCamelContextDirectEndpointTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringTwoCamelContextDirectEndpointTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringTwoCamelContextDirectEndpointTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringTwoCamelContextDirectEndpointTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/contextscan/SpringRouteIsComponentAnnotatedTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/contextscan/SpringRouteIsComponentAnnotatedTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/issues/contextscan/SpringRouteIsComponentAnnotatedTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/contextscan/SpringRouteIsComponentAnnotatedTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/contextscan2/SpringRouteIsComponentAnnotated2Test.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/contextscan2/SpringRouteIsComponentAnnotated2Test.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/issues/contextscan2/SpringRouteIsComponentAnnotated2Test.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/contextscan2/SpringRouteIsComponentAnnotated2Test.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/myprop.properties b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/myprop.properties
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/issues/myprop.properties
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/myprop.properties
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/packagescan/camelContext.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/packagescan/camelContext.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/issues/packagescan/camelContext.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/packagescan/camelContext.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/validate.xsd b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/validate.xsd
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/issues/validate.xsd
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/validate.xsd
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/jmx.properties b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/jmx.properties
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/jmx.properties
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/jmx.properties
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/jmxConfigUsingProperties.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/jmxConfigUsingProperties.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/jmxConfigUsingProperties.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/jmxConfigUsingProperties.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/lifecycleStrategyInjection.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/lifecycleStrategyInjection.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/lifecycleStrategyInjection.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/lifecycleStrategyInjection.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/management/ManagedEndpointInjectRefEndpointTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/ManagedEndpointInjectRefEndpointTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/management/ManagedEndpointInjectRefEndpointTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/ManagedEndpointInjectRefEndpointTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/management/ManagedRefEndpointTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/ManagedRefEndpointTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/management/ManagedRefEndpointTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/ManagedRefEndpointTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/management/ManagedStatisticsLevelRoutesOnlyTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/ManagedStatisticsLevelRoutesOnlyTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/management/ManagedStatisticsLevelRoutesOnlyTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/ManagedStatisticsLevelRoutesOnlyTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringCamelContextStartingFailedEventTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/SpringCamelContextStartingFailedEventTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringCamelContextStartingFailedEventTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/SpringCamelContextStartingFailedEventTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringDualLoggingEventNotifierTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/SpringDualLoggingEventNotifierTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringDualLoggingEventNotifierTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/SpringDualLoggingEventNotifierTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringJmxDumpCBRRouteAsXmlTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/SpringJmxDumpCBRRouteAsXmlTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringJmxDumpCBRRouteAsXmlTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/SpringJmxDumpCBRRouteAsXmlTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringJmxDumpRouteAsXmlIncludeHostNameTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/SpringJmxDumpRouteAsXmlIncludeHostNameTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringJmxDumpRouteAsXmlIncludeHostNameTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/SpringJmxDumpRouteAsXmlIncludeHostNameTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringJmxDumpRouteAsXmlTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/SpringJmxDumpRouteAsXmlTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringJmxDumpRouteAsXmlTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/SpringJmxDumpRouteAsXmlTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanRefTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanRefTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanRefTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanRefTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanRefTwoTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanRefTwoTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanRefTwoTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanRefTwoTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringJmxRecipientListTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/SpringJmxRecipientListTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringJmxRecipientListTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/SpringJmxRecipientListTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringJmxRecipientListTestRegisterAlways.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/SpringJmxRecipientListTestRegisterAlways.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringJmxRecipientListTestRegisterAlways.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/SpringJmxRecipientListTestRegisterAlways.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringLoggingEventNotifierTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/SpringLoggingEventNotifierTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringLoggingEventNotifierTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/SpringLoggingEventNotifierTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedCamelContextTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/SpringManagedCamelContextTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedCamelContextTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/SpringManagedCamelContextTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedCustomProcessorTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/SpringManagedCustomProcessorTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedCustomProcessorTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/SpringManagedCustomProcessorTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedNamePatternFixedTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/SpringManagedNamePatternFixedTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedNamePatternFixedTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/SpringManagedNamePatternFixedTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedNamePatternTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/SpringManagedNamePatternTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedNamePatternTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/SpringManagedNamePatternTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedResourceTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/SpringManagedResourceTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedResourceTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/SpringManagedResourceTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedRouteRemoveContextScopedErrorHandlerTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/SpringManagedRouteRemoveContextScopedErrorHandlerTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedRouteRemoveContextScopedErrorHandlerTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/SpringManagedRouteRemoveContextScopedErrorHandlerTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedRouteRemoveRouteAndContextScopedErrorHandlerTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/SpringManagedRouteRemoveRouteAndContextScopedErrorHandlerTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedRouteRemoveRouteAndContextScopedErrorHandlerTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/SpringManagedRouteRemoveRouteAndContextScopedErrorHandlerTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedRouteRemoveRouteScopedErrorHandlerTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/SpringManagedRouteRemoveRouteScopedErrorHandlerTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedRouteRemoveRouteScopedErrorHandlerTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/SpringManagedRouteRemoveRouteScopedErrorHandlerTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedSanitizeTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/SpringManagedSanitizeTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedSanitizeTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/SpringManagedSanitizeTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedSedaEndpointTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/SpringManagedSedaEndpointTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedSedaEndpointTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/SpringManagedSedaEndpointTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedStatisticsLevelOffTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/SpringManagedStatisticsLevelOffTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedStatisticsLevelOffTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/SpringManagedStatisticsLevelOffTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedTransactedProcessorTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/SpringManagedTransactedProcessorTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedTransactedProcessorTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/SpringManagedTransactedProcessorTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringPublishEventNotifierTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/SpringPublishEventNotifierTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringPublishEventNotifierTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/SpringPublishEventNotifierTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/management/dualCamelContextManagedAutoAssignedNameTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/dualCamelContextManagedAutoAssignedNameTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/management/dualCamelContextManagedAutoAssignedNameTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/dualCamelContextManagedAutoAssignedNameTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/management/dualCamelContextManagedTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/dualCamelContextManagedTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/management/dualCamelContextManagedTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/dualCamelContextManagedTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/management/jmxInstrumentationWithConnector.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/jmxInstrumentationWithConnector.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/management/jmxInstrumentationWithConnector.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/jmxInstrumentationWithConnector.xml
diff --git a/docs/components/modules/ROOT/examples/components/camel-spring/src/test/resources/org/apache/camel/spring/mock/InterceptSendToMockEndpointStrategyTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/mock/InterceptSendToMockEndpointStrategyTest.xml
similarity index 100%
rename from docs/components/modules/ROOT/examples/components/camel-spring/src/test/resources/org/apache/camel/spring/mock/InterceptSendToMockEndpointStrategyTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/mock/InterceptSendToMockEndpointStrategyTest.xml
diff --git a/docs/components/modules/ROOT/examples/components/camel-spring/src/test/resources/org/apache/camel/spring/mock/camel-route.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/mock/camel-route.xml
similarity index 100%
rename from docs/components/modules/ROOT/examples/components/camel-spring/src/test/resources/org/apache/camel/spring/mock/camel-route.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/mock/camel-route.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/mock/spring.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/mock/spring.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/mock/spring.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/mock/spring.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/multipleLifecycleStrategyInjection.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/multipleLifecycleStrategyInjection.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/multipleLifecycleStrategyInjection.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/multipleLifecycleStrategyInjection.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/myRoutes.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/myRoutes.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/myRoutes.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/myRoutes.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/myUpdatedRoutes.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/myUpdatedRoutes.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/myUpdatedRoutes.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/myUpdatedRoutes.xml
diff --git a/docs/user-manual/modules/ROOT/examples/components/camel-spring/src/test/resources/org/apache/camel/spring/patterns/FilterTest-context.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/patterns/FilterTest-context.xml
similarity index 100%
rename from docs/user-manual/modules/ROOT/examples/components/camel-spring/src/test/resources/org/apache/camel/spring/patterns/FilterTest-context.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/patterns/FilterTest-context.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/placeholder/SimpleLanguageWithSpringPropertyPlaceholderRouteTest-context.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/placeholder/SimpleLanguageWithSpringPropertyPlaceholderRouteTest-context.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/placeholder/SimpleLanguageWithSpringPropertyPlaceholderRouteTest-context.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/placeholder/SimpleLanguageWithSpringPropertyPlaceholderRouteTest-context.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/placeholder/bundle-context.properties b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/placeholder/bundle-context.properties
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/placeholder/bundle-context.properties
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/placeholder/bundle-context.properties
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/pollingconsumer/FileConsumerSpringSchedulerTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/pollingconsumer/FileConsumerSpringSchedulerTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/pollingconsumer/FileConsumerSpringSchedulerTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/pollingconsumer/FileConsumerSpringSchedulerTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/postprocessor/camelCustomPostProcessorOnRouteBuilderTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/postprocessor/camelCustomPostProcessorOnRouteBuilderTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/postprocessor/camelCustomPostProcessorOnRouteBuilderTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/postprocessor/camelCustomPostProcessorOnRouteBuilderTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/postprocessor/plainSpringCustomPostProcessorOnRouteBuilderTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/postprocessor/plainSpringCustomPostProcessorOnRouteBuilderTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/postprocessor/plainSpringCustomPostProcessorOnRouteBuilderTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/postprocessor/plainSpringCustomPostProcessorOnRouteBuilderTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/BatchResequencerAllowDuplicatesTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/BatchResequencerAllowDuplicatesTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/BatchResequencerAllowDuplicatesTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/BatchResequencerAllowDuplicatesTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/BatchResequencerJMSPriorityTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/BatchResequencerJMSPriorityTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/BatchResequencerJMSPriorityTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/BatchResequencerJMSPriorityTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/CBRHeaderPredicateTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/CBRHeaderPredicateTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/CBRHeaderPredicateTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/CBRHeaderPredicateTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ClaimCheckEipGetAndRemoveSetTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/ClaimCheckEipGetAndRemoveSetTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ClaimCheckEipGetAndRemoveSetTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/ClaimCheckEipGetAndRemoveSetTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ClaimCheckEipGetSetTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/ClaimCheckEipGetSetTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ClaimCheckEipGetSetTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/ClaimCheckEipGetSetTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ClaimCheckEipPushPopBodyTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/ClaimCheckEipPushPopBodyTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ClaimCheckEipPushPopBodyTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/ClaimCheckEipPushPopBodyTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ClaimCheckEipPushPopHeadersPatternTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/ClaimCheckEipPushPopHeadersPatternTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ClaimCheckEipPushPopHeadersPatternTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/ClaimCheckEipPushPopHeadersPatternTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ClaimCheckEipPushPopHeadersTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/ClaimCheckEipPushPopHeadersTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ClaimCheckEipPushPopHeadersTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/ClaimCheckEipPushPopHeadersTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ClaimCheckEipPushPopRemoveHeaderTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/ClaimCheckEipPushPopRemoveHeaderTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ClaimCheckEipPushPopRemoveHeaderTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/ClaimCheckEipPushPopRemoveHeaderTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ClaimCheckEipPushPopTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/ClaimCheckEipPushPopTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ClaimCheckEipPushPopTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/ClaimCheckEipPushPopTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/CustomProcessorFactoryTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/CustomProcessorFactoryTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/CustomProcessorFactoryTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/CustomProcessorFactoryTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/DeadLetterChannelLogExhaustedMessageHistoryTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/DeadLetterChannelLogExhaustedMessageHistoryTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/DeadLetterChannelLogExhaustedMessageHistoryTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/DeadLetterChannelLogExhaustedMessageHistoryTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/DeadLetterChannelNewExceptionTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/DeadLetterChannelNewExceptionTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/DeadLetterChannelNewExceptionTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/DeadLetterChannelNewExceptionTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/DeadLetterChannelNotHandleNewExceptionTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/DeadLetterChannelNotHandleNewExceptionTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/DeadLetterChannelNotHandleNewExceptionTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/DeadLetterChannelNotHandleNewExceptionTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/DeadLetterChannelOnPrepareTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/DeadLetterChannelOnPrepareTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/DeadLetterChannelOnPrepareTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/DeadLetterChannelOnPrepareTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/DefaultErrorHandlerExchangeFormatterRefTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/DefaultErrorHandlerExchangeFormatterRefTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/DefaultErrorHandlerExchangeFormatterRefTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/DefaultErrorHandlerExchangeFormatterRefTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/DefaultErrorHandlerLogExhaustedMessageHistoryTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/DefaultErrorHandlerLogExhaustedMessageHistoryTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/DefaultErrorHandlerLogExhaustedMessageHistoryTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/DefaultErrorHandlerLogExhaustedMessageHistoryTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/DefaultErrorHandlerOnPrepareTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/DefaultErrorHandlerOnPrepareTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/DefaultErrorHandlerOnPrepareTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/DefaultErrorHandlerOnPrepareTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/DefaultErrorHandlerRetryWhileTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/DefaultErrorHandlerRetryWhileTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/DefaultErrorHandlerRetryWhileTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/DefaultErrorHandlerRetryWhileTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/DoubleLoadBalancerMisconfigurationTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/DoubleLoadBalancerMisconfigurationTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/DoubleLoadBalancerMisconfigurationTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/DoubleLoadBalancerMisconfigurationTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/EventNotifierExchangeSentExampleTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/EventNotifierExchangeSentExampleTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/EventNotifierExchangeSentExampleTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/EventNotifierExchangeSentExampleTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/FailOverLoadBalanceAutoStartupFalseTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/FailOverLoadBalanceAutoStartupFalseTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/FailOverLoadBalanceAutoStartupFalseTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/FailOverLoadBalanceAutoStartupFalseTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/FailoverMaximumFailoverAttemptsTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/FailoverMaximumFailoverAttemptsTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/FailoverMaximumFailoverAttemptsTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/FailoverMaximumFailoverAttemptsTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/FailoverRoundRobinStickyTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/FailoverRoundRobinStickyTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/FailoverRoundRobinStickyTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/FailoverRoundRobinStickyTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/FailoverRoundRobinTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/FailoverRoundRobinTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/FailoverRoundRobinTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/FailoverRoundRobinTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/InheritErrorHandlerDefaultTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/InheritErrorHandlerDefaultTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/InheritErrorHandlerDefaultTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/InheritErrorHandlerDefaultTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/InheritErrorHandlerFalseTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/InheritErrorHandlerFalseTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/InheritErrorHandlerFalseTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/InheritErrorHandlerFalseTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/InheritErrorHandlerTrueTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/InheritErrorHandlerTrueTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/InheritErrorHandlerTrueTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/InheritErrorHandlerTrueTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/MessageHistoryDumpRoutingTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/MessageHistoryDumpRoutingTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/MessageHistoryDumpRoutingTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/MessageHistoryDumpRoutingTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/MulticastOnPrepareTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/MulticastOnPrepareTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/MulticastOnPrepareTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/MulticastOnPrepareTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/OnExceptionContinueToRouteTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/OnExceptionContinueToRouteTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/OnExceptionContinueToRouteTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/OnExceptionContinueToRouteTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/PolicyPerProcessorTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/PolicyPerProcessorTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/PolicyPerProcessorTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/PolicyPerProcessorTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/PolicyPerRouteTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/PolicyPerRouteTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/PolicyPerRouteTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/PolicyPerRouteTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/RecipientListAggregationStrategyTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/RecipientListAggregationStrategyTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/RecipientListAggregationStrategyTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/RecipientListAggregationStrategyTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/RecipientListDoNotStopOnExceptionTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/RecipientListDoNotStopOnExceptionTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/RecipientListDoNotStopOnExceptionTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/RecipientListDoNotStopOnExceptionTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/RecipientListOnPrepareTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/RecipientListOnPrepareTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/RecipientListOnPrepareTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/RecipientListOnPrepareTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/RecipientListStopOnExceptionTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/RecipientListStopOnExceptionTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/RecipientListStopOnExceptionTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/RecipientListStopOnExceptionTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/RedeliverToSubRouteTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/RedeliverToSubRouteTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/RedeliverToSubRouteTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/RedeliverToSubRouteTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/RouteNoAutoStartupTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/RouteNoAutoStartupTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/RouteNoAutoStartupTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/RouteNoAutoStartupTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/RouteStartupOrderSimpleTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/RouteStartupOrderSimpleTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/RouteStartupOrderSimpleTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/RouteStartupOrderSimpleTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/RouteStartupOrderTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/RouteStartupOrderTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/RouteStartupOrderTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/RouteStartupOrderTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/RouteStartupOrderWithDefaultTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/RouteStartupOrderWithDefaultTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/RouteStartupOrderWithDefaultTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/RouteStartupOrderWithDefaultTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/RouteWithConstantFieldFromExchangeFailTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/RouteWithConstantFieldFromExchangeFailTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/RouteWithConstantFieldFromExchangeFailTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/RouteWithConstantFieldFromExchangeFailTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/RouteWithConstantFieldFromExchangeTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/RouteWithConstantFieldFromExchangeTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/RouteWithConstantFieldFromExchangeTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/RouteWithConstantFieldFromExchangeTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ShutdownCompleteAllTasksTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/ShutdownCompleteAllTasksTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ShutdownCompleteAllTasksTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/ShutdownCompleteAllTasksTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ShutdownCompleteCurrentTaskOnlyTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/ShutdownCompleteCurrentTaskOnlyTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ShutdownCompleteCurrentTaskOnlyTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/ShutdownCompleteCurrentTaskOnlyTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SimpleProcessorIdAwareTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SimpleProcessorIdAwareTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SimpleProcessorIdAwareTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SimpleProcessorIdAwareTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SplitCustomExpressionTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SplitCustomExpressionTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SplitCustomExpressionTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SplitCustomExpressionTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SplitGroupMultiLinesTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SplitGroupMultiLinesTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SplitGroupMultiLinesTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SplitGroupMultiLinesTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SplitGroupSkipFirstTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SplitGroupSkipFirstTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SplitGroupSkipFirstTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SplitGroupSkipFirstTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SplitterOnPrepareTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SplitterOnPrepareTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SplitterOnPrepareTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SplitterOnPrepareTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringAggregateFromWireTapTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringAggregateFromWireTapTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringAggregateFromWireTapTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringAggregateFromWireTapTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringCamelContextLogExhaustedMessageBodyTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringCamelContextLogExhaustedMessageBodyTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringCamelContextLogExhaustedMessageBodyTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringCamelContextLogExhaustedMessageBodyTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringComplexBlockWithEndTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringComplexBlockWithEndTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringComplexBlockWithEndTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringComplexBlockWithEndTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringCustomExpressionTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringCustomExpressionTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringCustomExpressionTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringCustomExpressionTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringCustomPredicateTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringCustomPredicateTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringCustomPredicateTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringCustomPredicateTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringCustomRefLoadBalanceTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringCustomRefLoadBalanceTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringCustomRefLoadBalanceTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringCustomRefLoadBalanceTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelInvalidDeadLetterUriTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelInvalidDeadLetterUriTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelInvalidDeadLetterUriTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelInvalidDeadLetterUriTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelInvalidOptionDeadLetterUriTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelInvalidOptionDeadLetterUriTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelInvalidOptionDeadLetterUriTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelInvalidOptionDeadLetterUriTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelNoRedeliveryTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelNoRedeliveryTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelNoRedeliveryTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelNoRedeliveryTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalBodyNewTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalBodyNewTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalBodyNewTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalBodyNewTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalBodyTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalBodyTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalBodyTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalBodyTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalExchangeWithFileTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalExchangeWithFileTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalExchangeWithFileTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalExchangeWithFileTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringDualManagedThreadsThreadPoolTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringDualManagedThreadsThreadPoolTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringDualManagedThreadsThreadPoolTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringDualManagedThreadsThreadPoolTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringDynamicRouterTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringDynamicRouterTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringDynamicRouterTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringDynamicRouterTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringEnricherAggregateOnExceptionTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringEnricherAggregateOnExceptionTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringEnricherAggregateOnExceptionTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringEnricherAggregateOnExceptionTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringErrorHandlerRedeliveryPolicyProfileTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringErrorHandlerRedeliveryPolicyProfileTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringErrorHandlerRedeliveryPolicyProfileTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringErrorHandlerRedeliveryPolicyProfileTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringIdempotentConsumerNoSkipDuplicateFilterTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringIdempotentConsumerNoSkipDuplicateFilterTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringIdempotentConsumerNoSkipDuplicateFilterTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringIdempotentConsumerNoSkipDuplicateFilterTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringIdempotentConsumerNoSkipDuplicateTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringIdempotentConsumerNoSkipDuplicateTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringIdempotentConsumerNoSkipDuplicateTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringIdempotentConsumerNoSkipDuplicateTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringIdempotentConsumerRemoveOnFailureTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringIdempotentConsumerRemoveOnFailureTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringIdempotentConsumerRemoveOnFailureTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringIdempotentConsumerRemoveOnFailureTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringIdempotentConsumerTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringIdempotentConsumerTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringIdempotentConsumerTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringIdempotentConsumerTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringInterceptFromEndpointRefTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringInterceptFromEndpointRefTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringInterceptFromEndpointRefTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringInterceptFromEndpointRefTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringInterceptFromTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringInterceptFromTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringInterceptFromTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringInterceptFromTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringInterceptFromUriRegexTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringInterceptFromUriRegexTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringInterceptFromUriRegexTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringInterceptFromUriRegexTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringInterceptFromUriSimpleLogTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringInterceptFromUriSimpleLogTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringInterceptFromUriSimpleLogTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringInterceptFromUriSimpleLogTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringInterceptFromUriWildcardTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringInterceptFromUriWildcardTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringInterceptFromUriWildcardTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringInterceptFromUriWildcardTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringInterceptFromWhenNoStopTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringInterceptFromWhenNoStopTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringInterceptFromWhenNoStopTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringInterceptFromWhenNoStopTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringInterceptFromWhenTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringInterceptFromWhenTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringInterceptFromWhenTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringInterceptFromWhenTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringInterceptFromWhenWithChoiceTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringInterceptFromWhenWithChoiceTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringInterceptFromWhenWithChoiceTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringInterceptFromWhenWithChoiceTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringInterceptFromWithStopTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringInterceptFromWithStopTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringInterceptFromWithStopTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringInterceptFromWithStopTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringInterceptSimpleRouteStopTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringInterceptSimpleRouteStopTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringInterceptSimpleRouteStopTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringInterceptSimpleRouteStopTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringInterceptSimpleRouteTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringInterceptSimpleRouteTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringInterceptSimpleRouteTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringInterceptSimpleRouteTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringInterceptSimpleRouteWhenStopTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringInterceptSimpleRouteWhenStopTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringInterceptSimpleRouteWhenStopTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringInterceptSimpleRouteWhenStopTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringInterceptSimpleRouteWhenTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringInterceptSimpleRouteWhenTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringInterceptSimpleRouteWhenTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringInterceptSimpleRouteWhenTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringLoopCopyTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringLoopCopyTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringLoopCopyTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringLoopCopyTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringLoopDoWhileTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringLoopDoWhileTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringLoopDoWhileTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringLoopDoWhileTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringLoopNoCopyTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringLoopNoCopyTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringLoopNoCopyTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringLoopNoCopyTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringManagedThreadsThreadPoolTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringManagedThreadsThreadPoolTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringManagedThreadsThreadPoolTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringManagedThreadsThreadPoolTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringMethodCallTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringMethodCallTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringMethodCallTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringMethodCallTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringMulticastAggregatorTest-context.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringMulticastAggregatorTest-context.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringMulticastAggregatorTest-context.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringMulticastAggregatorTest-context.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringMulticastNoStopOnExceptionTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringMulticastNoStopOnExceptionTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringMulticastNoStopOnExceptionTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringMulticastNoStopOnExceptionTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringMulticastStopOnExceptionTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringMulticastStopOnExceptionTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringMulticastStopOnExceptionTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringMulticastStopOnExceptionTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringMulticastSubUnitOfWorkTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringMulticastSubUnitOfWorkTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringMulticastSubUnitOfWorkTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringMulticastSubUnitOfWorkTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringNestedChoiceIssueTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringNestedChoiceIssueTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringNestedChoiceIssueTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringNestedChoiceIssueTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringOnCompletionAndInterceptAndOnExceptionGlobalTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringOnCompletionAndInterceptAndOnExceptionGlobalTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringOnCompletionAndInterceptAndOnExceptionGlobalTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringOnCompletionAndInterceptAndOnExceptionGlobalTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringOnCompletionAndInterceptGlobalTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringOnCompletionAndInterceptGlobalTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringOnCompletionAndInterceptGlobalTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringOnCompletionAndInterceptGlobalTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringOnCompletionAndInterceptTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringOnCompletionAndInterceptTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringOnCompletionAndInterceptTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringOnCompletionAndInterceptTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringOnCompletionGlobalTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringOnCompletionGlobalTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringOnCompletionGlobalTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringOnCompletionGlobalTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringOnCompletionModeTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringOnCompletionModeTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringOnCompletionModeTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringOnCompletionModeTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringOnCompletionOnCompleteOnlyTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringOnCompletionOnCompleteOnlyTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringOnCompletionOnCompleteOnlyTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringOnCompletionOnCompleteOnlyTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringOnCompletionOnFailureOnlyTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringOnCompletionOnFailureOnlyTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringOnCompletionOnFailureOnlyTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringOnCompletionOnFailureOnlyTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringOnCompletionRouteScopeOverrideGlobalScopeTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringOnCompletionRouteScopeOverrideGlobalScopeTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringOnCompletionRouteScopeOverrideGlobalScopeTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringOnCompletionRouteScopeOverrideGlobalScopeTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringOnCompletionTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringOnCompletionTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringOnCompletionTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringOnCompletionTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringOnCompletionUseOriginalBodyTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringOnCompletionUseOriginalBodyTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringOnCompletionUseOriginalBodyTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringOnCompletionUseOriginalBodyTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringOnCompletionWhenTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringOnCompletionWhenTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringOnCompletionWhenTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringOnCompletionWhenTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringRecipientListParallelOptionalPropertiesTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringRecipientListParallelOptionalPropertiesTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringRecipientListParallelOptionalPropertiesTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringRecipientListParallelOptionalPropertiesTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringRecipientListParallelStreamingTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringRecipientListParallelStreamingTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringRecipientListParallelStreamingTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringRecipientListParallelStreamingTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringRecipientListParallelTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringRecipientListParallelTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringRecipientListParallelTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringRecipientListParallelTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringRecipientListSubUnitOfWorkTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringRecipientListSubUnitOfWorkTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringRecipientListSubUnitOfWorkTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringRecipientListSubUnitOfWorkTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringRedeliveryErrorHandlerNoRedeliveryOnShutdownTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringRedeliveryErrorHandlerNoRedeliveryOnShutdownTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringRedeliveryErrorHandlerNoRedeliveryOnShutdownTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringRedeliveryErrorHandlerNoRedeliveryOnShutdownTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringRouteContextProduceBeanTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringRouteContextProduceBeanTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringRouteContextProduceBeanTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringRouteContextProduceBeanTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringRoutePoliciesTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringRoutePoliciesTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringRoutePoliciesTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringRoutePoliciesTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringRouteStopTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringRouteStopTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringRouteStopTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringRouteStopTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringRouteTopLevelOnCompletionMisconfiguredTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringRouteTopLevelOnCompletionMisconfiguredTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringRouteTopLevelOnCompletionMisconfiguredTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringRouteTopLevelOnCompletionMisconfiguredTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringRouteTopLevelOnExceptionMisconfiguredTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringRouteTopLevelOnExceptionMisconfiguredTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringRouteTopLevelOnExceptionMisconfiguredTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringRouteTopLevelOnExceptionMisconfiguredTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringRouteTopLevelTransactedMisconfiguredTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringRouteTopLevelTransactedMisconfiguredTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringRouteTopLevelTransactedMisconfiguredTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringRouteTopLevelTransactedMisconfiguredTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringScheduledThreadPoolTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringScheduledThreadPoolTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringScheduledThreadPoolTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringScheduledThreadPoolTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringSetHeaderTest-context.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringSetHeaderTest-context.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringSetHeaderTest-context.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringSetHeaderTest-context.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringSetHeaderWithConstantTest-context.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringSetHeaderWithConstantTest-context.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringSetHeaderWithConstantTest-context.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringSetHeaderWithConstantTest-context.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringSetHeaderXPathResultTypeTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringSetHeaderXPathResultTypeTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringSetHeaderXPathResultTypeTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringSetHeaderXPathResultTypeTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringSimpleResultTypeRouteTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringSimpleResultTypeRouteTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringSimpleResultTypeRouteTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringSimpleResultTypeRouteTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringSplitSubUnitOfWorkTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringSplitSubUnitOfWorkTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringSplitSubUnitOfWorkTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringSplitSubUnitOfWorkTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringSplitTokenizerGroupDynamicTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringSplitTokenizerGroupDynamicTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringSplitTokenizerGroupDynamicTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringSplitTokenizerGroupDynamicTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringSplitterBodyTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringSplitterBodyTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringSplitterBodyTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringSplitterBodyTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringSplitterNoStopOnExceptionTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringSplitterNoStopOnExceptionTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringSplitterNoStopOnExceptionTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringSplitterNoStopOnExceptionTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringSplitterStopOnExceptionTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringSplitterStopOnExceptionTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringSplitterStopOnExceptionTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringSplitterStopOnExceptionTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringStreamCachingStrategyTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringStreamCachingStrategyTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringStreamCachingStrategyTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringStreamCachingStrategyTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringThreadNamePatternTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringThreadNamePatternTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringThreadNamePatternTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringThreadNamePatternTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringThrowExceptionMessageTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringThrowExceptionMessageTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringThrowExceptionMessageTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringThrowExceptionMessageTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringThrowExceptionTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringThrowExceptionTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringThrowExceptionTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringThrowExceptionTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringToDynamicIgnoreTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringToDynamicIgnoreTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringToDynamicIgnoreTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringToDynamicIgnoreTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringToDynamicLanguageXPathTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringToDynamicLanguageXPathTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringToDynamicLanguageXPathTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringToDynamicLanguageXPathTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringToDynamicTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringToDynamicTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringToDynamicTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringToDynamicTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringTraceTest-context.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringTraceTest-context.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringTraceTest-context.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringTraceTest-context.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringTraceUsingPropertyTest-context.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringTraceUsingPropertyTest-context.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringTraceUsingPropertyTest-context.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringTraceUsingPropertyTest-context.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringTryCatchMisconfiguredFinallyTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringTryCatchMisconfiguredFinallyTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringTryCatchMisconfiguredFinallyTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringTryCatchMisconfiguredFinallyTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringTryCatchMisconfiguredTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringTryCatchMisconfiguredTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringTryCatchMisconfiguredTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringTryCatchMisconfiguredTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringTryCatchMustHaveExceptionConfiguredTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringTryCatchMustHaveExceptionConfiguredTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringTryCatchMustHaveExceptionConfiguredTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringTryCatchMustHaveExceptionConfiguredTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringTryProcessorMultipleExceptionTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringTryProcessorMultipleExceptionTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringTryProcessorMultipleExceptionTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringTryProcessorMultipleExceptionTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringTryProcessorOnWhenTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringTryProcessorOnWhenTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringTryProcessorOnWhenTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringTryProcessorOnWhenTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringWireTapExpressionTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringWireTapExpressionTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringWireTapExpressionTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringWireTapExpressionTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringWireTapNewExchangeTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringWireTapNewExchangeTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringWireTapNewExchangeTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringWireTapNewExchangeTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringWireTapTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringWireTapTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringWireTapTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringWireTapTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringWireTapUsingFireAndForgetCopyTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringWireTapUsingFireAndForgetCopyTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringWireTapUsingFireAndForgetCopyTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringWireTapUsingFireAndForgetCopyTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringWireTapUsingFireAndForgetTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringWireTapUsingFireAndForgetTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringWireTapUsingFireAndForgetTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringWireTapUsingFireAndForgetTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringWireTapVoidBeanTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringWireTapVoidBeanTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringWireTapVoidBeanTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringWireTapVoidBeanTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringXPathHeaderTest-context.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringXPathHeaderTest-context.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringXPathHeaderTest-context.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringXPathHeaderTest-context.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ThreadsCoreAndMaxPoolKeepAliveTimeTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/ThreadsCoreAndMaxPoolKeepAliveTimeTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ThreadsCoreAndMaxPoolKeepAliveTimeTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/ThreadsCoreAndMaxPoolKeepAliveTimeTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ThreadsCoreAndMaxPoolTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/ThreadsCoreAndMaxPoolTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ThreadsCoreAndMaxPoolTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/ThreadsCoreAndMaxPoolTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ThreadsCorePoolTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/ThreadsCorePoolTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ThreadsCorePoolTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/ThreadsCorePoolTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ThreadsDefaultTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/ThreadsDefaultTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ThreadsDefaultTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/ThreadsDefaultTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ThreadsExternalThreadPoolFactoryBeanTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/ThreadsExternalThreadPoolFactoryBeanTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ThreadsExternalThreadPoolFactoryBeanTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/ThreadsExternalThreadPoolFactoryBeanTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ThreadsThreadPoolFactoryBeanTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/ThreadsThreadPoolFactoryBeanTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ThreadsThreadPoolFactoryBeanTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/ThreadsThreadPoolFactoryBeanTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ThrottlerGroupingTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/ThrottlerGroupingTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ThrottlerGroupingTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/ThrottlerGroupingTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ThrottlerMethodCallTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/ThrottlerMethodCallTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ThrottlerMethodCallTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/ThrottlerMethodCallTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ThrottlerThreadPoolProfileTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/ThrottlerThreadPoolProfileTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ThrottlerThreadPoolProfileTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/ThrottlerThreadPoolProfileTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ThrottlingInflightRoutePolicyTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/ThrottlingInflightRoutePolicyTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ThrottlingInflightRoutePolicyTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/ThrottlingInflightRoutePolicyTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ValidateSimpleTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/ValidateSimpleTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ValidateSimpleTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/ValidateSimpleTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/WireTapOnPrepareTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/WireTapOnPrepareTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/WireTapOnPrepareTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/WireTapOnPrepareTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/XsltTest-context.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/XsltTest-context.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/XsltTest-context.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/XsltTest-context.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator-custom-strategy.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/aggregator-custom-strategy.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator-custom-strategy.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/aggregator-custom-strategy.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/aggregator.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/aggregator.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateCompleteAllOnStopTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateCompleteAllOnStopTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateCompleteAllOnStopTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateCompleteAllOnStopTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateCompletionIntervalTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateCompletionIntervalTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateCompletionIntervalTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateCompletionIntervalTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateControllerTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateControllerTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateControllerTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateControllerTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateDiscardOnTimeoutTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateDiscardOnTimeoutTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateDiscardOnTimeoutTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateDiscardOnTimeoutTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateExpressionSizeFallbackTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateExpressionSizeFallbackTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateExpressionSizeFallbackTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateExpressionSizeFallbackTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateExpressionSizeTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateExpressionSizeTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateExpressionSizeTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateExpressionSizeTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateExpressionTimeoutFallbackTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateExpressionTimeoutFallbackTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateExpressionTimeoutFallbackTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateExpressionTimeoutFallbackTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateExpressionTimeoutPerGroupTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateExpressionTimeoutPerGroupTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateExpressionTimeoutPerGroupTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateExpressionTimeoutPerGroupTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateExpressionTimeoutTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateExpressionTimeoutTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateExpressionTimeoutTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateExpressionTimeoutTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateForceCompletionOnStopTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateForceCompletionOnStopTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateForceCompletionOnStopTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateForceCompletionOnStopTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateGroupedExchangeCompletionExpressionSizeTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateGroupedExchangeCompletionExpressionSizeTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateGroupedExchangeCompletionExpressionSizeTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateGroupedExchangeCompletionExpressionSizeTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateSimplePredicateEagerTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateSimplePredicateEagerTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateSimplePredicateEagerTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateSimplePredicateEagerTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateSimplePredicateTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateSimplePredicateTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateSimplePredicateTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateSimplePredicateTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateSimpleSizeTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateSimpleSizeTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateSimpleSizeTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateSimpleSizeTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateSimpleTimeoutTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateSimpleTimeoutTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateSimpleTimeoutTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateSimpleTimeoutTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateThreadPoolProfileTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateThreadPoolProfileTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateThreadPoolProfileTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateThreadPoolProfileTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregationStrategyBeanAdapterAllowNullTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregationStrategyBeanAdapterAllowNullTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregationStrategyBeanAdapterAllowNullTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregationStrategyBeanAdapterAllowNullTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregationStrategyBeanAdapterRefMethodNameTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregationStrategyBeanAdapterRefMethodNameTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregationStrategyBeanAdapterRefMethodNameTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregationStrategyBeanAdapterRefMethodNameTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregationStrategyBeanAdapterRefTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregationStrategyBeanAdapterRefTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregationStrategyBeanAdapterRefTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregationStrategyBeanAdapterRefTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/async/SpringAsyncDeadLetterChannelExecutorServiceRefTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/async/SpringAsyncDeadLetterChannelExecutorServiceRefTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/async/SpringAsyncDeadLetterChannelExecutorServiceRefTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/async/SpringAsyncDeadLetterChannelExecutorServiceRefTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/choice.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/choice.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/choice.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/choice.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/convertBody.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/convertBody.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/convertBody.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/convertBody.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/delayer.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/delayer.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/delayer.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/delayer.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/delayerperroute.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/delayerperroute.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/delayerperroute.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/delayerperroute.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/enrichExpressionTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/enrichExpressionTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/enrichExpressionTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/enrichExpressionTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/enricher.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/enricher.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/enricher.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/enricher.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/enricherref.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/enricherref.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/enricherref.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/enricherref.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/example.xsl b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/example.xsl
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/example.xsl
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/example.xsl
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/failOverLoadBalance.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/failOverLoadBalance.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/failOverLoadBalance.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/failOverLoadBalance.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/filter.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/filter.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/filter.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/filter.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/filterNoChild.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/filterNoChild.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/filterNoChild.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/filterNoChild.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/fromEndpointTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/fromEndpointTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/fromEndpointTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/fromEndpointTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/fromMultipleEndpointTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/fromMultipleEndpointTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/fromMultipleEndpointTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/fromMultipleEndpointTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/idempotent/SpringCacheIdempotentTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/idempotent/SpringCacheIdempotentTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/idempotent/SpringCacheIdempotentTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/idempotent/SpringCacheIdempotentTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/idempotent/fileConsumerIdempotentTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/idempotent/fileConsumerIdempotentTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/idempotent/fileConsumerIdempotentTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/idempotent/fileConsumerIdempotentTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/intercept/SpringParentChildInterceptStrategyTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/intercept/SpringParentChildInterceptStrategyTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/intercept/SpringParentChildInterceptStrategyTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/intercept/SpringParentChildInterceptStrategyTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/interceptSendToEndpoint.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/interceptSendToEndpoint.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/interceptSendToEndpoint.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/interceptSendToEndpoint.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/interceptSendToEndpointDynamic.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/interceptSendToEndpointDynamic.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/interceptSendToEndpointDynamic.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/interceptSendToEndpointDynamic.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/interceptSendToEndpointInOnExceptionTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/interceptSendToEndpointInOnExceptionTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/interceptSendToEndpointInOnExceptionTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/interceptSendToEndpointInOnExceptionTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/interceptSendToEndpointSkip.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/interceptSendToEndpointSkip.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/interceptSendToEndpointSkip.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/interceptSendToEndpointSkip.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/interceptSendToEndpointWhen.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/interceptSendToEndpointWhen.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/interceptSendToEndpointWhen.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/interceptSendToEndpointWhen.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/logEipCustomFormatterTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/logEipCustomFormatterTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/logEipCustomFormatterTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/logEipCustomFormatterTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/logEipMaskTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/logEipMaskTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/logEipMaskTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/logEipMaskTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/logProcessorTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/logProcessorTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/logProcessorTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/logProcessorTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/logProcessorWithProvidedLoggerTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/logProcessorWithProvidedLoggerTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/logProcessorWithProvidedLoggerTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/logProcessorWithProvidedLoggerTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/loop.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/loop.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/loop.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/loop.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/markrollbackonly.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/markrollbackonly.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/markrollbackonly.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/markrollbackonly.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/multicast.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/multicast.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/multicast.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/multicast.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/myprop.properties b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/myprop.properties
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/myprop.properties
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/myprop.properties
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/mysimplescript.txt b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/mysimplescript.txt
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/mysimplescript.txt
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/mysimplescript.txt
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/normalizer.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/normalizer.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/normalizer.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/normalizer.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/DeadLetterChannelOnExceptionOnRedeliveryTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/DeadLetterChannelOnExceptionOnRedeliveryTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/DeadLetterChannelOnExceptionOnRedeliveryTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/DeadLetterChannelOnExceptionOnRedeliveryTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/OnExceptionContinueSubRouteTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/OnExceptionContinueSubRouteTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/OnExceptionContinueSubRouteTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/OnExceptionContinueSubRouteTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/OnExceptionContinueSubSubRouteTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/OnExceptionContinueSubSubRouteTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/OnExceptionContinueSubSubRouteTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/OnExceptionContinueSubSubRouteTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/OnExceptionContinueTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/OnExceptionContinueTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/OnExceptionContinueTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/OnExceptionContinueTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/OnExceptionLoadBalancerDoubleIssueTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/OnExceptionLoadBalancerDoubleIssueTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/OnExceptionLoadBalancerDoubleIssueTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/OnExceptionLoadBalancerDoubleIssueTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/OnExceptionOccurredProcessorOnExceptionTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/OnExceptionOccurredProcessorOnExceptionTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/OnExceptionOccurredProcessorOnExceptionTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/OnExceptionOccurredProcessorOnExceptionTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/OnExceptionOccurredProcessorTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/OnExceptionOccurredProcessorTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/OnExceptionOccurredProcessorTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/OnExceptionOccurredProcessorTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/OnExceptionWithRouteAndContinueTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/OnExceptionWithRouteAndContinueTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/OnExceptionWithRouteAndContinueTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/OnExceptionWithRouteAndContinueTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/RedeliveryPolicyRefTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/RedeliveryPolicyRefTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/RedeliveryPolicyRefTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/RedeliveryPolicyRefTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/SpringContextScopeOnExceptionTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/SpringContextScopeOnExceptionTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/SpringContextScopeOnExceptionTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/SpringContextScopeOnExceptionTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/SpringOnExceptionFromChoiceUseOriginalBodyTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/SpringOnExceptionFromChoiceUseOriginalBodyTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/SpringOnExceptionFromChoiceUseOriginalBodyTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/SpringOnExceptionFromChoiceUseOriginalBodyTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/SpringOnExceptionUseOriginalBodyTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/SpringOnExceptionUseOriginalBodyTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/SpringOnExceptionUseOriginalBodyTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/SpringOnExceptionUseOriginalBodyTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/SpringOnExceptionUseOriginalMessageTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/SpringOnExceptionUseOriginalMessageTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/SpringOnExceptionUseOriginalMessageTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/SpringOnExceptionUseOriginalMessageTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/deadLetterChannelHandledExampleTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/deadLetterChannelHandledExampleTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/deadLetterChannelHandledExampleTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/deadLetterChannelHandledExampleTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/onExceptionNotNormalizedClassNameTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/onExceptionNotNormalizedClassNameTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/onExceptionNotNormalizedClassNameTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/onExceptionNotNormalizedClassNameTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/onExceptionSubRouteTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/onExceptionSubRouteTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/onExceptionSubRouteTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/onExceptionSubRouteTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/onExceptionSubRouteWithDefaultErrorHandlerTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/onExceptionSubRouteWithDefaultErrorHandlerTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/onExceptionSubRouteWithDefaultErrorHandlerTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/onExceptionSubRouteWithDefaultErrorHandlerTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/pollEnrichExpressionTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/pollEnrichExpressionTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/pollEnrichExpressionTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/pollEnrichExpressionTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/pollEnricher.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/pollEnricher.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/pollEnricher.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/pollEnricher.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/pollEnricherRef.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/pollEnricherRef.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/pollEnricherRef.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/pollEnricherRef.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/randomLoadBalance.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/randomLoadBalance.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/randomLoadBalance.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/randomLoadBalance.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/recipientListIgnoreInvalidEndpoints.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/recipientListIgnoreInvalidEndpoints.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/recipientListIgnoreInvalidEndpoints.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/recipientListIgnoreInvalidEndpoints.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/recipientListWithArrayHeader.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/recipientListWithArrayHeader.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/recipientListWithArrayHeader.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/recipientListWithArrayHeader.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/recipientListWithStringDelimitedHeader.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/recipientListWithStringDelimitedHeader.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/recipientListWithStringDelimitedHeader.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/recipientListWithStringDelimitedHeader.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/recipientListWithStringDelimitedProperty.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/recipientListWithStringDelimitedProperty.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/recipientListWithStringDelimitedProperty.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/recipientListWithStringDelimitedProperty.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/removeHeader.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/removeHeader.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/removeHeader.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/removeHeader.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/removeHeaders.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/removeHeaders.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/removeHeaders.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/removeHeaders.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/removeHeadersExclude.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/removeHeadersExclude.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/removeHeadersExclude.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/removeHeadersExclude.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/removePropertiesWithExclusion.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/removePropertiesWithExclusion.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/removePropertiesWithExclusion.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/removePropertiesWithExclusion.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/removePropertiesWithoutExclusion.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/removePropertiesWithoutExclusion.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/removePropertiesWithoutExclusion.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/removePropertiesWithoutExclusion.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/removeProperty.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/removeProperty.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/removeProperty.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/removeProperty.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/resequencer.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/resequencer.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/resequencer.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/resequencer.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/resequencerRejectOld.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/resequencerRejectOld.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/resequencerRejectOld.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/resequencerRejectOld.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/rollback.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/rollback.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/rollback.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/rollback.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/roundRobinLoadBalance.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/roundRobinLoadBalance.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/roundRobinLoadBalance.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/roundRobinLoadBalance.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/routingSlip.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/routingSlip.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/routingSlip.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/routingSlip.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/routingSlipIgnoreInvalidEndpoints.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/routingSlipIgnoreInvalidEndpoints.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/routingSlipIgnoreInvalidEndpoints.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/routingSlipIgnoreInvalidEndpoints.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/saga.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/saga.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/saga.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/saga.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/sagaRef.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/sagaRef.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/sagaRef.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/sagaRef.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/samplingThrottler.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/samplingThrottler.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/samplingThrottler.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/samplingThrottler.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/samplingThrottlerWithDefault.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/samplingThrottlerWithDefault.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/samplingThrottlerWithDefault.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/samplingThrottlerWithDefault.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/scattergather/scatter-gather.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/scattergather/scatter-gather.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/scattergather/scatter-gather.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/scattergather/scatter-gather.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/script-external.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/script-external.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/script-external.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/script-external.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/script.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/script.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/script.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/script.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/setBody.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/setBody.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/setBody.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/setBody.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/setExchangePattern.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/setExchangePattern.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/setExchangePattern.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/setExchangePattern.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/setExchangePatternWithCustomId.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/setExchangePatternWithCustomId.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/setExchangePatternWithCustomId.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/setExchangePatternWithCustomId.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/setHeaderNameDynamic.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/setHeaderNameDynamic.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/setHeaderNameDynamic.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/setHeaderNameDynamic.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/setProperty.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/setProperty.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/setProperty.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/setProperty.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/setPropertyNameDynamic.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/setPropertyNameDynamic.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/setPropertyNameDynamic.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/setPropertyNameDynamic.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/sortBodyTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/sortBodyTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/sortBodyTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/sortBodyTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/sortExpressionTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/sortExpressionTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/sortExpressionTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/sortExpressionTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/splitterMethodCallTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/splitterMethodCallTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/splitterMethodCallTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/splitterMethodCallTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/splitterTokenizerTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/splitterTokenizerTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/splitterTokenizerTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/splitterTokenizerTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/splitterWithCustomThreadPoolExecutor.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/splitterWithCustomThreadPoolExecutor.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/splitterWithCustomThreadPoolExecutor.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/splitterWithCustomThreadPoolExecutor.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/staticRecipientList.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/staticRecipientList.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/staticRecipientList.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/staticRecipientList.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/step.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/step.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/step.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/step.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/stickyLoadBalance.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/stickyLoadBalance.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/stickyLoadBalance.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/stickyLoadBalance.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/streamResequencer.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/streamResequencer.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/streamResequencer.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/streamResequencer.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/streamcachingperroute.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/streamcachingperroute.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/streamcachingperroute.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/streamcachingperroute.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/throttler.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/throttler.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/throttler.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/throttler.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/topicLoadBalance.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/topicLoadBalance.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/topicLoadBalance.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/topicLoadBalance.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/transform.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/transform.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/transform.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/transform.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/transformWithExpressionContext.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/transformWithExpressionContext.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/transformWithExpressionContext.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/transformWithExpressionContext.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/validate.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/validate.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/validate.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/validate.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/weightedRandomLoadBalance.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/weightedRandomLoadBalance.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/weightedRandomLoadBalance.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/weightedRandomLoadBalance.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/weightedRoundRobinLoadBalance.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/weightedRoundRobinLoadBalance.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/weightedRoundRobinLoadBalance.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/weightedRoundRobinLoadBalance.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/xPathHeaderNameContext.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/xPathHeaderNameContext.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/xPathHeaderNameContext.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/xPathHeaderNameContext.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/xPathHeaderNameResultTypeAndNamespaceContext.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/xPathHeaderNameResultTypeAndNamespaceContext.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/xPathHeaderNameResultTypeAndNamespaceContext.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/xPathHeaderNameResultTypeAndNamespaceContext.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/xpathChoiceWithNamespaceOnRouteContext.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/xpathChoiceWithNamespaceOnRouteContext.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/xpathChoiceWithNamespaceOnRouteContext.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/xpathChoiceWithNamespaceOnRouteContext.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/xpathChoiceWithNamespaceOnRouteContextRouteContext.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/xpathChoiceWithNamespaceOnRouteContextRouteContext.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/xpathChoiceWithNamespaceOnRouteContextRouteContext.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/xpathChoiceWithNamespaceOnRouteContextRouteContext.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/xpathFilter.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/xpathFilter.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/xpathFilter.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/xpathFilter.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/xpathFilterWithNamespace.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/xpathFilterWithNamespace.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/xpathFilterWithNamespace.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/xpathFilterWithNamespace.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/xpathFilterWithNamespaceOnRouteContext.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/xpathFilterWithNamespaceOnRouteContext.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/processor/xpathFilterWithNamespaceOnRouteContext.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/xpathFilterWithNamespaceOnRouteContext.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/produce/FluentProduceTemplateTest-context.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/produce/FluentProduceTemplateTest-context.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/produce/FluentProduceTemplateTest-context.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/produce/FluentProduceTemplateTest-context.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/produce/MyCoolBeanTest-context.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/produce/MyCoolBeanTest-context.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/produce/MyCoolBeanTest-context.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/produce/MyCoolBeanTest-context.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/produce/ProduceTemplateTest-context.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/produce/ProduceTemplateTest-context.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/produce/ProduceTemplateTest-context.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/produce/ProduceTemplateTest-context.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/produce/ProduceTemplateWithTwoCamelContextTest-context.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/produce/ProduceTemplateWithTwoCamelContextTest-context.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/produce/ProduceTemplateWithTwoCamelContextTest-context.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/produce/ProduceTemplateWithTwoCamelContextTest-context.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/produce/ProduceTest-context.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/produce/ProduceTest-context.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/produce/ProduceTest-context.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/produce/ProduceTest-context.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/produce/generics/MyServiceTest-context.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/produce/generics/MyServiceTest-context.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/produce/generics/MyServiceTest-context.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/produce/generics/MyServiceTest-context.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/routeRefCamelContextFactory.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/routeRefCamelContextFactory.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/routeRefCamelContextFactory.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/routeRefCamelContextFactory.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/routebuilder/SpringRouteTemplateRefTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/routebuilder/SpringRouteTemplateRefTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/routebuilder/SpringRouteTemplateRefTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/routebuilder/SpringRouteTemplateRefTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/routebuilder/SpringRouteTemplateTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/routebuilder/SpringRouteTemplateTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/routebuilder/SpringRouteTemplateTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/routebuilder/SpringRouteTemplateTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/routebuilder/camelRouteBuilder.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/routebuilder/camelRouteBuilder.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/routebuilder/camelRouteBuilder.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/routebuilder/camelRouteBuilder.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/routebuilder/myTemplates.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/routebuilder/myTemplates.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/routebuilder/myTemplates.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/routebuilder/myTemplates.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/routingUsingCamelContextFactory.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/routingUsingCamelContextFactory.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/routingUsingCamelContextFactory.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/routingUsingCamelContextFactory.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/routingUsingProcessor.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/routingUsingProcessor.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/routingUsingProcessor.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/routingUsingProcessor.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/spi/bridgePropertyPlaceholderConfigurer.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/spi/bridgePropertyPlaceholderConfigurer.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/spi/bridgePropertyPlaceholderConfigurer.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/spi/bridgePropertyPlaceholderConfigurer.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/spi/bridgePropertyPlaceholderConfigurerUtilIssue.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/spi/bridgePropertyPlaceholderConfigurerUtilIssue.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/spi/bridgePropertyPlaceholderConfigurerUtilIssue.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/spi/bridgePropertyPlaceholderConfigurerUtilIssue.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/spi/parentContextRegistryTestChild.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/spi/parentContextRegistryTestChild.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/spi/parentContextRegistryTestChild.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/spi/parentContextRegistryTestChild.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/spi/parentContextRegistryTestParent.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/spi/parentContextRegistryTestParent.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/spi/parentContextRegistryTestParent.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/spi/parentContextRegistryTestParent.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/streamCaching.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/streamCaching.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/streamCaching.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/streamCaching.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/util/EndpointHelperTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/util/EndpointHelperTest.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/util/EndpointHelperTest.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/util/EndpointHelperTest.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildCustomProcessor.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/buildCustomProcessor.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildCustomProcessor.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/buildCustomProcessor.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildCustomProcessorWithFilter.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/buildCustomProcessorWithFilter.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildCustomProcessorWithFilter.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/buildCustomProcessorWithFilter.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildDynamicRecipientList.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/buildDynamicRecipientList.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildDynamicRecipientList.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/buildDynamicRecipientList.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildIdempotentConsumer.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/buildIdempotentConsumer.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildIdempotentConsumer.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/buildIdempotentConsumer.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildSimpleRoute.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/buildSimpleRoute.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildSimpleRoute.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/buildSimpleRoute.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildSimpleRouteWithChoice.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/buildSimpleRouteWithChoice.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildSimpleRouteWithChoice.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/buildSimpleRouteWithChoice.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildSimpleRouteWithHeaderPredicate.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/buildSimpleRouteWithHeaderPredicate.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildSimpleRouteWithHeaderPredicate.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/buildSimpleRouteWithHeaderPredicate.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildSplitter.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/buildSplitter.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildSplitter.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/buildSplitter.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildStaticRecipientList.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/buildStaticRecipientList.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildStaticRecipientList.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/buildStaticRecipientList.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildWireTap.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/buildWireTap.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildWireTap.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/buildWireTap.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/handler/ErrorHandlerDefinitionParser.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/handler/ErrorHandlerDefinitionParser.xml
similarity index 97%
rename from components/camel-spring/src/test/resources/org/apache/camel/spring/handler/ErrorHandlerDefinitionParser.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/handler/ErrorHandlerDefinitionParser.xml
index 7a653a2..226b8733 100644
--- a/components/camel-spring/src/test/resources/org/apache/camel/spring/handler/ErrorHandlerDefinitionParser.xml
+++ b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/handler/ErrorHandlerDefinitionParser.xml
@@ -40,7 +40,7 @@
<camel:redeliveryPolicy maximumRedeliveries="2" redeliveryDelay="1000" logHandled="true" asyncDelayedRedelivery="true"/>
</camel:errorHandler>
- <bean id="myErrorProcessor" class="org.apache.camel.spring.handler.MyErrorProcessor"/>
+ <bean id="myErrorProcessor" class="org.apache.camel.spring.xml.handler.MyErrorProcessor"/>
<!-- TX error handler can be configured using a template -->
<camel:errorHandler id="transactionErrorHandler" type="TransactionErrorHandler"
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/util/spring/KeyStoreParametersFactoryBeanTest-context.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/util/spring/KeyStoreParametersFactoryBeanTest-context.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/util/spring/KeyStoreParametersFactoryBeanTest-context.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/util/spring/KeyStoreParametersFactoryBeanTest-context.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/util/spring/SSLContextParametersFactoryBeanTest-context.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/util/spring/SSLContextParametersFactoryBeanTest-context.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/util/spring/SSLContextParametersFactoryBeanTest-context.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/util/spring/SSLContextParametersFactoryBeanTest-context.xml
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/util/spring/SecureRandomParametersFactoryBeanTest-context.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/util/spring/SecureRandomParametersFactoryBeanTest-context.xml
similarity index 100%
rename from components/camel-spring/src/test/resources/org/apache/camel/util/spring/SecureRandomParametersFactoryBeanTest-context.xml
rename to components/camel-spring-xml/src/test/resources/org/apache/camel/util/spring/SecureRandomParametersFactoryBeanTest-context.xml
diff --git a/components/camel-spring/src/test/resources/sql/init.sql b/components/camel-spring-xml/src/test/resources/sql/init.sql
similarity index 100%
rename from components/camel-spring/src/test/resources/sql/init.sql
rename to components/camel-spring-xml/src/test/resources/sql/init.sql
diff --git a/components/camel-spring/pom.xml b/components/camel-spring/pom.xml
index 2c058f7..d78e70b 100644
--- a/components/camel-spring/pom.xml
+++ b/components/camel-spring/pom.xml
@@ -17,7 +17,8 @@
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">
+<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>
@@ -30,53 +31,31 @@
<packaging>jar</packaging>
<name>Camel :: Spring</name>
- <description>Camel Spring with XML DSL</description>
+ <description>Camel Spring</description>
<properties>
... 3968 lines suppressed ...