You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gn...@apache.org on 2018/10/12 07:55:17 UTC

[camel] 03/43: [CAMEL-12814] Remove deprecated components

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

gnodet pushed a commit to branch camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 2eb26b18191b6b871fe5173fe3deb106d63f3b59
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Sat Sep 15 20:37:36 2018 +0200

    [CAMEL-12814] Remove deprecated components
---
 apache-camel/pom.xml                               |  244 -----
 apache-camel/src/main/descriptors/common-bin.xml   |   58 --
 archetypes/camel-archetype-groovy/pom.xml          |   61 --
 .../META-INF/maven/archetype-metadata.xml          |   89 --
 .../src/main/resources/META-INF/LICENSE.txt        |  203 ----
 .../src/main/resources/META-INF/NOTICE.txt         |   11 -
 .../main/resources/archetype-resources/ReadMe.txt  |   15 -
 .../src/main/resources/archetype-resources/pom.xml |  162 ---
 .../src/main/groovy/MyRouteBuilder.groovy          |   34 -
 .../archetype-resources/src/main/java/MainApp.java |   44 -
 .../src/main/resources/log4j2.properties           |   23 -
 archetypes/camel-archetype-scala/pom.xml           |   61 --
 .../META-INF/maven/archetype-metadata.xml          |   81 --
 .../src/main/resources/META-INF/LICENSE.txt        |  203 ----
 .../src/main/resources/META-INF/NOTICE.txt         |   11 -
 .../main/resources/archetype-resources/ReadMe.txt  |   15 -
 .../src/main/resources/archetype-resources/pom.xml |  176 ----
 .../src/main/resources/log4j2.properties           |   25 -
 .../src/main/scala/MyRouteBuilder.scala            |   37 -
 .../src/main/scala/MyRouteMain.scala               |   37 -
 archetypes/camel-archetype-scr/pom.xml             |   85 --
 .../META-INF/maven/archetype-metadata.xml          |   76 --
 .../src/main/resources/META-INF/LICENSE.txt        |  203 ----
 .../src/main/resources/META-INF/NOTICE.txt         |   11 -
 .../main/resources/archetype-resources/ReadMe.txt  |   24 -
 .../src/main/resources/archetype-resources/pom.xml |  171 ----
 .../src/main/java/__className__.java               |   67 --
 .../src/main/java/internal/__className__Route.java |   40 -
 .../src/test/java/__className__Test.java           |  104 --
 .../src/test/resources/log4j2.properties           |   28 -
 .../camel-scr-example/archetype.properties         |   30 -
 .../resources/projects/camel-scr-example/goal.txt  |    1 -
 archetypes/pom.xml                                 |    3 -
 components/camel-ahc/pom.xml                       |    2 +-
 components/camel-bam/pom.xml                       |  247 -----
 .../camel-bam/src/main/docs/bam-example.adoc       |   89 --
 components/camel-bam/src/main/docs/bam.adoc        |   85 --
 .../java/org/apache/camel/bam/ActivityBuilder.java |  113 ---
 .../org/apache/camel/bam/ActivityLifecycle.java    |   24 -
 .../apache/camel/bam/EntityManagerCallback.java    |   33 -
 .../apache/camel/bam/EntityManagerTemplate.java    |   80 --
 .../java/org/apache/camel/bam/EntityManagers.java  |   60 --
 .../java/org/apache/camel/bam/ProcessBuilder.java  |  216 ----
 .../main/java/org/apache/camel/bam/QueryUtils.java |   59 --
 .../java/org/apache/camel/bam/TimeExpression.java  |   86 --
 .../apache/camel/bam/model/ActivityDefinition.java |   60 --
 .../org/apache/camel/bam/model/ActivityState.java  |  194 ----
 .../org/apache/camel/bam/model/EntitySupport.java  |   45 -
 .../apache/camel/bam/model/ProcessDefinition.java  |   91 --
 .../apache/camel/bam/model/ProcessInstance.java    |  147 ---
 .../org/apache/camel/bam/model/TemporalEntity.java |   59 --
 .../camel/bam/processor/ActivityMonitorEngine.java |  146 ---
 .../camel/bam/processor/BamProcessorSupport.java   |  154 ---
 .../camel/bam/processor/JpaBamProcessor.java       |   61 --
 .../bam/processor/JpaBamProcessorSupport.java      |  209 ----
 .../bam/processor/NoCorrelationKeyException.java   |   41 -
 .../apache/camel/bam/processor/ProcessContext.java |  102 --
 .../org/apache/camel/bam/rules/ActivityRules.java  |  103 --
 .../org/apache/camel/bam/rules/ProcessRules.java   |   74 --
 .../org/apache/camel/bam/rules/TemporalRule.java   |  174 ----
 .../src/main/resources/META-INF/LICENSE.txt        |  203 ----
 .../src/main/resources/META-INF/NOTICE.txt         |   11 -
 .../java/org/apache/camel/bam/BamRouteTest.java    |   91 --
 .../org/apache/camel/bam/EntityManagersTest.java   |   42 -
 .../bam/MultipleActivitiesConcurrentlyTest.java    |   68 --
 .../apache/camel/bam/MultipleProcessesTest.java    |   63 --
 .../profiles/eclipselink/META-INF/persistence.xml  |   41 -
 .../eclipselink/META-INF/spring/spring.xml         |   42 -
 .../test/profiles/eclipselink/log4j2.properties    |   34 -
 .../profiles/hibernate/META-INF/persistence.xml    |   38 -
 .../profiles/hibernate/META-INF/spring/spring.xml  |   43 -
 .../src/test/profiles/hibernate/log4j2.properties  |   34 -
 .../test/profiles/openjpa/META-INF/persistence.xml |   37 -
 .../profiles/openjpa/META-INF/spring/spring.xml    |   41 -
 .../src/test/profiles/openjpa/log4j2.properties    |   34 -
 .../camel-bam/src/test/resources/log4j2.properties |   34 -
 .../test/resources/org/apache/camel/bam/spring.xml |   36 -
 components/camel-cache/pom.xml                     |   97 --
 .../camel-cache/src/main/docs/cache-component.adoc |  480 ---------
 .../camel/component/cache/CacheComponent.java      |  120 ---
 .../camel/component/cache/CacheConfiguration.java  |  220 -----
 .../camel/component/cache/CacheConstants.java      |   45 -
 .../camel/component/cache/CacheConsumer.java       |   62 --
 .../camel/component/cache/CacheConverter.java      |   41 -
 .../camel/component/cache/CacheEndpoint.java       |  192 ----
 .../camel/component/cache/CacheEventListener.java  |   99 --
 .../cache/CacheEventListenerRegistry.java          |   49 -
 .../camel/component/cache/CacheLoaderRegistry.java |   47 -
 .../camel/component/cache/CacheLoaderWrapper.java  |   25 -
 .../camel/component/cache/CacheManagerFactory.java |   80 --
 .../camel/component/cache/CacheProducer.java       |  152 ---
 .../cache/DefaultCacheManagerFactory.java          |   60 --
 .../apache/camel/component/cache/EHCacheUtil.java  |   91 --
 .../component/cache/FileCacheManagerFactory.java   |   44 -
 .../cache/CacheBasedMessageBodyReplacer.java       |   93 --
 .../processor/cache/CacheBasedTokenReplacer.java   |  128 ---
 .../processor/cache/CacheBasedXPathReplacer.java   |  158 ---
 .../camel/processor/cache/CacheValidate.java       |   53 -
 .../src/main/resources/META-INF/LICENSE.txt        |  203 ----
 .../src/main/resources/META-INF/NOTICE.txt         |   11 -
 .../services/org/apache/camel/TypeConverter        |   18 -
 .../services/org/apache/camel/component/cache      |   17 -
 .../src/main/resources/xpathreplacer.xsl           |   36 -
 .../org/apache/camel/component/BaseCacheTest.java  |   42 -
 .../cache/CacheConfigurationFileTest.java          |   63 --
 .../component/cache/CacheConfigurationTest.java    |   42 -
 .../component/cache/CacheConsumerFIFOTest.java     |   53 -
 .../camel/component/cache/CacheConsumerTest.java   |  124 ---
 .../cache/CacheManagerFactoryRefTest.java          |   83 --
 .../camel/component/cache/CacheProducerTest.java   |  699 -------------
 .../component/cache/CacheRegistryRefTest.java      |  239 -----
 .../component/cache/CacheRoutesManagementTest.java |  132 ---
 .../cache/DefaultCacheManagerFactoryTest.java      |   79 --
 .../camel/component/cache/EHCacheUtilTest.java     |   53 -
 .../cache/FileCacheManagerFactoyRefTest.java       |   31 -
 .../component/cache/ObjectCacheProducerTest.java   |  137 ---
 .../org/apache/camel/component/cache/Poetry.java   |   39 -
 .../component/cache/PoetryNotSerializable.java     |   39 -
 .../cache/CacheBasedBodyReplacerTest.java          |  102 --
 .../cache/CacheBasedTokenReplacerTest.java         |  115 ---
 .../cache/CacheBasedXPathElementReplacerTest.java  |  117 ---
 .../META-INF/services/net.sf.ehcache.EhcacheInit   |    2 -
 .../src/test/resources/log4j2.properties           |   30 -
 .../src/test/resources/test-ehcache.xml            |   34 -
 components/camel-cache/src/test/resources/test.txt |   22 -
 .../camel-cache/src/test/resources/updatedtest.txt |   23 -
 components/camel-cdi/pom.xml                       |    7 -
 components/camel-context/pom.xml                   |  105 --
 .../src/main/docs/context-component.adoc           |  195 ----
 .../camel/component/context/ContextConverters.java |   37 -
 .../camel/component/context/ContextEndpoint.java   |  123 ---
 .../component/context/LocalContextComponent.java   |  108 --
 .../context/QualifiedContextComponent.java         |   69 --
 .../src/main/resources/META-INF/LICENSE.txt        |  203 ----
 .../src/main/resources/META-INF/NOTICE.txt         |   11 -
 .../services/org/apache/camel/TypeConverter        |   18 -
 .../services/org/apache/camel/component/context    |   17 -
 .../component/context/JavaDslBlackBoxTest.java     |   83 --
 .../context/JavaDslBlackBoxWithVerboseUriTest.java |   38 -
 .../context/SpringDslContextComponentTest.java     |   62 --
 .../src/test/resources/log4j2.properties           |   28 -
 .../SpringDslContextComponentTest-context.xml      |   54 -
 components/camel-cxf/pom.xml                       |    2 +-
 components/camel-eclipse/pom.xml                   |   87 --
 .../camel-eclipse/src/main/docs/eclipse.adoc       |   58 --
 .../eclipse/EclipsePackageScanClassResolver.java   |   34 -
 .../src/main/resources/META-INF/LICENSE.txt        |  203 ----
 .../src/main/resources/META-INF/NOTICE.txt         |   11 -
 components/camel-elasticsearch/pom.xml             |  107 --
 .../src/main/docs/elasticsearch-component.adoc     |  197 ----
 .../elasticsearch/ElasticsearchComponent.java      |  104 --
 .../elasticsearch/ElasticsearchConfiguration.java  |  195 ----
 .../elasticsearch/ElasticsearchConstants.java      |   51 -
 .../elasticsearch/ElasticsearchEndpoint.java       |  152 ---
 .../elasticsearch/ElasticsearchProducer.java       |  200 ----
 .../BulkRequestAggregationStrategy.java            |   51 -
 .../ElasticsearchActionRequestConverter.java       |  208 ----
 .../src/main/resources/META-INF/LICENSE.txt        |  203 ----
 .../src/main/resources/META-INF/NOTICE.txt         |   11 -
 .../services/org/apache/camel/TypeConverter        |   17 -
 .../org/apache/camel/component/elasticsearch       |   18 -
 .../elasticsearch/ElasticsearchBaseTest.java       |  107 --
 .../elasticsearch/ElasticsearchBulkTest.java       |   95 --
 .../ElasticsearchClusterBaseTest.java              |  124 ---
 .../ElasticsearchClusterIndexTest.java             |  117 ---
 ...asticsearchGetSearchDeleteExistsUpdateTest.java |  323 ------
 .../elasticsearch/ElasticsearchIndexTest.java      |   86 --
 .../src/test/resources/log4j2.properties           |   28 -
 components/camel-elasticsearch5/pom.xml            |  107 --
 .../src/main/docs/elasticsearch5-component.adoc    |  197 ----
 .../elasticsearch5/ElasticsearchComponent.java     |   91 --
 .../elasticsearch5/ElasticsearchConfiguration.java |  251 -----
 .../elasticsearch5/ElasticsearchConstants.java     |   43 -
 .../elasticsearch5/ElasticsearchEndpoint.java      |   59 --
 .../elasticsearch5/ElasticsearchOperation.java     |   58 --
 .../elasticsearch5/ElasticsearchProducer.java      |  274 ------
 .../BulkRequestAggregationStrategy.java            |   52 -
 .../ElasticsearchActionRequestConverter.java       |  261 -----
 .../src/main/resources/META-INF/LICENSE.txt        |  203 ----
 .../src/main/resources/META-INF/NOTICE.txt         |   11 -
 .../services/org/apache/camel/TypeConverter        |   17 -
 .../org/apache/camel/component/elasticsearch5      |   18 -
 .../elasticsearch5/ElasticsearchBaseTest.java      |  122 ---
 .../elasticsearch5/ElasticsearchBulkTest.java      |   93 --
 .../ElasticsearchClusterBaseTest.java              |  134 ---
 .../ElasticsearchClusterIndexTest.java             |  102 --
 ...asticsearchGetSearchDeleteExistsUpdateTest.java |  388 --------
 .../elasticsearch5/ElasticsearchIndexTest.java     |   78 --
 .../src/test/resources/log4j2.properties           |   28 -
 components/camel-groovy-dsl/pom.xml                |  209 ----
 .../camel-groovy-dsl/src/main/docs/groovy-dsl.adoc |  402 --------
 .../groovy/converter/GPathResultConverter.java     |   53 -
 .../camel/groovy/converter/TypeConverter.java      |   83 --
 .../groovy/dataformat/AbstractXmlDataFormat.java   |  104 --
 .../groovy/dataformat/XmlParserDataFormat.java     |   65 --
 .../groovy/dataformat/XmlSlurperDataFormat.java    |   55 --
 .../camel/groovy/extend/CamelGroovyMethods.java    |  383 --------
 .../groovy/extend/ClosureAggregationStrategy.java  |   37 -
 .../camel/groovy/extend/ClosureExpression.java     |   46 -
 .../camel/groovy/extend/ClosureProcessor.java      |   40 -
 .../apache/camel/groovy/extend/ClosureSupport.java |   39 -
 .../src/main/resources/META-INF/LICENSE.txt        |  203 ----
 .../src/main/resources/META-INF/NOTICE.txt         |   11 -
 .../META-INF/services/camel/TypeConverter          |   18 -
 .../META-INF/services/groovy/groovyMethods         |   18 -
 .../org.codehaus.groovy.runtime.ExtensionModule    |   20 -
 .../main/resources/dsld/CamelGroovyMethods.dsld    |  110 ---
 .../main/resources/gdsl/CamelGroovyMethods.gdsl    |  110 ---
 .../camel/language/groovy/ConfigureCamel.groovy    |   47 -
 .../groovy/extend/CamelGroovyMethodsTest.groovy    |  244 -----
 .../extend/ClosureAggregationStrategyTest.groovy   |   55 --
 .../groovy/extend/ClosureExpressionTest.groovy     |   72 --
 .../groovy/extend/ClosureProcessorTest.groovy      |   57 --
 .../src/test/resources/log4j2.properties           |   30 -
 .../src/test/resources/mygroovy.groovy             |   18 -
 components/camel-guice/pom.xml                     |   94 --
 components/camel-guice/src/main/docs/guice.adoc    |  161 ---
 .../java/org/apache/camel/guice/CamelModule.java   |   64 --
 .../camel/guice/CamelModuleWithMatchingRoutes.java |   60 --
 .../camel/guice/CamelModuleWithRouteTypes.java     |   69 --
 .../org/apache/camel/guice/GuiceCamelContext.java  |  176 ----
 .../src/main/java/org/apache/camel/guice/Main.java |  167 ----
 .../apache/camel/guice/impl/ConsumerInjection.java |   52 -
 .../apache/camel/guice/impl/EndpointInjector.java  |   70 --
 .../org/apache/camel/guice/impl/GuiceInjector.java |   55 --
 .../apache/camel/guice/impl/ProduceInjector.java   |   68 --
 .../org/apache/camel/guice/inject/Configures.java  |   36 -
 .../org/apache/camel/guice/inject/Injectors.java   |  457 ---------
 .../guice/jndi/GuiceInitialContextFactory.java     |  125 ---
 .../java/org/apache/camel/guice/jndi/JndiBind.java |   49 -
 .../org/apache/camel/guice/jndi/JndiBindings.java  |  129 ---
 .../apache/camel/guice/jndi/internal/Classes.java  |   55 --
 .../camel/guice/jndi/internal/JndiContext.java     |  424 --------
 .../camel/guice/jsr250/AnnotatedMethodCache.java   |   80 --
 .../apache/camel/guice/jsr250/Jsr250Module.java    |   55 --
 .../camel/guice/jsr250/NamedProviderSupport.java   |   92 --
 .../camel/guice/jsr250/PreDestroyCloser.java       |   53 -
 .../camel/guice/jsr250/ResourceMemberProvider.java |   47 -
 .../guice/support/AnnotationMemberProvider.java    |   47 -
 .../support/AnnotationMemberProviderSupport.java   |   57 --
 .../apache/camel/guice/support/CloseErrors.java    |   42 -
 .../camel/guice/support/CloseFailedException.java  |   43 -
 .../org/apache/camel/guice/support/CloseTask.java  |   28 -
 .../org/apache/camel/guice/support/Closer.java     |   36 -
 .../org/apache/camel/guice/support/Closers.java    |   53 -
 .../camel/guice/support/CompositeCloser.java       |   55 --
 .../camel/guice/support/EncounterProvider.java     |   71 --
 .../camel/guice/support/GuiceyFruitModule.java     |  482 ---------
 .../camel/guice/support/HasScopeAnnotation.java    |   33 -
 .../apache/camel/guice/support/MethodHandler.java  |   38 -
 .../org/apache/camel/guice/support/Reflectors.java |   71 --
 .../guice/support/internal/CloseErrorsImpl.java    |   50 -
 .../camel/guice/support/internal/MethodKey.java    |   67 --
 .../org/apache/camel/guice/util/CachedValue.java   |   24 -
 .../apache/camel/guice/util/CachingProvider.java   |   26 -
 .../apache/camel/guice/util/CloseableScope.java    |  105 --
 .../src/main/resources/META-INF/LICENSE.txt        |  203 ----
 .../src/main/resources/META-INF/NOTICE.txt         |   11 -
 .../camel/guice/CollectionOfCustomRoutesTest.java  |   63 --
 .../camel/guice/ComponentFoundInRegistryTest.java  |   75 --
 .../apache/camel/guice/ConciseGuiceRouteTest.java  |   39 -
 .../apache/camel/guice/EndpointInjectionTest.java  |   71 --
 .../guice/FileEndpointReferenceRouteTest.java      |  101 --
 .../camel/guice/GuiceRouteWithNamedKeysTest.java   |   85 --
 .../java/org/apache/camel/guice/GuiceTest.java     |   77 --
 .../test/java/org/apache/camel/guice/MainTest.java |   59 --
 .../apache/camel/guice/MyConfigurableRoute.java    |   42 -
 .../apache/camel/guice/MyConfigurableRoute2.java   |   46 -
 .../org/apache/camel/guice/MyHardcodeRoute.java    |   41 -
 .../org/apache/camel/guice/MyRouteInstaller.java   |   35 -
 .../camel/guice/TraditionalGuiceRouteTest.java     |   45 -
 .../apache/camel/guice/consume/ConsumeTest.java    |   69 --
 .../apache/camel/guice/patterns/FilterTest.java    |   78 --
 .../org/apache/camel/guice/produce/MyListener.java |   26 -
 .../camel/guice/produce/MyListenerService.java     |   38 -
 .../apache/camel/guice/produce/ProduceTest.java    |   52 -
 .../apache/camel/guice/testing/ClassScoped.java    |   37 -
 .../camel/guice/testing/InjectorManager.java       |  233 -----
 .../org/apache/camel/guice/testing/TestScoped.java |   43 -
 .../org/apache/camel/guice/testing/UseModule.java  |   40 -
 .../camel/guice/testing/junit4/GuiceyJUnit4.java   |   90 --
 .../camel-guice/src/test/resources/jndi.properties |   27 -
 .../src/test/resources/log4j2.properties           |   28 -
 components/camel-hawtdb/pom.xml                    |   88 --
 components/camel-hawtdb/src/main/docs/hawtdb.adoc  |  149 ---
 .../hawtdb/HawtDBAggregationRepository.java        |  529 ----------
 .../camel/component/hawtdb/HawtDBCamelCodec.java   |   90 --
 .../apache/camel/component/hawtdb/HawtDBFile.java  |  199 ----
 .../org/apache/camel/component/hawtdb/Work.java    |   35 -
 .../org/apache/camel/component/hawtdb/package.html |   24 -
 .../src/main/resources/META-INF/LICENSE.txt        |  203 ----
 .../src/main/resources/META-INF/NOTICE.txt         |   11 -
 .../apache/camel/component/hawtdb/BigPayload.java  |   34 -
 .../hawtdb/HawtDBAggregateBufferSizeTest.java      |   41 -
 ...wtDBAggregateConcurrentDifferentGroupsTest.java |  108 --
 .../HawtDBAggregateConcurrentSameGroupTest.java    |  107 --
 .../HawtDBAggregateDiscardOnTimeoutTest.java       |   95 --
 .../HawtDBAggregateForceCompletionHeaderTest.java  |  118 ---
 .../hawtdb/HawtDBAggregateLoadAndRecoverTest.java  |  133 ---
 .../hawtdb/HawtDBAggregateLoadConcurrentTest.java  |  113 ---
 .../component/hawtdb/HawtDBAggregateLoadTest.java  |   98 --
 ...DBAggregateNotLostRemovedWhenConfirmedTest.java |  101 --
 .../hawtdb/HawtDBAggregateNotLostTest.java         |  115 ---
 ...ggregateRecoverDeadLetterChannelFailedTest.java |  113 ---
 ...awtDBAggregateRecoverDeadLetterChannelTest.java |  109 ---
 .../hawtdb/HawtDBAggregateRecoverTest.java         |  104 --
 ...DBAggregateRecoverWithRedeliveryPolicyTest.java |  108 --
 .../hawtdb/HawtDBAggregateRecoverWithSedaTest.java |  109 ---
 .../HawtDBAggregateSerializedHeadersTest.java      |   90 --
 .../component/hawtdb/HawtDBAggregateTest.java      |   87 --
 ...awtDBAggregateTimeoutCompletionRestartTest.java |   91 --
 .../HawtDBAggregationRepositoryAlotDataTest.java   |  107 --
 ...awtDBAggregationRepositoryLoadExistingTest.java |   86 --
 ...awtDBAggregationRepositoryMultipleRepoTest.java |  127 ---
 ...DBAggregationRepositoryRecoverExistingTest.java |   80 --
 .../hawtdb/HawtDBAggregationRepositoryTest.java    |   97 --
 .../component/hawtdb/HawtDBBigPayloadTest.java     |   82 --
 .../hawtdb/HawtDBExchangeSerializationTest.java    |   94 --
 .../component/hawtdb/HawtDBGetNotFoundTest.java    |   84 --
 .../component/hawtdb/HawtDBGrowIssueTest.java      |   98 --
 ...ngAggregateRecoverWithRedeliveryPolicyTest.java |   91 --
 .../hawtdb/HawtDBSpringAggregateTest.java          |   71 --
 .../camel/component/hawtdb/util/HeaderDto.java     |   56 --
 .../src/test/resources/jndi.properties             |   18 -
 .../src/test/resources/log4j2.properties           |   28 -
 ...ingAggregateRecoverWithRedeliveryPolicyTest.xml |   68 --
 .../component/hawtdb/HawtDBSpringAggregateTest.xml |   57 --
 components/camel-hdfs/pom.xml                      |  144 ---
 .../camel-hdfs/src/main/docs/hdfs-component.adoc   |  265 -----
 .../apache/camel/component/hdfs/HdfsComponent.java |   87 --
 .../camel/component/hdfs/HdfsCompressionCodec.java |   49 -
 .../camel/component/hdfs/HdfsConfiguration.java    |  542 -----------
 .../apache/camel/component/hdfs/HdfsConstants.java |   51 -
 .../apache/camel/component/hdfs/HdfsConsumer.java  |  198 ----
 .../apache/camel/component/hdfs/HdfsEndpoint.java  |   69 --
 .../camel/component/hdfs/HdfsFileSystemType.java   |   51 -
 .../apache/camel/component/hdfs/HdfsFileType.java  |  516 ----------
 .../apache/camel/component/hdfs/HdfsHeader.java    |   23 -
 .../org/apache/camel/component/hdfs/HdfsInfo.java  |   51 -
 .../camel/component/hdfs/HdfsInfoFactory.java      |   43 -
 .../camel/component/hdfs/HdfsInputStream.java      |  108 --
 .../camel/component/hdfs/HdfsOutputStream.java     |  121 ---
 .../apache/camel/component/hdfs/HdfsProducer.java  |  298 ------
 .../component/hdfs/HdfsWritableFactories.java      |  241 -----
 .../org/apache/camel/component/hdfs/Holder.java    |   40 -
 .../apache/camel/component/hdfs/WritableType.java  |   97 --
 .../src/main/resources/META-INF/LICENSE.txt        |  203 ----
 .../src/main/resources/META-INF/NOTICE.txt         |   11 -
 .../services/org/apache/camel/component/hdfs       |   18 -
 .../camel/component/hdfs/FromFileToHdfsTest.java   |  112 ---
 .../camel/component/hdfs/HdfsConsumerTest.java     |  583 -----------
 .../component/hdfs/HdfsProducerConsumerTest.java   |   94 --
 .../component/hdfs/HdfsProducerSplitTest.java      |  135 ---
 .../camel/component/hdfs/HdfsProducerTest.java     |  438 ---------
 .../camel/component/hdfs/HdfsTestSupport.java      |   40 -
 .../component/hdfs/integration/HdfsAppendTest.java |   93 --
 .../HdfsProducerConsumerIntegrationTest.java       |   79 --
 .../src/test/resources/log4j2.properties           |   28 -
 components/camel-http/pom.xml                      |  108 --
 .../camel-http/src/main/docs/http-component.adoc   |  578 -----------
 .../apache/camel/component/http/AuthMethod.java    |   26 -
 .../BasicAuthenticationHttpClientConfigurer.java   |   55 --
 .../component/http/CompositeHttpConfigurer.java    |   61 --
 .../camel/component/http/HttpClientConfigurer.java |   33 -
 .../apache/camel/component/http/HttpComponent.java |  418 --------
 .../http/HttpComponentVerifierExtension.java       |  246 -----
 .../apache/camel/component/http/HttpEndpoint.java  |  215 ----
 .../apache/camel/component/http/HttpMethods.java   |   61 --
 .../http/HttpOperationFailedException.java         |   30 -
 .../camel/component/http/HttpPollingConsumer.java  |  127 ---
 .../apache/camel/component/http/HttpProducer.java  |  514 ----------
 .../camel/component/http/HttpProxyConfigurer.java  |   46 -
 .../org/apache/camel/component/http/HttpUtil.java  |   37 -
 .../NTLMAuthenticationHttpClientConfigurer.java    |   67 --
 .../component/http/RequestEntityConverter.java     |   92 --
 ...ntextParametersSecureProtocolSocketFactory.java |  111 ---
 .../org/apache/camel/component/http/package.html   |   25 -
 .../src/main/resources/META-INF/LICENSE.txt        |  203 ----
 .../src/main/resources/META-INF/NOTICE.txt         |   11 -
 .../services/org/apache/camel/TypeConverter        |   18 -
 .../services/org/apache/camel/component/http       |   18 -
 .../services/org/apache/camel/component/https      |   18 -
 .../services/org/apache/camel/send-dynamic/http    |   18 -
 .../services/org/apache/camel/send-dynamic/https   |   18 -
 .../apache/camel/component/http/BaseHttpTest.java  |   72 --
 .../camel/component/http/GoogleUrlRewrite.java     |   35 -
 .../component/http/HttpAuthMethodPriorityTest.java |   62 --
 .../component/http/HttpBridgeEndpointTest.java     |  121 ---
 .../http/HttpComponentVerifierExtensionTest.java   |  151 ---
 .../component/http/HttpComponentVerifierTest.java  |  150 ---
 .../http/HttpConnectionManagerSettingTest.java     |   58 --
 .../HttpEndpointOptionsNotChangeComponentTest.java |   89 --
 .../camel/component/http/HttpEndpointURLTest.java  |   49 -
 .../http/HttpExplicitConnectionCloseTest.java      |   78 --
 .../http/HttpGetHeadersNotCopiedTest.java          |   45 -
 .../apache/camel/component/http/HttpGetTest.java   |   77 --
 .../camel/component/http/HttpGetURLTest.java       |   76 --
 .../camel/component/http/HttpGetUriParamTest.java  |   75 --
 .../component/http/HttpGetWithHeadersTest.java     |   54 -
 ...pGetWithPathHeaderAndStaticQueryStringTest.java |   36 -
 .../component/http/HttpGetWithPathHeaderTest.java  |   37 -
 .../component/http/HttpGetWithQueryParamsTest.java |   31 -
 .../http/HttpHeaderFilterStrategyTest.java         |  110 ---
 .../http/HttpInterceptSendToEndpointTest.java      |   54 -
 .../http/HttpInvalidConfigurationTest.java         |   58 --
 .../HttpInvalidHttpClientConfigurationTest.java    |   58 --
 .../camel/component/http/HttpPostWithBodyTest.java |  120 ---
 .../http/HttpProducerSelectMethodTest.java         |  187 ----
 .../component/http/HttpProducerSessionTest.java    |  116 ---
 .../component/http/HttpProxyAuthBasicTest.java     |   63 --
 .../component/http/HttpProxyAuthDigestTest.java    |   60 --
 .../component/http/HttpProxyAuthNTLMTest.java      |   67 --
 .../apache/camel/component/http/HttpProxyTest.java |  117 ---
 .../component/http/HttpQueryGoogleProxyTest.java   |   52 -
 .../camel/component/http/HttpQueryGoogleTest.java  |   43 -
 .../component/http/HttpReferenceParameterTest.java |   93 --
 .../component/http/HttpSendDynamicAwareTest.java   |   96 --
 .../apache/camel/component/http/HttpsGetTest.java  |   40 -
 .../http/HttpsSslContextParametersGetTest.java     |   46 -
 .../camel/component/http/UrlRewriteTest.java       |   62 --
 .../handler/BasicRawQueryValidationHandler.java    |   38 -
 .../http/handler/BasicValidationHandler.java       |   97 --
 .../http/handler/DrinkValidationHandler.java       |   40 -
 .../http/handler/SessionReflectionHandler.java     |   47 -
 .../component/http/helper/HttpHelperTest.java      |  227 -----
 .../http/helper/HttpMethodsHelperTest.java         |  100 --
 .../src/test/resources/log4j2.properties           |   30 -
 components/camel-ibatis/pom.xml                    |   84 --
 .../src/main/docs/ibatis-component.adoc            |  259 -----
 .../camel/component/ibatis/IBatisComponent.java    |  145 ---
 .../camel/component/ibatis/IBatisConstants.java    |   31 -
 .../camel/component/ibatis/IBatisConsumer.java     |  211 ----
 .../camel/component/ibatis/IBatisEndpoint.java     |  212 ----
 .../camel/component/ibatis/IBatisProducer.java     |  175 ----
 .../camel/component/ibatis/StatementType.java      |   27 -
 .../strategy/DefaultIBatisProcessingStategy.java   |   68 --
 .../ibatis/strategy/IBatisProcessingStrategy.java  |   64 --
 .../ibatis/strategy/TransactionIsolationLevel.java |   56 --
 .../src/main/resources/META-INF/LICENSE.txt        |  203 ----
 .../src/main/resources/META-INF/NOTICE.txt         |   11 -
 .../services/org/apache/camel/component/ibatis     |   18 -
 .../org/apache/camel/component/ibatis/Account.java |   61 --
 .../component/ibatis/IBatisBatchConsumerTest.java  |   49 -
 .../ibatis/IBatisConsumerIdleMessageTest.java      |   55 --
 .../ibatis/IBatisPollingDelayRouteTest.java        |   49 -
 .../component/ibatis/IBatisQueryForDeleteTest.java |   71 --
 .../component/ibatis/IBatisQueryForInsertTest.java |   57 --
 .../component/ibatis/IBatisQueryForListTest.java   |   56 --
 .../ibatis/IBatisQueryForListWithSplitTest.java    |   56 --
 .../component/ibatis/IBatisQueryForObjectTest.java |   64 --
 .../component/ibatis/IBatisQueryForUpdateTest.java |   64 --
 .../camel/component/ibatis/IBatisQueueTest.java    |   85 --
 .../ibatis/IBatisRouteEmptyResultSetTest.java      |   51 -
 .../camel/component/ibatis/IBatisRouteTest.java    |   70 --
 .../ibatis/IBatisShutdownAllTasksTest.java         |  118 ---
 .../ibatis/IBatisShutdownCurrentTaskOnlyTest.java  |  113 ---
 .../camel/component/ibatis/IBatisTestSupport.java  |   87 --
 .../ibatis/IBatisUnknownStatementTypeTest.java     |   48 -
 .../src/test/resources/SqlMapConfig.xml            |   48 -
 .../src/test/resources/log4j2.properties           |   28 -
 .../org/apache/camel/component/ibatis/Account.xml  |  105 --
 components/camel-javaspace/README                  |    9 -
 components/camel-javaspace/pom.xml                 |  131 ---
 .../src/main/docs/javaspace-component.adoc         |  167 ----
 .../apache/camel/component/javaspace/InEntry.java  |   42 -
 .../component/javaspace/JavaSpaceComponent.java    |   48 -
 .../component/javaspace/JavaSpaceConsumer.java     |  212 ----
 .../component/javaspace/JavaSpaceEndpoint.java     |  141 ---
 .../component/javaspace/JavaSpaceProducer.java     |  133 ---
 .../component/javaspace/JiniSpaceAccessor.java     |   52 -
 .../apache/camel/component/javaspace/OutEntry.java |   42 -
 .../component/javaspace/TransactionHelper.java     |   83 --
 .../apache/camel/component/javaspace/Utility.java  |   55 --
 .../src/main/resources/META-INF/LICENSE.txt        |  203 ----
 .../src/main/resources/META-INF/NOTICE.txt         |   11 -
 .../services/org/apache/camel/component/javaspace  |   18 -
 .../camel-javaspace/src/main/resources/policy.all  |   19 -
 .../camel/component/javaspace/ITestPojo.java       |   26 -
 .../javaspace/JavaSpaceRequestReplyTest.java       |  117 ---
 .../javaspace/JavaSpaceSendReceiveTest.java        |   86 --
 .../JavaSpaceTransportSendReceiveTest.java         |   86 --
 .../component/javaspace/JavaspacesXPathTest.java   |   72 --
 .../apache/camel/component/javaspace/Reply.java    |   41 -
 .../apache/camel/component/javaspace/Request.java  |   41 -
 .../camel/component/javaspace/TestEntry.java       |   53 -
 .../apache/camel/component/javaspace/TestPojo.java |   30 -
 .../src/test/resources/log4j2.properties           |   28 -
 .../apache/camel/component/javaspace/spring.xml    |   30 -
 components/camel-jetty9/pom.xml                    |    4 +-
 .../src/main/docs/jetty-component.adoc             |    4 +-
 .../jetty/HttpAuthMethodPriorityTest.java          |    2 +-
 .../HttpBasicAuthComponentConfiguredTest.java      |    2 +-
 ...gMapHttpMessageFormUrlEncodedFalseBodyTest.java |    2 +-
 ...pBindingPreservePostFormUrlEncodedBodyTest.java |    2 +-
 .../jetty/HttpBridgeMultipartRouteTest.java        |    2 +-
 .../jetty/JettyHttpClientOptionsTest.java          |   18 +-
 .../component/jetty/MultiThreadedHttpGetTest.java  |   12 +-
 .../component/jetty/javabody/HttpJavaBodyTest.java |    2 +-
 .../JettyHttpProducerPutContentTest.java           |    2 +-
 components/camel-jira/pom.xml                      |   87 --
 .../camel-jira/src/main/docs/jira-component.adoc   |  138 ---
 .../apache/camel/component/jira/JIRAComponent.java |   35 -
 .../apache/camel/component/jira/JIRAEndpoint.java  |  155 ---
 .../org/apache/camel/component/jira/JIRAType.java  |   22 -
 .../jira/consumer/AbstractJIRAConsumer.java        |  102 --
 .../jira/consumer/NewCommentConsumer.java          |   79 --
 .../component/jira/consumer/NewIssueConsumer.java  |   82 --
 .../jira/producer/AbstractJIRAProducer.java        |   45 -
 .../component/jira/producer/NewIssueProducer.java  |   50 -
 .../src/main/resources/META-INF/LICENSE.txt        |  203 ----
 .../src/main/resources/META-INF/NOTICE.txt         |   11 -
 .../services/org/apache/camel/component/jira       |   18 -
 .../camel/component/jira/CommentConsumerTest.java  |  120 ---
 .../camel/component/jira/IssueConsumerTest.java    |  115 ---
 .../component/jira/mocks/MockIssueClient.java      |  247 -----
 .../mocks/MockJerseyJiraRestClientFactory.java     |   36 -
 .../component/jira/mocks/MockJiraRestClient.java   |   84 --
 .../component/jira/mocks/MockSearchRestClient.java |  108 --
 .../component/jira/mocks/MockSearchResult.java     |   66 --
 .../src/test/resources/log4j2.properties           |   30 -
 components/camel-kestrel/pom.xml                   |   94 --
 .../src/main/docs/kestrel-component.adoc           |  300 ------
 .../camel/component/kestrel/KestrelComponent.java  |  209 ----
 .../component/kestrel/KestrelConfiguration.java    |  130 ---
 .../camel/component/kestrel/KestrelConsumer.java   |  317 ------
 .../camel/component/kestrel/KestrelEndpoint.java   |   95 --
 .../camel/component/kestrel/KestrelProducer.java   |   51 -
 .../src/main/resources/META-INF/LICENSE.txt        |  203 ----
 .../src/main/resources/META-INF/NOTICE.txt         |   11 -
 .../services/org/apache/camel/component/kestrel    |   18 -
 .../component/kestrel/KestrelEndpointTest.java     |  143 ---
 .../kestrel/KestrelProduceAndConsumeTest.java      |   62 --
 .../component/kestrel/KestrelProducerTest.java     |   37 -
 .../kestrel/KestrelSingleThreadedConsumerTest.java |   62 --
 .../component/kestrel/KestrelSpringXmlTest.java    |   61 --
 .../src/test/resources/log4j2.properties           |   28 -
 .../kestrel/KestrelSpringXmlTest-context.xml       |   34 -
 components/camel-krati/pom.xml                     |   83 --
 .../camel-krati/src/main/docs/krati-component.adoc |  235 -----
 .../camel/component/krati/KratiComponent.java      |   39 -
 .../camel/component/krati/KratiConstants.java      |   48 -
 .../camel/component/krati/KratiConsumer.java       |  113 ---
 .../krati/KratiDataStoreRegistration.java          |   57 --
 .../camel/component/krati/KratiEndpoint.java       |  251 -----
 .../apache/camel/component/krati/KratiHelper.java  |   88 --
 .../camel/component/krati/KratiProducer.java       |  127 ---
 .../idempotent/KratiIdempotentRepository.java      |  156 ---
 .../krati/serializer/KratiDefaultSerializer.java   |  104 --
 .../src/main/resources/META-INF/LICENSE.txt        |  203 ----
 .../src/main/resources/META-INF/NOTICE.txt         |   11 -
 .../services/org/apache/camel/component/krati      |   18 -
 .../apache/camel/component/krati/KeyObject.java    |   52 -
 .../krati/KratiConsumerMaxMessagesPerPollTest.java |   65 --
 .../component/krati/KratiConsumerSpringTest.java   |   45 -
 .../camel/component/krati/KratiConsumerTest.java   |   50 -
 .../camel/component/krati/KratiEndpointTest.java   |   44 -
 .../component/krati/KratiProducerSpringTest.java   |   84 --
 .../camel/component/krati/KratiProducerTest.java   |  113 ---
 .../apache/camel/component/krati/ValueObject.java  |   52 -
 .../idempotent/KratiIdempotentRepositoryTest.java  |  132 ---
 .../src/test/resources/consumer-test.xml           |   40 -
 .../src/test/resources/log4j2.properties           |   28 -
 .../src/test/resources/producer-test.xml           |   50 -
 components/camel-mina/pom.xml                      |  120 ---
 .../camel-mina/src/main/docs/mina-component.adoc   |  343 -------
 .../apache/camel/component/mina/MinaComponent.java |  407 --------
 .../camel/component/mina/MinaConfiguration.java    |  336 -------
 .../apache/camel/component/mina/MinaConstants.java |   38 -
 .../apache/camel/component/mina/MinaConsumer.java  |  192 ----
 .../apache/camel/component/mina/MinaConverter.java |   76 --
 .../apache/camel/component/mina/MinaEndpoint.java  |  181 ----
 .../apache/camel/component/mina/MinaHelper.java    |   59 --
 .../camel/component/mina/MinaPayloadHelper.java    |   75 --
 .../apache/camel/component/mina/MinaProducer.java  |  298 ------
 .../mina/MinaUdpProtocolCodecFactory.java          |   88 --
 .../camel/component/mina/TextLineCodecFactory.java |   72 --
 .../camel/component/mina/TextLineDelimiter.java    |   24 -
 .../src/main/resources/META-INF/LICENSE.txt        |  203 ----
 .../src/main/resources/META-INF/NOTICE.txt         |   11 -
 .../services/org/apache/camel/TypeConverter        |   18 -
 .../services/org/apache/camel/component/mina       |   18 -
 components/camel-mina/src/test/data/message1.txt   |    1 -
 .../apache/camel/component/mina/BaseMinaTest.java  |   83 --
 .../camel/component/mina/MessageIOSessionTest.java |   71 --
 .../MinaClientModeTcpTextlineDelimiterTest.java    |   89 --
 .../camel/component/mina/MinaClientServerTest.java |   63 --
 .../camel/component/mina/MinaComponentTest.java    |   53 -
 .../mina/MinaComponentWithConfigurationTest.java   |   53 -
 .../camel/component/mina/MinaConsumerTest.java     |   75 --
 .../camel/component/mina/MinaConverterTest.java    |  101 --
 .../camel/component/mina/MinaCustomCodecTest.java  |  131 ---
 .../camel/component/mina/MinaDisconnectTest.java   |   48 -
 .../camel/component/mina/MinaEncodingTest.java     |  197 ----
 .../mina/MinaExchangeDefaultTimeOutTest.java       |   59 --
 .../component/mina/MinaExchangeTimeOutTest.java    |   69 --
 .../camel/component/mina/MinaFileTcpTest.java      |   49 -
 .../camel/component/mina/MinaFileUdpTest.java      |   48 -
 .../camel/component/mina/MinaFiltersTest.java      |  112 ---
 .../camel/component/mina/MinaInOnlyRouteTest.java  |   58 --
 .../MinaInOutCloseSessionWhenCompleteTest.java     |   49 -
 .../camel/component/mina/MinaInOutRouteTest.java   |   62 --
 .../mina/MinaInOutRouteTextLineDelimiterTest.java  |   57 --
 .../mina/MinaInOutWithForcedNoResponseTest.java    |   77 --
 .../camel/component/mina/MinaLoggerOptionTest.java |  126 ---
 .../component/mina/MinaMaxLineLengthTest.java      |   69 --
 .../component/mina/MinaNoDefaultCodecTest.java     |   56 --
 .../mina/MinaNoResponseFromServerTest.java         |  106 --
 .../mina/MinaProducerAnotherConcurrentTest.java    |   95 --
 .../component/mina/MinaProducerConcurrentTest.java |   93 --
 .../mina/MinaProducerShutdownMockTest.java         |   75 --
 .../component/mina/MinaProducerShutdownTest.java   |   93 --
 .../component/mina/MinaSendToProcessorTest.java    |   62 --
 .../MinaTcpLineDelimiterUsingPlainSocketTest.java  |  144 ---
 .../apache/camel/component/mina/MinaTcpTest.java   |   58 --
 .../mina/MinaTcpTextlineDelimiterTest.java         |   48 -
 .../mina/MinaTcpTextlineProtocolTest.java          |   48 -
 .../camel/component/mina/MinaTcpWithInOutTest.java |  130 ---
 .../mina/MinaTcpWithInOutUsingPlainSocketTest.java |  149 ---
 .../MinaTcpWithIoOutProcessorExceptionTest.java    |   55 --
 .../mina/MinaTransferExchangeOptionTest.java       |  122 ---
 .../apache/camel/component/mina/MinaUdpTest.java   |   71 --
 .../component/mina/MinaUdpUsingTemplateTest.java   |  113 ---
 .../mina/MinaUdpWithInOutUsingPlainSocketTest.java |   79 --
 .../component/mina/MinaVMCustomCodecTest.java      |  131 ---
 .../camel/component/mina/MinaVMFileTcpTest.java    |   49 -
 .../component/mina/MinaVMTextlineProtocolTest.java |   48 -
 .../mina/MinaVMTransferExchangeOptionTest.java     |  123 ---
 .../apache/camel/component/mina/MinaVmTest.java    |   47 -
 .../component/mina/ReverseProtocolHandler.java     |   47 -
 .../camel/component/mina/ReverserServer.java       |   61 --
 .../component/mina/SpringMinaEndpointTest.java     |   48 -
 .../src/test/resources/jndi-example.properties     |   22 -
 .../src/test/resources/log4j2.properties           |   34 -
 .../mina/SpringMinaEndpointTest-context.xml        |   65 --
 components/camel-mongodb/pom.xml                   |  123 ---
 .../src/main/docs/mongodb-component.adoc           | 1027 --------------------
 .../component/mongodb/CamelMongoDbException.java   |   35 -
 .../component/mongodb/MongoDBTailTrackingEnum.java |   52 -
 .../mongodb/MongoDBTailTrackingStrategy.java       |   42 -
 .../camel/component/mongodb/MongoDbComponent.java  |   71 --
 .../camel/component/mongodb/MongoDbConstants.java  |   48 -
 .../component/mongodb/MongoDbConsumerType.java     |   24 -
 .../camel/component/mongodb/MongoDbEndpoint.java   |  690 -------------
 .../camel/component/mongodb/MongoDbOperation.java  |   49 -
 .../camel/component/mongodb/MongoDbOutputType.java |   21 -
 .../camel/component/mongodb/MongoDbProducer.java   |  614 ------------
 .../mongodb/MongoDbTailTrackingConfig.java         |   64 --
 .../mongodb/MongoDbTailTrackingManager.java        |   97 --
 .../mongodb/MongoDbTailableCursorConsumer.java     |   65 --
 .../component/mongodb/MongoDbTailingProcess.java   |  213 ----
 .../mongodb/converters/MongoDbBasicConverters.java |   95 --
 .../converters/MongoDbFallbackConverter.java       |   90 --
 .../idempotent/MongoDbIdempotentRepository.java    |  131 ---
 .../src/main/resources/META-INF/LICENSE.txt        |  203 ----
 .../src/main/resources/META-INF/NOTICE.txt         |   11 -
 .../services/org/apache/camel/TypeConverter        |   19 -
 .../services/org/apache/camel/component/mongodb    |   18 -
 .../component/mongodb/AbstractMongoDbTest.java     |  113 ---
 .../component/mongodb/EmbedMongoConfiguration.java |   59 --
 .../mongodb/MongoBasicOperationsConfiguration.java |   27 -
 .../mongodb/MongoDBTailTrackingStrategyTest.java   |   75 --
 .../mongodb/MongoDbAggregateOperationTest.java     |  124 ---
 .../mongodb/MongoDbBigDecimalConverterTest.java    |   60 --
 .../mongodb/MongoDbBulkWriteOperationTest.java     |  122 ---
 .../component/mongodb/MongoDbConversionsTest.java  |  116 ---
 .../component/mongodb/MongoDbDynamicityTest.java   |  156 ---
 .../mongodb/MongoDbExceptionHandlingTest.java      |   95 --
 .../mongodb/MongoDbFindOperationTest.java          |  293 ------
 .../mongodb/MongoDbHeaderHandlingTest.java         |  124 ---
 .../camel/component/mongodb/MongoDbIndexTest.java  |  216 ----
 .../component/mongodb/MongoDbOperationsTest.java   |  321 ------
 .../component/mongodb/MongoDbOutputTypeTest.java   |  134 ---
 .../mongodb/MongoDbReadPreferenceOptionTest.java   |   86 --
 .../mongodb/MongoDbSpringDslOperationsTest.java    |   43 -
 .../mongodb/MongoDbTailableCursorConsumerTest.java |  450 ---------
 .../mongodb/MongoDbWriteConcernsTest.java          |   71 --
 .../MongoDbIdempotentRepositoryTest.java           |  113 ---
 .../src/test/resources/log4j2.properties           |   28 -
 .../src/test/resources/mongodb.test.properties     |   21 -
 .../component/mongodb/mongoBasicOperationsTest.xml |  100 --
 components/camel-netty-http/pom.xml                |   98 --
 .../src/main/docs/netty-http-component.adoc        |  573 -----------
 .../component/netty/http/ContextPathMatcher.java   |   55 --
 .../netty/http/DefaultContextPathMatcher.java      |   88 --
 .../netty/http/DefaultNettyHttpBinding.java        |  562 -----------
 .../netty/http/DefaultNettySharedHttpServer.java   |  131 ---
 .../netty/http/HttpClientPipelineFactory.java      |  186 ----
 .../camel/component/netty/http/HttpPrincipal.java  |   52 -
 .../netty/http/HttpServerBootstrapFactory.java     |  101 --
 .../http/HttpServerConsumerChannelFactory.java     |   63 --
 .../netty/http/HttpServerPipelineFactory.java      |  201 ----
 .../http/HttpServerSharedPipelineFactory.java      |  164 ----
 .../netty/http/JAASSecurityAuthenticator.java      |   73 --
 .../netty/http/NettyChannelBufferStreamCache.java  |  104 --
 .../component/netty/http/NettyHttpBinding.java     |  117 ---
 .../component/netty/http/NettyHttpComponent.java   |  431 --------
 .../netty/http/NettyHttpConfiguration.java         |  331 -------
 .../component/netty/http/NettyHttpConstants.java   |   34 -
 .../component/netty/http/NettyHttpConsumer.java    |   75 --
 .../component/netty/http/NettyHttpConverter.java   |  113 ---
 .../component/netty/http/NettyHttpEndpoint.java    |  253 -----
 .../netty/http/NettyHttpHeaderFilterStrategy.java  |   54 -
 .../component/netty/http/NettyHttpHelper.java      |  283 ------
 .../component/netty/http/NettyHttpMessage.java     |   53 -
 .../http/NettyHttpOperationFailedException.java    |   78 --
 .../component/netty/http/NettyHttpProducer.java    |  119 ---
 .../netty/http/NettyHttpSecurityConfiguration.java |  115 ---
 .../netty/http/NettySharedHttpServer.java          |   74 --
 ...ettySharedHttpServerBootstrapConfiguration.java |   59 --
 .../netty/http/RestContextPathMatcher.java         |  130 ---
 .../component/netty/http/RestNettyHttpBinding.java |   91 --
 .../netty/http/SecurityAuthenticator.java          |   76 --
 .../netty/http/SecurityAuthenticatorSupport.java   |  128 ---
 .../component/netty/http/SecurityConstraint.java   |   31 -
 .../netty/http/SecurityConstraintMapping.java      |  133 ---
 .../http/handlers/HttpClientChannelHandler.java    |  129 ---
 .../http/handlers/HttpServerChannelHandler.java    |  336 -------
 .../HttpServerMultiplexChannelHandler.java         |  329 -------
 .../src/main/resources/META-INF/LICENSE.txt        |  203 ----
 .../src/main/resources/META-INF/NOTICE.txt         |   11 -
 .../services/org/apache/camel/TypeConverter        |   18 -
 .../services/org/apache/camel/component/netty-http |   17 -
 .../camel/component/netty/http/BaseNettyTest.java  |   93 --
 .../netty/http/Http4DeleteWithBodyTest.java        |   58 --
 .../netty/http/ManagedNettyEndpointTest.java       |   80 --
 .../camel/component/netty/http/MyLoginModule.java  |  103 --
 .../component/netty/http/MyRolePrincipal.java      |   33 -
 .../netty/http/NettyCamelWebsiteTest.java          |   50 -
 .../netty/http/NettyDefaultProtocolTest.java       |   54 -
 .../netty/http/NettyHttp500ErrorTest.java          |   66 --
 ...ettyHttp500ErrorThrowExceptionOnServerTest.java |   67 --
 ...tyHttpAccessHttpRequestAndResponseBeanTest.java |   72 --
 .../http/NettyHttpAccessHttpRequestBeanTest.java   |   54 -
 .../netty/http/NettyHttpAccessHttpRequestTest.java |   57 --
 .../NettyHttpBasicAuthConstraintMapperTest.java    |   97 --
 ...tpBasicAuthCustomSecurityAuthenticatorTest.java |  103 --
 .../netty/http/NettyHttpBasicAuthTest.java         |  102 --
 ...pBindingPreservePostFormUrlEncodedBodyTest.java |   75 --
 .../NettyHttpBindingUseRelativePathInPostTest.java |   75 --
 .../netty/http/NettyHttpBridgeEncodedPathTest.java |   98 --
 .../NettyHttpBridgeRouteUsingHttpClientTest.java   |   92 --
 .../netty/http/NettyHttpCharacterEncodingTest.java |   63 --
 .../netty/http/NettyHttpClientChunkedTest.java     |   46 -
 .../http/NettyHttpClientExpectContinueTest.java    |   55 --
 .../netty/http/NettyHttpCompressTest.java          |   70 --
 .../netty/http/NettyHttpContentTypeTest.java       |   87 --
 .../NettyHttpConvertPayloadToInputStreamTest.java  |   62 --
 .../netty/http/NettyHttpCustomOptionsTest.java     |   44 -
 ...pEndpointUriCustomHeaderFilterStrategyTest.java |   70 --
 .../NettyHttpEndpointUriEncodingIssueTest.java     |   57 --
 ...pointUriEncodingIssueUrlDecodeDisabledTest.java |   49 -
 .../http/NettyHttpFilterCamelHeadersTest.java      |   76 --
 .../http/NettyHttpGetWithInvalidMessageTest.java   |  104 --
 .../NettyHttpGetWithParamAsExchangeHeaderTest.java |  127 ---
 .../netty/http/NettyHttpGetWithParamTest.java      |   78 --
 .../netty/http/NettyHttpGlobalSSLTest.java         |  106 --
 .../netty/http/NettyHttpHandle404Test.java         |   92 --
 .../netty/http/NettyHttpHeaderCaseTest.java        |   73 --
 .../NettyHttpHeaderFilterStrategyRemovalTest.java  |   78 --
 .../http/NettyHttpHeaderFilterStrategyTest.java    |  108 --
 .../netty/http/NettyHttpHeaderMaxSizeTest.java     |   63 --
 .../component/netty/http/NettyHttpHeadersTest.java |   54 -
 .../netty/http/NettyHttpMapHeadersFalseTest.java   |   70 --
 .../netty/http/NettyHttpMethodRestrictTest.java    |   74 --
 .../netty/http/NettyHttpOkStatusCodeTest.java      |   79 --
 .../http/NettyHttpOnExceptionHandledTest.java      |   56 --
 .../NettyHttpOperationFailedExceptionTest.java     |   34 -
 .../netty/http/NettyHttpProducerBridgeTest.java    |   91 --
 .../http/NettyHttpProducerConcurrentTest.java      |   87 --
 .../netty/http/NettyHttpProducerKeepAliveTest.java |   82 --
 .../http/NettyHttpProducerQueryParamTest.java      |  110 ---
 .../http/NettyHttpProducerSendEmptyHeaderTest.java |   48 -
 .../netty/http/NettyHttpProducerSimpleGetTest.java |   69 --
 .../netty/http/NettyHttpProducerSimpleTest.java    |   74 --
 ...tyHttpProducerTwoParametersWithSameKeyTest.java |  100 --
 .../http/NettyHttpProducerWithHeaderTest.java      |   60 --
 .../netty/http/NettyHttpProtocolNoSlashTest.java   |   54 -
 .../netty/http/NettyHttpRawQueryTest.java          |   57 --
 .../http/NettyHttpRedirectNoLocationTest.java      |   59 --
 .../netty/http/NettyHttpRedirectTest.java          |   56 --
 .../netty/http/NettyHttpRequestTimeoutTest.java    |   60 --
 .../http/NettyHttpRestContextPathMatcherTest.java  |   63 --
 ...ttpReturnDataNotInputStreamConvertableTest.java |   53 -
 .../netty/http/NettyHttpReturnFaultTest.java       |   58 --
 .../netty/http/NettyHttpSSLHandshakeErrorTest.java |   62 --
 .../component/netty/http/NettyHttpSSLTest.java     |  111 ---
 .../NettyHttpSameHostDifferentParametersTest.java  |   52 -
 ...ttyHttpSimpleBasicAuthConstraintMapperTest.java |   91 --
 .../netty/http/NettyHttpSimpleBasicAuthTest.java   |   72 --
 .../component/netty/http/NettyHttpSimpleTest.java  |   46 -
 .../http/NettyHttpSimpleUriParametersTest.java     |   46 -
 .../http/NettyHttpStreamCacheFileResponseTest.java |   75 --
 .../netty/http/NettyHttpSuspendResume503Test.java  |   74 --
 .../netty/http/NettyHttpSuspendResumeTest.java     |   73 --
 .../netty/http/NettyHttpTraceDisabledTest.java     |   62 --
 .../netty/http/NettyHttpTransferExceptionTest.java |   52 -
 ...ttyHttpTwoRoutesBootstrapConfigurationTest.java |   93 --
 .../NettyHttpTwoRoutesMatchOnUriPrefixTest.java    |   77 --
 .../http/NettyHttpTwoRoutesStopOneRouteTest.java   |   77 --
 .../netty/http/NettyHttpTwoRoutesTest.java         |   54 -
 ...woRoutesValidateBootstrapConfigurationTest.java |   52 -
 .../netty/http/NettyHttpXMLXPathResponseTest.java  |   53 -
 .../netty/http/NettyHttpXMLXPathTest.java          |   53 -
 .../netty/http/NettyMixedCaseHttpPathTest.java     |   47 -
 .../netty/http/NettyProxyMixedCasePathTest.java    |   44 -
 .../netty/http/NettyRecipientListHttpBaseTest.java |   53 -
 .../component/netty/http/NettyRouteSimpleTest.java |   51 -
 .../netty/http/NettySharedHttpServerTest.java      |   91 --
 .../netty/http/NettyUseRawHttpResponseTest.java    |   63 --
 .../netty/http/SecurityConstraintMappingTest.java  |  116 ---
 .../netty/http/SpringNettyHttpBasicAuthTest.java   |  114 ---
 .../netty/http/SpringNettyHttpSSLTest.java         |   79 --
 .../component/netty/http/rest/CountryPojo.java     |   40 -
 .../RestNettyHttpBindingModeAutoWithJsonTest.java  |   59 --
 .../RestNettyHttpBindingModeAutoWithXmlTest.java   |   59 --
 .../rest/RestNettyHttpBindingModeJsonTest.java     |   76 --
 .../http/rest/RestNettyHttpBindingModeXmlTest.java |   77 --
 .../RestNettyHttpContextPathConfigurationTest.java |   68 --
 .../rest/RestNettyHttpContextPathMatchGetTest.java |   68 --
 .../netty/http/rest/RestNettyHttpGetTest.java      |   65 --
 .../http/rest/RestNettyHttpGetWildcardsTest.java   |   79 --
 .../http/rest/RestNettyHttpPojoInOutTest.java      |   69 --
 .../rest/RestNettyHttpPostJsonJaxbPojoTest.java    |   61 --
 .../rest/RestNettyHttpPostJsonPojoListTest.java    |   68 --
 .../http/rest/RestNettyHttpPostJsonPojoTest.java   |   61 --
 .../rest/RestNettyHttpPostXmlJaxbPojoTest.java     |   79 --
 .../netty/http/rest/RestNettyHttpVerbTest.java     |   89 --
 .../netty/http/rest/RestPathMatchingTest.java      |   89 --
 .../component/netty/http/rest/UserJaxbPojo.java    |   48 -
 .../camel/component/netty/http/rest/UserPojo.java  |   40 -
 .../component/netty/http/rest/UserService.java     |   33 -
 .../src/test/resources/jsse/client-keystore.jks    |  Bin 1344 -> 0 bytes
 .../src/test/resources/jsse/client-truststore.jks  |  Bin 639 -> 0 bytes
 .../src/test/resources/jsse/localhost.ks           |  Bin 1265 -> 0 bytes
 .../src/test/resources/jsse/server-keystore.jks    |  Bin 1345 -> 0 bytes
 .../src/test/resources/jsse/server-truststore.jks  |  Bin 639 -> 0 bytes
 .../src/test/resources/log4j2.properties           |   28 -
 .../src/test/resources/myjaas.config               |    5 -
 .../netty/http/SpringNettyHttpBasicAuthTest.xml    |   72 --
 .../netty/http/SpringNettyHttpSSLTest.xml          |   64 --
 components/camel-netty/pom.xml                     |   87 --
 .../camel-netty/src/main/docs/netty-component.adoc |  716 --------------
 .../netty/CamelNettyThreadNameDeterminer.java      |   36 -
 .../component/netty/ChannelHandlerFactories.java   |   80 --
 .../component/netty/ChannelHandlerFactory.java     |   35 -
 .../ClientModeTCPNettyServerBootstrapFactory.java  |  228 -----
 .../component/netty/ClientPipelineFactory.java     |   41 -
 .../netty/DefaultClientPipelineFactory.java        |  173 ----
 .../netty/DefaultServerPipelineFactory.java        |  191 ----
 .../camel/component/netty/NettyCamelState.java     |   46 -
 .../netty/NettyClientBossPoolBuilder.java          |  115 ---
 .../camel/component/netty/NettyComponent.java      |  198 ----
 .../camel/component/netty/NettyConfiguration.java  |  633 ------------
 .../camel/component/netty/NettyConstants.java      |   43 -
 .../camel/component/netty/NettyConsumer.java       |  126 ---
 .../netty/NettyConsumerExceptionHandler.java       |   66 --
 .../camel/component/netty/NettyConverter.java      |  125 ---
 .../camel/component/netty/NettyEndpoint.java       |  178 ----
 .../apache/camel/component/netty/NettyHelper.java  |  121 ---
 .../camel/component/netty/NettyPayloadHelper.java  |   82 --
 .../camel/component/netty/NettyProducer.java       |  596 ------------
 .../netty/NettyServerBootstrapConfiguration.java   |  627 ------------
 .../netty/NettyServerBootstrapFactory.java         |   73 --
 .../netty/NettyServerBossPoolBuilder.java          |   68 --
 .../component/netty/NettyWorkerPoolBuilder.java    |   70 --
 .../component/netty/ServerPipelineFactory.java     |   41 -
 .../netty/ShareableChannelHandlerFactory.java      |   36 -
 .../component/netty/SharedSingletonObjectPool.java |   86 --
 .../SingleTCPNettyServerBootstrapFactory.java      |  210 ----
 .../SingleUDPNettyServerBootstrapFactory.java      |  203 ----
 .../camel/component/netty/TextLineDelimiter.java   |   26 -
 .../netty/handlers/ClientChannelHandler.java       |  248 -----
 .../netty/handlers/ServerChannelHandler.java       |  218 -----
 .../handlers/ServerResponseFutureListener.java     |   82 --
 .../component/netty/ssl/SSLEngineFactory.java      |   86 --
 .../src/main/resources/META-INF/LICENSE.txt        |  203 ----
 .../src/main/resources/META-INF/NOTICE.txt         |   11 -
 .../services/org/apache/camel/TypeConverter        |   18 -
 .../services/org/apache/camel/component/netty      |   17 -
 components/camel-netty/src/test/data/message1.txt  |    1 -
 .../camel/component/netty/BaseNettyTest.java       |   94 --
 .../component/netty/MultipleCodecsSpringTest.java  |   43 -
 .../camel/component/netty/MultipleCodecsTest.java  |   86 --
 .../camel/component/netty/MyCustomCodec.java       |   81 --
 .../camel/component/netty/Netty2978IssueTest.java  |  123 ---
 .../camel/component/netty/NettyBacklogTest.java    |   46 -
 .../netty/NettyComponentWithConfigurationTest.java |   84 --
 .../camel/component/netty/NettyConcurrentTest.java |  105 --
 .../netty/NettyConcurrentTimerAccessTest.java      |   52 -
 .../netty/NettyConsumerClientModeTest.java         |  159 ---
 .../camel/component/netty/NettyConverterTest.java  |   60 --
 .../netty/NettyCustomCodecRequestTimeoutTest.java  |   69 --
 .../component/netty/NettyCustomCodecTest.java      |   64 --
 .../NettyCustomPipelineFactoryAsynchTest.java      |  128 ---
 .../netty/NettyCustomPipelineFactorySynchTest.java |  130 ---
 .../camel/component/netty/NettyDisconnectTest.java |   49 -
 .../camel/component/netty/NettyFileTcpTest.java    |   50 -
 .../netty/NettyGlobalSSLContextParametersTest.java |   95 --
 .../NettyInOutCloseChannelWhenCompleteTest.java    |   50 -
 .../component/netty/NettyInOutFromSedaTest.java    |   56 --
 .../netty/NettyInOutWithForcedNoResponseTest.java  |   55 --
 .../component/netty/NettyManualEndpointTest.java   |   79 --
 .../NettyMultipleSimultaneousClientsTest.java      |   95 --
 .../camel/component/netty/NettyOptionTest.java     |   46 -
 .../netty/NettyProducerAsyncEndpointTest.java      |   76 --
 .../netty/NettyProducerPoolDisabledTest.java       |   50 -
 .../camel/component/netty/NettyProxyTest.java      |   61 --
 .../camel/component/netty/NettyRedeliveryTest.java |  220 -----
 .../netty/NettyRequestTimeoutIssueTest.java        |   50 -
 .../component/netty/NettyRequestTimeoutTest.java   |   95 --
 .../component/netty/NettyReuseConnectionTest.java  |   46 -
 .../component/netty/NettySSLClasspathTest.java     |   57 --
 .../netty/NettySSLClientCertHeadersTest.java       |   74 --
 .../netty/NettySSLContextParametersTest.java       |   92 --
 .../component/netty/NettySSLPassphaseBeanTest.java |   65 --
 .../apache/camel/component/netty/NettySSLTest.java |   79 --
 .../component/netty/NettySingleCodecTest.java      |   62 --
 .../component/netty/NettySuspendResumeTest.java    |   61 --
 .../camel/component/netty/NettyTCPAsyncTest.java   |   74 --
 .../netty/NettyTCPSyncNotLazyChannelTest.java      |   62 --
 .../camel/component/netty/NettyTCPSyncTest.java    |   75 --
 .../NettyTcpWithInOutUsingPlainSocketTest.java     |  143 ---
 .../NettyTextlineInOnlyNullDelimiterTest.java      |   48 -
 .../component/netty/NettyTextlineInOnlyTest.java   |   66 --
 .../netty/NettyTextlineInOutNonBlockingTest.java   |   87 --
 .../NettyTextlineInOutSynchronousFalseTest.java    |   72 --
 .../netty/NettyTextlineInOutSynchronousTest.java   |   72 --
 .../component/netty/NettyTextlineInOutTest.java    |   50 -
 .../netty/NettyTransferExchangeOptionTest.java     |  128 ---
 .../camel/component/netty/NettyUDPAsyncTest.java   |   62 --
 .../netty/NettyUDPLargeMessageInOnlyTest.java      |   68 --
 .../netty/NettyUDPMulticastAsyncTest.java          |   90 --
 .../component/netty/NettyUDPObjectSyncTest.java    |   50 -
 .../camel/component/netty/NettyUDPSyncTest.java    |   52 -
 .../component/netty/NettyUdpConnectedSendTest.java |  110 ---
 .../netty/NettyUdpConnectionlessSendTest.java      |  107 --
 .../NettyUdpWithInOutUsingPlainSocketTest.java     |   80 --
 ...ttyUseSharedWorkerThreadPoolManyRoutesTest.java |   85 --
 .../netty/NettyUseSharedWorkerThreadPoolTest.java  |  103 --
 .../org/apache/camel/component/netty/Poetry.java   |   57 --
 .../SpringNettyUseSharedWorkerThreadPoolTest.java  |   51 -
 .../netty/UnsharableCodecsConflicts2Test.java      |  120 ---
 .../netty/UnsharableCodecsConflictsTest.java       |  128 ---
 .../camel-netty/src/test/resources/keystore.jks    |  Bin 1473 -> 0 bytes
 .../src/test/resources/log4j2.properties           |   28 -
 .../SpringNettyUseSharedWorkerThreadPoolTest.xml   |   54 -
 .../camel/component/netty/multiple-codecs.xml      |   74 --
 components/camel-netty/src/test/resources/test.txt |   19 -
 components/camel-netty4-http/pom.xml               |    7 +-
 ...pBindingPreservePostFormUrlEncodedBodyTest.java |    2 +-
 .../NettyHttpBindingUseRelativePathInPostTest.java |    2 +-
 .../src/main/docs/netty4-component.adoc            |    4 +-
 components/camel-openshift/pom.xml                 |   89 --
 .../src/main/docs/openshift-component.adoc         |  194 ----
 .../component/openshift/OpenShiftComponent.java    |   95 --
 .../component/openshift/OpenShiftConstants.java    |   35 -
 .../component/openshift/OpenShiftConsumer.java     |  244 -----
 .../component/openshift/OpenShiftEndpoint.java     |  188 ----
 .../camel/component/openshift/OpenShiftHelper.java |   75 --
 .../component/openshift/OpenShiftOperation.java    |   45 -
 .../component/openshift/OpenShiftProducer.java     |  656 -------------
 .../src/main/resources/META-INF/LICENSE.txt        |  203 ----
 .../src/main/resources/META-INF/NOTICE.txt         |   11 -
 .../services/org/apache/camel/component/openshift  |   18 -
 .../component/openshift/OpenShiftAddAliasTest.java |   61 --
 .../OpenShiftAddEmbeddedCartridgeTest.java         |   63 --
 .../OpenShiftAddEnvironmentVariableTest.java       |   61 --
 ...enShiftAddMultipleEnvironmentVariablesTest.java |   61 --
 .../openshift/OpenShiftConsumerOnChangeTest.java   |   59 --
 .../component/openshift/OpenShiftConsumerTest.java |   59 --
 .../openshift/OpenShiftGetAliasesTest.java         |   61 --
 .../OpenShiftGetAllEnvironmentVariablesTest.java   |   61 --
 .../openshift/OpenShiftGetDeploymentTypeTest.java  |   61 --
 .../OpenShiftGetEmbeddedCartridgesTest.java        |   63 --
 .../OpenShiftGetEnvironmentVariableValueTest.java  |   61 --
 .../openshift/OpenShiftGetGearProfileTest.java     |   61 --
 .../openshift/OpenShiftGetGitUrlTest.java          |   61 --
 .../OpenShiftGetStandaloneCartridgeTest.java       |   63 --
 .../OpenShiftListApplicationsModeJsonTest.java     |   61 --
 .../openshift/OpenShiftListApplicationsTest.java   |   61 --
 .../openshift/OpenShiftRemoveAliasTest.java        |   61 --
 .../OpenShiftRemoveEmbeddedCartridgeTest.java      |   63 --
 .../OpenShiftRemoveEnvironmentVariableTest.java    |   61 --
 .../openshift/OpenShiftScaleDownTest.java          |   61 --
 .../component/openshift/OpenShiftScaleUpTest.java  |   61 --
 .../openshift/OpenShiftSetDeploymentTypeTest.java  |   61 --
 .../component/openshift/OpenShiftStateTest.java    |   63 --
 .../OpenShiftUpdateEnvironmentVariableTest.java    |   61 --
 .../src/test/resources/log4j2.properties           |   28 -
 components/camel-quartz/pom.xml                    |  127 ---
 .../src/main/docs/quartz-component.adoc            |  267 -----
 .../apache/camel/component/quartz/CamelJob.java    |  102 --
 .../camel/component/quartz/QuartzComponent.java    |  638 ------------
 .../camel/component/quartz/QuartzConstants.java    |   40 -
 .../camel/component/quartz/QuartzConsumer.java     |   48 -
 .../camel/component/quartz/QuartzEndpoint.java     |  409 --------
 .../camel/component/quartz/QuartzHelper.java       |   35 -
 .../camel/component/quartz/QuartzMessage.java      |   70 --
 .../camel/component/quartz/StatefulCamelJob.java   |   28 -
 .../org/apache/camel/component/quartz/package.html |   25 -
 .../quartz/CronScheduledRoutePolicy.java           |  141 ---
 .../camel/routepolicy/quartz/ScheduledJob.java     |   58 --
 .../routepolicy/quartz/ScheduledJobState.java      |   37 -
 .../routepolicy/quartz/ScheduledRouteDetails.java  |   96 --
 .../routepolicy/quartz/ScheduledRoutePolicy.java   |  304 ------
 .../quartz/ScheduledRoutePolicyConstants.java      |   41 -
 .../quartz/SimpleScheduledRoutePolicy.java         |  203 ----
 .../src/main/resources/META-INF/LICENSE.txt        |  203 ----
 .../src/main/resources/META-INF/NOTICE.txt         |   11 -
 .../services/org/apache/camel/component/quartz     |   18 -
 .../camel/component/quartz/BaseQuartzTest.java     |   39 -
 .../quartz/DelegateEndpointQuartzTest.java         |  121 ---
 .../quartz/QuartUnderscoreTimerNameTest.java       |   42 -
 .../quartz/QuartzAddDynamicRouteTest.java          |   61 --
 ...uartzAddRoutesAfterCamelContextStartedTest.java |   48 -
 .../component/quartz/QuartzAutoStartTest.java      |   63 --
 ...omponentCamelContextSchedulerIsolationTest.java |   94 --
 .../component/quartz/QuartzComponentTest.java      |   53 -
 .../component/quartz/QuartzCronRouteTest.java      |   55 --
 .../quartz/QuartzCronRouteWithSmallCacheTest.java  |   68 --
 .../quartz/QuartzCronTriggerRouteTest.java         |   50 -
 .../quartz/QuartzEndpointConfigureTest.java        |  103 --
 .../quartz/QuartzJobRouteUnderscoreTest.java       |   52 -
 .../component/quartz/QuartzManagementTest.java     |   62 --
 .../component/quartz/QuartzNameCollisionTest.java  |  171 ----
 .../quartz/QuartzOneCamelContextRestartTest.java   |   69 --
 .../QuartzOneCamelContextSuspendResumeTest.java    |   68 --
 .../component/quartz/QuartzPropertiesTest.java     |   85 --
 .../component/quartz/QuartzRouteFireNowTest.java   |   58 --
 .../component/quartz/QuartzRouteRestartTest.java   |   64 --
 .../camel/component/quartz/QuartzRouteTest.java    |   58 --
 .../quartz/QuartzStartDelayedOptionTest.java       |   45 -
 .../component/quartz/QuartzStartDelayedTest.java   |   47 -
 .../QuartzStartDelayedWithReferenceTest.java       |   46 -
 .../component/quartz/QuartzStopRouteTest.java      |   68 --
 .../component/quartz/QuartzSuspendRouteTest.java   |   68 --
 .../quartz/QuartzTwoCamelContextRestartTest.java   |   86 --
 .../QuartzTwoCamelContextSameNameClashTest.java    |   86 --
 .../QuartzTwoCamelContextSuspendResumeTest.java    |   85 --
 .../quartz/QuartzTwoCamelContextTest.java          |  103 --
 ...QuartzConsumerTwoAppsClusteredFailoverTest.java |  106 --
 .../quartz/SpringQuartzCronRouteTest.java          |   43 -
 ...PersistentStoreRestartAppChangeOptionsTest.java |  179 ----
 .../SpringQuartzPersistentStoreRestartAppTest.java |   81 --
 ...pringQuartzPersistentStoreRestartRouteTest.java |   66 --
 .../quartz/SpringQuartzPersistentStoreTest.java    |   43 -
 .../component/quartz/StatefulQuartzRouteTest.java  |   61 --
 .../quartz/CronScheduledRoutePolicyTest.java       |  249 -----
 .../camel/routepolicy/quartz/DateFactory.java      |   29 -
 .../quartz/MultiplePoliciesOnRouteTest.java        |   96 --
 .../camel/routepolicy/quartz/MyRoutePolicy.java    |   47 -
 .../RouteAutoStopFalseCronScheduledPolicyTest.java |   56 --
 .../SimpleScheduledCombinedRoutePolicyTest.java    |   76 --
 .../quartz/SimpleScheduledRoutePolicyTest.java     |  263 -----
 .../quartz/SpringCronScheduledRoutePolicyTest.java |   51 -
 .../quartz/SpringMultiplePoliciesOnRouteTest.java  |   50 -
 .../SpringQuartzTwoAppsClusteredFailoverTest.java  |   99 --
 .../quartz/SpringScheduledRoutePolicyTest.java     |  139 ---
 .../SpringSimpleScheduledRoutePolicyTest.java      |   51 -
 .../src/test/resources/log4j2.properties           |   28 -
 .../SpringQuartzConsumerClusteredAppDatabase.xml   |   32 -
 .../quartz/SpringQuartzConsumerClusteredAppOne.xml |   75 --
 .../quartz/SpringQuartzConsumerClusteredAppTwo.xml |   73 --
 .../component/quartz/SpringQuartzCronRouteTest.xml |   36 -
 ...entStoreRestartAppChangeCronExpressionTest1.xml |   72 --
 ...entStoreRestartAppChangeCronExpressionTest2.xml |   72 --
 ...entStoreRestartAppChangeCronExpressionTest3.xml |   72 --
 ...PersistentStoreRestartAppChangeOptionsTest1.xml |   72 --
 ...PersistentStoreRestartAppChangeOptionsTest2.xml |   72 --
 .../SpringQuartzPersistentStoreRestartTest.xml     |   68 --
 .../quartz/SpringQuartzPersistentStoreTest.xml     |   68 --
 .../camel/component/quartz/myquartz.properties     |   26 -
 .../camel/routepolicy/quartz/CronPolicies.xml      |   56 --
 .../camel/routepolicy/quartz/MultiplePolicies.xml  |   48 -
 .../camel/routepolicy/quartz/SimplePolicies.xml    |   68 --
 .../quartz/SpringQuartzClusteredAppDatabase.xml    |   32 -
 .../quartz/SpringQuartzClusteredAppOne.xml         |   77 --
 .../quartz/SpringQuartzClusteredAppTwo.xml         |   77 --
 .../camel/routepolicy/quartz/myquartz.properties   |   26 -
 .../src/test/resources/tables_derby.sql            |  152 ---
 components/camel-rest-swagger/pom.xml              |    6 -
 components/camel-restlet/pom.xml                   |    2 +-
 components/camel-routebox/pom.xml                  |   75 --
 .../src/main/docs/routebox-component.adoc          |  296 ------
 .../component/routebox/RouteboxComponent.java      |   95 --
 .../component/routebox/RouteboxConfiguration.java  |  337 -------
 .../camel/component/routebox/RouteboxConsumer.java |   23 -
 .../camel/component/routebox/RouteboxEndpoint.java |   64 --
 .../camel/component/routebox/RouteboxProducer.java |   21 -
 .../component/routebox/RouteboxServiceSupport.java |   98 --
 .../routebox/direct/RouteboxDirectConsumer.java    |  111 ---
 .../routebox/direct/RouteboxDirectEndpoint.java    |   79 --
 .../routebox/direct/RouteboxDirectProducer.java    |  124 ---
 .../routebox/seda/RouteboxSedaConsumer.java        |  140 ---
 .../routebox/seda/RouteboxSedaEndpoint.java        |  125 ---
 .../routebox/seda/RouteboxSedaProducer.java        |  149 ---
 .../strategy/RouteboxDispatchStrategy.java         |   39 -
 .../routebox/strategy/RouteboxDispatcher.java      |  148 ---
 .../src/main/resources/META-INF/LICENSE.txt        |  203 ----
 .../src/main/resources/META-INF/NOTICE.txt         |   11 -
 .../services/org/apache/camel/component/routebox   |   17 -
 .../RouteboxDefaultContextAndRouteBuilderTest.java |   95 --
 .../routebox/RouteboxDirectProducerOnlyTest.java   |   97 --
 .../component/routebox/RouteboxDirectTest.java     |   99 --
 .../routebox/RouteboxDispatchMapTest.java          |  102 --
 .../camel/component/routebox/RouteboxSedaTest.java |  100 --
 .../apache/camel/component/routebox/demo/Book.java |   47 -
 .../camel/component/routebox/demo/BookCatalog.java |   69 --
 .../routebox/demo/RouteboxDemoTestSupport.java     |   60 --
 .../routebox/demo/SimpleRouteBuilder.java          |   44 -
 .../src/test/resources/log4j2.properties           |   28 -
 components/camel-rx/pom.xml                        |   94 --
 components/camel-rx/src/main/docs/rx.adoc          |  194 ----
 .../java/org/apache/camel/rx/CamelOperator.java    |   93 --
 .../java/org/apache/camel/rx/ObservableBody.java   |   39 -
 .../org/apache/camel/rx/ObservableMessage.java     |   33 -
 .../java/org/apache/camel/rx/ReactiveCamel.java    |  170 ----
 .../apache/camel/rx/RuntimeCamelRxException.java   |   42 -
 .../src/main/java/org/apache/camel/rx/package.html |   26 -
 .../camel/rx/support/EndpointObservable.java       |   37 -
 .../camel/rx/support/EndpointSubscribeFunc.java    |   43 -
 .../camel/rx/support/EndpointSubscription.java     |  118 ---
 .../camel/rx/support/ExchangeToBodyFunc1.java      |   40 -
 .../camel/rx/support/ExchangeToMessageFunc1.java   |   38 -
 .../camel/rx/support/ObservableProcessor.java      |   67 --
 .../apache/camel/rx/support/ObserverSender.java    |   89 --
 .../camel/rx/support/ProcessorToObserver.java      |   52 -
 .../rx/support/ReactiveBeanPostProcessor.java      |   48 -
 .../apache/camel/rx/support/ReactiveInjector.java  |   66 --
 .../rx/support/ReactivePostProcessorHelper.java    |   47 -
 .../src/main/resources/META-INF/LICENSE.txt        |  203 ----
 .../src/main/resources/META-INF/NOTICE.txt         |   11 -
 .../org/apache/camel/rx/CamelOperatorTest.java     |   92 --
 .../java/org/apache/camel/rx/LoginService.java     |   34 -
 .../camel/rx/LoginServiceObservableTest.java       |   46 -
 .../org/apache/camel/rx/ObservableBodyTest.java    |   71 --
 .../org/apache/camel/rx/ObservableMessageTest.java |   68 --
 .../src/test/java/org/apache/camel/rx/Order.java   |   40 -
 .../java/org/apache/camel/rx/RxTestSupport.java    |   44 -
 .../test/java/org/apache/camel/rx/SendToTest.java  |   39 -
 .../java/org/apache/camel/rx/SendToUoWTest.java    |   61 --
 .../apache/camel/rx/ToObservableAndMapTest.java    |   48 -
 .../org/apache/camel/rx/ToObservableBodyTest.java  |   53 -
 .../java/org/apache/camel/rx/ToObservableTest.java |   44 -
 .../org/apache/camel/rx/ToObservableUoWTest.java   |   55 --
 .../camel-rx/src/test/resources/log4j2.properties  |   28 -
 components/camel-sap-netweaver/pom.xml             |    2 +-
 components/camel-scala/pom.xml                     |  225 -----
 .../camel-scala/src/main/docs/scala-eip.adoc       |  224 -----
 .../src/main/docs/scala-getting-started.adoc       |   59 --
 .../src/main/docs/scala-supported-languages.adoc   |   30 -
 components/camel-scala/src/main/docs/scala.adoc    |   78 --
 .../src/main/resources/META-INF/LICENSE.txt        |  203 ----
 .../src/main/resources/META-INF/NOTICE.txt         |   11 -
 .../services/org/apache/camel/TypeConverter        |   21 -
 .../scala/org/apache/camel/scala/Frequency.scala   |   27 -
 .../main/scala/org/apache/camel/scala/Period.scala |   91 --
 .../scala/org/apache/camel/scala/Preamble.scala    |  151 ---
 .../org/apache/camel/scala/RichExchange.scala      |  145 ---
 .../scala/org/apache/camel/scala/RichInt.scala     |   26 -
 .../scala/org/apache/camel/scala/RichMessage.scala |  110 ---
 .../org/apache/camel/scala/ScalaExpression.scala   |   40 -
 .../org/apache/camel/scala/ScalaPredicate.scala    |   33 -
 .../org/apache/camel/scala/ScalaProcessor.scala    |   29 -
 .../scala/org/apache/camel/scala/Wrapper.scala     |   26 -
 .../camel/scala/converter/ScalaCollections.scala   |  112 ---
 .../apache/camel/scala/converter/ScalaOption.scala |   51 -
 .../camel/scala/converter/ScalaTypeConverter.scala |   59 --
 .../scala/org/apache/camel/scala/dsl/Block.scala   |   30 -
 .../scala/org/apache/camel/scala/dsl/Config.scala  |   26 -
 .../scala/org/apache/camel/scala/dsl/DSL.scala     |  124 ---
 .../org/apache/camel/scala/dsl/Functions.scala     |   33 -
 .../camel/scala/dsl/SAbstractDefinition.scala      |  180 ----
 .../camel/scala/dsl/SAggregateDefinition.scala     |   70 --
 .../apache/camel/scala/dsl/SChoiceDefinition.scala |   37 -
 .../apache/camel/scala/dsl/SDelayDefinition.scala  |   27 -
 .../apache/camel/scala/dsl/SEnrichDefinition.scala |   36 -
 .../apache/camel/scala/dsl/SFilterDefinition.scala |   27 -
 .../scala/dsl/SIdempotentConsumerDefinition.scala  |   41 -
 .../camel/scala/dsl/SInterceptDefinition.scala     |   32 -
 .../camel/scala/dsl/SInterceptFromDefinition.scala |   32 -
 .../dsl/SInterceptSendToEndpointDefinition.scala   |   37 -
 .../camel/scala/dsl/SLoadBalanceDefinition.scala   |   46 -
 .../apache/camel/scala/dsl/SLoopDefinition.scala   |   29 -
 .../camel/scala/dsl/SMulticastDefinition.scala     |   54 -
 .../camel/scala/dsl/SOnCompletionDefinition.scala  |   43 -
 .../camel/scala/dsl/SOnExceptionDefinition.scala   |   82 --
 .../camel/scala/dsl/SPipelineDefinition.scala      |   38 -
 .../apache/camel/scala/dsl/SPolicyDefinition.scala |   27 -
 .../camel/scala/dsl/SResequenceDefinition.scala    |   57 --
 .../apache/camel/scala/dsl/SRouteDefinition.scala  |   48 -
 .../apache/camel/scala/dsl/SSplitDefinition.scala  |   50 -
 .../camel/scala/dsl/SThreadsDefinition.scala       |   51 -
 .../camel/scala/dsl/SThrottleDefinition.scala      |   40 -
 .../camel/scala/dsl/STransactedDefinition.scala    |   28 -
 .../apache/camel/scala/dsl/STryDefinition.scala    |   39 -
 .../camel/scala/dsl/SValidateDefinition.scala      |   27 -
 .../camel/scala/dsl/SWireTapDefinition.scala       |   27 -
 .../camel/scala/dsl/builder/RouteBuilder.scala     |  231 -----
 .../scala/dsl/builder/RouteBuilderSupport.scala    |   23 -
 .../scala/dsl/builder/ScalaRouteBuilder.scala      |   25 -
 .../scala/dsl/languages/LanguageFunction.scala     |   38 -
 .../camel/scala/dsl/languages/Languages.scala      |  110 ---
 .../src/test/resources/log4j2.properties           |   32 -
 .../scala/dsl/builder/scan/scan-camel-context.xml  |   31 -
 .../org/apache/camel/scala/dsl/enricher.vm         |   17 -
 .../scala/org/apache/camel/scala/CamelSpec.scala   |   42 -
 .../apache/camel/scala/CamelTestSupportTest.scala  |   41 -
 .../org/apache/camel/scala/RichMockEndpoint.scala  |   43 -
 .../org/apache/camel/scala/UsingModelTest.scala    |   42 -
 .../camel/scala/converter/ConverterSpec.scala      |  204 ----
 .../apache/camel/scala/dsl/AggregatorTest.scala    |  141 ---
 ...utoStartupNotReturningRouteDefinitionTest.scala |   48 -
 .../apache/camel/scala/dsl/AutoStartupTest.scala   |   81 --
 .../camel/scala/dsl/BasicRouteBuilderTest.scala    |   52 -
 .../org/apache/camel/scala/dsl/BlockBeanTest.scala |   49 -
 .../org/apache/camel/scala/dsl/CamelCBRTest.scala  |   61 --
 .../camel/scala/dsl/ContentBasedRouterTest.scala   |   55 --
 .../camel/scala/dsl/ContentEnricherTest.scala      |   75 --
 .../camel/scala/dsl/ConvertBodyToAsTest.scala      |   37 -
 .../apache/camel/scala/dsl/ConvertBodyToTest.scala |   50 -
 .../dsl/DataFormatStringDataTypeRefTest.scala      |   50 -
 .../apache/camel/scala/dsl/DataFormatTest.scala    |   50 -
 .../org/apache/camel/scala/dsl/DelayerTest.scala   |   67 --
 .../org/apache/camel/scala/dsl/EnricherTest.scala  |   66 --
 .../camel/scala/dsl/ExceptionHandlerTest.scala     |   75 --
 .../camel/scala/dsl/ExchangePatternTest.scala      |   94 --
 .../camel/scala/dsl/FilterRouteBuilderTest.scala   |   62 --
 .../org/apache/camel/scala/dsl/FilterTest.scala    |   45 -
 .../scala/dsl/HeaderContentBasedRouterTest.scala   |   54 -
 .../scala/org/apache/camel/scala/dsl/IdTest.scala  |   64 --
 .../camel/scala/dsl/IdempotentConsumerTest.scala   |  120 ---
 .../apache/camel/scala/dsl/InterceptFromTest.scala |   79 --
 .../camel/scala/dsl/InterceptSendToTest.scala      |  126 ---
 .../org/apache/camel/scala/dsl/InterceptTest.scala |   56 --
 .../apache/camel/scala/dsl/LoadBalancerTest.scala  |   51 -
 .../org/apache/camel/scala/dsl/LoopCopyTest.scala  |   49 -
 .../apache/camel/scala/dsl/LoopNoCopyTest.scala    |   49 -
 .../org/apache/camel/scala/dsl/LoopTest.scala      |   75 --
 .../org/apache/camel/scala/dsl/MulticastTest.scala |   78 --
 .../apache/camel/scala/dsl/OnExceptionTest.scala   |  109 ---
 .../camel/scala/dsl/PipelineAndMulticastTest.scala |   75 --
 .../camel/scala/dsl/PipelineRouteBuilderTest.scala |   72 --
 .../org/apache/camel/scala/dsl/PipelineTest.scala  |  100 --
 .../camel/scala/dsl/RecipientListRouteTest.scala   |   69 --
 .../apache/camel/scala/dsl/RemoveHeaderTest.scala  |   54 -
 .../camel/scala/dsl/RemoveHeadersExcludeTest.scala |   89 --
 .../apache/camel/scala/dsl/RemoveHeadersTest.scala |   89 --
 .../apache/camel/scala/dsl/ResequencerTest.scala   |   83 --
 .../org/apache/camel/scala/dsl/RichTestUri.scala   |   58 --
 .../org/apache/camel/scala/dsl/RollbackTest.scala  |   80 --
 .../camel/scala/dsl/RouteErrorHandlerTest.scala    |   57 --
 .../org/apache/camel/scala/dsl/RouteIdTest.scala   |   63 --
 .../dsl/SEnricherAggregateOnExceptionTest.scala    |   41 -
 .../apache/camel/scala/dsl/SLogProcessorTest.scala |   48 -
 .../camel/scala/dsl/SOnCompletionGlobalTest.scala  |   33 -
 .../camel/scala/dsl/SOnCompletionModeTest.scala    |   48 -
 .../dsl/SOnCompletionOnCompleteOnlyTest.scala      |   39 -
 .../scala/dsl/SOnCompletionOnFailureOnlyTest.scala |   39 -
 .../camel/scala/dsl/SOnCompletionWhenTest.scala    |   37 -
 .../camel/scala/dsl/SPolicyPerRouteTest.scala      |   34 -
 .../apache/camel/scala/dsl/SPollEnricherTest.scala |   44 -
 .../apache/camel/scala/dsl/SRoutingSlipTest.scala  |   39 -
 .../org/apache/camel/scala/dsl/SScriptTest.scala   |   38 -
 .../org/apache/camel/scala/dsl/SSortTest.scala     |   47 -
 .../camel/scala/dsl/SThrowExceptionTest.scala      |   34 -
 .../camel/scala/dsl/STransformProcessorTest.scala  |   43 -
 .../apache/camel/scala/dsl/STransformTest.scala    |   38 -
 .../org/apache/camel/scala/dsl/SValidateTest.scala |   95 --
 .../camel/scala/dsl/ScalaRouteBuilderTest.scala    |   49 -
 .../apache/camel/scala/dsl/ScalaTestSupport.scala  |   79 --
 .../org/apache/camel/scala/dsl/SetBodyTest.scala   |   84 --
 .../camel/scala/dsl/SetExchangePatternTest.scala   |   83 --
 .../org/apache/camel/scala/dsl/SetHeaderTest.scala |   85 --
 .../apache/camel/scala/dsl/SetPropertyTest.scala   |   79 --
 .../apache/camel/scala/dsl/SimpleBeanTest.scala    |   74 --
 .../camel/scala/dsl/SplitterRouteBuilderTest.scala |   62 --
 .../scala/dsl/SplitterTokenizeHeaderTest.scala     |   50 -
 .../camel/scala/dsl/SplitterTokenizePairTest.scala |   50 -
 .../camel/scala/dsl/SplitterTokenizeTest.scala     |   50 -
 .../camel/scala/dsl/SplitterTokenizeXMLTest.scala  |   50 -
 .../apache/camel/scala/dsl/StartOrderTest.scala    |   54 -
 .../org/apache/camel/scala/dsl/ThrottlerTest.scala |   61 --
 .../org/apache/camel/scala/dsl/ToDynamicTest.scala |   47 -
 .../apache/camel/scala/dsl/TransactedTest.scala    |   69 --
 .../camel/scala/dsl/TryCatchFinallyTest.scala      |   72 --
 .../org/apache/camel/scala/dsl/WiretapTest.scala   |  100 --
 .../scala/dsl/XPathContentBasedRouterTest.scala    |   53 -
 .../scala/dsl/builder/RouteBuilderUnwrapTest.scala |   55 --
 .../builder/scan/DiscoverRouteBuilderTest.scala    |   46 -
 .../builder/scan/DiscoverableRouteBuilder.scala    |   28 -
 .../apache/camel/scala/example/FilterRoute.scala   |   39 -
 .../camel/scala/example/FilterRouteTest.scala      |   54 -
 .../scala/org/apache/camel/scala/routeSpec.scala   |  126 ---
 .../scala/org/apache/camel/scala/test/Animal.scala |   28 -
 .../apache/camel/scala/test/CartoonService.scala   |   32 -
 .../org/apache/camel/scala/test/Envelope.scala     |   26 -
 .../scala/org/apache/camel/scala/test/Person.scala |   32 -
 components/camel-scr/README.md                     |   51 -
 components/camel-scr/pom.xml                       |   94 --
 components/camel-scr/src/main/docs/scr.adoc        |  654 -------------
 .../org/apache/camel/scr/AbstractCamelRunner.java  |  305 ------
 .../main/java/org/apache/camel/scr/ScrHelper.java  |   70 --
 .../src/main/resources/META-INF/LICENSE.txt        |  203 ----
 .../src/main/resources/META-INF/NOTICE.txt         |   11 -
 .../apache/camel/scr/AbstractCamelRunnerTest.java  |  138 ---
 .../org/apache/camel/scr/ConcreteCamelRunner.java  |  140 ---
 .../java/org/apache/camel/scr/ScrHelperTest.java   |   55 --
 .../org/apache/camel/scr/TestRouteBuilder.java     |   54 -
 .../org/apache/camel/scr/TestRouteBuilder2.java    |   35 -
 .../test/resources/componentDefinitionExample.xml  |   41 -
 .../camel-scr/src/test/resources/log4j2.properties |   28 -
 components/camel-servletlistener/pom.xml           |   96 --
 .../src/main/docs/servletlistener.adoc             |  355 -------
 .../servletlistener/CamelContextLifecycle.java     |   83 --
 .../CamelServletContextListener.java               |  472 ---------
 .../JndiCamelServletContextListener.java           |   42 -
 .../servletlistener/ServletCamelContext.java       |   39 -
 .../SimpleCamelServletContextListener.java         |   44 -
 .../src/main/resources/META-INF/LICENSE.txt        |  203 ----
 .../src/main/resources/META-INF/NOTICE.txt         |   11 -
 .../camel/component/servletlistener/HelloBean.java |   27 -
 .../component/servletlistener/JmxDisabledTest.java |   51 -
 .../component/servletlistener/LifecycleTest.java   |   51 -
 .../servletlistener/MultipleRoutesTest.java        |   56 --
 .../component/servletlistener/MyBeanRoute.java     |   32 -
 .../component/servletlistener/MyLifecycle.java     |   63 --
 .../camel/component/servletlistener/MyRoute.java   |   31 -
 .../PropertyPlaceholderRouteTest.java              |   51 -
 .../servletlistener/RoutesFromPackageScanTest.java |   59 --
 .../servletlistener/RoutesFromXmlTest.java         |   57 --
 .../servletlistener/ServletCamelTestSupport.java   |   60 --
 .../component/servletlistener/SingleRouteTest.java |   51 -
 .../servletlistener/routes/BarRouteBuilder.java    |   31 -
 .../servletlistener/routes/FooRouteBuilder.java    |   31 -
 .../src/test/resources/log4j2.properties           |   28 -
 .../src/test/resources/myproperties.properties     |   19 -
 .../src/test/resources/myweb.xml                   |   52 -
 .../src/test/resources/myweb2.xml                  |   52 -
 .../src/test/resources/myweb3.xml                  |   52 -
 .../src/test/resources/myweb4.xml                  |   55 --
 .../src/test/resources/myweb5.xml                  |   56 --
 .../src/test/resources/myweb6.xml                  |   63 --
 .../src/test/resources/myweb7.xml                  |   58 --
 .../src/test/resources/routes/myOtherRoute.xml     |   31 -
 .../src/test/resources/routes/myRoutes.xml         |   33 -
 components/camel-spark-rest/pom.xml                |    2 +-
 components/camel-swagger/pom.xml                   |  223 -----
 .../camel-swagger/src/main/docs/swagger.adoc       |  248 -----
 .../src/main/resources/META-INF/LICENSE.txt        |  203 ----
 .../src/main/resources/META-INF/NOTICE.txt         |   11 -
 .../swagger/DefaultCamelSwaggerServlet.scala       |   95 --
 .../component/swagger/RestApiListingCache.scala    |   56 --
 .../swagger/RestSwaggerApiDeclarationServlet.scala |  268 -----
 .../component/swagger/RestSwaggerCorsFilter.scala  |   47 -
 .../component/swagger/RestSwaggerReader.scala      |  276 ------
 .../swagger/DefaultCamelSwaggerServletTest.java    |   95 --
 .../swagger/DummyRestConsumerFactory.java          |   49 -
 .../component/swagger/RestSwaggerReaderTest.java   |   77 --
 .../src/test/resources/log4j2.properties           |   28 -
 components/camel-testng/pom.xml                    |  104 --
 components/camel-testng/src/main/docs/testng.adoc  |    7 -
 .../AbstractCamelTestNGSpringContextTests.java     |   73 --
 .../apache/camel/testng/AvailablePortFinder.java   |  112 ---
 .../camel/testng/CamelSpringTestSupport.java       |  165 ----
 .../org/apache/camel/testng/CamelTestSupport.java  |  693 -------------
 .../apache/camel/testng/ExchangeTestSupport.java   |   57 --
 .../apache/camel/testng/LanguageTestSupport.java   |   95 --
 .../java/org/apache/camel/testng/TestSupport.java  |  550 -----------
 .../src/main/resources/META-INF/LICENSE.txt        |  203 ----
 .../src/main/resources/META-INF/NOTICE.txt         |   11 -
 ...ontextTestsDisableJmxInheritedOverrideTest.java |   33 -
 ...GSpringContextTestsDisableJmxInheritedTest.java |   21 -
 ...amelTestNGSpringContextTestsDisableJmxTest.java |   33 -
 ...lTestNGSpringContextTestsExcludeRoutesTest.java |   31 -
 ...amelTestNGSpringContextTestsJavaConfigTest.java |   38 -
 ...SpringContextTestsMockEndpointsAndSkipTest.java |   53 -
 ...lTestNGSpringContextTestsMockEndpointsTest.java |   52 -
 ...ractCamelTestNGSpringContextTestsPlainTest.java |  122 ---
 ...ntextTestsProvidesBreakpointInherritedTest.java |   22 -
 ...NGSpringContextTestsProvidesBreakpointTest.java |   68 --
 ...tTestsShutdownTimeoutInheritedOverrideTest.java |   37 -
 ...ngContextTestsShutdownTimeoutInheritedTest.java |   22 -
 ...estNGSpringContextTestsShutdownTimeoutTest.java |   36 -
 ...lTestNGSpringContextTestsUseAdviceWithTest.java |   49 -
 .../camel/testng/SpringTestConfiguration.java      |   27 -
 .../org/apache/camel/testng/TestRouteBuilder.java  |   30 -
 .../patterns/DebugSpringCamelContextTest.java      |   39 -
 .../camel/testng/patterns/DebugSpringTest.java     |   85 --
 .../apache/camel/testng/patterns/DebugTest.java    |   83 --
 .../camel/testng/patterns/DebugTestNGTest.java     |   82 --
 .../FilterCreateCamelContextPerClassTest.java      |   74 --
 .../apache/camel/testng/patterns/FilterTest.java   |   66 --
 .../camel/testng/patterns/FilterTestNGTest.java    |   66 --
 .../camel/testng/patterns/IsUseAdviceWithTest.java |   66 --
 .../RouteBuilderConfigureExceptionTest.java        |   52 -
 .../src/test/resources/jndi.properties             |   22 -
 .../src/test/resources/log4j2.properties           |   30 -
 ...elTestNGSpringContextTestsPlainTest-context.xml |   54 -
 .../camel/testng/patterns/applicationContext.xml   |   40 -
 components/camel-undertow/pom.xml                  |    7 +-
 .../PreservePostFormUrlEncodedBodyTest.java        |    2 +-
 components/camel-urlrewrite/pom.xml                |  110 ---
 .../camel-urlrewrite/src/main/docs/urlrewrite.adoc |  189 ----
 .../camel/component/urlrewrite/HttpUrlRewrite.java |   39 -
 .../component/urlrewrite/UrlRewriteFilter.java     |  222 -----
 .../src/main/resources/META-INF/LICENSE.txt        |  203 ----
 .../src/main/resources/META-INF/NOTICE.txt         |   11 -
 .../component/urlrewrite/BaseUrlRewriteTest.java   |   83 --
 .../HttpUrlRewriteLoadBalanceFailoverTest.java     |   82 --
 .../HttpUrlRewriteLoadBalanceRoundRobinTest.java   |   73 --
 .../urlrewrite/http/HttpUrlRewriteModFileTest.java |   61 --
 .../urlrewrite/http/HttpUrlRewriteModTest.java     |   63 --
 .../http/HttpUrlRewritePingQueryTest.java          |   62 --
 .../urlrewrite/http/HttpUrlRewritePingTest.java    |   62 --
 .../urlrewrite/http/HttpUrlRewriteTest.java        |   61 --
 .../Http4UrlRewriteLoadBalanceFailoverTest.java    |   82 --
 .../Http4UrlRewriteLoadBalanceRoundRobinTest.java  |   73 --
 .../http4/Http4UrlRewriteModFileTest.java          |   61 --
 .../urlrewrite/http4/Http4UrlRewriteModTest.java   |   63 --
 .../http4/Http4UrlRewritePingQueryTest.java        |   62 --
 .../urlrewrite/http4/Http4UrlRewritePingTest.java  |   62 --
 .../urlrewrite/http4/Http4UrlRewriteTest.java      |   61 --
 .../JettyUrlRewriteLoadBalanceFailoverTest.java    |   82 --
 .../JettyUrlRewriteLoadBalanceRoundRobinTest.java  |   73 --
 .../urlrewrite/jetty/JettyUrlRewriteModTest.java   |   61 --
 .../urlrewrite/jetty/JettyUrlRewriteTest.java      |   65 --
 .../src/test/resources/example/modrewrite.cfg      |    5 -
 .../src/test/resources/example/urlrewrite-ping.xml |   38 -
 .../src/test/resources/example/urlrewrite2.xml     |   40 -
 .../src/test/resources/log4j2.properties           |   28 -
 .../src/test/resources/urlrewrite.xml              |  114 ---
 components/camel-xmlrpc/pom.xml                    |   93 --
 .../src/main/docs/xmlrpc-component.adoc            |  209 ----
 .../src/main/docs/xmlrpc-dataformat.adoc           |   72 --
 .../component/xmlrpc/XmlRpcAsyncCallback.java      |   56 --
 .../component/xmlrpc/XmlRpcClientConfigurer.java   |   34 -
 .../camel/component/xmlrpc/XmlRpcComponent.java    |   43 -
 .../component/xmlrpc/XmlRpcConfiguration.java      |  212 ----
 .../camel/component/xmlrpc/XmlRpcConstants.java    |   27 -
 .../camel/component/xmlrpc/XmlRpcEndpoint.java     |  157 ---
 .../camel/component/xmlrpc/XmlRpcProducer.java     |  105 --
 .../camel/component/xmlrpc/XmlRpcRequestImpl.java  |   59 --
 .../xmlrpc/converter/XmlRpcConverter.java          |   56 --
 .../camel/dataformat/xmlrpc/XmlRpcDataFormat.java  |  192 ----
 .../camel/dataformat/xmlrpc/XmlRpcWriter.java      |   64 --
 .../src/main/resources/META-INF/LICENSE.txt        |  203 ----
 .../src/main/resources/META-INF/NOTICE.txt         |   11 -
 .../services/org/apache/camel/TypeConverter        |   18 -
 .../services/org/apache/camel/component/xmlrpc     |   17 -
 .../services/org/apache/camel/dataformat/xmlrpc    |   18 -
 .../camel/component/xmlrpc/MyClientConfigurer.java |   35 -
 .../component/xmlrpc/XmlRpcComponentTest.java      |  139 ---
 .../camel/component/xmlrpc/XmlRpcEndpointTest.java |   63 --
 .../xmlrpc/converter/XmlRpcConverterTest.java      |   56 --
 .../xmlrpc/SpringXmlRpcDataFormatTest.java         |   55 --
 .../dataformat/xmlrpc/XmlRpcDataFormatTest.java    |   92 --
 .../src/test/resources/log4j2.properties           |   28 -
 .../xmlrpc/SpringXmlRpcDataFormatTest.xml          |   55 --
 components/pom.xml                                 |   31 -
 examples/camel-example-aggregate/pom.xml           |    4 -
 .../resources/META-INF/spring/camel-context.xml    |   11 +-
 examples/camel-example-bam/README.md               |   40 -
 examples/camel-example-bam/pom.xml                 |  133 ---
 .../src/data/invoices/invoiceA.xml                 |   22 -
 .../src/data/invoices/invoiceC.xml                 |   22 -
 .../src/data/purchaseOrders/po1.xml                |   24 -
 .../src/data/purchaseOrders/po2.xml                |   24 -
 .../src/data/purchaseOrders/po3.xml                |   24 -
 .../java/org/apache/camel/example/bam/Main.java    |   33 -
 .../org/apache/camel/example/bam/MyActivities.java |   55 --
 .../src/main/resources/META-INF/LICENSE.txt        |  203 ----
 .../src/main/resources/META-INF/NOTICE.txt         |   11 -
 .../src/main/resources/META-INF/persistence.xml    |   35 -
 .../resources/META-INF/spring/camel-context.xml    |   61 --
 .../src/main/resources/log4j2.properties           |   23 -
 examples/camel-example-cdi-osgi/README.md          |  183 ----
 examples/camel-example-cdi-osgi/pom.xml            |  310 ------
 .../org/apache/camel/example/cdi/osgi/Config.java  |   35 -
 .../apache/camel/example/cdi/osgi/Consumer.java    |   31 -
 .../org/apache/camel/example/cdi/osgi/Jms.java     |   41 -
 .../apache/camel/example/cdi/osgi/Producer.java    |   30 -
 .../src/main/resources/META-INF/LICENSE.txt        |  203 ----
 .../src/main/resources/META-INF/NOTICE.txt         |   11 -
 .../src/main/resources/META-INF/beans.xml          |   20 -
 .../src/main/resources/jms.properties              |   18 -
 .../src/main/resources/log4j2.properties           |   23 -
 .../apache/camel/example/cdi/osgi/CdiOsgiIT.java   |  103 --
 .../camel/example/cdi/osgi/PaxExamOptions.java     |  116 ---
 examples/camel-example-cxf-proxy/pom.xml           |    2 +-
 examples/camel-example-groovy/ReadMe.md            |   23 -
 examples/camel-example-groovy/pom.xml              |  172 ----
 .../src/main/java/org/apache/camel/MainApp.groovy  |   44 -
 .../java/org/apache/camel/MyRouteBuilder.groovy    |   34 -
 .../src/main/resources/log4j2.properties           |   23 -
 examples/camel-example-guice-jms/README.md         |   46 -
 examples/camel-example-guice-jms/pom.xml           |  131 ---
 .../camel-example-guice-jms/src/data/message1.xml  |   24 -
 .../camel-example-guice-jms/src/data/message2.xml  |   24 -
 .../apache/camel/example/guice/jms/MyModule.java   |   59 --
 .../camel/example/guice/jms/MyRouteBuilder.java    |   38 -
 .../apache/camel/example/guice/jms/Printer.java    |   25 -
 .../apache/camel/example/guice/jms/SomeBean.java   |   36 -
 .../src/main/resources/META-INF/LICENSE.txt        |  203 ----
 .../src/main/resources/META-INF/NOTICE.txt         |   11 -
 .../src/main/resources/camel.properties            |   19 -
 .../src/main/resources/guicejndi.properties        |   30 -
 .../src/main/resources/log4j2.properties           |   23 -
 .../camel/example/guice/jms/IntegrationTest.java   |   33 -
 examples/camel-example-hystrix/client/pom.xml      |    2 +-
 examples/camel-example-hystrix/service1/pom.xml    |    2 +-
 examples/camel-example-java8-rx/pom.xml            |   91 --
 examples/camel-example-java8-rx/readme.adoc        |   14 -
 .../camel/example/java8/rx/MyApplication.java      |   93 --
 .../src/main/resources/log4j2.properties           |   23 -
 examples/camel-example-netty-http/README.md        |    2 +-
 .../camel-example-netty-http/myapp-cdi/pom.xml     |    4 +-
 .../camel/example/netty/cdi/NettyHttpRoute.java    |    2 +-
 .../camel-example-netty-http/myapp-one/pom.xml     |    4 +-
 .../resources/OSGI-INF/blueprint/camel-one.xml     |    2 +-
 .../camel-example-netty-http/myapp-two/pom.xml     |    4 +-
 .../resources/OSGI-INF/blueprint/camel-two.xml     |    2 +-
 examples/camel-example-netty-http/pom.xml          |    2 +-
 .../shared-netty-http-server/pom.xml               |    4 +-
 .../resources/OSGI-INF/blueprint/http-server.xml   |    6 +-
 examples/camel-example-opentracing/client/pom.xml  |    2 +-
 .../camel-example-opentracing/service1/pom.xml     |    2 +-
 examples/camel-example-scala/ReadMe.md             |   26 -
 examples/camel-example-scala/pom.xml               |  182 ----
 .../src/main/resources/log4j2.properties           |   25 -
 .../org/apache/camel/example/MyRouteBuilder.scala  |   37 -
 .../org/apache/camel/example/MyRouteMain.scala     |   37 -
 .../README.md                                      |   36 -
 .../camel-example-servlet-tomcat-no-spring/pom.xml |   97 --
 .../camel/example/servletlistener/HelloBean.java   |   28 -
 .../camel/example/servletlistener/MyLifecycle.java |   55 --
 .../src/main/resources/META-INF/LICENSE.txt        |  203 ----
 .../src/main/resources/META-INF/NOTICE.txt         |   11 -
 .../src/main/resources/camel-config.xml            |   46 -
 .../src/main/resources/log4j2.properties           |   23 -
 .../src/main/webapp/WEB-INF/web.xml                |   68 --
 .../src/main/webapp/index.html                     |   49 -
 .../consumer/pom.xml                               |    2 +-
 examples/camel-example-zipkin/client/pom.xml       |    2 +-
 examples/camel-example-zipkin/service1/pom.xml     |    2 +-
 examples/pom.xml                                   |    8 -
 .../components-starter/camel-bam-starter/pom.xml   |   61 --
 .../src/main/resources/META-INF/LICENSE.txt        |  203 ----
 .../src/main/resources/META-INF/NOTICE.txt         |   11 -
 .../src/main/resources/META-INF/spring.provides    |   17 -
 .../components-starter/camel-cache-starter/pom.xml |   53 -
 .../CacheComponentAutoConfiguration.java           |  128 ---
 .../springboot/CacheComponentConfiguration.java    |  276 ------
 .../src/main/resources/META-INF/LICENSE.txt        |  203 ----
 .../src/main/resources/META-INF/NOTICE.txt         |   11 -
 .../additional-spring-configuration-metadata.json  |   10 -
 .../src/main/resources/META-INF/spring.factories   |   18 -
 .../src/main/resources/META-INF/spring.provides    |   17 -
 .../camel-context-starter/pom.xml                  |   53 -
 ...QualifiedContextComponentAutoConfiguration.java |  129 ---
 .../QualifiedContextComponentConfiguration.java    |   55 --
 .../src/main/resources/META-INF/LICENSE.txt        |  203 ----
 .../src/main/resources/META-INF/NOTICE.txt         |   11 -
 .../additional-spring-configuration-metadata.json  |   10 -
 .../src/main/resources/META-INF/spring.factories   |   18 -
 .../src/main/resources/META-INF/spring.provides    |   17 -
 .../camel-eclipse-starter/pom.xml                  |   53 -
 .../src/main/resources/META-INF/LICENSE.txt        |  203 ----
 .../src/main/resources/META-INF/NOTICE.txt         |   11 -
 .../src/main/resources/META-INF/spring.provides    |   17 -
 .../camel-elasticsearch-starter/pom.xml            |   53 -
 .../ElasticsearchComponentAutoConfiguration.java   |  129 ---
 .../ElasticsearchComponentConfiguration.java       |   69 --
 .../src/main/resources/META-INF/LICENSE.txt        |  203 ----
 .../src/main/resources/META-INF/NOTICE.txt         |   11 -
 .../additional-spring-configuration-metadata.json  |   10 -
 .../src/main/resources/META-INF/spring.factories   |   18 -
 .../src/main/resources/META-INF/spring.provides    |   17 -
 .../camel-elasticsearch5-starter/pom.xml           |   61 --
 .../ElasticsearchComponentAutoConfiguration.java   |  129 ---
 .../ElasticsearchComponentConfiguration.java       |   70 --
 .../src/main/resources/META-INF/LICENSE.txt        |  203 ----
 .../src/main/resources/META-INF/NOTICE.txt         |   11 -
 .../additional-spring-configuration-metadata.json  |   10 -
 .../src/main/resources/META-INF/spring.factories   |   18 -
 .../src/main/resources/META-INF/spring.provides    |   17 -
 .../components-starter/camel-guice-starter/pom.xml |   53 -
 .../src/main/resources/META-INF/LICENSE.txt        |  203 ----
 .../src/main/resources/META-INF/NOTICE.txt         |   11 -
 .../src/main/resources/META-INF/spring.provides    |   17 -
 .../camel-hawtdb-starter/pom.xml                   |   61 --
 .../src/main/resources/META-INF/LICENSE.txt        |  203 ----
 .../src/main/resources/META-INF/NOTICE.txt         |   11 -
 .../src/main/resources/META-INF/spring.provides    |   17 -
 .../components-starter/camel-hdfs-starter/pom.xml  |   61 --
 .../springboot/HdfsComponentAutoConfiguration.java |  128 ---
 .../springboot/HdfsComponentConfiguration.java     |   67 --
 .../src/main/resources/META-INF/LICENSE.txt        |  203 ----
 .../src/main/resources/META-INF/NOTICE.txt         |   11 -
 .../additional-spring-configuration-metadata.json  |   10 -
 .../src/main/resources/META-INF/spring.factories   |   18 -
 .../src/main/resources/META-INF/spring.provides    |   17 -
 .../components-starter/camel-http-starter/pom.xml  |   61 --
 .../springboot/HttpComponentAutoConfiguration.java |  128 ---
 .../springboot/HttpComponentConfiguration.java     |  151 ---
 .../HttpComponentSSLAutoConfiguration.java         |   94 --
 .../src/main/resources/META-INF/LICENSE.txt        |  203 ----
 .../src/main/resources/META-INF/NOTICE.txt         |   11 -
 .../additional-spring-configuration-metadata.json  |   10 -
 .../src/main/resources/META-INF/spring.factories   |   19 -
 .../src/main/resources/META-INF/spring.provides    |   17 -
 .../camel-javaspace-starter/pom.xml                |   53 -
 .../JavaSpaceComponentAutoConfiguration.java       |  128 ---
 .../JavaSpaceComponentConfiguration.java           |   54 -
 .../src/main/resources/META-INF/LICENSE.txt        |  203 ----
 .../src/main/resources/META-INF/NOTICE.txt         |   11 -
 .../additional-spring-configuration-metadata.json  |   10 -
 .../src/main/resources/META-INF/spring.factories   |   18 -
 .../src/main/resources/META-INF/spring.provides    |   17 -
 .../components-starter/camel-jira-starter/pom.xml  |   65 --
 .../springboot/JIRAComponentAutoConfiguration.java |  128 ---
 .../springboot/JIRAComponentConfiguration.java     |   54 -
 .../src/main/resources/META-INF/LICENSE.txt        |  203 ----
 .../src/main/resources/META-INF/NOTICE.txt         |   11 -
 .../additional-spring-configuration-metadata.json  |   10 -
 .../src/main/resources/META-INF/spring.factories   |   18 -
 .../src/main/resources/META-INF/spring.provides    |   17 -
 .../camel-kestrel-starter/pom.xml                  |   53 -
 .../KestrelComponentAutoConfiguration.java         |  128 ---
 .../springboot/KestrelComponentConfiguration.java  |  109 ---
 .../src/main/resources/META-INF/LICENSE.txt        |  203 ----
 .../src/main/resources/META-INF/NOTICE.txt         |   11 -
 .../additional-spring-configuration-metadata.json  |   10 -
 .../src/main/resources/META-INF/spring.factories   |   18 -
 .../src/main/resources/META-INF/spring.provides    |   17 -
 .../components-starter/camel-krati-starter/pom.xml |   53 -
 .../KratiComponentAutoConfiguration.java           |  128 ---
 .../springboot/KratiComponentConfiguration.java    |   54 -
 .../src/main/resources/META-INF/LICENSE.txt        |  203 ----
 .../src/main/resources/META-INF/NOTICE.txt         |   11 -
 .../additional-spring-configuration-metadata.json  |   10 -
 .../src/main/resources/META-INF/spring.factories   |   18 -
 .../src/main/resources/META-INF/spring.provides    |   17 -
 .../camel-mongodb-starter/pom.xml                  |   53 -
 .../MongoDbComponentAutoConfiguration.java         |  128 ---
 .../springboot/MongoDbComponentConfiguration.java  |   54 -
 .../src/main/resources/META-INF/LICENSE.txt        |  203 ----
 .../src/main/resources/META-INF/NOTICE.txt         |   11 -
 .../additional-spring-configuration-metadata.json  |   10 -
 .../src/main/resources/META-INF/spring.factories   |   18 -
 .../src/main/resources/META-INF/spring.provides    |   17 -
 .../camel-netty-http-starter/pom.xml               |   61 --
 .../NettyHttpComponentAutoConfiguration.java       |  128 ---
 .../NettyHttpComponentConfiguration.java           |  505 ----------
 .../src/main/resources/META-INF/LICENSE.txt        |  203 ----
 .../src/main/resources/META-INF/NOTICE.txt         |   11 -
 .../additional-spring-configuration-metadata.json  |   10 -
 .../src/main/resources/META-INF/spring.factories   |   18 -
 .../src/main/resources/META-INF/spring.provides    |   17 -
 .../springboot/NettyHttpAutoConfigurationTest.java |   72 --
 .../http/springboot/NettyStarterTestHelper.java    |   62 --
 .../src/test/resources/application.properties      |    1 -
 .../src/test/resources/logback.xml                 |   41 -
 .../components-starter/camel-netty-starter/pom.xml |   53 -
 .../NettyComponentAutoConfiguration.java           |  128 ---
 .../springboot/NettyComponentConfiguration.java    | 1017 -------------------
 .../src/main/resources/META-INF/LICENSE.txt        |  203 ----
 .../src/main/resources/META-INF/NOTICE.txt         |   11 -
 .../additional-spring-configuration-metadata.json  |   10 -
 .../src/main/resources/META-INF/spring.factories   |   18 -
 .../src/main/resources/META-INF/spring.provides    |   17 -
 .../camel-openshift-starter/pom.xml                |   53 -
 .../OpenShiftComponentAutoConfiguration.java       |  128 ---
 .../OpenShiftComponentConfiguration.java           |  104 --
 .../src/main/resources/META-INF/LICENSE.txt        |  203 ----
 .../src/main/resources/META-INF/NOTICE.txt         |   11 -
 .../additional-spring-configuration-metadata.json  |   10 -
 .../src/main/resources/META-INF/spring.factories   |   18 -
 .../src/main/resources/META-INF/spring.provides    |   17 -
 .../camel-routebox-starter/pom.xml                 |   53 -
 .../RouteboxComponentAutoConfiguration.java        |  128 ---
 .../springboot/RouteboxComponentConfiguration.java |   55 --
 .../src/main/resources/META-INF/LICENSE.txt        |  203 ----
 .../src/main/resources/META-INF/NOTICE.txt         |   11 -
 .../additional-spring-configuration-metadata.json  |   10 -
 .../src/main/resources/META-INF/spring.factories   |   18 -
 .../src/main/resources/META-INF/spring.provides    |   17 -
 .../components-starter/camel-rx-starter/pom.xml    |   53 -
 .../src/main/resources/META-INF/LICENSE.txt        |  203 ----
 .../src/main/resources/META-INF/NOTICE.txt         |   11 -
 .../src/main/resources/META-INF/spring.provides    |   17 -
 .../camel-servletlistener-starter/pom.xml          |   57 --
 .../src/main/resources/META-INF/LICENSE.txt        |  203 ----
 .../src/main/resources/META-INF/NOTICE.txt         |   11 -
 .../src/main/resources/META-INF/spring.provides    |   17 -
 .../camel-urlrewrite-starter/pom.xml               |   53 -
 .../src/main/resources/META-INF/LICENSE.txt        |  203 ----
 .../src/main/resources/META-INF/NOTICE.txt         |   11 -
 .../src/main/resources/META-INF/spring.provides    |   17 -
 .../camel-xmlrpc-starter/pom.xml                   |   53 -
 .../XmlRpcComponentAutoConfiguration.java          |  128 ---
 .../springboot/XmlRpcComponentConfiguration.java   |   54 -
 .../XmlRpcDataFormatAutoConfiguration.java         |  129 ---
 .../springboot/XmlRpcDataFormatConfiguration.java  |   66 --
 .../src/main/resources/META-INF/LICENSE.txt        |  203 ----
 .../src/main/resources/META-INF/NOTICE.txt         |   11 -
 .../additional-spring-configuration-metadata.json  |   16 -
 .../src/main/resources/META-INF/spring.factories   |   20 -
 .../src/main/resources/META-INF/spring.provides    |   17 -
 platforms/spring-boot/components-starter/pom.xml   |   23 -
 tests/camel-blueprint-cxf-test/pom.xml             |    2 +-
 tests/camel-itest/pom.xml                          |   22 +-
 .../quartz/FtpCronScheduledRoutePolicyTest.java    |    2 +-
 tests/camel-performance/pom.xml                    |    2 +-
 tooling/maven/guice-maven-plugin/pom.xml           |   70 --
 .../org/apache/camel/guice/maven/EmbeddedMojo.java |  186 ----
 .../java/org/apache/camel/guice/maven/RunMojo.java |  815 ----------------
 .../src/main/resources/META-INF/LICENSE.txt        |  203 ----
 .../src/main/resources/META-INF/NOTICE.txt         |   11 -
 tooling/maven/pom.xml                              |    1 -
 1720 files changed, 92 insertions(+), 149074 deletions(-)

diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index 6b65468..090a24c 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -112,10 +112,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-bam</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
       <artifactId>camel-base64</artifactId>
     </dependency>
     <dependency>
@@ -164,10 +160,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-cache</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
       <artifactId>camel-caffeine</artifactId>
     </dependency>
     <dependency>
@@ -212,10 +204,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-context</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
       <artifactId>camel-couchbase</artifactId>
     </dependency>
     <dependency>
@@ -272,10 +260,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-eclipse</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
       <artifactId>camel-ehcache</artifactId>
     </dependency>
     <dependency>
@@ -284,18 +268,10 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-elasticsearch</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
       <artifactId>camel-elasticsearch-rest</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-elasticsearch5</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
       <artifactId>camel-elsql</artifactId>
     </dependency>
     <dependency>
@@ -388,10 +364,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-groovy-dsl</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
       <artifactId>camel-grpc</artifactId>
     </dependency>
     <dependency>
@@ -400,10 +372,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-guice</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
       <artifactId>camel-gora</artifactId>
     </dependency>
     <dependency>
@@ -412,10 +380,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-hawtdb</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
       <artifactId>camel-hazelcast</artifactId>
     </dependency>
     <dependency>
@@ -424,10 +388,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-hdfs</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
       <artifactId>camel-hdfs2</artifactId>
     </dependency>
     <dependency>
@@ -436,10 +396,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-http</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
       <artifactId>camel-http-common</artifactId>
     </dependency>
     <dependency>
@@ -460,10 +416,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-ibatis</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
       <artifactId>camel-ical</artifactId>
     </dependency>
     <dependency>
@@ -504,10 +456,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-javaspace</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
       <artifactId>camel-jaxb</artifactId>
     </dependency>
     <dependency>
@@ -556,10 +504,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-jira</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
       <artifactId>camel-jms</artifactId>
     </dependency>
     <dependency>
@@ -607,14 +551,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-kestrel</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-krati</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
       <artifactId>camel-kubernetes</artifactId>
     </dependency>
     <dependency>
@@ -679,10 +615,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-mina</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
       <artifactId>camel-mina2</artifactId>
     </dependency>
     <dependency>
@@ -691,10 +623,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-mongodb</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
       <artifactId>camel-mongodb3</artifactId>
     </dependency>
     <dependency>
@@ -727,18 +655,10 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-netty</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
       <artifactId>camel-netty4</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-netty-http</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
       <artifactId>camel-netty4-http</artifactId>
     </dependency>
      <dependency>
@@ -763,10 +683,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-openshift</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
       <artifactId>camel-openstack</artifactId>
     </dependency>
     <dependency>
@@ -807,10 +723,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-quartz</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
       <artifactId>camel-quartz2</artifactId>
     </dependency>
     <dependency>
@@ -851,18 +763,10 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-routebox</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
       <artifactId>camel-rss</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-rx</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
       <artifactId>camel-salesforce</artifactId>
     </dependency>
     <dependency>
@@ -875,18 +779,10 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-scala</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
       <artifactId>camel-schematron</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-scr</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
       <artifactId>camel-script</artifactId>
     </dependency>
     <dependency>
@@ -903,10 +799,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-servletlistener</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
       <artifactId>camel-shiro</artifactId>
     </dependency>
     <dependency>
@@ -1015,10 +907,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-swagger</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
       <artifactId>camel-swagger-java</artifactId>
     </dependency>
     <dependency>
@@ -1087,10 +975,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-testng</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
       <artifactId>camel-thrift</artifactId>
     </dependency>
     <dependency>
@@ -1115,10 +999,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-urlrewrite</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
       <artifactId>camel-velocity</artifactId>
     </dependency>
     <dependency>
@@ -1151,10 +1031,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-xmlrpc</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
       <artifactId>camel-xmpp</artifactId>
     </dependency>
     <dependency>
@@ -1268,11 +1144,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-bam-starter</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
       <artifactId>camel-barcode-starter</artifactId>
       <version>${project.version}</version>
     </dependency>
@@ -1323,11 +1194,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-cache-starter</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
       <artifactId>camel-caffeine-starter</artifactId>
       <version>${project.version}</version>
     </dependency>
@@ -1373,11 +1239,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-context-starter</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
       <artifactId>camel-core-starter</artifactId>
       <version>${project.version}</version>
     </dependency>
@@ -1452,31 +1313,16 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-eclipse-starter</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
       <artifactId>camel-ehcache-starter</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-elasticsearch-starter</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
       <artifactId>camel-elasticsearch-rest-starter</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-elasticsearch5-starter</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
       <artifactId>camel-elsql-starter</artifactId>
       <version>${project.version}</version>
     </dependency>
@@ -1607,16 +1453,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-guice-starter</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-hawtdb-starter</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
       <artifactId>camel-hazelcast-starter</artifactId>
       <version>${project.version}</version>
     </dependency>
@@ -1627,11 +1463,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-hdfs-starter</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
       <artifactId>camel-hdfs2-starter</artifactId>
       <version>${project.version}</version>
     </dependency>
@@ -1662,11 +1493,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-http-starter</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
       <artifactId>camel-hystrix-starter</artifactId>
       <version>${project.version}</version>
     </dependency>
@@ -1722,11 +1548,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-javaspace-starter</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
       <artifactId>camel-jaxb-starter</artifactId>
       <version>${project.version}</version>
     </dependency>
@@ -1787,11 +1608,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-jira-starter</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
       <artifactId>camel-jms-starter</artifactId>
       <version>${project.version}</version>
     </dependency>
@@ -1842,21 +1658,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-kestrel-starter</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-krati-starter</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-kubernetes-starter</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
       <artifactId>camel-kura-starter</artifactId>
       <version>${project.version}</version>
     </dependency>
@@ -1942,11 +1743,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-mongodb-starter</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
       <artifactId>camel-mongodb3-starter</artifactId>
       <version>${project.version}</version>
     </dependency>
@@ -1997,16 +1793,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-netty-http-starter</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-netty-starter</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
       <artifactId>camel-ognl-starter</artifactId>
       <version>${project.version}</version>
     </dependency>
@@ -2022,11 +1808,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-openshift-starter</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
       <artifactId>camel-openstack-starter</artifactId>
       <version>${project.version}</version>
     </dependency>
@@ -2102,11 +1883,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-routebox-starter</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
       <artifactId>camel-rss-starter</artifactId>
       <version>${project.version}</version>
     </dependency>
@@ -2132,11 +1908,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-rx-starter</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
       <artifactId>camel-salesforce-starter</artifactId>
       <version>${project.version}</version>
     </dependency>
@@ -2172,11 +1943,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-servletlistener-starter</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
       <artifactId>camel-servlet-starter</artifactId>
       <version>${project.version}</version>
     </dependency>
@@ -2392,11 +2158,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-urlrewrite-starter</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
       <artifactId>camel-velocity-starter</artifactId>
       <version>${project.version}</version>
     </dependency>
@@ -2432,11 +2193,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-xmlrpc-starter</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
       <artifactId>camel-xmlsecurity-starter</artifactId>
       <version>${project.version}</version>
     </dependency>
diff --git a/apache-camel/src/main/descriptors/common-bin.xml b/apache-camel/src/main/descriptors/common-bin.xml
index a898af7..d47e45d 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -40,7 +40,6 @@
         <include>org.apache.camel:camel-aws-xray</include>
         <include>org.apache.camel:camel-azure</include>
         <include>org.apache.camel:camel-avro</include>
-        <include>org.apache.camel:camel-bam</include>
         <include>org.apache.camel:camel-barcode</include>
         <include>org.apache.camel:camel-base64</include>
         <include>org.apache.camel:camel-bean-validator</include>
@@ -53,7 +52,6 @@
         <include>org.apache.camel:camel-box</include>
         <include>org.apache.camel:camel-box-api</include>
         <include>org.apache.camel:camel-braintree</include>
-        <include>org.apache.camel:camel-cache</include>
         <include>org.apache.camel:camel-caffeine</include>
         <include>org.apache.camel:camel-cassandraql</include>
         <include>org.apache.camel:camel-cdi</include>
@@ -66,7 +64,6 @@
         <include>org.apache.camel:camel-cometd</include>
         <include>org.apache.camel:camel-connector</include>
         <include>org.apache.camel:camel-consul</include>
-        <include>org.apache.camel:camel-context</include>
         <include>org.apache.camel:camel-couchdb</include>
         <include>org.apache.camel:camel-couchbase</include>
         <include>org.apache.camel:camel-crypto</include>
@@ -81,11 +78,8 @@
         <include>org.apache.camel:camel-dozer</include>
         <include>org.apache.camel:camel-drill</include>
         <include>org.apache.camel:camel-dropbox</include>
-        <include>org.apache.camel:camel-eclipse</include>
         <include>org.apache.camel:camel-ehcache</include>
         <include>org.apache.camel:camel-ejb</include>
-        <include>org.apache.camel:camel-elasticsearch</include>
-        <include>org.apache.camel:camel-elasticsearch5</include>
         <include>org.apache.camel:camel-elasticsearch-rest</include>
         <include>org.apache.camel:camel-elsql</include>
         <include>org.apache.camel:camel-etcd</include>
@@ -110,23 +104,17 @@
         <include>org.apache.camel:camel-google-pubsub</include>
         <include>org.apache.camel:camel-gora</include>
         <include>org.apache.camel:camel-groovy</include>
-        <include>org.apache.camel:camel-groovy-dsl</include>
         <include>org.apache.camel:camel-grpc</include>
         <include>org.apache.camel:camel-guava-eventbus</include>
-        <include>org.apache.camel:camel-guice</include>
         <include>org.apache.camel:camel-gson</include>
         <include>org.apache.camel:camel-hl7</include>
-        <include>org.apache.camel:camel-hawtdb</include>
         <include>org.apache.camel:camel-hazelcast</include>
         <include>org.apache.camel:camel-hbase</include>
-        <include>org.apache.camel:camel-hdfs</include>
         <include>org.apache.camel:camel-hdfs2</include>
         <include>org.apache.camel:camel-headersmap</include>
         <include>org.apache.camel:camel-hipchat</include>
-        <include>org.apache.camel:camel-http</include>
         <include>org.apache.camel:camel-http-common</include>
         <include>org.apache.camel:camel-http4</include>
-        <include>org.apache.camel:camel-ibatis</include>
         <include>org.apache.camel:camel-ical</include>
         <include>org.apache.camel:camel-iec60870</include>
         <include>org.apache.camel:camel-infinispan</include>
@@ -137,7 +125,6 @@
         <include>org.apache.camel:camel-jackson</include>
         <include>org.apache.camel:camel-jacksonxml</include>
         <include>org.apache.camel:camel-jasypt</include>
-        <include>org.apache.camel:camel-javaspace</include>
         <include>org.apache.camel:camel-jaxb</include>
         <include>org.apache.camel:camel-jbpm</include>
         <include>org.apache.camel:camel-jcr</include>
@@ -150,7 +137,6 @@
         <include>org.apache.camel:camel-jgroups</include>
         <include>org.apache.camel:camel-jibx</include>
         <include>org.apache.camel:camel-jing</include>
-        <include>org.apache.camel:camel-jira</include>
         <include>org.apache.camel:camel-jms</include>
         <include>org.apache.camel:camel-jmx</include>
         <include>org.apache.camel:camel-jolt</include>
@@ -160,10 +146,7 @@
         <include>org.apache.camel:camel-json-validator</include>
         <include>org.apache.camel:camel-jsonpath</include>
         <include>org.apache.camel:camel-jt400</include>
-        <include>org.apache.camel:camel-jxpath</include>
         <include>org.apache.camel:camel-kafka</include>
-        <include>org.apache.camel:camel-kestrel</include>
-        <include>org.apache.camel:camel-krati</include>
         <include>org.apache.camel:camel-kura</include>
         <include>org.apache.camel:camel-kubernetes</include>
         <include>org.apache.camel:camel-ldap</include>
@@ -180,10 +163,8 @@
         <include>org.apache.camel:camel-milo</include>
         <include>org.apache.camel:camel-mail</include>
         <include>org.apache.camel:camel-master</include>
-        <include>org.apache.camel:camel-mina</include>
         <include>org.apache.camel:camel-mina2</include>
         <include>org.apache.camel:camel-mllp</include>
-        <include>org.apache.camel:camel-mongodb</include>
         <include>org.apache.camel:camel-mongodb3</include>
         <include>org.apache.camel:camel-mongodb-gridfs</include>
         <include>org.apache.camel:camel-mqtt</include>
@@ -192,16 +173,13 @@
         <include>org.apache.camel:camel-mvel</include>
         <include>org.apache.camel:camel-mybatis</include>
         <include>org.apache.camel:camel-nagios</include>
-        <include>org.apache.camel:camel-netty</include>
         <include>org.apache.camel:camel-netty4</include>
-        <include>org.apache.camel:camel-netty-http</include>
         <include>org.apache.camel:camel-netty4-http</include>
         <include>org.apache.camel:camel-ognl</include>
         <include>org.apache.camel:camel-olingo2-api</include>
         <include>org.apache.camel:camel-olingo2</include>
         <include>org.apache.camel:camel-olingo4-api</include>
         <include>org.apache.camel:camel-olingo4</include>
-        <include>org.apache.camel:camel-openshift</include>
         <include>org.apache.camel:camel-openstack</include>
         <include>org.apache.camel:camel-opentracing</include>
         <include>org.apache.camel:camel-optaplanner</include>
@@ -212,7 +190,6 @@
         <include>org.apache.camel:camel-printer</include>
         <include>org.apache.camel:camel-protobuf</include>
         <include>org.apache.camel:camel-pubnub</include>
-        <include>org.apache.camel:camel-quartz</include>
         <include>org.apache.camel:camel-quartz2</include>
         <include>org.apache.camel:camel-quickfix</include>
         <include>org.apache.camel:camel-rabbitmq</include>
@@ -223,21 +200,15 @@
         <include>org.apache.camel:camel-rest-swagger</include>
         <include>org.apache.camel:camel-ribbon</include>
         <include>org.apache.camel:camel-rmi</include>
-        <include>org.apache.camel:camel-routebox</include>
         <include>org.apache.camel:camel-rss</include>
-        <include>org.apache.camel:camel-ruby</include>
-        <include>org.apache.camel:camel-rx</include>
         <include>org.apache.camel:camel-salesforce</include>
         <include>org.apache.camel:camel-sap-netweaver</include>
         <include>org.apache.camel:camel-saxon</include>
-        <include>org.apache.camel:camel-scala</include>
         <include>org.apache.camel:camel-schematron</include>
-        <include>org.apache.camel:camel-scr</include>
         <include>org.apache.camel:camel-script</include>
         <include>org.apache.camel:camel-service</include>
         <include>org.apache.camel:camel-servicenow</include>
         <include>org.apache.camel:camel-servlet</include>
-        <include>org.apache.camel:camel-servletlistener</include>
         <include>org.apache.camel:camel-shiro</include>
         <include>org.apache.camel:camel-sip</include>
         <include>org.apache.camel:camel-sjms</include>
@@ -270,7 +241,6 @@
         <include>org.apache.camel:camel-stream</include>
         <include>org.apache.camel:camel-stringtemplate</include>
         <include>org.apache.camel:camel-syslog</include>
-        <include>org.apache.camel:camel-swagger</include>
         <include>org.apache.camel:camel-swagger-java</include>
         <include>org.apache.camel:camel-tagsoup</include>
         <include>org.apache.camel:camel-tarfile</include>
@@ -282,14 +252,12 @@
         <include>org.apache.camel:camel-test-spring</include>
         <include>org.apache.camel:camel-testcontainers</include>
         <include>org.apache.camel:camel-testcontainers-spring</include>
-        <include>org.apache.camel:camel-testng</include>
         <include>org.apache.camel:camel-thrift</include>
         <include>org.apache.camel:camel-tika</include>
         <include>org.apache.camel:camel-twilio</include>
         <include>org.apache.camel:camel-twitter</include>
         <include>org.apache.camel:camel-undertow</include>
         <include>org.apache.camel:camel-univocity-parsers</include>
-        <include>org.apache.camel:camel-urlrewrite</include>
         <include>org.apache.camel:camel-velocity</include>
         <include>org.apache.camel:camel-vertx</include>
         <include>org.apache.camel:camel-weather</include>
@@ -297,7 +265,6 @@
         <include>org.apache.camel:camel-websocket</include>
         <include>org.apache.camel:camel-wordpress</include>
         <include>org.apache.camel:camel-xchange</include>
-        <include>org.apache.camel:camel-xmlrpc</include>
         <include>org.apache.camel:camel-xmlsecurity</include>
         <include>org.apache.camel:camel-xmpp</include>
         <include>org.apache.camel:camel-xstream</include>
@@ -362,7 +329,6 @@
         <include>org.apache.camel:camel-aws-starter</include>
         <include>org.apache.camel:camel-aws-xray-starter</include>
         <include>org.apache.camel:camel-azure-starter</include>
-        <include>org.apache.camel:camel-bam-starter</include>
         <include>org.apache.camel:camel-barcode-starter</include>
         <include>org.apache.camel:camel-base64-starter</include>
         <include>org.apache.camel:camel-beanio-starter</include>
@@ -373,7 +339,6 @@
         <include>org.apache.camel:camel-boon-starter</include>
         <include>org.apache.camel:camel-box-starter</include>
         <include>org.apache.camel:camel-braintree-starter</include>
-        <include>org.apache.camel:camel-cache-starter</include>
         <include>org.apache.camel:camel-caffeine-starter</include>
         <include>org.apache.camel:camel-cassandraql-starter</include>
         <include>org.apache.camel:camel-chunk-starter</include>
@@ -382,7 +347,6 @@
         <include>org.apache.camel:camel-coap-starter</include>
         <include>org.apache.camel:camel-cometd-starter</include>
         <include>org.apache.camel:camel-consul-starter</include>
-        <include>org.apache.camel:camel-context-starter</include>
         <include>org.apache.camel:camel-core-starter</include>
         <include>org.apache.camel:camel-couchdb-starter</include>
         <include>org.apache.camel:camel-couchbase-starter</include>
@@ -398,10 +362,7 @@
         <include>org.apache.camel:camel-dozer-starter</include>
         <include>org.apache.camel:camel-drill-starter</include>
         <include>org.apache.camel:camel-dropbox-starter</include>
-        <include>org.apache.camel:camel-eclipse-starter</include>
         <include>org.apache.camel:camel-ehcache-starter</include>
-        <include>org.apache.camel:camel-elasticsearch-starter</include>
-        <include>org.apache.camel:camel-elasticsearch5-starter</include>
         <include>org.apache.camel:camel-elasticsearch-rest-starter</include>
         <include>org.apache.camel:camel-elsql-starter</include>
         <include>org.apache.camel:camel-etcd-starter</include>
@@ -429,18 +390,13 @@
         <include>org.apache.camel:camel-grpc-starter</include>
         <include>org.apache.camel:camel-gson-starter</include>
         <include>org.apache.camel:camel-guava-eventbus-starter</include>
-        <include>org.apache.camel:camel-guice-starter</include>
-        <include>org.apache.camel:camel-hawtdb-starter</include>
         <include>org.apache.camel:camel-hazelcast-starter</include>
         <include>org.apache.camel:camel-hbase-starter</include>
-        <include>org.apache.camel:camel-hdfs-starter</include>
         <include>org.apache.camel:camel-hdfs2-starter</include>
         <include>org.apache.camel:camel-headersmap-starter</include>
-        <include>org.apache.camel:camel-hessian-starter</include>
         <include>org.apache.camel:camel-hl7-starter</include>
         <include>org.apache.camel:camel-http4-starter</include>
         <include>org.apache.camel:camel-http-common-starter</include>
-        <include>org.apache.camel:camel-http-starter</include>
         <include>org.apache.camel:camel-hystrix-starter</include>
         <include>org.apache.camel:camel-ical-starter</include>
         <include>org.apache.camel:camel-iec60870-starter</include>
@@ -452,7 +408,6 @@
         <include>org.apache.camel:camel-jackson-starter</include>
         <include>org.apache.camel:camel-jacksonxml-starter</include>
         <include>org.apache.camel:camel-jasypt-starter</include>
-        <include>org.apache.camel:camel-javaspace-starter</include>
         <include>org.apache.camel:camel-jaxb-starter</include>
         <include>org.apache.camel:camel-jbpm-starter</include>
         <include>org.apache.camel:camel-jcache-starter</include>
@@ -465,7 +420,6 @@
         <include>org.apache.camel:camel-jgroups-starter</include>
         <include>org.apache.camel:camel-jibx-starter</include>
         <include>org.apache.camel:camel-jing-starter</include>
-        <include>org.apache.camel:camel-jira-starter</include>
         <include>org.apache.camel:camel-jms-starter</include>
         <include>org.apache.camel:camel-jmx-starter</include>
         <include>org.apache.camel:camel-johnzon-starter</include>
@@ -476,9 +430,6 @@
         <include>org.apache.camel:camel-jsonpath-starter</include>
         <include>org.apache.camel:camel-jt400-starter</include>
         <include>org.apache.camel:camel-kafka-starter</include>
-        <include>org.apache.camel:camel-kestrel-starter</include>
-        <include>org.apache.camel:camel-krati-starter</include>
-        <include>org.apache.camel:camel-kubernetes-starter</include>
         <include>org.apache.camel:camel-kura-starter</include>
         <include>org.apache.camel:camel-ldap-starter</include>
         <include>org.apache.camel:camel-ldif-starter</include>
@@ -496,7 +447,6 @@
         <include>org.apache.camel:camel-mina2-starter</include>
         <include>org.apache.camel:camel-mllp-starter</include>
         <include>org.apache.camel:camel-mongodb-gridfs-starter</include>
-        <include>org.apache.camel:camel-mongodb-starter</include>
         <include>org.apache.camel:camel-mongodb3-starter</include>
         <include>org.apache.camel:camel-mqtt-starter</include>
         <include>org.apache.camel:camel-msv-starter</include>
@@ -507,12 +457,9 @@
         <include>org.apache.camel:camel-nats-starter</include>
         <include>org.apache.camel:camel-netty4-http-starter</include>
         <include>org.apache.camel:camel-netty4-starter</include>
-        <include>org.apache.camel:camel-netty-http-starter</include>
-        <include>org.apache.camel:camel-netty-starter</include>
         <include>org.apache.camel:camel-ognl-starter</include>
         <include>org.apache.camel:camel-olingo2-starter</include>
         <include>org.apache.camel:camel-olingo4-starter</include>
-        <include>org.apache.camel:camel-openshift-starter</include>
         <include>org.apache.camel:camel-openstack-starter</include>
         <include>org.apache.camel:camel-opentracing-starter</include>
         <include>org.apache.camel:camel-optaplanner-starter</include>
@@ -532,10 +479,7 @@
         <include>org.apache.camel:camel-rest-swagger-starter</include>
         <include>org.apache.camel:camel-ribbon-starter</include>
         <include>org.apache.camel:camel-rmi-starter</include>
-        <include>org.apache.camel:camel-routebox-starter</include>
         <include>org.apache.camel:camel-rss-starter</include>
-        <include>org.apache.camel:camel-ruby-starter</include>
-        <include>org.apache.camel:camel-rx-starter</include>
         <include>org.apache.camel:camel-salesforce-starter</include>
         <include>org.apache.camel:camel-sap-netweaver-starter</include>
         <include>org.apache.camel:camel-saxon-starter</include>
@@ -543,7 +487,6 @@
         <include>org.apache.camel:camel-script-starter</include>
         <include>org.apache.camel:camel-service-starter</include>
         <include>org.apache.camel:camel-servicenow-starter</include>
-        <include>org.apache.camel:camel-servletlistener-starter</include>
         <include>org.apache.camel:camel-servlet-starter</include>
         <include>org.apache.camel:camel-shiro-starter</include>
         <include>org.apache.camel:camel-sip-starter</include>
@@ -588,7 +531,6 @@
         <include>org.apache.camel:camel-twitter-starter</include>
         <include>org.apache.camel:camel-undertow-starter</include>
         <include>org.apache.camel:camel-univocity-parsers-starter</include>
-        <include>org.apache.camel:camel-urlrewrite-starter</include>
         <include>org.apache.camel:camel-velocity-starter</include>
         <include>org.apache.camel:camel-vertx-starter</include>
         <include>org.apache.camel:camel-weather-starter</include>
diff --git a/archetypes/camel-archetype-groovy/pom.xml b/archetypes/camel-archetype-groovy/pom.xml
deleted file mode 100644
index 3eb523f..0000000
--- a/archetypes/camel-archetype-groovy/pom.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.camel</groupId>
-    <artifactId>archetypes</artifactId>
-    <version>3.0.0-SNAPSHOT</version>
-  </parent>
-
-  <groupId>org.apache.camel.archetypes</groupId>
-  <artifactId>camel-archetype-groovy</artifactId>
-  <name>Camel :: Archetypes :: Groovy Router (deprecated)</name>
-  <description>Creates a new Camel project using Groovy DSL.</description>
-  <packaging>maven-archetype</packaging>
-
-  <build>
-    <extensions>
-      <extension>
-        <groupId>org.apache.maven.archetype</groupId>
-        <artifactId>archetype-packaging</artifactId>
-        <version>${maven-archetype-packaging-version}</version>
-      </extension>
-    </extensions>
-
-    <!-- include all resources but only filter archetype-metadata.xml -->
-    <resources>
-      <resource>
-        <directory>src/main/resources</directory>
-        <filtering>false</filtering>
-      </resource>
-      <resource>
-        <directory>src/main/resources-filtered</directory>
-        <filtering>true</filtering>
-        <includes>
-          <include>**/archetype-metadata.xml</include>
-        </includes>
-      </resource>
-    </resources>
-  </build>
-
-</project>
diff --git a/archetypes/camel-archetype-groovy/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml b/archetypes/camel-archetype-groovy/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
deleted file mode 100644
index 7bcd996..0000000
--- a/archetypes/camel-archetype-groovy/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<archetype-descriptor xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd" name="camel-archetype-java"
-    xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <requiredProperties>
-    <requiredProperty key="camel-version">
-      <defaultValue>${project.version}</defaultValue>
-    </requiredProperty>
-    <requiredProperty key="exec-maven-plugin-version">
-      <defaultValue>${exec-maven-plugin-version}</defaultValue>
-    </requiredProperty>
-    <requiredProperty key="maven-compiler-plugin-version">
-      <defaultValue>${maven-compiler-plugin-version}</defaultValue>
-    </requiredProperty>
-    <requiredProperty key="maven-eclipse-plugin-version">
-      <defaultValue>${maven-eclipse-plugin-version}</defaultValue>
-    </requiredProperty>
-    <requiredProperty key="maven-resources-plugin-version">
-      <defaultValue>${maven-resources-plugin-version}</defaultValue>
-    </requiredProperty>
-    <requiredProperty key="gmaven-plugin-version">
-      <defaultValue>${gmaven-plugin-version}</defaultValue>
-    </requiredProperty>
-  </requiredProperties>
-  <fileSets>
-    <fileSet filtered="true" packaged="true" encoding="UTF-8">
-      <directory>src/main/java</directory>
-      <includes>
-        <include>**/*.java</include>
-      </includes>
-    </fileSet>
-    <fileSet filtered="true" packaged="true" encoding="UTF-8">
-      <directory>src/main/groovy</directory>
-      <includes>
-        <include>**/*.groovy</include>
-      </includes>
-    </fileSet>
-    <fileSet filtered="true" encoding="UTF-8">
-      <directory>src/main/resources</directory>
-      <includes>
-        <include>**/*.xml</include>
-        <include>**/*.properties</include>
-      </includes>
-    </fileSet>
-    <fileSet filtered="true" packaged="true" encoding="UTF-8">
-      <directory>src/test/java</directory>
-      <includes>
-        <include>**/*.java</include>
-      </includes>
-    </fileSet>
-    <fileSet filtered="true" encoding="UTF-8">
-      <directory>src/test/resources</directory>
-      <includes>
-        <include>**/*.xml</include>
-        <include>**/*.properties</include>
-      </includes>
-    </fileSet>
-    <fileSet filtered="true" encoding="UTF-8">
-      <directory>src/data</directory>
-      <includes>
-        <include>**/*.xml</include>
-      </includes>
-    </fileSet>
-    <fileSet encoding="UTF-8">
-      <directory></directory>
-      <includes>
-        <include>ReadMe.txt</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-</archetype-descriptor>
diff --git a/archetypes/camel-archetype-groovy/src/main/resources/META-INF/LICENSE.txt b/archetypes/camel-archetype-groovy/src/main/resources/META-INF/LICENSE.txt
deleted file mode 100644
index 6b0b127..0000000
--- a/archetypes/camel-archetype-groovy/src/main/resources/META-INF/LICENSE.txt
+++ /dev/null
@@ -1,203 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
diff --git a/archetypes/camel-archetype-groovy/src/main/resources/META-INF/NOTICE.txt b/archetypes/camel-archetype-groovy/src/main/resources/META-INF/NOTICE.txt
deleted file mode 100644
index 2e215bf..0000000
--- a/archetypes/camel-archetype-groovy/src/main/resources/META-INF/NOTICE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-   =========================================================================
-   ==  NOTICE file corresponding to the section 4 d of                    ==
-   ==  the Apache License, Version 2.0,                                   ==
-   ==  in this case for the Apache Camel distribution.                    ==
-   =========================================================================
-
-   This product includes software developed by
-   The Apache Software Foundation (http://www.apache.org/).
-
-   Please read the different LICENSE files present in the licenses directory of
-   this distribution.
diff --git a/archetypes/camel-archetype-groovy/src/main/resources/archetype-resources/ReadMe.txt b/archetypes/camel-archetype-groovy/src/main/resources/archetype-resources/ReadMe.txt
deleted file mode 100644
index 0e40aff..0000000
--- a/archetypes/camel-archetype-groovy/src/main/resources/archetype-resources/ReadMe.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-Camel Groovy Router Project
-===========================
-
-To build this project use
-
-    mvn install
-
-To run this project from within Maven use
-
-    mvn exec:java
-
-For more help see the Apache Camel documentation
-
-    http://camel.apache.org/
-
diff --git a/archetypes/camel-archetype-groovy/src/main/resources/archetype-resources/pom.xml b/archetypes/camel-archetype-groovy/src/main/resources/archetype-resources/pom.xml
deleted file mode 100644
index ed27546..0000000
--- a/archetypes/camel-archetype-groovy/src/main/resources/archetype-resources/pom.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>${groupId}</groupId>
-  <artifactId>${artifactId}</artifactId>
-  <packaging>jar</packaging>
-  <version>${version}</version>
-
-  <name>A Groovy DSL Camel Route</name>
-
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-  </properties>
-
-  <dependencyManagement>
-    <dependencies>
-      <!-- Camel BOM -->
-      <dependency>
-        <groupId>org.apache.camel</groupId>
-        <artifactId>camel-parent</artifactId>
-        <version>${camel-version}</version>
-        <scope>import</scope>
-        <type>pom</type>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-groovy-dsl</artifactId>
-    </dependency>
-
-    <!-- used for jetty -->
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-jetty</artifactId>
-    </dependency>
-   
-    <!-- logging -->
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-api</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-slf4j-impl</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <!-- testing -->
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-test</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <defaultGoal>install</defaultGoal>
-
-    <plugins>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-resources-plugin</artifactId>
-        <version>${maven-resources-plugin-version}</version>
-        <configuration>
-          <encoding>UTF-8</encoding>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>${maven-compiler-plugin-version}</version>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-          <compilerId>groovy-eclipse-compiler</compilerId>
-          <!-- set verbose to be true if you want lots of uninteresting messages -->
-          <!-- <verbose>true</verbose> -->
-        </configuration>
-        <dependencies>
-          <dependency>
-            <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-eclipse-compiler</artifactId>
-            <version>2.9.2-01</version>
-            <exclusions>
-              <exclusion>
-                <groupId>org.codehaus.groovy</groupId>
-                <artifactId>groovy-eclipse-batch</artifactId>
-              </exclusion>
-            </exclusions>
-          </dependency>
-          <dependency>
-            <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-eclipse-batch</artifactId>
-            <version>2.4.3-01</version>
-          </dependency>
-        </dependencies>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-eclipse-plugin</artifactId>
-        <version>${maven-eclipse-plugin-version}</version>
-        <configuration>
-          <additionalProjectnatures>
-            <projectnature>org.eclipse.jdt.groovy.core.groovyNature</projectnature>
-          </additionalProjectnatures>
-          <classpathContainers>
-            <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer>
-            <classpathContainer>GROOVY_DSL_SUPPORT</classpathContainer>
-          </classpathContainers>
-        </configuration>
-      </plugin>
-
-      <!-- Allows the example to be run via 'mvn compile exec:java' -->
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>exec-maven-plugin</artifactId>
-        <version>${exec-maven-plugin-version}</version>
-        <configuration>
-          <mainClass>${package}.MainApp</mainClass>
-          <includePluginDependencies>false</includePluginDependencies>
-        </configuration>
-      </plugin>
-
-    </plugins>
-  </build>
-
-</project>
diff --git a/archetypes/camel-archetype-groovy/src/main/resources/archetype-resources/src/main/groovy/MyRouteBuilder.groovy b/archetypes/camel-archetype-groovy/src/main/resources/archetype-resources/src/main/groovy/MyRouteBuilder.groovy
deleted file mode 100644
index 20b152d..0000000
--- a/archetypes/camel-archetype-groovy/src/main/resources/archetype-resources/src/main/groovy/MyRouteBuilder.groovy
+++ /dev/null
@@ -1,34 +0,0 @@
-## ------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ------------------------------------------------------------------------
-package ${package}
-
-import org.apache.camel.builder.RouteBuilder
-
-/**
- * A Camel Groovy DSL Router
- */
-class MyRouteBuilder extends RouteBuilder {
-
-    /**
-     * Let's configure the Camel routing rules using Groovy code...
-     */
-    void configure() {
-        from("jetty:http://0.0.0.0:8080")
-          .transform { 'Today is ' + new Date() }
-    }
-
-}
diff --git a/archetypes/camel-archetype-groovy/src/main/resources/archetype-resources/src/main/java/MainApp.java b/archetypes/camel-archetype-groovy/src/main/resources/archetype-resources/src/main/java/MainApp.java
deleted file mode 100644
index 238b91c..0000000
--- a/archetypes/camel-archetype-groovy/src/main/resources/archetype-resources/src/main/java/MainApp.java
+++ /dev/null
@@ -1,44 +0,0 @@
-## ------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ------------------------------------------------------------------------
-package ${package};
-
-import org.apache.camel.main.Main;
-
-/**
- * A Camel Application
- */
-public class MainApp {
-
-    /**
-     * A main() so we can easily run these routing rules in our IDE
-     */
-    public static void main(String... args) throws Exception {
-
-        System.out.println("\n\n\n\n");
-        System.out.println("===============================================");
-        System.out.println("Open your web browser on http://localhost:8080");
-        System.out.println("Press ctrl+c to stop this example");
-        System.out.println("===============================================");
-        System.out.println("\n\n\n\n");
-
-        Main main = new Main();
-        main.addRouteBuilder(new MyRouteBuilder());
-        main.run(args);
-    }
-
-}
-
diff --git a/archetypes/camel-archetype-groovy/src/main/resources/archetype-resources/src/main/resources/log4j2.properties b/archetypes/camel-archetype-groovy/src/main/resources/archetype-resources/src/main/resources/log4j2.properties
deleted file mode 100644
index d9f0508..0000000
--- a/archetypes/camel-archetype-groovy/src/main/resources/archetype-resources/src/main/resources/log4j2.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
-
-appender.out.type = Console
-appender.out.name = out
-appender.out.layout.type = PatternLayout
-appender.out.layout.pattern = [%30.30t] %-30.30c{1} %-5p %m%n
-rootLogger.level = INFO
-rootLogger.appenderRef.out.ref = out
diff --git a/archetypes/camel-archetype-scala/pom.xml b/archetypes/camel-archetype-scala/pom.xml
deleted file mode 100644
index 8d82fc1..0000000
--- a/archetypes/camel-archetype-scala/pom.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.camel</groupId>
-    <artifactId>archetypes</artifactId>
-    <version>3.0.0-SNAPSHOT</version>
-  </parent>
-
-  <groupId>org.apache.camel.archetypes</groupId>
-  <artifactId>camel-archetype-scala</artifactId>
-  <name>Camel :: Archetypes :: Scala Router (deprecated)</name>
-  <description>Creates a new Camel project using Scala DSL.</description>
-  <packaging>maven-archetype</packaging>
-
-  <build>
-    <extensions>
-      <extension>
-        <groupId>org.apache.maven.archetype</groupId>
-        <artifactId>archetype-packaging</artifactId>
-        <version>${maven-archetype-packaging-version}</version>
-      </extension>
-    </extensions>
-
-    <!-- include all resources but only filter archetype-metadata.xml -->
-    <resources>
-      <resource>
-        <directory>src/main/resources</directory>
-        <filtering>false</filtering>
-      </resource>
-      <resource>
-        <directory>src/main/resources-filtered</directory>
-        <filtering>true</filtering>
-        <includes>
-          <include>**/archetype-metadata.xml</include>
-        </includes>
-      </resource>
-    </resources>
-  </build>
-
-</project>
diff --git a/archetypes/camel-archetype-scala/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml b/archetypes/camel-archetype-scala/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
deleted file mode 100644
index 66bc4a6..0000000
--- a/archetypes/camel-archetype-scala/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<archetype-descriptor xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd" name="camel-archetype-java"
-    xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <requiredProperties>
-    <requiredProperty key="camel-version">
-      <defaultValue>${project.version}</defaultValue>
-    </requiredProperty>
-    <requiredProperty key="maven-compiler-plugin-version">
-      <defaultValue>${maven-compiler-plugin-version}</defaultValue>
-    </requiredProperty>
-    <requiredProperty key="maven-resources-plugin-version">
-      <defaultValue>${maven-resources-plugin-version}</defaultValue>
-    </requiredProperty>
-    <requiredProperty key="maven-eclipse-plugin-version">
-      <defaultValue>${maven-eclipse-plugin-version}</defaultValue>
-    </requiredProperty>
-    <requiredProperty key="exec-maven-plugin-version">
-      <defaultValue>${exec-maven-plugin-version}</defaultValue>
-    </requiredProperty>
-    <requiredProperty key="scala-version">
-      <defaultValue>${scala-version}</defaultValue>
-    </requiredProperty>
-    <requiredProperty key="scalaxml-version">
-      <defaultValue>${scalaxml-version}</defaultValue>
-    </requiredProperty>    
-    <requiredProperty key="scala-maven-plugin-version">
-      <defaultValue>${scala-maven-plugin-version}</defaultValue>
-    </requiredProperty>
-  </requiredProperties>
-  <fileSets>
-    <fileSet filtered="true" packaged="true" encoding="UTF-8">
-      <directory>src/main/scala</directory>
-      <includes>
-        <include>**/*.scala</include>
-      </includes>
-    </fileSet>
-    <fileSet filtered="true" encoding="UTF-8">
-      <directory>src/main/resources</directory>
-      <includes>
-        <include>**/*</include>
-      </includes>
-    </fileSet>
-    <fileSet filtered="true" packaged="true" encoding="UTF-8">
-      <directory>src/test/scala</directory>
-      <includes>
-        <include>**/*.scala</include>
-      </includes>
-    </fileSet>
-    <fileSet filtered="true" encoding="UTF-8">
-      <directory>src/test/resources</directory>
-      <includes>
-        <include>**/*</include>
-      </includes>
-    </fileSet>
-    <fileSet encoding="UTF-8">
-      <directory></directory>
-      <includes>
-        <include>ReadMe.txt</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-</archetype-descriptor>
diff --git a/archetypes/camel-archetype-scala/src/main/resources/META-INF/LICENSE.txt b/archetypes/camel-archetype-scala/src/main/resources/META-INF/LICENSE.txt
deleted file mode 100644
index 6b0b127..0000000
--- a/archetypes/camel-archetype-scala/src/main/resources/META-INF/LICENSE.txt
+++ /dev/null
@@ -1,203 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
diff --git a/archetypes/camel-archetype-scala/src/main/resources/META-INF/NOTICE.txt b/archetypes/camel-archetype-scala/src/main/resources/META-INF/NOTICE.txt
deleted file mode 100644
index 2e215bf..0000000
--- a/archetypes/camel-archetype-scala/src/main/resources/META-INF/NOTICE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-   =========================================================================
-   ==  NOTICE file corresponding to the section 4 d of                    ==
-   ==  the Apache License, Version 2.0,                                   ==
-   ==  in this case for the Apache Camel distribution.                    ==
-   =========================================================================
-
-   This product includes software developed by
-   The Apache Software Foundation (http://www.apache.org/).
-
-   Please read the different LICENSE files present in the licenses directory of
-   this distribution.
diff --git a/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/ReadMe.txt b/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/ReadMe.txt
deleted file mode 100644
index 5806db3..0000000
--- a/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/ReadMe.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-Camel Router with Scala DSL Project
-===================================
-
-To build this project use
-
-    mvn install
-
-To run this project
-
-    mvn exec:java
-    
-For more help see the Apache Camel documentation
-
-    http://camel.apache.org/
-
diff --git a/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml b/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml
deleted file mode 100644
index 1730fbe..0000000
--- a/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-## ------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ------------------------------------------------------------------------
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>${groupId}</groupId>
-  <artifactId>${artifactId}</artifactId>
-  <packaging>jar</packaging>
-  <version>${version}</version>
-
-  <name>A Camel Scala Route</name>
-
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-  </properties>
-
-  <dependencyManagement>
-    <dependencies>
-      <!-- Camel BOM -->
-      <dependency>
-        <groupId>org.apache.camel</groupId>
-        <artifactId>camel-parent</artifactId>
-        <version>${camel-version}</version>
-        <scope>import</scope>
-        <type>pom</type>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
-  <dependencies>
-
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-scala</artifactId>
-    </dependency>
-
-    <!-- scala -->
-    <dependency>
-      <groupId>org.scala-lang</groupId>
-      <artifactId>scala-library</artifactId>
-      <version>${scala-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.scala-lang.modules</groupId>
-      <artifactId>scala-xml_2.11</artifactId>
-      <version>${scalaxml-version}</version>
-    </dependency>
-
-    <!-- logging -->
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-api</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-core</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-slf4j-impl</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-
-    <!-- testing -->
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-test</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <defaultGoal>install</defaultGoal>
-    <sourceDirectory>src/main/scala</sourceDirectory>
-    <testSourceDirectory>src/test/scala</testSourceDirectory>
-
-    <plugins>
-
-      <!-- the Maven compiler plugin will compile Java source files -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>${maven-compiler-plugin-version}</version>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-resources-plugin</artifactId>
-        <version>${maven-resources-plugin-version}</version>
-        <configuration>
-          <encoding>UTF-8</encoding>
-        </configuration>
-      </plugin>
-
-      <!-- the Maven Scala plugin will compile Scala source files -->
-      <plugin>
-        <groupId>net.alchim31.maven</groupId>
-        <artifactId>scala-maven-plugin</artifactId>
-        <version>${scala-maven-plugin-version}</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>compile</goal>
-              <goal>testCompile</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-
-      <!-- configure the eclipse plugin to generate eclipse project descriptors for a Scala project -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-eclipse-plugin</artifactId>
-        <version>${maven-eclipse-plugin-version}</version>
-        <configuration>
-          <projectnatures>
-            <projectnature>org.scala-ide.sdt.core.scalanature</projectnature>
-            <projectnature>org.eclipse.jdt.core.javanature</projectnature>
-          </projectnatures>
-          <buildcommands>
-            <buildcommand>org.scala-ide.sdt.core.scalabuilder</buildcommand>
-          </buildcommands>
-          <classpathContainers>
-            <classpathContainer>org.scala-ide.sdt.launching.SCALA_CONTAINER</classpathContainer>
-            <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer>
-          </classpathContainers>
-          <excludes>
-            <exclude>org.scala-lang:scala-library</exclude>
-            <exclude>org.scala-lang:scala-compiler</exclude>
-          </excludes>
-          <sourceIncludes>
-            <sourceInclude>**/*.scala</sourceInclude>
-            <sourceInclude>**/*.java</sourceInclude>
-          </sourceIncludes>
-        </configuration>
-      </plugin>
-
-      <!-- allows the route to be run via 'mvn exec:java' -->
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>exec-maven-plugin</artifactId>
-        <version>${exec-maven-plugin-version}</version>
-        <configuration>
-          <mainClass>${package}.MyRouteMain</mainClass>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
diff --git a/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/src/main/resources/log4j2.properties b/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/src/main/resources/log4j2.properties
deleted file mode 100644
index 6bfc9d9..0000000
--- a/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/src/main/resources/log4j2.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
-
-appender.out.type = Console
-appender.out.name = out
-appender.out.layout.type = PatternLayout
-appender.out.layout.pattern = [%30.30t] %-30.30c{1} %-5p %m%n
-logger.springframework.name = org.springframework
-logger.springframework.level = WARN
-rootLogger.level = INFO
-rootLogger.appenderRef.out.ref = out
diff --git a/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/src/main/scala/MyRouteBuilder.scala b/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/src/main/scala/MyRouteBuilder.scala
deleted file mode 100644
index 885d5d0..0000000
--- a/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/src/main/scala/MyRouteBuilder.scala
+++ /dev/null
@@ -1,37 +0,0 @@
-## ------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ------------------------------------------------------------------------
-package ${package}
-
-import org.apache.camel.{CamelContext, Exchange}
-import org.apache.camel.scala.dsl.builder.ScalaRouteBuilder
-
-/**
- * A Camel Router using the Scala DSL
- */
-class MyRouteBuilder(override val context : CamelContext) extends ScalaRouteBuilder(context) {
-
-    // an example of a Processor method
-   val myProcessorMethod = (exchange: Exchange) => {
-     exchange.getIn.setBody("block test")
-   }
-   
-   // a route using Scala blocks
-   "timer://foo?period=5s" ==> {
-      process(myProcessorMethod)
-      to("log:block")
-   }
-}
\ No newline at end of file
diff --git a/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/src/main/scala/MyRouteMain.scala b/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/src/main/scala/MyRouteMain.scala
deleted file mode 100644
index c872d49..0000000
--- a/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/src/main/scala/MyRouteMain.scala
+++ /dev/null
@@ -1,37 +0,0 @@
-## ------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ------------------------------------------------------------------------
-package ${package}
-
-import org.apache.camel.main.Main
-import org.apache.camel.scala.dsl.builder.RouteBuilderSupport
-
-/**
- * A Main to run Camel with MyRouteBuilder
- */
-object MyRouteMain extends RouteBuilderSupport {
-
-  def main(args: Array[String]) {
-    val main = new Main()
-    // create the CamelContext
-    val context = main.getOrCreateCamelContext()
-    // add our route using the created CamelContext
-    main.addRouteBuilder(new MyRouteBuilder(context))
-    // must use run to start the main application
-    main.run()
-  }
-}
-
diff --git a/archetypes/camel-archetype-scr/pom.xml b/archetypes/camel-archetype-scr/pom.xml
deleted file mode 100644
index 7ff96e5..0000000
--- a/archetypes/camel-archetype-scr/pom.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <artifactId>archetypes</artifactId>
-    <groupId>org.apache.camel</groupId>
-    <version>3.0.0-SNAPSHOT</version>
-  </parent>
-
-  <groupId>org.apache.camel.archetypes</groupId>
-  <artifactId>camel-archetype-scr</artifactId>
-  <name>Camel :: Archetypes :: OSGi Service Component Runtime bundle (deprecated)</name>
-  <description>Creates a new Camel SCR (Declarative Services) bundle project for OSGi</description>
-  <packaging>maven-archetype</packaging>
-
-  <build>
-    <extensions>
-      <extension>
-        <groupId>org.apache.maven.archetype</groupId>
-        <artifactId>archetype-packaging</artifactId>
-        <version>2.2</version>
-      </extension>
-    </extensions>
-
-    <resources>
-      <resource>
-        <directory>src/main/resources</directory>
-        <filtering>false</filtering>
-      </resource>
-      <resource>
-        <directory>src/main/resources-filtered</directory>
-        <filtering>true</filtering>
-        <includes>
-          <include>**/archetype-metadata.xml</include>
-        </includes>
-      </resource>
-    </resources>
-
-    <testResources>
-      <testResource>
-        <directory>src/test/resources</directory>
-        <filtering>true</filtering>
-      </testResource>
-    </testResources>
-
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <artifactId>maven-archetype-plugin</artifactId>
-          <version>${maven-archetype-plugin-version}</version>
-          <configuration>
-            <skip>${maven.test.skip.exec}</skip>
-          </configuration>
-          <dependencies>
-            <dependency>
-              <groupId>org.apache.maven.shared</groupId>
-              <artifactId>maven-invoker</artifactId>
-              <version>2.2</version>
-            </dependency>
-          </dependencies>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-
-</project>
diff --git a/archetypes/camel-archetype-scr/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml b/archetypes/camel-archetype-scr/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
deleted file mode 100644
index 9fda611..0000000
--- a/archetypes/camel-archetype-scr/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<archetype-descriptor xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd" name="finavia-blueprint"
-                      xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0"
-                      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <requiredProperties>
-        <requiredProperty key="className"/>
-        <requiredProperty key="camel-version">
-          <defaultValue>${project.version}</defaultValue>
-        </requiredProperty>
-        <requiredProperty key="maven-bundle-plugin-version">
-          <defaultValue>${maven-bundle-plugin-version}</defaultValue>
-        </requiredProperty>
-        <requiredProperty key="maven-scr-plugin-version">
-          <defaultValue>${maven-scr-plugin-version}</defaultValue>
-        </requiredProperty>
-        <requiredProperty key="maven-jar-plugin-version">
-          <defaultValue>${maven-jar-plugin-version}</defaultValue>
-        </requiredProperty>
-        <requiredProperty key="maven-compiler-plugin-version">
-          <defaultValue>${maven-compiler-plugin-version}</defaultValue>
-        </requiredProperty>
-        <requiredProperty key="maven-resources-plugin-version">
-          <defaultValue>${maven-resources-plugin-version}</defaultValue>
-        </requiredProperty>
-    </requiredProperties>
-    <fileSets>
-        <fileSet filtered="true" packaged="true" encoding="UTF-8">
-            <directory>src/main/java</directory>
-            <includes>
-                <include>**/*.java</include>
-            </includes>
-        </fileSet>
-        <fileSet filtered="true" encoding="UTF-8">
-            <directory>src/main/resources</directory>
-            <includes>
-                <include>**/*</include>
-            </includes>
-        </fileSet>
-        <fileSet filtered="true" packaged="true" encoding="UTF-8">
-            <directory>src/test/java</directory>
-            <includes>
-                <include>**/*.java</include>
-            </includes>
-        </fileSet>
-        <fileSet filtered="true" encoding="UTF-8">
-            <directory>src/test/resources</directory>
-            <includes>
-                <include>**/*</include>
-            </includes>
-        </fileSet>
-        <fileSet filtered="true" encoding="UTF-8">
-            <directory></directory>
-            <includes>
-                <include>ReadMe.txt</include>
-            </includes>
-        </fileSet>
-    </fileSets>
-</archetype-descriptor>
diff --git a/archetypes/camel-archetype-scr/src/main/resources/META-INF/LICENSE.txt b/archetypes/camel-archetype-scr/src/main/resources/META-INF/LICENSE.txt
deleted file mode 100644
index 6b0b127..0000000
--- a/archetypes/camel-archetype-scr/src/main/resources/META-INF/LICENSE.txt
+++ /dev/null
@@ -1,203 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
diff --git a/archetypes/camel-archetype-scr/src/main/resources/META-INF/NOTICE.txt b/archetypes/camel-archetype-scr/src/main/resources/META-INF/NOTICE.txt
deleted file mode 100644
index 2e215bf..0000000
--- a/archetypes/camel-archetype-scr/src/main/resources/META-INF/NOTICE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-   =========================================================================
-   ==  NOTICE file corresponding to the section 4 d of                    ==
-   ==  the Apache License, Version 2.0,                                   ==
-   ==  in this case for the Apache Camel distribution.                    ==
-   =========================================================================
-
-   This product includes software developed by
-   The Apache Software Foundation (http://www.apache.org/).
-
-   Please read the different LICENSE files present in the licenses directory of
-   this distribution.
diff --git a/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/ReadMe.txt b/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/ReadMe.txt
deleted file mode 100644
index 335f5bf..0000000
--- a/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/ReadMe.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-Camel SCR bundle project
-========================
-
-To build this project run
-
-    mvn install
-
-To deploy this project in Apache Karaf
-
-On Karaf command line:
-
-    feature:repo-add camel ${camel-version}
-    feature:install camel-scr
-    osgi:install -s mvn:${groupId}/${artifactId}/${version}
-
-See how it's running
-
-    log:tail
-
-Press `ctrl-c` to stop watching the log.
-
-For more help see the Apache Camel documentation
-
-    http://camel.apache.org/
diff --git a/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/pom.xml b/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/pom.xml
deleted file mode 100644
index c439407..0000000
--- a/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/pom.xml
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-## ------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ------------------------------------------------------------------------
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>${groupId}</groupId>
-  <artifactId>${artifactId}</artifactId>
-  <version>${version}</version>
-  <packaging>jar</packaging>
-
-  <name>A Camel OSGi SCR Route</name>
-
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-  </properties>
-
-  <dependencyManagement>
-    <dependencies>
-      <!-- Camel BOM -->
-      <dependency>
-        <groupId>org.apache.camel</groupId>
-        <artifactId>camel-parent</artifactId>
-        <version>${camel-version}</version>
-        <scope>import</scope>
-        <type>pom</type>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
-  <dependencies>
-
-    <!-- Camel -->
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-scr</artifactId>
-    </dependency>
-    
-    <!-- logging -->
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-api</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-slf4j-impl</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    
-  </dependencies>
-
-  <build>
-    <plugins>
-
-      <!-- compiler plugin -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>${maven-compiler-plugin-version}</version>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-resources-plugin</artifactId>
-        <version>${maven-resources-plugin-version}</version>
-        <configuration>
-          <encoding>UTF-8</encoding>
-        </configuration>
-      </plugin>
-
-      <!-- to include SRC descriptors in MANIFEST.MF file -->
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-scr-plugin</artifactId>
-        <version>${maven-scr-plugin-version}</version>
-        <executions>
-          <execution>
-            <id>generate-scr-scrdescriptor</id>
-            <phase>compile</phase>
-            <goals>
-              <goal>scr</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <!-- to generate the MANIFEST.MF of the bundle -->
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <version>${maven-bundle-plugin-version}</version>
-        <extensions>false</extensions>
-        <executions>
-          <execution>
-            <id>bundle-manifest</id>
-            <phase>prepare-package</phase>
-            <goals>
-              <goal>manifest</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <!-- to include MANIFEST.MF in the bundle -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>${maven-jar-plugin-version}</version>
-        <configuration>
-          <archive>
-            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
-          </archive>
-        </configuration>
-      </plugin>
-
-    </plugins>
-  </build>
-
-  <profiles>
-    <profile>
-      <id>jdk9+-build</id>
-      <activation>
-        <jdk>[9,)</jdk>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <argLine>--add-modules java.xml.bind</argLine>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-</project>
diff --git a/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/src/main/java/__className__.java b/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/src/main/java/__className__.java
deleted file mode 100644
index 58d2d59..0000000
--- a/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/src/main/java/__className__.java
+++ /dev/null
@@ -1,67 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-## ------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ------------------------------------------------------------------------
-package ${package};
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.camel.scr.AbstractCamelRunner;
-import ${package}.internal.${className}Route;
-import org.apache.camel.RoutesBuilder;
-import org.apache.camel.spi.ComponentResolver;
-import org.apache.felix.scr.annotations.*;
-import org.osgi.framework.BundleContext;
-
-@Component(label = ${className}.COMPONENT_LABEL, description = ${className}.COMPONENT_DESCRIPTION, immediate = true, metatype = true)
-@Properties({
-    @Property(name = "camelContextId", value = "${artifactId}"),
-    @Property(name = "camelRouteId", value = "foo"),
-    @Property(name = "active", value = "true"),
-    @Property(name = "from", value = "timer:foo?period=5000"),
-    @Property(name = "to", value = "log:foo")
-})
-@References({
-    @Reference(name = "camelComponent",referenceInterface = ComponentResolver.class,
-        cardinality = ReferenceCardinality.MANDATORY_MULTIPLE, policy = ReferencePolicy.DYNAMIC,
-        policyOption = ReferencePolicyOption.GREEDY, bind = "gotCamelComponent", unbind = "lostCamelComponent")
-})
-public class ${className} extends AbstractCamelRunner {
-
-    public static final String COMPONENT_LABEL = "${package}.${className}";
-    public static final String COMPONENT_DESCRIPTION = "This is the description for ${artifactId}.";
-
-    @Override
-    protected List<RoutesBuilder> getRouteBuilders() {
-        List<RoutesBuilder> routesBuilders = new ArrayList<>();
-        routesBuilders.add(new ${className}Route());
-        return routesBuilders;
-    }
-
-    @Override
-    protected void setupCamelContext(BundleContext bundleContext, String camelContextId)throws Exception{
-        super.setupCamelContext(bundleContext, camelContextId);
-
-        // Use MDC logging
-        getContext().setUseMDCLogging(true);
-
-        // Use breadcrumb logging
-        getContext().setUseBreadcrumb(true);
-    }
-}
diff --git a/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/src/main/java/internal/__className__Route.java b/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/src/main/java/internal/__className__Route.java
deleted file mode 100644
index c5ff82c..0000000
--- a/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/src/main/java/internal/__className__Route.java
+++ /dev/null
@@ -1,40 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-## ------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ------------------------------------------------------------------------
-package ${package}.internal;
-
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.impl.SimpleRegistry;
-import org.apache.camel.scr.AbstractCamelRunner;
-
-public class ${className}Route extends RouteBuilder {
-
-    // Configured fields
-    private String camelRouteId;
-
-    @Override
-	public void configure() throws Exception {
-        // Add a bean to Camel context registry
-        AbstractCamelRunner.getRegistry(getContext(), SimpleRegistry.class).put("testString", "this is a test");
-
-        from("{{from}}").routeId(camelRouteId)
-            .to("{{to}}");
-	}
-
-}
diff --git a/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/src/test/java/__className__Test.java b/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/src/test/java/__className__Test.java
deleted file mode 100644
index 0a102e2..0000000
--- a/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/src/test/java/__className__Test.java
+++ /dev/null
@@ -1,104 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-## ------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ------------------------------------------------------------------------
-package ${package};
-
-import java.util.List;
-
-import org.apache.camel.scr.AbstractCamelRunner;
-import org.apache.camel.scr.ScrHelper;
-import org.apache.camel.builder.AdviceWithRouteBuilder;
-import org.apache.camel.component.mock.MockComponent;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.model.ModelCamelContext;
-import org.apache.camel.model.RouteDefinition;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TestName;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-@RunWith(JUnit4.class)
-public class ${className}Test {
-
-    Logger log = LoggerFactory.getLogger(getClass());
-
-    @Rule
-    public TestName testName = new TestName();
-
-    ${className} integration;
-    ModelCamelContext context;
-
-    @Before
-    public void setUp() throws Exception {
-        log.info("*******************************************************************");
-        log.info("Test: {}", testName.getMethodName());
-        log.info("*******************************************************************");
-
-        // Set property prefix for unit testing
-        System.setProperty(${className}.PROPERTY_PREFIX, "unit");
-
-        // Prepare the integration
-        integration = new ${className}();
-        integration.prepare(null, ScrHelper.getScrProperties(integration.getClass().getName()));
-        context = (ModelCamelContext) integration.getContext();
-
-        // Configure this
-        AbstractCamelRunner.configure(context, this, log);
-
-        // Disable JMX for test
-        context.disableJMX();
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        integration.stop();
-    }
-
-	@Test
-	public void testRoutes() throws Exception {
-        // Adjust routes
-        List<RouteDefinition> routes = context.getRouteDefinitions();
-
-        routes.get(0).adviceWith(context, new AdviceWithRouteBuilder() {
-            @Override
-            public void configure() throws Exception {
-                // Replace "from" endpoint with direct:start
-                replaceFromWith("direct:start");
-                // Mock and skip result endpoint
-                mockEndpoints("log:*");
-            }
-        });
-
-        MockEndpoint resultEndpoint = context.getEndpoint("mock:log:foo", MockEndpoint.class);
-        resultEndpoint.expectedBodiesReceived("hello");
-
-        // Start the integration
-        integration.run();
-
-        // Send the test message
-        context.createProducerTemplate().sendBody("direct:start", "hello");
-
-        resultEndpoint.assertIsSatisfied();
-	}
-}
diff --git a/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/src/test/resources/log4j2.properties b/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/src/test/resources/log4j2.properties
deleted file mode 100644
index 41a2c65..0000000
--- a/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/src/test/resources/log4j2.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
-
-appender.file.type = File
-appender.file.name = file
-appender.file.fileName = target/camel-test.log
-appender.file.layout.type = PatternLayout
-appender.file.layout.pattern = %d %-5p %c{1} - %m %n
-appender.out.type = Console
-appender.out.name = out
-appender.out.layout.type = PatternLayout
-appender.out.layout.pattern = [%30.30t] %-30.30c{1} %-5p %m%n
-rootLogger.level = INFO
-rootLogger.appenderRef.out.ref = out
diff --git a/archetypes/camel-archetype-scr/src/test/resources/projects/camel-scr-example/archetype.properties b/archetypes/camel-archetype-scr/src/test/resources/projects/camel-scr-example/archetype.properties
deleted file mode 100644
index 9e648d2..0000000
--- a/archetypes/camel-archetype-scr/src/test/resources/projects/camel-scr-example/archetype.properties
+++ /dev/null
@@ -1,30 +0,0 @@
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
-
-groupId = example
-artifactId = camel-scr-example
-version = 1.0-SNAPSHOT
-package = example
-className = CamelScrExample
-camel-version = ${project.version}
-log4j-version = ${log4j-version}
-maven-bundle-plugin-version = ${maven-bundle-plugin-version}
-maven-compiler-plugin-version = ${maven-compiler-plugin-version}
-maven-jar-plugin-version = ${maven-jar-plugin-version}
-maven-resources-plugin-version = ${maven-resources-plugin-version}
-maven-scr-plugin-version = ${maven-scr-plugin-version}
-slf4j-version = ${slf4j-version}
diff --git a/archetypes/camel-archetype-scr/src/test/resources/projects/camel-scr-example/goal.txt b/archetypes/camel-archetype-scr/src/test/resources/projects/camel-scr-example/goal.txt
deleted file mode 100644
index 30d74d2..0000000
--- a/archetypes/camel-archetype-scr/src/test/resources/projects/camel-scr-example/goal.txt
+++ /dev/null
@@ -1 +0,0 @@
-test
\ No newline at end of file
diff --git a/archetypes/pom.xml b/archetypes/pom.xml
index 6a133b9..2bd1bf3 100644
--- a/archetypes/pom.xml
+++ b/archetypes/pom.xml
@@ -41,11 +41,8 @@
     <module>camel-archetype-component</module>
     <module>camel-archetype-connector</module>
     <module>camel-archetype-dataformat</module>
-    <module>camel-archetype-groovy</module>
     <module>camel-archetype-java</module>
     <module>camel-archetype-java8</module>
-    <module>camel-archetype-scala</module>
-    <module>camel-archetype-scr</module>
     <module>camel-archetype-spring</module>
     <module>camel-archetype-spring-boot</module>
     <module>camel-archetype-web</module>
diff --git a/components/camel-ahc/pom.xml b/components/camel-ahc/pom.xml
index f84169c..c4a667c 100644
--- a/components/camel-ahc/pom.xml
+++ b/components/camel-ahc/pom.xml
@@ -71,7 +71,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-http</artifactId>
+      <artifactId>camel-http4</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/components/camel-bam/pom.xml b/components/camel-bam/pom.xml
deleted file mode 100644
index d3e5933..0000000
--- a/components/camel-bam/pom.xml
+++ /dev/null
@@ -1,247 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.camel</groupId>
-    <artifactId>components</artifactId>
-    <version>3.0.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>camel-bam</artifactId>
-  <packaging>jar</packaging>
-  <name>Camel :: BAM (deprecated)</name>
-  <description>Business Activity Monitoring</description>
-
-  <properties>
-    <!-- use by camel-catalog -->
-    <firstVersion>1.0.0</firstVersion>
-    <label>monitoring</label>
-    <title>BAM</title>
-
-    <camel.osgi.export.pkg>org.apache.camel.bam.*</camel.osgi.export.pkg>
-    <eclipselink-version>2.3.2</eclipselink-version>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-spring</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-orm</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-jdbc</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jpa_2.1_spec</artifactId>
-    </dependency>
-
-    <!-- testing -->
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-test-spring</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.derby</groupId>
-      <artifactId>derby</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-api</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-slf4j-impl</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <profiles>
-    <!-- Hibernate Derby profile -->
-    <profile>
-      <id>hibernate</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <build>
-        <testResources>
-          <testResource>
-            <directory>${basedir}/src/test/profiles/hibernate</directory>
-          </testResource>
-        </testResources>
-      </build>
-      <dependencies>
-        <dependency>
-          <groupId>org.hibernate</groupId>
-          <artifactId>hibernate-entitymanager</artifactId>
-          <scope>test</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.apache.geronimo.specs</groupId>
-          <artifactId>geronimo-jta_1.1_spec</artifactId>
-          <scope>test</scope>
-        </dependency>
-      </dependencies>
-    </profile>
-
-    <!-- EclipseLink Derby profile -->
-    <profile>
-      <id>eclipselink</id>
-      <build>
-        <testResources>
-          <testResource>
-            <directory>${basedir}/src/test/profiles/eclipselink</directory>
-          </testResource>
-        </testResources>
-      </build>
-      <dependencies>
-        <dependency>
-          <groupId>org.eclipse.persistence</groupId>
-          <artifactId>eclipselink</artifactId>
-          <version>${eclipselink-version}</version>
-          <scope>test</scope>
-        </dependency>
-      </dependencies>
-      <repositories>
-        <repository>
-          <id>Eclipse</id>
-          <url>http://www.eclipse.org/downloads/download.php?r=1&amp;nf=1&amp;file=/rt/eclipselink/maven.repo</url>
-        </repository>
-      </repositories>
-    </profile>
-
-    <!-- OpenJPA Derby profile -->
-    <profile>
-      <id>openjpa</id>
-      <build>
-        <testResources>
-          <testResource>
-            <directory>${basedir}/src/test/profiles/openjpa</directory>
-          </testResource>
-        </testResources>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.openjpa</groupId>
-            <artifactId>openjpa-maven-plugin</artifactId>
-            <version>${openjpa-version}</version>
-            <executions>
-              <execution>
-                <id>JPA Enhance</id>
-                <phase>process-test-classes</phase>
-                <goals>
-                  <goal>enhance</goal>
-                </goals>
-              </execution>
-            </executions>
-            <configuration>
-              <persistenceXmlFile>${project.basedir}/src/test/profiles/openjpa/META-INF/persistence.xml</persistenceXmlFile>
-              <addDefaultConstructor>true</addDefaultConstructor>
-              <enforcePropertyRestrictions>true</enforcePropertyRestrictions>
-            </configuration>
-            <dependencies>
-              <dependency>
-                <groupId>org.apache.camel</groupId>
-                <artifactId>camel-core</artifactId>
-                <version>${project.version}</version>
-              </dependency>
-              <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-orm</artifactId>
-                <version>${spring-version}</version>
-              </dependency>
-            </dependencies>
-          </plugin>
-        </plugins>
-      </build>
-
-      <dependencies>
-        <dependency>
-          <groupId>org.apache.openjpa</groupId>
-          <artifactId>openjpa</artifactId>
-          <version>${openjpa-version}</version>
-          <scope>test</scope>
-        </dependency>
-      </dependencies>
-    </profile>
-    
-    <profile>
-      <id>jdk9+-hibernate</id>
-      <activation>
-        <jdk>[9,)</jdk>
-      </activation>
-      <build>
-        <testResources>
-          <testResource>
-            <directory>${basedir}/src/test/profiles/hibernate</directory>
-          </testResource>
-        </testResources>
-        
-        <plugins>
-          <plugin>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <argLine>--add-modules java.activation,java.xml.bind --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-      <dependencies>
-        <dependency>
-          <groupId>org.hibernate</groupId>
-          <artifactId>hibernate-entitymanager</artifactId>
-          <scope>test</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.apache.geronimo.specs</groupId>
-          <artifactId>geronimo-jta_1.1_spec</artifactId>
-          <scope>test</scope>
-        </dependency>
-      </dependencies>
-    </profile>
-  </profiles>
-</project>
diff --git a/components/camel-bam/src/main/docs/bam-example.adoc b/components/camel-bam/src/main/docs/bam-example.adoc
deleted file mode 100644
index 240c7dc..0000000
--- a/components/camel-bam/src/main/docs/bam-example.adoc
+++ /dev/null
@@ -1,89 +0,0 @@
-## Business Activity Monitor (BAM) Example
-
-The BAM (Business Activity Monitor) example shows how to
-monitor your transaction flows using Camel.
-
-In this example we will use Camel to monitor a business process
-consisting of
-
-* purchase orders
-* invoices
-
-Then we will check to see that for every purchase order created by
-system A, that system B will generate an invoice within the specified
-amount of time (2 seconds in this example). If an invoice is not
-generated within the allowed amount of time and error is generated and
-sent to an Endpoint.
-
-### Overview
-
-This example lives in the _examples/camel-example-bam_ directory. It
-will poll the following directories
-
-* the child _src/data/purchaseOrders_ directory for XML purchase orders
-* the child _src/data/invoices_ directory for XML invoices
-
-The
-http://svn.apache.org/repos/asf/camel/trunk/examples/camel-example-bam/src/main/java/org/apache/camel/example/bam/MyActivities.java[MyActivities]
-class defines the BAM activities; that is
-
-* the input sources (the two directories above) which could be any of
-the supported camel URIs
-* how the activities relate to each other - namely the
-Correlation Identifier pattern
-* the maixmum amount of time allowed from the time a purchase order is
-received when if an invoice is not received an error should be raised.
-
-There is also a spring configuration file in
-http://svn.apache.org/repos/asf/camel/trunk/examples/camel-example-bam/src/main/resources/META-INF/spring/camel-context.xml[src/resources/META-INF/services/camel-context.xml]
-which defines the JPA `EntityManagerFactory` and tells Camel to look in
-the *org.apache.camel.example.bam* package to find its routes.
-
-### Using BAM
-
-So lets start with the activities definition in
-http://svn.apache.org/repos/asf/camel/trunk/examples/camel-example-bam/src/main/java/org/apache/camel/example/bam/MyActivities.java[MyActivities]
-
-The first two lines of code sets up the inputs for the
-BAM activities via the *activity()* method which defines
-
-* the URIs of the inputs (which could come from any of
-the Camel Components
-* the Correlation Identifier used to
-correlate together the purchase order and invoice messages which can be
-any Expression via any of the
-Languages Supported. In this case we are
-using <<xpath-language,XPath>>.
-
-Then the final line of code defines the temporal rules to use; namely
-that it is considered to be an error if an invoice is not received
-within 2 seconds of a purchase order being received. When a failure
-occurs in this example we just send it to the <<log-component,Log>>
-component to log out an error level message to commons-logging / log4j.
-You could change this to use some of the other
-Components such as ActiveMQ,
-<<jms-component,JMS>>, <<jms-component,IRC>>, <<jms-component,Mail>>,
-<<xmpp-component,XMPP>> etc.
-
-### Running the example
-
-To run the example we use the link:camel-maven-plugin.html[Camel Maven
-Plugin]. For example from the source or binary distribution the
-following should work
-
-[source,java]
------------------------------
-cd examples/camel-example-bam
-mvn camel:run
------------------------------
-
-If you prefer you can just run the Main directly using
-
-[source,java]
----------------------
-mvn compile exec:java
----------------------
-
-Failing that you can run the Main from inside your IDE if you prefer.
-Follow the Building instructions to create an
-Eclipse/IDEA project to import
diff --git a/components/camel-bam/src/main/docs/bam.adoc b/components/camel-bam/src/main/docs/bam.adoc
deleted file mode 100644
index 0c13cb7..0000000
--- a/components/camel-bam/src/main/docs/bam.adoc
+++ /dev/null
@@ -1,85 +0,0 @@
-[[BAM-BusinessActivityMonitoring]]
-Business Activity Monitoring
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-The *Camel BAM* module provides a Business Activity Monitoring (BAM)
-framework for testing business processes across multiple message
-exchanges on different Endpoint instances.
-
-Consider, for example, a simple system in which you submit Purchase
-Orders into system A and then receive Invoices from system B. You might
-want to test that, for a given Purchase Order, you receive a matching
-Invoice from system B within a specific time period.
-
-[[BAM-HowCamelBAMWorks]]
-How Camel BAM Works
-^^^^^^^^^^^^^^^^^^^
-
-Camel BAM uses a link:correlation-identifier.html[Correlation
-Identifier] on an input message to determine the _Process Instance_ to
-which it belongs. The process instance is an entity bean which can
-maintain state for each _Activity_ (where an activity typically maps to
-a single endpoint - such as the submission of Purchase Orders or the
-receipt of Invoices).
-
-You can then add rules to be triggered when a message is received on any
-activity - such as to set time expectations or perform real time
-reconciliation of values across activities.
-
-[[BAM-SimpleExample]]
-Simple Example
-^^^^^^^^^^^^^^
-
-The following example shows how to perform some time based rules on a
-simple business process of 2 activities - A and B - which correspond
-with Purchase Orders and Invoices in the example above. If you would
-like to experiment with this scenario, you may edit this
-http://svn.apache.org/repos/asf/camel/trunk/components/camel-bam/src/test/java/org/apache/camel/bam/BamRouteTest.java[Test
-Case], which defines the activities and rules, and then tests that they
-work.
-
-[source,java]
--------------------------------------------------
-return new ProcessBuilder(entityManagerFactory, transactionTemplate) {
-    public void configure() throws Exception {
- 
-        // let's define some activities, correlating on an XPath on the message bodies
-        ActivityBuilder a = activity("seda:a").name("a")
-                .correlate(xpath("/hello/@id"));
- 
-        ActivityBuilder b = activity("seda:b").name("b")
-                .correlate(xpath("/hello/@id"));
- 
-        // now let's add some rules
-        b.starts().after(a.completes())
-                .expectWithin(seconds(1))
-                .errorIfOver(seconds(errorTimeout)).to("mock:overdue");
-    }
-};
--------------------------------------------------
-
-As you can see in the above example, we first define two activities, and
-then rules to specify when we expect them to complete for a process
-instance and when an error condition should be raised.p. The
-ProcessBuilder is a RouteBuilder and can be
-added to any CamelContext.
-
-[[BAM-CompleteExample]]
-Complete Example
-^^^^^^^^^^^^^^^^
-
-For a complete example please see the link:examples/bam-example.html[BAM
-Example], which is part of the standard Camel
-Examples
-
-[[BAM-UseCases]]
-Use Cases
-^^^^^^^^^
-
-In the world of finance, a common requirement is tracking trades. Often
-a trader will submit a Front Office Trade which then flows through the
-Middle Office and Back Office through various systems to settle the
-trade so that money is exchanged. You may wish to test that the front
-and back office trades match up within a certain time period; if they
-don't match or a back office trade does not arrive within a required
-amount of time, you might signal an alarm.
diff --git a/components/camel-bam/src/main/java/org/apache/camel/bam/ActivityBuilder.java b/components/camel-bam/src/main/java/org/apache/camel/bam/ActivityBuilder.java
deleted file mode 100644
index c64de95..0000000
--- a/components/camel-bam/src/main/java/org/apache/camel/bam/ActivityBuilder.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.bam;
-
-import java.util.Date;
-
-import org.apache.camel.Endpoint;
-import org.apache.camel.Expression;
-import org.apache.camel.Processor;
-import org.apache.camel.bam.model.ActivityState;
-import org.apache.camel.bam.model.ProcessInstance;
-import org.apache.camel.bam.rules.ActivityRules;
-
-/**
- * @version 
- */
-public class ActivityBuilder {
-    private final ProcessBuilder processBuilder;
-    private final Endpoint endpoint;
-    private final ActivityRules activityRules;
-    private Expression correlationExpression;
-    private volatile Processor processor;
-
-    public ActivityBuilder(ProcessBuilder processBuilder, Endpoint endpoint) {
-        this.processBuilder = processBuilder;
-        this.endpoint = endpoint;
-        this.activityRules = new ActivityRules(processBuilder);
-        this.activityRules.setActivityName(endpoint.getEndpointUri());
-    }
-
-    public Endpoint getEndpoint() {
-        return endpoint;
-    }
-
-    public Processor createProcessor() throws Exception {
-        return processBuilder.createActivityProcessor(this);
-    }
-
-    /**
-     * Returns the processor of the route
-     */
-    public synchronized Processor getProcessor() throws Exception {
-        if (processor == null) {
-            processor = createProcessor();
-        }
-        if (processor == null) {
-            throw new IllegalArgumentException("No processor created for ActivityBuilder: " + this);
-        }
-        return processor;
-    }
-
-    // Builder methods
-    //-----------------------------------------------------------------------
-    public ActivityBuilder correlate(Expression correlationExpression) {
-        this.correlationExpression = correlationExpression;
-        return this;
-    }
-
-    public ActivityBuilder name(String name) {
-        activityRules.setActivityName(name);
-        return this;
-    }
-
-    /**
-     * Create a temporal rule for when this step starts
-     */
-    public TimeExpression starts() {
-        return new TimeExpression(this, ActivityLifecycle.Started) {
-            public Date evaluate(ProcessInstance instance, ActivityState state) {
-                return state.getTimeStarted();
-            }
-        };
-    }
-
-    /**
-     * Create a temporal rule for when this step completes
-     */
-    public TimeExpression completes() {
-        return new TimeExpression(this, ActivityLifecycle.Completed) {
-            public Date evaluate(ProcessInstance instance, ActivityState state) {
-                return state.getTimeCompleted();
-            }
-        };
-    }
-
-    // Properties
-    //-----------------------------------------------------------------------
-    public Expression getCorrelationExpression() {
-        return correlationExpression;
-    }
-
-    public ActivityRules getActivityRules() {
-        return activityRules;
-    }
-
-    public ProcessBuilder getProcessBuilder() {
-        return processBuilder;
-    }
-}
diff --git a/components/camel-bam/src/main/java/org/apache/camel/bam/ActivityLifecycle.java b/components/camel-bam/src/main/java/org/apache/camel/bam/ActivityLifecycle.java
deleted file mode 100644
index ed79fe7..0000000
--- a/components/camel-bam/src/main/java/org/apache/camel/bam/ActivityLifecycle.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.bam;
-
-/**
- * @version 
- */
-public enum ActivityLifecycle {
-    Started, Completed
-}
diff --git a/components/camel-bam/src/main/java/org/apache/camel/bam/EntityManagerCallback.java b/components/camel-bam/src/main/java/org/apache/camel/bam/EntityManagerCallback.java
deleted file mode 100644
index 604b0ee..0000000
--- a/components/camel-bam/src/main/java/org/apache/camel/bam/EntityManagerCallback.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.bam;
-
-import javax.persistence.EntityManager;
-
-/**
- * Function operating on the {@code EntityManager} instance. Intended to be executed as a part of the template method
- * defined by the {@link org.apache.camel.bam.EntityManagerTemplate#execute(EntityManagerCallback)}.
- * {@code EntityManager} should not be closed by the callback, as doing this is the responsibility of the
- * {@link org.apache.camel.bam.EntityManagerTemplate}.
- *
- * @param <T>
- */
-public interface EntityManagerCallback<T> {
-
-    T execute(EntityManager entityManager);
-
-}
diff --git a/components/camel-bam/src/main/java/org/apache/camel/bam/EntityManagerTemplate.java b/components/camel-bam/src/main/java/org/apache/camel/bam/EntityManagerTemplate.java
deleted file mode 100644
index 357a56b..0000000
--- a/components/camel-bam/src/main/java/org/apache/camel/bam/EntityManagerTemplate.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.bam;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.TypedQuery;
-
-import static org.apache.camel.bam.EntityManagers.closeNonTransactionalEntityManager;
-import static org.apache.camel.bam.EntityManagers.resolveEntityManager;
-
-public class EntityManagerTemplate {
-
-    private final EntityManagerFactory entityManagerFactory;
-
-    public EntityManagerTemplate(EntityManagerFactory entityManagerFactory) {
-        this.entityManagerFactory = entityManagerFactory;
-    }
-
-    public <T> T execute(EntityManagerCallback<T> entityManagerCallback) {
-        EntityManager entityManager = null;
-        try {
-            entityManager = resolveEntityManager(entityManagerFactory);
-            return entityManagerCallback.execute(entityManager);
-        } finally {
-            closeNonTransactionalEntityManager(entityManager);
-        }
-    }
-
-    public void persist(final Object entity) {
-        execute(new EntityManagerCallback<Object>() {
-            @Override
-            public Object execute(EntityManager entityManager) {
-                entityManager.persist(entity);
-                return null;
-            }
-        });
-    }
-
-    public void flush() {
-        execute(new EntityManagerCallback<Object>() {
-            @Override
-            public Object execute(EntityManager entityManager) {
-                entityManager.flush();
-                return null;
-            }
-        });
-    }
-
-    public <T> List<T> find(final Class<T> entity, final String query, final Map<String, Object> parameters) {
-        return execute(new EntityManagerCallback<List<T>>() {
-            @Override
-            public List<T> execute(EntityManager entityManager) {
-                TypedQuery<T> typedQuery = entityManager.createQuery(query, entity);
-                for (Map.Entry<String, Object> parameter : parameters.entrySet()) {
-                    typedQuery.setParameter(parameter.getKey(), parameter.getValue());
-                }
-                return typedQuery.getResultList();
-            }
-        });
-    }
-
-}
diff --git a/components/camel-bam/src/main/java/org/apache/camel/bam/EntityManagers.java b/components/camel-bam/src/main/java/org/apache/camel/bam/EntityManagers.java
deleted file mode 100644
index 297bef4..0000000
--- a/components/camel-bam/src/main/java/org/apache/camel/bam/EntityManagers.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.bam;
-
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-
-import org.springframework.orm.jpa.EntityManagerHolder;
-import org.springframework.transaction.support.TransactionSynchronizationManager;
-
-/**
- * Utility class designed to orchestrate JPA {@link javax.persistence.EntityManager} and Spring transactions.
- */
-public final class EntityManagers {
-
-    private EntityManagers() {
-    }
-
-    /**
-     * Fetches {@link javax.persistence.EntityManager} bound to the current Spring transaction or creates new manager.
-     *
-     * @param entityManagerFactory {@link javax.persistence.EntityManagerFactory} used either as a key for a Spring
-     *                             transaction resource lookup or as a factory to create new
-     *                             {@link javax.persistence.EntityManager}.
-     * @return {@link javax.persistence.EntityManager} bound to the existing Spring transaction or new manager instance.
-     */
-    public static EntityManager resolveEntityManager(EntityManagerFactory entityManagerFactory) {
-        EntityManagerHolder entityManagerHolder =
-                (EntityManagerHolder) TransactionSynchronizationManager.getResource(entityManagerFactory);
-        if (entityManagerHolder != null) {
-            return entityManagerHolder.getEntityManager();
-        }
-        return entityManagerFactory.createEntityManager();
-    }
-
-    public static void closeNonTransactionalEntityManager(EntityManager entityManager) {
-        if (entityManager == null) {
-            return;
-        }
-        boolean isTransactional = TransactionSynchronizationManager.hasResource(entityManager.getEntityManagerFactory());
-        if (isTransactional) {
-            entityManager.close();
-        }
-    }
-
-}
diff --git a/components/camel-bam/src/main/java/org/apache/camel/bam/ProcessBuilder.java b/components/camel-bam/src/main/java/org/apache/camel/bam/ProcessBuilder.java
deleted file mode 100644
index fa4f39e..0000000
--- a/components/camel-bam/src/main/java/org/apache/camel/bam/ProcessBuilder.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.bam;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.persistence.EntityManagerFactory;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.Endpoint;
-import org.apache.camel.Processor;
-import org.apache.camel.bam.model.ActivityDefinition;
-import org.apache.camel.bam.model.ProcessDefinition;
-import org.apache.camel.bam.model.ProcessInstance;
-import org.apache.camel.bam.processor.ActivityMonitorEngine;
-import org.apache.camel.bam.processor.JpaBamProcessor;
-import org.apache.camel.bam.rules.ProcessRules;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.util.ObjectHelper;
-import org.springframework.transaction.TransactionStatus;
-import org.springframework.transaction.support.TransactionCallbackWithoutResult;
-import org.springframework.transaction.support.TransactionTemplate;
-
-import static org.apache.camel.util.ObjectHelper.notNull;
-
-/**
- * A builder of a process definition
- * 
- * @version 
- */
-public abstract class ProcessBuilder extends RouteBuilder {
-    private static int processCounter;
-    private EntityManagerFactory entityManagerFactory;
-    private EntityManagerTemplate entityManagerTemplate;
-    private TransactionTemplate transactionTemplate;
-    private String processName;
-    private final List<ActivityBuilder> activityBuilders = new ArrayList<>();
-    private Class<ProcessInstance> entityType = ProcessInstance.class;
-    private final ProcessRules processRules = new ProcessRules();
-    private volatile ProcessDefinition processDefinition;
-    private ActivityMonitorEngine engine;
-
-    protected ProcessBuilder() {
-    }
-
-    protected ProcessBuilder(EntityManagerFactory entityManagerFactory, TransactionTemplate transactionTemplate) {
-        this(entityManagerFactory, transactionTemplate, createProcessName());
-    }
-
-    protected ProcessBuilder(EntityManagerFactory entityManagerFactory, TransactionTemplate transactionTemplate, String processName) {
-        setEntityManagerFactory(entityManagerFactory);
-        this.transactionTemplate = transactionTemplate;
-        this.processName = processName;
-    }
-
-    protected static synchronized String createProcessName() {
-        return "Process-" + (++processCounter);
-    }
-
-    public ActivityBuilder activity(String endpointUri) {
-        return activity(endpoint(endpointUri));
-    }
-
-    public ActivityBuilder activity(Endpoint endpoint) {
-        ActivityBuilder answer = new ActivityBuilder(this, endpoint);
-        activityBuilders.add(answer);
-        return answer;
-    }
-
-    /**
-     * Sets the process entity type used to perform state management
-     */
-    public ProcessBuilder entityType(Class<ProcessInstance> entityType) {
-        this.entityType = entityType;
-        return this;
-    }
-
-    public Processor createActivityProcessor(ActivityBuilder activityBuilder) {
-        notNull(entityManagerFactory, "entityManagerFactory");
-        transactionTemplate.execute(new TransactionCallbackWithoutResult() {
-            protected void doInTransactionWithoutResult(TransactionStatus status) {
-                processRules.setProcessDefinition(getProcessDefinition());
-            }
-        });
-        return new JpaBamProcessor(transactionTemplate, entityManagerFactory, activityBuilder.getCorrelationExpression(), activityBuilder.getActivityRules(), getEntityType());
-    }
-
-    // Properties
-    // -----------------------------------------------------------------------
-    public List<ActivityBuilder> getActivityBuilders() {
-        return activityBuilders;
-    }
-
-    public Class<ProcessInstance> getEntityType() {
-        return entityType;
-    }
-
-    public EntityManagerFactory getEntityManagerFactory() {
-        return entityManagerFactory;
-    }
-
-    public void setEntityManagerFactory(EntityManagerFactory entityManagerFactory) {
-        this.entityManagerFactory = entityManagerFactory;
-        this.entityManagerTemplate = new EntityManagerTemplate(entityManagerFactory);
-    }
-
-    public TransactionTemplate getTransactionTemplate() {
-        return transactionTemplate;
-    }
-
-    public void setTransactionTemplate(TransactionTemplate transactionTemplate) {
-        this.transactionTemplate = transactionTemplate;
-    }
-
-    public ProcessRules getProcessRules() {
-        return processRules;
-    }
-
-    public String getProcessName() {
-        if (processName == null) {
-            processName = createProcessName();
-        }
-        return processName;
-    }
-
-    public synchronized ProcessDefinition getProcessDefinition() {
-        if (processDefinition == null) {
-            processDefinition = findOrCreateProcessDefinition();
-        }
-        return processDefinition;
-    }
-
-    public void setProcessDefinition(ProcessDefinition processDefinition) {
-        this.processDefinition = processDefinition;
-    }
-
-    // Implementation methods
-    // -------------------------------------------------------------------------
-    protected void populateRoutes() throws Exception {
-        ObjectHelper.notNull(entityManagerFactory, "entityManagerFactory", this);
-        ObjectHelper.notNull(getTransactionTemplate(), "transactionTemplate", this);
-
-        // add the monitoring service - should there be an easier way??
-        if (engine == null) {
-            engine = new ActivityMonitorEngine(entityManagerFactory, getTransactionTemplate(), getProcessRules());
-        }
-        CamelContext camelContext = getContext();
-        if (camelContext instanceof DefaultCamelContext) {
-            DefaultCamelContext defaultCamelContext = (DefaultCamelContext) camelContext;
-            defaultCamelContext.addService(engine);
-        }
-
-        // create the routes for the activities
-        for (ActivityBuilder builder : activityBuilders) {
-            from(builder.getEndpoint()).process(builder.getProcessor());
-        }
-
-        super.populateRoutes();
-    }
-
-    // Implementation methods
-    // -------------------------------------------------------------------------
-    public ActivityDefinition findOrCreateActivityDefinition(String activityName) {
-        ProcessDefinition definition = getProcessDefinition();
-
-        Map<String, Object> params = new HashMap<>(2);
-        params.put("definition", definition);
-        params.put("name", activityName);
-
-        List<ActivityDefinition> list = entityManagerTemplate.find(ActivityDefinition.class, "select x from "
-            + QueryUtils.getTypeName(ActivityDefinition.class) + " x where x.processDefinition = :definition and x.name = :name", params);
-        if (!list.isEmpty()) {
-            return list.get(0);
-        } else {
-            ActivityDefinition answer = new ActivityDefinition();
-            answer.setName(activityName);
-            answer.setProcessDefinition(ProcessDefinition.getRefreshedProcessDefinition(entityManagerTemplate, definition));
-            entityManagerTemplate.persist(answer);
-            return answer;
-        }
-    }
-
-    protected ProcessDefinition findOrCreateProcessDefinition() {
-        Map<String, Object> params = new HashMap<>(1);
-        params.put("name", processName);
-
-        List<ProcessDefinition> list = entityManagerTemplate.find(ProcessDefinition.class, "select x from "
-            + QueryUtils.getTypeName(ProcessDefinition.class) + " x where x.name = :name", params);
-        if (!list.isEmpty()) {
-            return list.get(0);
-        } else {
-            ProcessDefinition answer = new ProcessDefinition();
-            answer.setName(processName);
-            entityManagerTemplate.persist(answer);
-            return answer;
-        }
-    }
-}
diff --git a/components/camel-bam/src/main/java/org/apache/camel/bam/QueryUtils.java b/components/camel-bam/src/main/java/org/apache/camel/bam/QueryUtils.java
deleted file mode 100644
index b886bfd..0000000
--- a/components/camel-bam/src/main/java/org/apache/camel/bam/QueryUtils.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.bam;
-
-import javax.persistence.Entity;
-
-public final class QueryUtils {
-
-    private QueryUtils() {
-    }
-
-    public static String getTypeName(Class<?> clazz) {
-
-        if (clazz == null) {
-            return null;
-        } else {
-
-            // Check if we have a property name on the @Entity annotation
-            String name = getEntityName(clazz);
-
-            if (name != null) {
-                return name;
-            } else {
-                // Remove package name of the entity to be conform with JPA 1.0
-                // spec
-                return clazz.getSimpleName();
-            }
-
-        }
-    }
-
-    protected static String getEntityName(Class<?> clazz) {
-
-        Entity entity = clazz.getAnnotation(Entity.class);
-
-        // Check if the property name has been defined for Entity annotation
-        if (!entity.name().equals("")) {
-            return entity.name();
-        } else {
-            return null;
-        }
-
-    }
-
-}
diff --git a/components/camel-bam/src/main/java/org/apache/camel/bam/TimeExpression.java b/components/camel-bam/src/main/java/org/apache/camel/bam/TimeExpression.java
deleted file mode 100644
index 5a3c914..0000000
--- a/components/camel-bam/src/main/java/org/apache/camel/bam/TimeExpression.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.bam;
-
-import java.util.Date;
-
-import org.apache.camel.bam.model.ActivityState;
-import org.apache.camel.bam.model.ProcessInstance;
-import org.apache.camel.bam.rules.ActivityRules;
-import org.apache.camel.bam.rules.TemporalRule;
-import static org.apache.camel.util.ObjectHelper.equal;
-
-/**
- * @version 
- */
-public abstract class TimeExpression {
-    private ActivityRules activityRules;
-    private ActivityBuilder builder;
-    private ActivityLifecycle lifecycle;
-
-    public TimeExpression(ActivityBuilder builder, ActivityLifecycle lifecycle) {
-        this.lifecycle = lifecycle;
-        this.builder = builder;
-        this.activityRules = builder.getActivityRules();
-    }
-
-    public boolean isActivityLifecycle(ActivityRules activityRules, ActivityLifecycle lifecycle) {
-        return equal(activityRules, this.activityRules) && equal(lifecycle, this.lifecycle);
-    }
-
-    /**
-     * Creates a new temporal rule on this expression and the other expression
-     */
-    public TemporalRule after(TimeExpression expression) {
-        TemporalRule rule = new TemporalRule(expression, this);
-        rule.getSecond().getActivityRules().addRule(rule);
-        return rule;
-    }
-
-    public Date evaluate(ProcessInstance processInstance) {
-        ActivityState state = processInstance.getActivityState(activityRules);
-        if (state != null) {
-            return evaluate(processInstance, state);
-        }
-        return null;
-    }
-
-    public abstract Date evaluate(ProcessInstance instance, ActivityState state);
-
-    // Properties
-    //-------------------------------------------------------------------------
-
-    public ActivityBuilder getBuilder() {
-        return builder;
-    }
-
-    public ActivityRules getActivityRules() {
-        return activityRules;
-    }
-
-    public ActivityLifecycle getLifecycle() {
-        return lifecycle;
-    }
-
-    public ActivityState getActivityState(ProcessInstance instance) {
-        return instance.getActivityState(activityRules);
-    }
-
-    public ActivityState getOrCreateActivityState(ProcessInstance instance) {
-        return instance.getOrCreateActivityState(activityRules);
-    }
-}
diff --git a/components/camel-bam/src/main/java/org/apache/camel/bam/model/ActivityDefinition.java b/components/camel-bam/src/main/java/org/apache/camel/bam/model/ActivityDefinition.java
deleted file mode 100644
index 00141d5..0000000
--- a/components/camel-bam/src/main/java/org/apache/camel/bam/model/ActivityDefinition.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.bam.model;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
-/**
- * @version 
- */
-@Entity
-@Table(
-    name = "CAMEL_ACTIVITYDEFINITION"
-)
-public class ActivityDefinition extends EntitySupport {
-    
-    private String name;
-    private ProcessDefinition processDefinition;
-
-    @Override
-    public String toString() {
-        return "Activity[" + getId() + " name: " + getName() + "]";
-    }
-    
-    @Column(unique = true) 
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST, CascadeType.MERGE })
-    public ProcessDefinition getProcessDefinition() {
-        return processDefinition;
-    }
-
-    public void setProcessDefinition(ProcessDefinition processDefinition) {
-        this.processDefinition = processDefinition;
-    }
-}
diff --git a/components/camel-bam/src/main/java/org/apache/camel/bam/model/ActivityState.java b/components/camel-bam/src/main/java/org/apache/camel/bam/model/ActivityState.java
deleted file mode 100644
index a429b79..0000000
--- a/components/camel-bam/src/main/java/org/apache/camel/bam/model/ActivityState.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.bam.model;
-
-import java.util.Date;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-import javax.persistence.Transient;
-
-import org.apache.camel.bam.processor.ProcessContext;
-import org.apache.camel.bam.rules.ActivityRules;
-import org.apache.camel.util.ObjectHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * The default state for a specific activity within a process
- *
- * @version 
- */
-@Entity
-@Table(
-    name = "CAMEL_ACTIVITYSTATE"
-)
-public class ActivityState extends TemporalEntity {
-    private static final Logger LOG = LoggerFactory.getLogger(ActivityState.class);
-    private ProcessInstance processInstance;
-    private Integer receivedMessageCount = 0;
-    private ActivityDefinition activityDefinition;
-    private Date timeExpected;
-    private Date timeOverdue;
-    private Integer escalationLevel = 0;
-
-    @Override
-    public String toString() {
-        return "ActivityState[" + getId() + " on " + getProcessInstance() + " " + getActivityDefinition() + "]";
-    }
-
-    public synchronized void processExchange(ActivityRules activityRules, ProcessContext context) throws Exception {
-        int messageCount = 0;
-        Integer count = getReceivedMessageCount();
-        if (count != null) {
-            messageCount = count.intValue();
-        }
-        setReceivedMessageCount(++messageCount);
-
-        if (messageCount == 1) {
-            onFirstMessage(context);
-        }
-        int expectedMessages = activityRules.getExpectedMessages();
-        if (messageCount == expectedMessages) {
-            onExpectedMessage(context);
-        } else if (messageCount > expectedMessages) {
-            onExcessMessage(context);
-        }
-    }
-
-    /**
-     * Returns true if this state is for the given activity
-     */
-    public boolean isActivity(ActivityRules activityRules) {
-        return ObjectHelper.equal(getActivityDefinition(), activityRules.getActivityDefinition());
-    }
-
-    // Properties
-    // -----------------------------------------------------------------------
-    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST, CascadeType.MERGE })
-    public ProcessInstance getProcessInstance() {
-        return processInstance;
-    }
-
-    public void setProcessInstance(ProcessInstance processInstance) {
-        this.processInstance = processInstance;
-        processInstance.getActivityStates().add(this);
-    }
-
-    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST, CascadeType.MERGE })
-    public ActivityDefinition getActivityDefinition() {
-        return activityDefinition;
-    }
-
-    public void setActivityDefinition(ActivityDefinition activityDefinition) {
-        this.activityDefinition = activityDefinition;
-    }
-
-    public Integer getEscalationLevel() {
-        return escalationLevel;
-    }
-
-    public void setEscalationLevel(Integer escalationLevel) {
-        this.escalationLevel = escalationLevel;
-    }
-
-    public Integer getReceivedMessageCount() {
-        return receivedMessageCount;
-    }
-
-    public void setReceivedMessageCount(Integer receivedMessageCount) {
-        this.receivedMessageCount = receivedMessageCount;
-    }
-
-    @Temporal(TemporalType.TIME)
-    public Date getTimeExpected() {
-        return timeExpected;
-    }
-
-    public void setTimeExpected(Date timeExpected) {
-        this.timeExpected = timeExpected;
-    }
-
-    @Temporal(TemporalType.TIME)
-    public Date getTimeOverdue() {
-        return timeOverdue;
-    }
-
-    public void setTimeOverdue(Date timeOverdue) {
-        this.timeOverdue = timeOverdue;
-    }
-
-    public void setTimeCompleted(Date timeCompleted) {
-        super.setTimeCompleted(timeCompleted);
-        if (timeCompleted != null) {
-            setEscalationLevel(-1);
-        }
-    }
-
-    @Transient
-    public String getCorrelationKey() {
-        ProcessInstance pi = getProcessInstance();
-        if (pi == null) {
-            return null;
-        }
-        return pi.getCorrelationKey();
-    }
-
-    // Implementation methods
-    // -----------------------------------------------------------------------
-
-    /**
-     * Called when the first message is reached
-     */
-    protected void onFirstMessage(ProcessContext context) {
-        if (!isStarted()) {
-            setTimeStarted(currentTime());
-            context.onStarted(this);
-            LOG.debug("Activity first message: {}", this);
-        }
-    }
-
-    /**
-     * Called when the expected number of messages are is reached
-     */
-    protected void onExpectedMessage(ProcessContext context) {
-        if (!isCompleted()) {
-            setTimeCompleted(currentTime());
-            // must also clear overdue otherwise we will get failures
-            setTimeOverdue(null);
-            context.onCompleted(this);
-            LOG.debug("Activity complete: {}", this);
-        }
-    }
-
-    /**
-     * Called when an excess message (after the expected number of messages) are
-     * received
-     */
-    protected void onExcessMessage(ProcessContext context) {
-        // TODO
-    }
-
-    protected Date currentTime() {
-        return new Date();
-    }
-}
diff --git a/components/camel-bam/src/main/java/org/apache/camel/bam/model/EntitySupport.java b/components/camel-bam/src/main/java/org/apache/camel/bam/model/EntitySupport.java
deleted file mode 100644
index 84d902e..0000000
--- a/components/camel-bam/src/main/java/org/apache/camel/bam/model/EntitySupport.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.bam.model;
-
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.MappedSuperclass;
-
-/**
- * A base class for persistent entities
- *
- * @version 
- */
-@MappedSuperclass
-public class EntitySupport {
-    private Long id;
-
-    @Id
-    @GeneratedValue
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String toString() {
-        return getClass().getName() + "[" + getId() + "]";
-    }
-}
diff --git a/components/camel-bam/src/main/java/org/apache/camel/bam/model/ProcessDefinition.java b/components/camel-bam/src/main/java/org/apache/camel/bam/model/ProcessDefinition.java
deleted file mode 100644
index dadf781..0000000
--- a/components/camel-bam/src/main/java/org/apache/camel/bam/model/ProcessDefinition.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.bam.model;
-
-import java.util.List;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EntityManager;
-import javax.persistence.Table;
-
-import org.apache.camel.bam.EntityManagerCallback;
-import org.apache.camel.bam.EntityManagerTemplate;
-import org.apache.camel.bam.QueryUtils;
-import org.apache.camel.util.ObjectHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @version 
- */
-@Entity
-@Table(name = "CAMEL_PROCESSDEFINITION")
-public class ProcessDefinition extends EntitySupport {
-
-    private static final Logger LOG = LoggerFactory.getLogger(ProcessDefinition.class);
-    private String name;
-
-    @Column(unique = true)
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public static ProcessDefinition getRefreshedProcessDefinition(EntityManagerTemplate entityManagerTemplate, ProcessDefinition definition) {
-        // TODO refresh doesn't tend to work - maybe its a spring thing?
-        // template.refresh(definition);
-
-        ObjectHelper.notNull(definition, "definition");
-        final Long id = definition.getId();
-        if (id == null) {
-            LOG.warn("No primary key is available!");
-            return findOrCreateProcessDefinition(entityManagerTemplate, definition.getName());
-        }
-        return entityManagerTemplate.execute(new EntityManagerCallback<ProcessDefinition>() {
-            @Override
-            public ProcessDefinition execute(EntityManager entityManager) {
-                return entityManager.find(ProcessDefinition.class, id);
-            }
-        });
-    }
-
-    public static ProcessDefinition findOrCreateProcessDefinition(EntityManagerTemplate entityManagerTemplate, final String processName) {
-        final String definitionsQuery = "select x from " + QueryUtils.getTypeName(ProcessDefinition.class)
-                + " x where x.name = :processName";
-        List<ProcessDefinition> list = entityManagerTemplate.execute(new EntityManagerCallback<List<ProcessDefinition>>() {
-            @Override
-            public List<ProcessDefinition> execute(EntityManager entityManager) {
-                return entityManager.createQuery(definitionsQuery, ProcessDefinition.class).
-                        setParameter("processName", processName).
-                        getResultList();
-            }
-        });
-        if (!list.isEmpty()) {
-            return list.get(0);
-        } else {
-            ProcessDefinition answer = new ProcessDefinition();
-            answer.setName(processName);
-            entityManagerTemplate.persist(answer);
-            return answer;
-        }
-    }
-
-}
diff --git a/components/camel-bam/src/main/java/org/apache/camel/bam/model/ProcessInstance.java b/components/camel-bam/src/main/java/org/apache/camel/bam/model/ProcessInstance.java
deleted file mode 100644
index 8dd50be..0000000
--- a/components/camel-bam/src/main/java/org/apache/camel/bam/model/ProcessInstance.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.bam.model;
-
-import java.util.Collection;
-import java.util.Date;
-import java.util.concurrent.CopyOnWriteArraySet;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-import javax.persistence.Transient;
-
-import org.apache.camel.bam.rules.ActivityRules;
-
-/**
- * Represents a single business process
- * 
- * @version 
- */
-@Entity
-@Table(name = "CAMEL_PROCESSINSTANCE")
-public class ProcessInstance {
-    private ProcessDefinition processDefinition;
-    private Collection<ActivityState> activityStates = new CopyOnWriteArraySet<>();
-    private String correlationKey;
-    private Date timeStarted;
-    private Date timeCompleted;
-
-    public ProcessInstance() {
-        setTimeStarted(new Date());
-    }
-
-    public String toString() {
-        return "ProcessInstance[" + getCorrelationKey() + "]";
-    }
-
-    @Id
-    public String getCorrelationKey() {
-        return correlationKey;
-    }
-
-    public void setCorrelationKey(String correlationKey) {
-        this.correlationKey = correlationKey;
-    }
-
-    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST, CascadeType.MERGE})
-    public ProcessDefinition getProcessDefinition() {
-        return processDefinition;
-    }
-
-    public void setProcessDefinition(ProcessDefinition processDefinition) {
-        this.processDefinition = processDefinition;
-    }
-
-    @OneToMany(mappedBy = "processInstance", fetch = FetchType.LAZY, cascade = {CascadeType.ALL})
-    public Collection<ActivityState> getActivityStates() {
-        return activityStates;
-    }
-
-    public void setActivityStates(Collection<ActivityState> activityStates) {
-        this.activityStates = activityStates;
-    }
-
-    @Transient
-    public boolean isStarted() {
-        return getTimeStarted() != null;
-    }
-
-    @Transient
-    public boolean isCompleted() {
-        return getTimeCompleted() != null;
-    }
-
-    @Temporal(TemporalType.TIME)
-    public Date getTimeStarted() {
-        return timeStarted;
-    }
-
-    public void setTimeStarted(Date timeStarted) {
-        this.timeStarted = timeStarted;
-    }
-
-    @Temporal(TemporalType.TIME)
-    public Date getTimeCompleted() {
-        return timeCompleted;
-    }
-
-    public void setTimeCompleted(Date timeCompleted) {
-        this.timeCompleted = timeCompleted;
-    } // Helper methods
-
-    // -------------------------------------------------------------------------
-
-    /**
-     * Returns the activity state for the given activity
-     * 
-     * @param activityRules the activity to find the state for
-     * @return the activity state or null if no state could be found for the
-     *         given activity
-     */
-    public ActivityState getActivityState(ActivityRules activityRules) {
-        for (ActivityState activityState : getActivityStates()) {
-            if (activityState.isActivity(activityRules)) {
-                return activityState;
-            }
-        }
-        return null;
-    }
-
-    public ActivityState getOrCreateActivityState(ActivityRules activityRules) {
-        ActivityState state = getActivityState(activityRules);
-
-        if (state == null) {
-            state = createActivityState();
-            state.setProcessInstance(this);
-            state.setActivityDefinition(activityRules.getActivityDefinition());
-            // we don't need to do: getTemplate().persist(state);
-        }
-
-        return state;
-    }
-
-    protected ActivityState createActivityState() {
-        return new ActivityState();
-    }
-}
diff --git a/components/camel-bam/src/main/java/org/apache/camel/bam/model/TemporalEntity.java b/components/camel-bam/src/main/java/org/apache/camel/bam/model/TemporalEntity.java
deleted file mode 100644
index b143e9c..0000000
--- a/components/camel-bam/src/main/java/org/apache/camel/bam/model/TemporalEntity.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.bam.model;
-
-import java.util.Date;
-
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-import javax.persistence.Transient;
-
-/**
- * @version 
- */
-public abstract class TemporalEntity extends EntitySupport {
-    private Date timeStarted;
-    private Date timeCompleted;
-
-    @Transient
-    public boolean isStarted() {
-        return timeStarted != null;
-    }
-
-    @Transient
-    public boolean isCompleted() {
-        return timeCompleted != null;
-    }
-
-    @Temporal(TemporalType.TIME)
-    public Date getTimeStarted() {
-        return timeStarted;
-    }
-
-    public void setTimeStarted(Date timeStarted) {
-        this.timeStarted = timeStarted;
-    }
-
-    @Temporal(TemporalType.TIME)
-    public Date getTimeCompleted() {
-        return timeCompleted;
-    }
-
-    public void setTimeCompleted(Date timeCompleted) {
-        this.timeCompleted = timeCompleted;
-    }
-}
diff --git a/components/camel-bam/src/main/java/org/apache/camel/bam/processor/ActivityMonitorEngine.java b/components/camel-bam/src/main/java/org/apache/camel/bam/processor/ActivityMonitorEngine.java
deleted file mode 100644
index fbbd9c4..0000000
--- a/components/camel-bam/src/main/java/org/apache/camel/bam/processor/ActivityMonitorEngine.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.bam.processor;
-
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.LockModeType;
-import javax.persistence.PersistenceException;
-
-import org.apache.camel.bam.EntityManagerCallback;
-import org.apache.camel.bam.EntityManagerTemplate;
-import org.apache.camel.bam.QueryUtils;
-import org.apache.camel.bam.model.ActivityState;
-import org.apache.camel.bam.rules.ProcessRules;
-import org.apache.camel.support.ServiceSupport;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.transaction.TransactionStatus;
-import org.springframework.transaction.support.TransactionCallbackWithoutResult;
-import org.springframework.transaction.support.TransactionTemplate;
-
-/**
- * A timer engine to monitor for expired activities and perform whatever actions
- * are required.
- * 
- * @version 
- */
-public class ActivityMonitorEngine extends ServiceSupport implements Runnable {
-    private static final Logger LOG = LoggerFactory.getLogger(ActivityMonitorEngine.class);
-    private EntityManagerFactory entityManagerFactory;
-    private EntityManagerTemplate entityManagerTemplate;
-    private TransactionTemplate transactionTemplate;
-    private ProcessRules rules;
-    private long windowMillis = 1000L;
-    private Thread thread;
-    private boolean useLocking;
-
-    public ActivityMonitorEngine(EntityManagerFactory entityManagerFactory, TransactionTemplate transactionTemplate, ProcessRules rules) {
-        this.entityManagerFactory = entityManagerFactory;
-        this.entityManagerTemplate = new EntityManagerTemplate(entityManagerFactory);
-        this.transactionTemplate = transactionTemplate;
-        this.rules = rules;
-    }
-
-    public boolean isUseLocking() {
-        return useLocking;
-    }
-
-    public void setUseLocking(boolean useLocking) {
-        this.useLocking = useLocking;
-    }
-
-    public void run() {
-        LOG.debug("Starting to poll for timeout events");
-
-        while (!isStopped()) {
-            try {
-                long now = System.currentTimeMillis();
-                long nextPoll = now + windowMillis;
-                final Date timeNow = new Date(now);
-
-                transactionTemplate.execute(new TransactionCallbackWithoutResult() {
-                    protected void doInTransactionWithoutResult(TransactionStatus status) {
-                        Map<String, Object> params = new HashMap<>(1);
-                        params.put("timeNow", timeNow);
-
-                        String activityStateQuery = "select x from "
-                                + QueryUtils.getTypeName(ActivityState.class) + " x where x.timeOverdue < :timeNow";
-                        List<ActivityState> list = entityManagerTemplate.find(ActivityState.class,
-                                activityStateQuery, params);
-                        for (ActivityState activityState : list) {
-                            fireExpiredEvent(activityState);
-                        }
-                    }
-                });
-
-                long timeToSleep = nextPoll - System.currentTimeMillis();
-                if (timeToSleep > 0) {
-                    LOG.debug("Sleeping for {} millis", timeToSleep);
-                    try {
-                        Thread.sleep(timeToSleep);
-                    } catch (InterruptedException e) {
-                        // ignore
-                    }
-                }
-            } catch (Exception e) {
-                LOG.warn("Error during running ActivityMonitorEngine. This exception is ignored.", e);
-            }
-        }
-    }
-
-    protected void fireExpiredEvent(final ActivityState activityState) {
-        LOG.debug("Trying to fire expiration of: {}", activityState);
-
-        entityManagerTemplate.execute(new EntityManagerCallback<Object>() {
-            public Object execute(EntityManager entityManager) throws PersistenceException {
-                // let's try locking the object first
-                if (isUseLocking()) {
-                    LOG.debug("Attempting to lock: {}", activityState);
-                    entityManager.lock(activityState, LockModeType.WRITE);
-                    LOG.debug("Grabbed lock: {}", activityState);
-                }
-
-                try {
-                    rules.processExpired(activityState);
-                } catch (Exception e) {
-                    LOG.error("Failed to process expiration of: " + activityState + ". Reason: " + e, e);
-                }
-                activityState.setTimeOverdue(null);
-                //activityState.setEscalationLevel(escalateLevel + 1);
-                return null;
-            }
-        });
-    }
-
-    protected void doStart() throws Exception {
-        rules.start();
-        thread = new Thread(this, "ActivityMonitorEngine");
-        thread.start();
-    }
-
-    protected void doStop() throws Exception {
-        if (thread != null) {
-            thread = null;
-        }
-        rules.stop();
-    }
-}
diff --git a/components/camel-bam/src/main/java/org/apache/camel/bam/processor/BamProcessorSupport.java b/components/camel-bam/src/main/java/org/apache/camel/bam/processor/BamProcessorSupport.java
deleted file mode 100644
index c890f67..0000000
--- a/components/camel-bam/src/main/java/org/apache/camel/bam/processor/BamProcessorSupport.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.bam.processor;
-
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.Expression;
-import org.apache.camel.Processor;
-import org.apache.camel.RuntimeCamelException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.transaction.TransactionStatus;
-import org.springframework.transaction.support.TransactionCallback;
-import org.springframework.transaction.support.TransactionTemplate;
-
-import static org.apache.camel.util.ObjectHelper.wrapRuntimeCamelException;
-
-/**
- * A base {@link Processor} for working on <a
- * href="http://camel.apache.org/bam.html">BAM</a> which a derived
- * class would do the actual persistence such as the {@link JpaBamProcessor}
- *
- * @version 
- */
-public abstract class BamProcessorSupport<T> implements Processor {
-    private static final Logger LOG = LoggerFactory.getLogger(BamProcessorSupport.class);
-    private Class<T> entityType;
-    private Expression correlationKeyExpression;
-    private TransactionTemplate transactionTemplate;
-    private int retryCount = 20;
-    private long retrySleep = 1000L;
-
-    @SuppressWarnings("unchecked")
-    protected BamProcessorSupport(TransactionTemplate transactionTemplate,
-                                  Expression correlationKeyExpression) {
-        this.transactionTemplate = transactionTemplate;
-        this.correlationKeyExpression = correlationKeyExpression;
-
-        Type type = getClass().getGenericSuperclass();
-        if (type instanceof ParameterizedType) {
-            ParameterizedType parameterizedType = (ParameterizedType)type;
-            Type[] arguments = parameterizedType.getActualTypeArguments();
-            if (arguments.length > 0) {
-                Type argumentType = arguments[0];
-                if (argumentType instanceof Class) {
-                    this.entityType = (Class<T>) argumentType;
-                }
-            }
-        }
-        if (entityType == null) {
-            throw new IllegalArgumentException("Could not infer the entity type!");
-        }
-    }
-
-    protected BamProcessorSupport(TransactionTemplate transactionTemplate,
-                                  Expression correlationKeyExpression, Class<T> entitytype) {
-        this.transactionTemplate = transactionTemplate;
-        this.entityType = entitytype;
-        this.correlationKeyExpression = correlationKeyExpression;
-    }
-
-    public void process(final Exchange exchange) {
-        for (int i = 1; i <= retryCount; i++) {
-            if (i > 1) {
-                LOG.info("Retrying attempt: {}", i);
-                try {
-                    Thread.sleep(retrySleep);
-                } catch (InterruptedException e) {
-                    // ignore
-                }
-            }
-            try {
-                transactionTemplate.execute(new TransactionCallback<T>() {
-                    public T doInTransaction(TransactionStatus status) {
-                        try {
-                            Object key = getCorrelationKey(exchange);
-
-                            T entity = loadEntity(exchange, key);
-
-                            LOG.debug("Correlation key: {} with entity: {}", key, entity);
-                            processEntity(exchange, entity);
-
-                            return entity;
-                        } catch (Exception e) {
-                            onError(status, e);
-                            return null;
-                        }
-                    }
-                });
-                if (i > 1) {
-                    LOG.debug("Attempt {} worked!", i);
-                }
-                return;
-            } catch (Exception e) {
-                LOG.warn("Failed to complete transaction. This exception is ignored.", e);
-            }
-        }
-    }
-
-    // Properties
-    // -----------------------------------------------------------------------
-    public Expression getCorrelationKeyExpression() {
-        return correlationKeyExpression;
-    }
-
-    public Class<T> getEntityType() {
-        return entityType;
-    }
-
-    // Implemenation methods
-    // -----------------------------------------------------------------------
-    protected abstract void processEntity(Exchange exchange, T entity) throws Exception;
-
-    protected abstract T loadEntity(Exchange exchange, Object key) throws Exception;
-
-    protected abstract Class<?> getKeyType();
-
-    protected Object getCorrelationKey(Exchange exchange) throws NoCorrelationKeyException {
-        Object value;
-        Class<?> keyType = getKeyType();
-        if (keyType != null) {
-            value = correlationKeyExpression.evaluate(exchange, keyType);
-        } else {
-            value = correlationKeyExpression.evaluate(exchange, Object.class);
-        }
-        if (value == null) {
-            throw new NoCorrelationKeyException(this, exchange);
-        }
-        return value;
-    }
-
-    protected void onError(TransactionStatus status, Exception e) throws RuntimeCamelException {
-        status.setRollbackOnly();
-        LOG.warn("Caught: {}", e, e);
-        throw wrapRuntimeCamelException(e);
-    }
-
-}
diff --git a/components/camel-bam/src/main/java/org/apache/camel/bam/processor/JpaBamProcessor.java b/components/camel-bam/src/main/java/org/apache/camel/bam/processor/JpaBamProcessor.java
deleted file mode 100644
index 1d23dcf..0000000
--- a/components/camel-bam/src/main/java/org/apache/camel/bam/processor/JpaBamProcessor.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.bam.processor;
-
-import javax.persistence.EntityManagerFactory;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.Expression;
-import org.apache.camel.bam.model.ActivityState;
-import org.apache.camel.bam.model.ProcessInstance;
-import org.apache.camel.bam.rules.ActivityRules;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.transaction.support.TransactionTemplate;
-
-/**
- * A concrete {@link org.apache.camel.Processor} for working on <a
- * href="http://camel.apache.org/bam.html">BAM</a> which uses JPA as
- * the persistence and uses the {@link ProcessInstance} entity to store the
- * process information.
- * 
- * @version 
- */
-public class JpaBamProcessor extends JpaBamProcessorSupport<ProcessInstance> {
-    private static final Logger LOG = LoggerFactory.getLogger(JpaBamProcessor.class);
-
-    public JpaBamProcessor(TransactionTemplate transactionTemplate, EntityManagerFactory entityManagerFactory, Expression correlationKeyExpression, ActivityRules activityRules) {
-        super(transactionTemplate, entityManagerFactory, correlationKeyExpression, activityRules);
-    }
-
-    public JpaBamProcessor(TransactionTemplate transactionTemplate, EntityManagerFactory entityManagerFactory, Expression correlationKeyExpression,
-                           ActivityRules activityRules, Class<ProcessInstance> entitytype) {
-        super(transactionTemplate, entityManagerFactory, correlationKeyExpression, activityRules, entitytype);
-    }
-
-    protected void processEntity(Exchange exchange, ProcessInstance process) throws Exception {
-        LOG.debug("Processing process instance: {}", process);
-
-        // force the lazy creation of this activity
-        ActivityRules rules = getActivityRules();
-        ActivityState state = process.getOrCreateActivityState(rules);
-
-        state.processExchange(rules, new ProcessContext(exchange, rules, state));
-
-        rules.getProcessRules().processExchange(exchange, process);
-    }
-}
diff --git a/components/camel-bam/src/main/java/org/apache/camel/bam/processor/JpaBamProcessorSupport.java b/components/camel-bam/src/main/java/org/apache/camel/bam/processor/JpaBamProcessorSupport.java
deleted file mode 100644
index 82ba7f8..0000000
--- a/components/camel-bam/src/main/java/org/apache/camel/bam/processor/JpaBamProcessorSupport.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.bam.processor;
-
-import java.lang.reflect.Method;
-import java.util.List;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
-
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.Expression;
-import org.apache.camel.Processor;
-import org.apache.camel.bam.EntityManagerCallback;
-import org.apache.camel.bam.EntityManagerTemplate;
-import org.apache.camel.bam.QueryUtils;
-import org.apache.camel.bam.model.ProcessDefinition;
-import org.apache.camel.bam.rules.ActivityRules;
-import org.apache.camel.util.IntrospectionSupport;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.transaction.support.TransactionTemplate;
-
-/**
- * A base class for JPA based BAM which can use any entity to store the process
- * instance information which allows derived classes to specialise the process
- * instance entity.
- *
- * @version
- */
-public class JpaBamProcessorSupport<T> extends BamProcessorSupport<T> {
-    private static final Logger LOG = LoggerFactory.getLogger(JpaBamProcessorSupport.class);
-
-    private static final Lock LOCK = new ReentrantLock(); // lock used for concurrency issues
-
-    private ActivityRules activityRules;
-    private EntityManagerFactory entityManagerFactory;
-    private EntityManagerTemplate entityManagerTemplate;
-    private String findByKeyQuery;
-    private String keyPropertyName = "correlationKey";
-    private boolean correlationKeyIsPrimary = true;
-
-    public JpaBamProcessorSupport(TransactionTemplate transactionTemplate, EntityManagerFactory entityManagerFactory,
-            Expression correlationKeyExpression, ActivityRules activityRules, Class<T> entitytype) {
-        super(transactionTemplate, correlationKeyExpression, entitytype);
-        this.activityRules = activityRules;
-        setEntityManagerFactory(entityManagerFactory);
-    }
-
-    public JpaBamProcessorSupport(TransactionTemplate transactionTemplate, EntityManagerFactory entityManagerFactory,
-            Expression correlationKeyExpression, ActivityRules activityRules) {
-        super(transactionTemplate, correlationKeyExpression);
-        this.activityRules = activityRules;
-        setEntityManagerFactory(entityManagerFactory);
-    }
-
-    public String getFindByKeyQuery() {
-        if (findByKeyQuery == null) {
-            findByKeyQuery = createFindByKeyQuery();
-        }
-        return findByKeyQuery;
-    }
-
-    public void setFindByKeyQuery(String findByKeyQuery) {
-        this.findByKeyQuery = findByKeyQuery;
-    }
-
-    public ActivityRules getActivityRules() {
-        return activityRules;
-    }
-
-    public void setActivityRules(ActivityRules activityRules) {
-        this.activityRules = activityRules;
-    }
-
-    public String getKeyPropertyName() {
-        return keyPropertyName;
-    }
-
-    public void setKeyPropertyName(String keyPropertyName) {
-        this.keyPropertyName = keyPropertyName;
-    }
-
-    public EntityManagerFactory getEntityManagerFactory() {
-        return entityManagerFactory;
-    }
-
-    public void setEntityManagerFactory(EntityManagerFactory entityManagerFactory) {
-        this.entityManagerFactory = entityManagerFactory;
-        this.entityManagerTemplate = new EntityManagerTemplate(entityManagerFactory);
-    }
-
-    public boolean isCorrelationKeyIsPrimary() {
-        return correlationKeyIsPrimary;
-    }
-
-    public void setCorrelationKeyIsPrimary(boolean correlationKeyIsPrimary) {
-        this.correlationKeyIsPrimary = correlationKeyIsPrimary;
-    }
-
-    // Implementatiom methods
-    // -----------------------------------------------------------------------
-    protected T loadEntity(Exchange exchange, Object key) throws Exception {
-        LOCK.lock();
-        try {
-            LOG.trace("LoadEntity call");
-            T entity = findEntityByCorrelationKey(key);
-            if (entity == null) {
-                entity = createEntity(exchange, key);
-                setKeyProperty(entity, key);
-                ProcessDefinition definition = ProcessDefinition.getRefreshedProcessDefinition(entityManagerTemplate,
-                        getActivityRules().getProcessRules().getProcessDefinition());
-                setProcessDefinitionProperty(entity, definition);
-                entityManagerTemplate.persist(entity);
-
-                // Now we must flush to avoid concurrent updates clashing trying to
-                // insert the same row
-                LOG.debug("About to flush on entity: {} with key: {}", entity, key);
-                entityManagerTemplate.flush();
-            }
-            return entity;
-        } finally {
-            LOCK.unlock();
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    protected T findEntityByCorrelationKey(final Object key) {
-        if (isCorrelationKeyIsPrimary()) {
-            return entityManagerTemplate.execute(new EntityManagerCallback<T>() {
-                @Override
-                public T execute(EntityManager entityManager) {
-                    return entityManager.find(getEntityType(), key);
-                }
-            });
-        } else {
-            List<T> list = entityManagerTemplate.execute(new EntityManagerCallback<List<T>>() {
-                @Override
-                public List<T> execute(EntityManager entityManager) {
-                    return entityManager.createQuery(getFindByKeyQuery()).setParameter("key", key).getResultList();
-                }
-            });
-            if (list.isEmpty()) {
-                return null;
-            } else {
-                return list.get(0);
-            }
-        }
-    }
-
-    protected Class<?> getKeyType() {
-        try {
-            Method getter = IntrospectionSupport.getPropertyGetter(getEntityType(), getKeyPropertyName());
-            return getter.getReturnType();
-        } catch (NoSuchMethodException e) {
-            LOG.warn("no such getter for: " + getKeyPropertyName() + " on " + getEntityType() + ". This exception will be ignored.", e);
-            return null;
-        }
-    }
-
-    /**
-     * Sets the key property on the new entity
-     */
-    protected void setKeyProperty(T entity, Object key) throws Exception {
-        IntrospectionSupport.setProperty(entity, getKeyPropertyName(), key);
-    }
-
-    protected void setProcessDefinitionProperty(T entity, ProcessDefinition processDefinition)
-        throws Exception {
-        IntrospectionSupport.setProperty(entity, "processDefinition", processDefinition);
-    }
-
-    /**
-     * Create a new instance of the entity for the given key
-     */
-    protected T createEntity(Exchange exchange, Object key) {
-        return exchange.getContext().getInjector().newInstance(getEntityType());
-    }
-
-    protected void processEntity(Exchange exchange, T entity) throws Exception {
-        if (entity instanceof Processor) {
-            Processor processor = (Processor)entity;
-            processor.process(exchange);
-        } else {
-            // TODO add other extension points - eg. passing in Activity
-            throw new IllegalArgumentException("No processor defined for this route");
-        }
-    }
-
-    protected String createFindByKeyQuery() {
-        return "select x from " + QueryUtils.getTypeName(getEntityType()) + " x where x." + getKeyPropertyName() + " = :key";
-    }
-}
diff --git a/components/camel-bam/src/main/java/org/apache/camel/bam/processor/NoCorrelationKeyException.java b/components/camel-bam/src/main/java/org/apache/camel/bam/processor/NoCorrelationKeyException.java
deleted file mode 100644
index bebf110..0000000
--- a/components/camel-bam/src/main/java/org/apache/camel/bam/processor/NoCorrelationKeyException.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.bam.processor;
-
-import org.apache.camel.CamelExchangeException;
-import org.apache.camel.Exchange;
-
-/**
- * An exception thrown if no correlation key could be found for a message
- * exchange preventing any particular orchestration or
- * <a href="http://camel.apache.org/bam.html">BAM</a>
- *
- * @version 
- */
-public class NoCorrelationKeyException extends CamelExchangeException {
-    private static final long serialVersionUID = 4511220911189364989L;
-    private final BamProcessorSupport<?> processor;
-
-    public NoCorrelationKeyException(BamProcessorSupport<?> processor, Exchange exchange) {
-        super("No correlation key could be found for " + processor.getCorrelationKeyExpression(), exchange);
-        this.processor = processor;
-    }
-
-    public BamProcessorSupport<?> getProcessor() {
-        return processor;
-    }
-}
diff --git a/components/camel-bam/src/main/java/org/apache/camel/bam/processor/ProcessContext.java b/components/camel-bam/src/main/java/org/apache/camel/bam/processor/ProcessContext.java
deleted file mode 100644
index ffac7e0..0000000
--- a/components/camel-bam/src/main/java/org/apache/camel/bam/processor/ProcessContext.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.bam.processor;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.bam.model.ActivityState;
-import org.apache.camel.bam.model.ProcessInstance;
-import org.apache.camel.bam.rules.ActivityRules;
-import org.apache.camel.bam.rules.ProcessRules;
-
-/**
- * @version 
- */
-public class ProcessContext {
-    private Exchange exchange;
-    private ProcessRules processRules;
-    private ActivityRules activityRules;
-    private ProcessInstance processInstance;
-    private ActivityState activityState;
-
-    public ProcessContext(Exchange exchange, ActivityRules activityRules, ActivityState activityState) {
-        this.exchange = exchange;
-        this.activityRules = activityRules;
-        this.activityState = activityState;
-        this.processRules = activityRules.getProcessRules();
-        this.processInstance = activityState.getProcessInstance();
-    }
-
-    public ActivityRules getActivity() {
-        return activityRules;
-    }
-
-    public void setActivity(ActivityRules activityRules) {
-        this.activityRules = activityRules;
-    }
-
-    public ActivityState getActivityState() {
-        return activityState;
-    }
-
-    public void setActivityState(ActivityState activityState) {
-        this.activityState = activityState;
-    }
-
-    public Exchange getExchange() {
-        return exchange;
-    }
-
-    public void setExchange(Exchange exchange) {
-        this.exchange = exchange;
-    }
-
-    public ProcessRules getProcessDefinition() {
-        return processRules;
-    }
-
-    public void setProcessDefinition(ProcessRules processRules) {
-        this.processRules = processRules;
-    }
-
-    public ProcessInstance getProcessInstance() {
-        return processInstance;
-    }
-
-    public void setProcessInstance(ProcessInstance processInstance) {
-        this.processInstance = processInstance;
-    }
-
-    public ActivityState getActivityState(ActivityRules activityRules) {
-        return getProcessInstance().getActivityState(activityRules);
-    }
-
-    /**
-     * Called when the activity is started which may end up creating some timers
-     * for dependent actions
-     */
-    public void onStarted(ActivityState activityState) {
-        // noop
-    }
-
-    /**
-     * Called when the activity is completed which may end up creating some timers
-     * for dependent actions
-     */
-    public void onCompleted(ActivityState activityState) {
-        // noop
-    }
-}
diff --git a/components/camel-bam/src/main/java/org/apache/camel/bam/rules/ActivityRules.java b/components/camel-bam/src/main/java/org/apache/camel/bam/rules/ActivityRules.java
deleted file mode 100644
index 45421b3..0000000
--- a/components/camel-bam/src/main/java/org/apache/camel/bam/rules/ActivityRules.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.bam.rules;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.bam.ProcessBuilder;
-import org.apache.camel.bam.model.ActivityDefinition;
-import org.apache.camel.bam.model.ActivityState;
-import org.apache.camel.bam.model.ProcessInstance;
-import org.apache.camel.support.ServiceSupport;
-import org.apache.camel.util.ServiceHelper;
-
-/**
- * Represents a activity which is typically a system or could be an endpoint
- *
- * @version 
- */
-public class ActivityRules extends ServiceSupport {
-    private int expectedMessages = 1;
-    private ProcessRules processRules;
-    private List<TemporalRule> rules = new ArrayList<>();
-    private String activityName;
-    private final org.apache.camel.bam.ProcessBuilder builder;
-
-    public ActivityRules(ProcessBuilder builder) {
-        this.builder = builder;
-        this.processRules = builder.getProcessRules();
-        processRules.getActivities().add(this);
-    }
-
-    public void addRule(TemporalRule rule) {
-        rules.add(rule);
-    }
-
-    /**
-     * Handles overdue activities
-     */
-    public void processExpired(ActivityState activityState) throws Exception {
-        for (TemporalRule rule : rules) {
-            rule.processExpired(activityState);
-        }
-    }
-
-    public void processExchange(Exchange exchange, ProcessInstance process) {
-        for (TemporalRule rule : rules) {
-            rule.processExchange(exchange, process);
-        }
-    }
-
-    // Properties
-    //-------------------------------------------------------------------------
-
-    public ActivityDefinition getActivityDefinition() {
-        // let's always query for it, to avoid issues with refreshing before a commit etc
-        return builder.findOrCreateActivityDefinition(activityName);
-    }
-
-    public void setActivityDefinition(ActivityDefinition activityDefinition) {
-    }
-
-    public int getExpectedMessages() {
-        return expectedMessages;
-    }
-
-    public void setExpectedMessages(int expectedMessages) {
-        this.expectedMessages = expectedMessages;
-    }
-
-    public ProcessRules getProcessRules() {
-        return processRules;
-    }
-
-    public void setActivityName(String activityName) {
-        this.activityName = activityName;
-    }
-
-    // Implementation methods
-    //-------------------------------------------------------------------------
-    protected void doStart() throws Exception {
-        ServiceHelper.startServices(rules);
-    }
-
-    protected void doStop() throws Exception {
-        ServiceHelper.stopServices(rules);
-    }
-}
diff --git a/components/camel-bam/src/main/java/org/apache/camel/bam/rules/ProcessRules.java b/components/camel-bam/src/main/java/org/apache/camel/bam/rules/ProcessRules.java
deleted file mode 100644
index cc28e3e..0000000
--- a/components/camel-bam/src/main/java/org/apache/camel/bam/rules/ProcessRules.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.bam.rules;
-
-import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.bam.model.ActivityState;
-import org.apache.camel.bam.model.ProcessDefinition;
-import org.apache.camel.bam.model.ProcessInstance;
-import org.apache.camel.support.ServiceSupport;
-import org.apache.camel.util.ServiceHelper;
-
-/**
- * @version 
- */
-public class ProcessRules extends ServiceSupport {
-    private ProcessDefinition processDefinition;
-    private List<ActivityRules> activities = new CopyOnWriteArrayList<>();
-
-    public synchronized void processExpired(ActivityState activityState) throws Exception {
-        for (ActivityRules activityRules : activities) {
-            activityRules.processExpired(activityState);
-        }
-    }
-
-    public synchronized void processExchange(Exchange exchange, ProcessInstance process) {
-        for (ActivityRules activityRules : activities) {
-            activityRules.processExchange(exchange, process);
-        }
-    }
-
-    // Properties
-    //-------------------------------------------------------------------------
-    public List<ActivityRules> getActivities() {
-        return activities;
-    }
-
-    public ProcessDefinition getProcessDefinition() {
-        return processDefinition;
-    }
-
-    public void setProcessDefinition(ProcessDefinition processDefinition) {
-        this.processDefinition = processDefinition;
-    }
-
-    // Implementation methods
-    //-------------------------------------------------------------------------
-    protected void doStart() throws Exception {
-        ServiceHelper.startServices(activities);
-    }
-
-    protected void doStop() throws Exception {
-        ServiceHelper.stopServices(activities);
-    }
-}
-
-
-
diff --git a/components/camel-bam/src/main/java/org/apache/camel/bam/rules/TemporalRule.java b/components/camel-bam/src/main/java/org/apache/camel/bam/rules/TemporalRule.java
deleted file mode 100644
index 6a3a957..0000000
--- a/components/camel-bam/src/main/java/org/apache/camel/bam/rules/TemporalRule.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.bam.rules;
-
-import java.util.ArrayList;
-import java.util.Date;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
-import org.apache.camel.Route;
-import org.apache.camel.bam.TimeExpression;
-import org.apache.camel.bam.model.ActivityState;
-import org.apache.camel.bam.model.ProcessInstance;
-import org.apache.camel.impl.DefaultExchange;
-import org.apache.camel.impl.DefaultRouteContext;
-import org.apache.camel.model.OutputDefinition;
-import org.apache.camel.model.RouteDefinition;
-import org.apache.camel.spi.RouteContext;
-import org.apache.camel.support.ServiceSupport;
-import org.apache.camel.util.Time;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import static org.apache.camel.util.ServiceHelper.startServices;
-import static org.apache.camel.util.ServiceHelper.stopServices;
-
-/**
- * A temporal rule for use within BAM
- *
- * @version 
- */
-public class TemporalRule extends ServiceSupport {
-    private static final Logger LOG = LoggerFactory.getLogger(TemporalRule.class);
-    private TimeExpression first;
-    private TimeExpression second;
-    private long expectedMillis;
-    private long overdueMillis;
-    private Processor overdueAction;
-
-    @SuppressWarnings("rawtypes")
-    private OutputDefinition<?> overdueProcessors = new OutputDefinition();
-
-    public TemporalRule(TimeExpression first, TimeExpression second) {
-        this.first = first;
-        this.second = second;
-    }
-
-    public TemporalRule expectWithin(Time builder) {
-        return expectWithin(builder.toMillis());
-    }
-
-    public TemporalRule expectWithin(long millis) {
-        expectedMillis = millis;
-        return this;
-    }
-
-    public OutputDefinition<?> errorIfOver(Time builder) {
-        return errorIfOver(builder.toMillis());
-    }
-
-    public OutputDefinition<?> errorIfOver(long millis) {
-        overdueMillis = millis;
-        return overdueProcessors;
-    }
-
-    public TimeExpression getFirst() {
-        return first;
-    }
-
-    public TimeExpression getSecond() {
-        return second;
-    }
-
-    public Processor getOverdueAction() throws Exception {
-        if (overdueAction == null && overdueProcessors != null) {
-            RouteDefinition route = new RouteDefinition();
-            RouteContext routeContext = new DefaultRouteContext(first.getBuilder().getProcessBuilder().getContext(),
-                    route, null, new ArrayList<Route>());
-
-            overdueAction = overdueProcessors.createOutputsProcessor(routeContext);
-        }
-        return overdueAction;
-    }
-
-    public void processExchange(Exchange exchange, ProcessInstance instance) {
-        Date firstTime = first.evaluate(instance);
-        if (firstTime == null) {
-            // ignore as first event has not occurred yet
-            return;
-        }
-
-        // TODO now we might need to set the second activity state
-        // to 'grey' to indicate it now could happen?
-
-        // let's force the lazy creation of the second state
-        ActivityState secondState = second.getOrCreateActivityState(instance);
-        if (expectedMillis > 0L) {
-            Date expected = secondState.getTimeExpected();
-            if (expected == null) {
-                expected = add(firstTime, expectedMillis);
-                secondState.setTimeExpected(expected);
-            }
-        }
-        if (overdueMillis > 0L) {
-            Date overdue = secondState.getTimeOverdue();
-            if (overdue == null) {
-                overdue = add(firstTime, overdueMillis);
-                secondState.setTimeOverdue(overdue);
-            }
-        }
-    }
-
-    public void processExpired(ActivityState activityState) throws Exception {
-        Processor processor = getOverdueAction();
-        if (processor != null) {
-            Date now = new Date();
-/*
-            TODO this doesn't work and returns null for some strange reason
-            ProcessInstance instance = activityState.getProcessInstance();
-            ActivityState secondState = second.getActivityState(instance);
-            if (secondState == null) {
-                log.error("Could not find the second state! Process is: " 
-                + instance + " with first state: " + first.getActivityState(instance) 
-                + " and the state I was called with was: " + activityState);
-            }
-*/
-
-            ActivityState secondState = activityState;
-            Date overdue = secondState.getTimeOverdue();
-            if (now.compareTo(overdue) >= 0) {
-                Exchange exchange = createExchange();
-                exchange.getIn().setBody(activityState);
-                processor.process(exchange);
-            } else {
-                LOG.warn("Process has not actually expired; the time is: " + now + " but the overdue time is: " + overdue);
-            }
-        }
-    }
-
-    protected Exchange createExchange() {
-        return new DefaultExchange(second.getBuilder().getProcessBuilder().getContext());
-    }
-
-    /**
-     * Returns the date in the future adding the given number of millis
-     *
-     * @return the date in the future
-     */
-    protected Date add(Date date, long millis) {
-        return new Date(date.getTime() + millis);
-    }
-
-    protected void doStart() throws Exception {
-        startServices(getOverdueAction());
-    }
-
-    protected void doStop() throws Exception {
-        stopServices(getOverdueAction());
-    }
-}
diff --git a/components/camel-bam/src/main/resources/META-INF/LICENSE.txt b/components/camel-bam/src/main/resources/META-INF/LICENSE.txt
deleted file mode 100644
index 6b0b127..0000000
--- a/components/camel-bam/src/main/resources/META-INF/LICENSE.txt
+++ /dev/null
@@ -1,203 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
diff --git a/components/camel-bam/src/main/resources/META-INF/NOTICE.txt b/components/camel-bam/src/main/resources/META-INF/NOTICE.txt
deleted file mode 100644
index 2e215bf..0000000
--- a/components/camel-bam/src/main/resources/META-INF/NOTICE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-   =========================================================================
-   ==  NOTICE file corresponding to the section 4 d of                    ==
-   ==  the Apache License, Version 2.0,                                   ==
-   ==  in this case for the Apache Camel distribution.                    ==
-   =========================================================================
-
-   This product includes software developed by
-   The Apache Software Foundation (http://www.apache.org/).
-
-   Please read the different LICENSE files present in the licenses directory of
-   this distribution.
diff --git a/components/camel-bam/src/test/java/org/apache/camel/bam/BamRouteTest.java b/components/camel-bam/src/test/java/org/apache/camel/bam/BamRouteTest.java
deleted file mode 100644
index f7d1b63..0000000
--- a/components/camel-bam/src/test/java/org/apache/camel/bam/BamRouteTest.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.bam;
-
-import javax.persistence.EntityManagerFactory;
-
-import org.apache.camel.bam.model.ActivityState;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.Before;
-import org.junit.Test;
-
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.transaction.support.TransactionTemplate;
-
-import static org.apache.camel.util.Time.seconds;
-
-/**
- * @version 
- */
-public class BamRouteTest extends CamelSpringTestSupport {
-    protected MockEndpoint overdueEndpoint;
-    protected int errorTimeout = 2;
-
-    @Test
-    public void testBam() throws Exception {
-        overdueEndpoint.expectedMessageCount(1);
-
-        template.sendBody("seda:a", "<hello id='123'>world!</hello>");
-
-        overdueEndpoint.assertIsSatisfied();
-
-        // it was b that was the problem and thus send to the overdue endpoint
-        ActivityState state = overdueEndpoint.getExchanges().get(0).getIn().getBody(ActivityState.class);
-        assertNotNull(state);
-        assertEquals("123", state.getCorrelationKey());
-        assertEquals("b", state.getActivityDefinition().getName());
-    }
-
-    protected ClassPathXmlApplicationContext createApplicationContext() {
-        return new ClassPathXmlApplicationContext("META-INF/spring/spring.xml");
-    }
-
-    @Before
-    public void setUp() throws Exception {
-        super.setUp();
-
-        overdueEndpoint = getMockEndpoint("mock:overdue");
-        overdueEndpoint.setResultWaitTime(20000);
-    }
-
-    protected RouteBuilder createRouteBuilder() throws Exception {
-        EntityManagerFactory entityManagerFactory = getMandatoryBean(EntityManagerFactory.class, "entityManagerFactory");
-        TransactionTemplate transactionTemplate = getMandatoryBean(TransactionTemplate.class, "transactionTemplate");
-
-        // START SNIPPET: example
-        return new ProcessBuilder(entityManagerFactory, transactionTemplate) {
-            public void configure() throws Exception {
-
-                // let's define some activities, correlating on an XPath on the message bodies
-                ActivityBuilder a = activity("seda:a").name("a")
-                        .correlate(xpath("/hello/@id"));
-
-                ActivityBuilder b = activity("seda:b").name("b")
-                        .correlate(xpath("/hello/@id"));
-
-                // now let's add some rules
-                b.starts().after(a.completes())
-                        .expectWithin(seconds(1))
-                        .errorIfOver(seconds(errorTimeout)).to("mock:overdue");
-            }
-        };
-        // END SNIPPET: example
-    }
-
-}
diff --git a/components/camel-bam/src/test/java/org/apache/camel/bam/EntityManagersTest.java b/components/camel-bam/src/test/java/org/apache/camel/bam/EntityManagersTest.java
deleted file mode 100644
index 67ee23c..0000000
--- a/components/camel-bam/src/test/java/org/apache/camel/bam/EntityManagersTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.bam;
-
-import javax.persistence.EntityManagerFactory;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-import static org.apache.camel.bam.EntityManagers.resolveEntityManager;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-
-public class EntityManagersTest extends Assert {
-
-    @Test
-    public void shouldCreateNewEntityManagerIfThereIsNoTransaction() {
-        // Given
-        EntityManagerFactory entityManagerFactory = mock(EntityManagerFactory.class);
-
-        // When
-        resolveEntityManager(entityManagerFactory);
-
-        // Then
-        verify(entityManagerFactory).createEntityManager();
-    }
-
-}
diff --git a/components/camel-bam/src/test/java/org/apache/camel/bam/MultipleActivitiesConcurrentlyTest.java b/components/camel-bam/src/test/java/org/apache/camel/bam/MultipleActivitiesConcurrentlyTest.java
deleted file mode 100644
index 79d2967..0000000
--- a/components/camel-bam/src/test/java/org/apache/camel/bam/MultipleActivitiesConcurrentlyTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.bam;
-
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * @version 
- */
-public class MultipleActivitiesConcurrentlyTest extends MultipleProcessesTest {
-
-    @Override
-    @Test
-    public void testBam() throws Exception {
-        // TODO fixme
-        //overdueEndpoint.expectedMessageCount(1);
-        overdueEndpoint.expectedMinimumMessageCount(1);
-        //overdueEndpoint.message(0).predicate(el("${in.body.correlationKey == '124'}"));
-
-        final CountDownLatch startLatch = new CountDownLatch(1);
-        final CountDownLatch endLatch = new CountDownLatch(1);
-
-        Thread thread = new Thread("B sender") {
-            public void run() {
-                startLatch.countDown();
-                sendBMessages();
-                endLatch.countDown();
-            }
-        };
-        thread.start();
-
-        // use a timeout to avoid test hang if something happens
-        assertTrue(startLatch.await(30, TimeUnit.SECONDS));
-
-        sendAMessages();
-
-        // use a timeout to avoid test hang if something happens
-        assertTrue(endLatch.await(30, TimeUnit.SECONDS));
-
-        overdueEndpoint.assertIsSatisfied();
-    }
-
-    @Override
-    @Before
-    public void setUp() throws Exception {
-        errorTimeout = 5;
-
-        super.setUp();
-    }
-}
diff --git a/components/camel-bam/src/test/java/org/apache/camel/bam/MultipleProcessesTest.java b/components/camel-bam/src/test/java/org/apache/camel/bam/MultipleProcessesTest.java
deleted file mode 100644
index 5366d62..0000000
--- a/components/camel-bam/src/test/java/org/apache/camel/bam/MultipleProcessesTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.bam;
-
-import org.junit.Test;
-import org.springframework.transaction.TransactionStatus;
-import org.springframework.transaction.support.TransactionCallbackWithoutResult;
-import org.springframework.transaction.support.TransactionTemplate;
-
-/**
- * @version 
- */
-public class MultipleProcessesTest extends BamRouteTest {
-    
-    @Override
-    @Test
-    public void testBam() throws Exception {
-        // TODO fixme
-        //overdueEndpoint.expectedMessageCount(1);
-        overdueEndpoint.expectedMinimumMessageCount(1);
-        //overdueEndpoint.message(0).predicate().el("${in.body.correlationKey == '124'}");
-
-        sendAMessages();
-        sendBMessages();
-
-        overdueEndpoint.assertIsSatisfied();
-    }
-
-    protected void sendAMessages() {
-        TransactionTemplate transaction = getMandatoryBean(TransactionTemplate.class, "transactionTemplate");
-        transaction.execute(new TransactionCallbackWithoutResult() {
-            protected void doInTransactionWithoutResult(TransactionStatus status) {
-                template.sendBody("seda:a", "<hello id='123'>A</hello>");
-                template.sendBody("seda:a", "<hello id='124'>B</hello>");
-                template.sendBody("seda:a", "<hello id='125'>C</hello>");
-            }
-        });
-    }
-
-    protected void sendBMessages() {
-        TransactionTemplate transaction = getMandatoryBean(TransactionTemplate.class, "transactionTemplate");
-        transaction.execute(new TransactionCallbackWithoutResult() {
-            protected void doInTransactionWithoutResult(TransactionStatus status) {
-                template.sendBody("seda:b", "<hello id='123'>A</hello>");
-                template.sendBody("seda:b", "<hello id='125'>C</hello>");
-            }
-        });
-    }
-}
diff --git a/components/camel-bam/src/test/profiles/eclipselink/META-INF/persistence.xml b/components/camel-bam/src/test/profiles/eclipselink/META-INF/persistence.xml
deleted file mode 100644
index 02ebf40..0000000
--- a/components/camel-bam/src/test/profiles/eclipselink/META-INF/persistence.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<persistence xmlns="http://java.sun.com/xml/ns/persistence"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0">
-
-	<persistence-unit name="bam" transaction-type="RESOURCE_LOCAL">
-		<class>org.apache.camel.bam.model.ActivityDefinition</class>
-		<class>org.apache.camel.bam.model.ActivityState</class>
-		<class>org.apache.camel.bam.model.ProcessDefinition</class>
-		<class>org.apache.camel.bam.model.ProcessInstance</class>
-
-		<properties>
-			<property name="javax.persistence.jdbc.driver" value="org.apache.derby.jdbc.EmbeddedDriver" />
-			<property name="javax.persistence.jdbc.url" value="jdbc:derby:target/test/database;create=true" />
-			<property name="eclipselink.logging.level" value="FINE" />
-			<property name="eclipselink.logging.file" value="target/camel-eclipselink.log" />
-			<property name="eclipselink.ddl-generation" value="drop-and-create-tables" />
-			<property name="eclipselink.ddl-generation.output-mode" value="database" />
-			<!-- <property name="eclipselink.logging.thread" value="false" />-->
-			<!-- <property name="eclipselink.logging.session" value="false" />-->
-			<!-- <property name="eclipselink.logging.exceptions" value="false" />-->
-		</properties>
-	</persistence-unit>
-</persistence>
\ No newline at end of file
diff --git a/components/camel-bam/src/test/profiles/eclipselink/META-INF/spring/spring.xml b/components/camel-bam/src/test/profiles/eclipselink/META-INF/spring/spring.xml
deleted file mode 100644
index 76a1e38..0000000
--- a/components/camel-bam/src/test/profiles/eclipselink/META-INF/spring/spring.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-
-	<bean id="transactionTemplate" class="org.springframework.transaction.support.TransactionTemplate">
-		<property name="transactionManager">
-			<bean class="org.springframework.orm.jpa.JpaTransactionManager">
-				<property name="entityManagerFactory" ref="entityManagerFactory" />
-			</bean>
-		</property>
-	</bean>
-
-	<bean id="entityManagerFactory"	class="org.springframework.orm.jpa.LocalEntityManagerFactoryBean">
-		<property name="persistenceUnitName" value="bam" />
-		<property name="jpaVendorAdapter" ref="jpaAdapter"/>
-	</bean>
-	
-	<bean id="jpaAdapter" class="org.springframework.orm.jpa.vendor.EclipseLinkJpaVendorAdapter">
-   		<property name="databasePlatform" value="org.eclipse.persistence.platform.database.DerbyPlatform" />
-        <property name="database" value="DERBY"/>
-   		<property name="showSql" value="true" />
-	</bean>
-</beans>
\ No newline at end of file
diff --git a/components/camel-bam/src/test/profiles/eclipselink/log4j2.properties b/components/camel-bam/src/test/profiles/eclipselink/log4j2.properties
deleted file mode 100644
index 3f694b6..0000000
--- a/components/camel-bam/src/test/profiles/eclipselink/log4j2.properties
+++ /dev/null
@@ -1,34 +0,0 @@
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
-
-appender.out.type = File
-appender.out.name = out
-appender.out.fileName = target/camel-bam-test.log
-appender.out.layout.type = PatternLayout
-appender.out.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n
-appender.stdout.type = Console
-appender.stdout.name = stdout
-appender.stdout.layout.type = PatternLayout
-appender.stdout.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n
-logger.bam.name = org.apache.camel.bam
-logger.bam.level = DEBUG
-logger.hibernate.name = org.hibernate
-logger.hibernate.level = WARN
-logger.springframework.name = org.springframework
-logger.springframework.level = DEBUG
-rootLogger.level = DEBUG
-rootLogger.appenderRef.out.ref = out
diff --git a/components/camel-bam/src/test/profiles/hibernate/META-INF/persistence.xml b/components/camel-bam/src/test/profiles/hibernate/META-INF/persistence.xml
deleted file mode 100644
index 017b463..0000000
--- a/components/camel-bam/src/test/profiles/hibernate/META-INF/persistence.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<persistence xmlns="http://java.sun.com/xml/ns/persistence"
-             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-             version="1.0">
-
-  <persistence-unit name="bam" transaction-type="RESOURCE_LOCAL">
-    <class>org.apache.camel.bam.model.ActivityDefinition</class>
-    <class>org.apache.camel.bam.model.ActivityState</class>
-    <class>org.apache.camel.bam.model.ProcessDefinition</class>
-    <class>org.apache.camel.bam.model.ProcessInstance</class>
-
-    <properties>
-      <property name="hibernate.dialect" value="org.hibernate.dialect.DerbyDialect"/>
-      <property name="hibernate.connection.driver_class" value="org.apache.derby.jdbc.EmbeddedDriver"/>
-      <property name="hibernate.connection.url" value="jdbc:derby:target/test/database;create=true"/>
-      <property name="hibernate.hbm2ddl.auto" value="create"/>
-    </properties>
-
-  </persistence-unit>
-</persistence>
diff --git a/components/camel-bam/src/test/profiles/hibernate/META-INF/spring/spring.xml b/components/camel-bam/src/test/profiles/hibernate/META-INF/spring/spring.xml
deleted file mode 100644
index 00f66b5..0000000
--- a/components/camel-bam/src/test/profiles/hibernate/META-INF/spring/spring.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-
-	<bean id="transactionTemplate"
-		class="org.springframework.transaction.support.TransactionTemplate">
-		<property name="transactionManager">
-			<bean class="org.springframework.orm.jpa.JpaTransactionManager">
-				<property name="entityManagerFactory" ref="entityManagerFactory" />
-			</bean>
-		</property>
-	</bean>
-
-	<bean id="entityManagerFactory"	class="org.springframework.orm.jpa.LocalEntityManagerFactoryBean">
-		<property name="persistenceUnitName" value="bam" />
-		<property name="jpaVendorAdapter" ref="jpaAdapter"/>
-	</bean>
-	
-	<!-- Hibernate addapter -->
-	<bean id="jpaAdapter" class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter">
-		<property name="databasePlatform" value="org.hibernate.dialect.DerbyDialect" />
-	</bean>
-	
-</beans>
diff --git a/components/camel-bam/src/test/profiles/hibernate/log4j2.properties b/components/camel-bam/src/test/profiles/hibernate/log4j2.properties
deleted file mode 100644
index 3f694b6..0000000
--- a/components/camel-bam/src/test/profiles/hibernate/log4j2.properties
+++ /dev/null
@@ -1,34 +0,0 @@
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
-
-appender.out.type = File
-appender.out.name = out
-appender.out.fileName = target/camel-bam-test.log
-appender.out.layout.type = PatternLayout
-appender.out.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n
-appender.stdout.type = Console
-appender.stdout.name = stdout
-appender.stdout.layout.type = PatternLayout
-appender.stdout.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n
-logger.bam.name = org.apache.camel.bam
-logger.bam.level = DEBUG
-logger.hibernate.name = org.hibernate
-logger.hibernate.level = WARN
-logger.springframework.name = org.springframework
-logger.springframework.level = DEBUG
-rootLogger.level = DEBUG
-rootLogger.appenderRef.out.ref = out
diff --git a/components/camel-bam/src/test/profiles/openjpa/META-INF/persistence.xml b/components/camel-bam/src/test/profiles/openjpa/META-INF/persistence.xml
deleted file mode 100644
index 8372f47..0000000
--- a/components/camel-bam/src/test/profiles/openjpa/META-INF/persistence.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<persistence xmlns="http://java.sun.com/xml/ns/persistence"
-             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-             version="1.0">
-
-  <persistence-unit name="bam" transaction-type="RESOURCE_LOCAL">
-    <class>org.apache.camel.bam.model.ActivityDefinition</class>
-    <class>org.apache.camel.bam.model.ActivityState</class>
-    <class>org.apache.camel.bam.model.ProcessDefinition</class>
-    <class>org.apache.camel.bam.model.ProcessInstance</class>
-
-    <properties>
-      <property name="openjpa.ConnectionURL" value="jdbc:derby:target/bamTest;create=true"/>
-      <property name="openjpa.ConnectionDriverName" value="org.apache.derby.jdbc.EmbeddedDriver"/>
-      <property name="openjpa.Log" value="DefaultLevel=INFO, Tool=INFO, Runtime=TRACE, SQL=TRACE"/>
-      <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema" />
-    </properties>
-  </persistence-unit>
-</persistence>
diff --git a/components/camel-bam/src/test/profiles/openjpa/META-INF/spring/spring.xml b/components/camel-bam/src/test/profiles/openjpa/META-INF/spring/spring.xml
deleted file mode 100644
index 7330a8b..0000000
--- a/components/camel-bam/src/test/profiles/openjpa/META-INF/spring/spring.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-
-	<bean id="transactionTemplate" class="org.springframework.transaction.support.TransactionTemplate">
-		<property name="transactionManager">
-			<bean class="org.springframework.orm.jpa.JpaTransactionManager">
-				<property name="entityManagerFactory" ref="entityManagerFactory" />
-			</bean>
-		</property>
-	</bean>
-
-	<bean id="entityManagerFactory"	class="org.springframework.orm.jpa.LocalEntityManagerFactoryBean">
-		<property name="persistenceUnitName" value="bam" />
-		<property name="jpaVendorAdapter" ref="jpaAdapter"/>
-	</bean>
-	
-	<bean id="jpaAdapter" class="org.springframework.orm.jpa.vendor.OpenJpaVendorAdapter">
-		<property name="databasePlatform" value="org.apache.openjpa.jdbc.sql.DerbyDictionary"/>
-		<property name="database" value="DERBY"/>
-	</bean>
-</beans>
diff --git a/components/camel-bam/src/test/profiles/openjpa/log4j2.properties b/components/camel-bam/src/test/profiles/openjpa/log4j2.properties
deleted file mode 100644
index 3f694b6..0000000
--- a/components/camel-bam/src/test/profiles/openjpa/log4j2.properties
+++ /dev/null
@@ -1,34 +0,0 @@
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
-
-appender.out.type = File
-appender.out.name = out
-appender.out.fileName = target/camel-bam-test.log
-appender.out.layout.type = PatternLayout
-appender.out.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n
-appender.stdout.type = Console
-appender.stdout.name = stdout
-appender.stdout.layout.type = PatternLayout
-appender.stdout.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n
-logger.bam.name = org.apache.camel.bam
-logger.bam.level = DEBUG
-logger.hibernate.name = org.hibernate
-logger.hibernate.level = WARN
-logger.springframework.name = org.springframework
-logger.springframework.level = DEBUG
-rootLogger.level = DEBUG
-rootLogger.appenderRef.out.ref = out
diff --git a/components/camel-bam/src/test/resources/log4j2.properties b/components/camel-bam/src/test/resources/log4j2.properties
deleted file mode 100644
index 5c3be1a..0000000
--- a/components/camel-bam/src/test/resources/log4j2.properties
+++ /dev/null
@@ -1,34 +0,0 @@
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
-
-appender.out.type = File
-appender.out.name = out
-appender.out.fileName = target/camel-bam-test.log
-appender.out.layout.type = PatternLayout
-appender.out.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n
-appender.stdout.type = Console
-appender.stdout.name = stdout
-appender.stdout.layout.type = PatternLayout
-appender.stdout.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n
-logger.bam.name = org.apache.camel.bam
-logger.bam.level = DEBUG
-logger.hibernate.name = org.hibernate
-logger.hibernate.level = WARN
-logger.springframework.name = org.springframework
-logger.springframework.level = WARN
-rootLogger.level = INFO
-rootLogger.appenderRef.out.ref = out
diff --git a/components/camel-bam/src/test/resources/org/apache/camel/bam/spring.xml b/components/camel-bam/src/test/resources/org/apache/camel/bam/spring.xml
deleted file mode 100644
index 1b49e91..0000000
--- a/components/camel-bam/src/test/resources/org/apache/camel/bam/spring.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-
-  <bean id="transactionTemplate" class="org.springframework.transaction.support.TransactionTemplate">
-    <property name="transactionManager">
-      <bean class="org.springframework.orm.jpa.JpaTransactionManager">
-        <property name="entityManagerFactory" ref="entityManagerFactory"/>
-      </bean>
-    </property>
-  </bean>
-
-  <bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalEntityManagerFactoryBean">
-    <property name="persistenceUnitName" value="bam"/>
-  </bean>
-
-</beans>
diff --git a/components/camel-cache/pom.xml b/components/camel-cache/pom.xml
deleted file mode 100644
index 2a0dcd9..0000000
--- a/components/camel-cache/pom.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.camel</groupId>
-        <artifactId>components</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>camel-cache</artifactId>
-    <packaging>jar</packaging>
-    <name>Camel :: Cache (deprecated)</name>
-    <description>Camel Cache support based on ehCache</description>
-
-    <properties>
-        <camel.osgi.import>
-            !org.apache.camel.component.cache.*,
-            !org.apache.camel.processor.cache.*,
-            ${camel.osgi.import.defaults},
-            *
-        </camel.osgi.import>
-        <camel.osgi.export.pkg>
-            org.apache.camel.component.cache.*;${camel.osgi.version},
-            org.apache.camel.processor.cache.*;${camel.osgi.version}
-        </camel.osgi.export.pkg>
-        <camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=cache</camel.osgi.export.service>
-    </properties>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>net.sf.ehcache</groupId>
-            <artifactId>ehcache</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>xalan</groupId>
-            <artifactId>xalan</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>xerces</groupId>
-            <artifactId>xercesImpl</artifactId>
-        </dependency>
-
-        <!-- testing -->
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <!-- logging -->
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-api</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/components/camel-cache/src/main/docs/cache-component.adoc b/components/camel-cache/src/main/docs/cache-component.adoc
deleted file mode 100644
index e5d40c1..0000000
--- a/components/camel-cache/src/main/docs/cache-component.adoc
+++ /dev/null
@@ -1,480 +0,0 @@
-[[cache-component]]
-== EHCache Component (deprecated)
-
-*Available as of Camel version 2.1*
-
-The *cache* component enables you to perform caching operations using
-EHCache as the Cache Implementation. The cache itself is created on
-demand or if a cache of that name already exists then it is simply
-utilized with its original settings.
-
-This component supports producer and event based consumer endpoints.
-
-The Cache consumer is an event based consumer and can be used to listen
-and respond to specific cache activities. If you need to perform
-selections from a pre-existing cache, use the processors defined for the
-cache component.
-
-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-cache</artifactId>
-    <version>x.x.x</version>
-    <!-- use the same version as your Camel core version -->
-</dependency>
-------------------------------------------------------------
-
-### URI format
-
-[source,java]
----------------------------
-cache://cacheName[?options]
----------------------------
-
-You can append query options to the URI in the following format,
-`?option=value&option=#beanRef&...`
-
-### Options
-
-
-
-
-
-// component options: START
-The EHCache component supports 4 options, which are listed below.
-
-
-
-[width="100%",cols="2,5,^1,2",options="header"]
-|===
-| Name | Description | Default | Type
-| *cacheManagerFactory* (advanced) | To use the given CacheManagerFactory for creating the CacheManager. By default the DefaultCacheManagerFactory is used. |  | CacheManagerFactory
-| *configuration* (common) | Sets the Cache configuration |  | CacheConfiguration
-| *configurationFile* (common) | Sets the location of the ehcache.xml file to load from classpath or file system. By default the file is loaded from classpath:ehcache.xml | classpath:ehcache.xml | String
-| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
-|===
-// component options: END
-
-
-
-
-
-
-// endpoint options: START
-The EHCache endpoint is configured using URI syntax:
-
-----
-cache:cacheName
-----
-
-with the following path and query parameters:
-
-==== Path Parameters (1 parameters):
-
-
-[width="100%",cols="2,5,^1,2",options="header"]
-|===
-| Name | Description | Default | Type
-| *cacheName* | *Required* Name of the cache |  | String
-|===
-
-
-==== Query Parameters (19 parameters):
-
-
-[width="100%",cols="2,5,^1,2",options="header"]
-|===
-| Name | Description | Default | Type
-| *diskExpiryThreadInterval Seconds* (common) | The number of seconds between runs of the disk expiry thread. |  | long
-| *diskPersistent* (common) | Whether the disk store persists between restarts of the application. | false | boolean
-| *diskStorePath* (common) | *Deprecated* This parameter is ignored. CacheManager sets it using setter injection. |  | String
-| *eternal* (common) | Sets whether elements are eternal. If eternal, timeouts are ignored and the element never expires. | false | boolean
-| *key* (common) | The default key to use. If a key is provided in the message header, then the key from the header takes precedence. |  | String
-| *maxElementsInMemory* (common) | The number of elements that may be stored in the defined cache in memory. | 1000 | int
-| *memoryStoreEvictionPolicy* (common) | Which eviction strategy to use when maximum number of elements in memory is reached. The strategy defines which elements to be removed. LRU - Lest Recently Used LFU - Lest Frequently Used FIFO - First In First Out | LFU | MemoryStoreEviction Policy
-| *objectCache* (common) | Whether to turn on allowing to store non serializable objects in the cache. If this option is enabled then overflow to disk cannot be enabled as well. | false | boolean
-| *operation* (common) | The default cache operation to use. If an operation in the message header, then the operation from the header takes precedence. |  | String
-| *overflowToDisk* (common) | Specifies whether cache may overflow to disk | true | boolean
-| *timeToIdleSeconds* (common) | The maximum amount of time between accesses before an element expires | 300 | long
-| *timeToLiveSeconds* (common) | The maximum time between creation time and when an element expires. Is used only if the element is not eternal | 300 | long
-| *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
-| *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
-| *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
-| *cacheLoaderRegistry* (advanced) | To configure cache loader using the CacheLoaderRegistry |  | CacheLoaderRegistry
-| *cacheManagerFactory* (advanced) | To use a custom CacheManagerFactory for creating the CacheManager to be used by this endpoint. By default the CacheManagerFactory configured on the component is used. |  | CacheManagerFactory
-| *eventListenerRegistry* (advanced) | To configure event listeners using the CacheEventListenerRegistry |  | CacheEventListener Registry
-| *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
-|===
-// endpoint options: END
-// spring-boot-auto-configure options: START
-=== Spring Boot Auto-Configuration
-
-
-The component supports 17 options, which are listed below.
-
-
-
-[width="100%",cols="2,5,^1,2",options="header"]
-|===
-| Name | Description | Default | Type
-| *camel.component.cache.cache-manager-factory* | To use the given CacheManagerFactory for creating the CacheManager. By default the DefaultCacheManagerFactory is used. The option is a org.apache.camel.component.cache.CacheManagerFactory type. |  | String
-| *camel.component.cache.configuration-file* | Sets the location of the ehcache.xml file to load from classpath or file system. By default the file is loaded from classpath:ehcache.xml | classpath:ehcache.xml | String
-| *camel.component.cache.configuration.cache-loader-registry* | To configure cache loader using the CacheLoaderRegistry |  | CacheLoaderRegistry
-| *camel.component.cache.configuration.cache-name* | Name of the cache |  | String
-| *camel.component.cache.configuration.disk-expiry-thread-interval-seconds* | The number of seconds between runs of the disk expiry thread. |  | Long
-| *camel.component.cache.configuration.disk-persistent* | Whether the disk store persists between restarts of the application. | false | Boolean
-| *camel.component.cache.configuration.disk-store-path* | This parameter is ignored. CacheManager sets it using setter injection. |  | String
-| *camel.component.cache.configuration.eternal* | Sets whether elements are eternal. If eternal, timeouts are ignored and the element never expires. | false | Boolean
-| *camel.component.cache.configuration.event-listener-registry* | To configure event listeners using the CacheEventListenerRegistry |  | CacheEventListener Registry
-| *camel.component.cache.configuration.max-elements-in-memory* | The number of elements that may be stored in the defined cache in memory. | 1000 | Integer
-| *camel.component.cache.configuration.memory-store-eviction-policy* | Which eviction strategy to use when maximum number of elements in memory is reached. The strategy defines which elements to be removed. LRU - Lest Recently Used LFU - Lest Frequently Used FIFO - First In First Out |  | MemoryStoreEviction Policy
-| *camel.component.cache.configuration.object-cache* | Whether to turn on allowing to store non serializable objects in the cache. If this option is enabled then overflow to disk cannot be enabled as well. | false | Boolean
-| *camel.component.cache.configuration.overflow-to-disk* | Specifies whether cache may overflow to disk | true | Boolean
-| *camel.component.cache.configuration.time-to-idle-seconds* | The maximum amount of time between accesses before an element expires | 300 | Long
-| *camel.component.cache.configuration.time-to-live-seconds* | The maximum time between creation time and when an element expires. Is used only if the element is not eternal | 300 | Long
-| *camel.component.cache.enabled* | Enable cache component | true | Boolean
-| *camel.component.cache.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
-|===
-// spring-boot-auto-configure options: END
-
-
-
-### Sending/Receiving Messages to/from the cache
-
-#### Message Headers up to Camel 2.7
-
-[width="100%",cols="20%,80%",options="header",]
-|=======================================================================
-|Header |Description
-
-|`CACHE_OPERATION` |The operation to be performed on the cache. Valid options are
-
-* GET
-* CHECK
-* ADD
-* UPDATE
-* DELETE
-* DELETEALL +
- `GET` and `CHECK` requires *Camel 2.3* onwards.
-
-|`CACHE_KEY` |The cache key used to store the Message in the cache. The cache key is
-optional if the CACHE_OPERATION is DELETEALL
-|=======================================================================
-#### Message Headers Camel 2.8+
-
-Header changes in Camel 2.8
-
-The header names and supported values have changed to be prefixed with
-'CamelCache' and use mixed case. This makes them easier to identify and
-keep separate from other headers. The CacheConstants variable names
-remain unchanged, just their values have been changed. Also, these
-headers are now removed from the exchange after the cache operation is
-performed.
-
-
-[width="100%",cols="20%,80%",options="header",]
-|=======================================================================
-|Header |Description
-
-|`CamelCacheOperation` |The operation to be performed on the cache. The valid options are
-
-* CamelCacheGet
-* CamelCacheCheck
-* CamelCacheAdd
-* CamelCacheUpdate
-* CamelCacheDelete
-* CamelCacheDeleteAll
-
-|`CamelCacheKey` |The cache key used to store the Message in the cache. The cache key is
-optional if the CamelCacheOperation is CamelCacheDeleteAll
-|=======================================================================
-
-The `CamelCacheAdd` and `CamelCacheUpdate` operations support additional
-headers:
-
-[width="100%",cols="10%,10%,80%",options="header",]
-|=======================================================================
-|Header |Type |Description
-
-|`CamelCacheTimeToLive` |`Integer` |*Camel 2.11:* Time to live in seconds.
-
-|`CamelCacheTimeToIdle` |`Integer` |*Camel 2.11:* Time to idle in seconds.
-
-|`CamelCacheEternal` |`Boolean` |*Camel 2.11:* Whether the content is eternal.
-|=======================================================================
-
-#### Cache Producer
-
-Sending data to the cache involves the ability to direct payloads in
-exchanges to be stored in a pre-existing or created-on-demand cache. The
-mechanics of doing this involve
-
-* setting the Message Exchange Headers shown above.
-* ensuring that the Message Exchange Body contains the message directed
-to the cache
-
-#### Cache Consumer
-
-Receiving data from the cache involves the ability of the CacheConsumer
-to listen on a pre-existing or created-on-demand Cache using an event
-Listener and receive automatic notifications when any cache activity
-take place (i.e
-CamelCacheGet/CamelCacheUpdate/CamelCacheDelete/CamelCacheDeleteAll).
-Upon such an activity taking place
-
-* an exchange containing Message Exchange Headers and a Message Exchange
-Body containing the just added/updated payload is placed and sent.
-* in case of a CamelCacheDeleteAll operation, the Message Exchange
-Header CamelCacheKey and the Message Exchange Body are not populated.
-
-#### Cache Processors
-
-There are a set of nice processors with the ability to perform cache
-lookups and selectively replace payload content at the
-
-* body
-* token
-* xpath level
-
-### Cache Usage Samples
-
-#### Example 1: Configuring the cache
-
-[source,java]
--------------------------------------------------
-from("cache://MyApplicationCache" +
-          "?maxElementsInMemory=1000" +
-          "&memoryStoreEvictionPolicy=" +
-              "MemoryStoreEvictionPolicy.LFU" +
-          "&overflowToDisk=true" +
-          "&eternal=true" +
-          "&timeToLiveSeconds=300" +
-          "&timeToIdleSeconds=true" +
-          "&diskPersistent=true" +
-          "&diskExpiryThreadIntervalSeconds=300")
--------------------------------------------------
-
-#### Example 2: Adding keys to the cache
-
-[source,java]
----------------------------------------------------------------------------------------------
-RouteBuilder builder = new RouteBuilder() {
-    public void configure() {
-     from("direct:start")
-     .setHeader(CacheConstants.CACHE_OPERATION, constant(CacheConstants.CACHE_OPERATION_ADD))
-     .setHeader(CacheConstants.CACHE_KEY, constant("Ralph_Waldo_Emerson"))
-     .to("cache://TestCache1")
-   }
-};
----------------------------------------------------------------------------------------------
-
-#### Example 2: Updating existing keys in a cache
-
-[source,java]
-------------------------------------------------------------------------------------------------
-RouteBuilder builder = new RouteBuilder() {
-    public void configure() {
-     from("direct:start")
-     .setHeader(CacheConstants.CACHE_OPERATION, constant(CacheConstants.CACHE_OPERATION_UPDATE))
-     .setHeader(CacheConstants.CACHE_KEY, constant("Ralph_Waldo_Emerson"))
-     .to("cache://TestCache1")
-   }
-};
-------------------------------------------------------------------------------------------------
-
-#### Example 3: Deleting existing keys in a cache
-
-[source,java]
---------------------------------------------------------------------------------------
-RouteBuilder builder = new RouteBuilder() {
-    public void configure() {
-     from("direct:start")
-     .setHeader(CacheConstants.CACHE_OPERATION, constant(CacheConstants.CACHE_DELETE))
-     .setHeader(CacheConstants.CACHE_KEY", constant("Ralph_Waldo_Emerson"))
-     .to("cache://TestCache1")
-   }
-};
---------------------------------------------------------------------------------------
-
-#### Example 4: Deleting all existing keys in a cache
-
-[source,java]
------------------------------------------------------------------------------------------
-RouteBuilder builder = new RouteBuilder() {
-    public void configure() {
-     from("direct:start")
-     .setHeader(CacheConstants.CACHE_OPERATION, constant(CacheConstants.CACHE_DELETEALL))
-     .to("cache://TestCache1");
-    }
-};
------------------------------------------------------------------------------------------
-
-#### Example 5: Notifying any changes registering in a Cache to Processors and other Producers
-
-[source,java]
---------------------------------------------------------------------------------------------------
-RouteBuilder builder = new RouteBuilder() {
-    public void configure() {
-     from("cache://TestCache1")
-     .process(new Processor() {
-        public void process(Exchange exchange)
-               throws Exception {
-           String operation = (String) exchange.getIn().getHeader(CacheConstants.CACHE_OPERATION);
-           String key = (String) exchange.getIn().getHeader(CacheConstants.CACHE_KEY);
-           Object body = exchange.getIn().getBody();
-           // Do something
-        }
-     })
-   }
-};
---------------------------------------------------------------------------------------------------
-
-#### Example 6: Using Processors to selectively replace payload with cache values
-
-[source,java]
----------------------------------------------------------------------------------------
-RouteBuilder builder = new RouteBuilder() {
-   public void configure() {
-     //Message Body Replacer
-     from("cache://TestCache1")
-     .filter(header(CacheConstants.CACHE_KEY).isEqualTo("greeting"))
-     .process(new CacheBasedMessageBodyReplacer("cache://TestCache1","farewell"))
-     .to("direct:next");
-
-    //Message Token replacer
-    from("cache://TestCache1")
-    .filter(header(CacheConstants.CACHE_KEY).isEqualTo("quote"))
-    .process(new CacheBasedTokenReplacer("cache://TestCache1","novel","#novel#"))
-    .process(new CacheBasedTokenReplacer("cache://TestCache1","author","#author#"))
-    .process(new CacheBasedTokenReplacer("cache://TestCache1","number","#number#"))
-    .to("direct:next");
-
-    //Message XPath replacer
-    from("cache://TestCache1").
-    .filter(header(CacheConstants.CACHE_KEY).isEqualTo("XML_FRAGMENT"))
-    .process(new CacheBasedXPathReplacer("cache://TestCache1","book1","/books/book1"))
-    .process (new CacheBasedXPathReplacer("cache://TestCache1","book2","/books/book2"))
-    .to("direct:next");
-   }
-};
----------------------------------------------------------------------------------------
-
-#### Example 7: Getting an entry from the Cache
-
-[source,java]
-------------------------------------------------------------------------------------------------
-from("direct:start")
-    // Prepare headers
-    .setHeader(CacheConstants.CACHE_OPERATION, constant(CacheConstants.CACHE_OPERATION_GET))
-    .setHeader(CacheConstants.CACHE_KEY, constant("Ralph_Waldo_Emerson")).
-    .to("cache://TestCache1").
-    // Check if entry was not found
-    .choice().when(header(CacheConstants.CACHE_ELEMENT_WAS_FOUND).isNull()).
-        // If not found, get the payload and put it to cache
-        .to("cxf:bean:someHeavyweightOperation").
-        .setHeader(CacheConstants.CACHE_OPERATION, constant(CacheConstants.CACHE_OPERATION_ADD))
-        .setHeader(CacheConstants.CACHE_KEY, constant("Ralph_Waldo_Emerson"))
-        .to("cache://TestCache1")
-    .end()
-    .to("direct:nextPhase");
-------------------------------------------------------------------------------------------------
-
-#### Example 8: Checking for an entry in the Cache
-
-Note: The CHECK command tests existence of an entry in the cache but
-doesn't place a message in the body.
-
-[source,java]
-------------------------------------------------------------------------------------------------
-from("direct:start")
-    // Prepare headers
-    .setHeader(CacheConstants.CACHE_OPERATION, constant(CacheConstants.CACHE_OPERATION_CHECK))
-    .setHeader(CacheConstants.CACHE_KEY, constant("Ralph_Waldo_Emerson")).
-    .to("cache://TestCache1").
-    // Check if entry was not found
-    .choice().when(header(CacheConstants.CACHE_ELEMENT_WAS_FOUND).isNull()).
-        // If not found, get the payload and put it to cache
-        .to("cxf:bean:someHeavyweightOperation").
-        .setHeader(CacheConstants.CACHE_OPERATION, constant(CacheConstants.CACHE_OPERATION_ADD))
-        .setHeader(CacheConstants.CACHE_KEY, constant("Ralph_Waldo_Emerson"))
-        .to("cache://TestCache1")
-    .end();
-------------------------------------------------------------------------------------------------
-
-### Management of EHCache
-
-http://ehcache.org/[EHCache] has its own statistics and management from
-JMX.
-
-Here's a snippet on how to expose them via JMX in a Spring application
-context:
-
-[source,xml]
------------------------------------------------------------------------------------------------------------------------------
-<bean id="ehCacheManagementService" class="net.sf.ehcache.management.ManagementService" init-method="init" lazy-init="false">
-  <constructor-arg>
-    <bean class="net.sf.ehcache.CacheManager" factory-method="getInstance"/>
-  </constructor-arg>
-  <constructor-arg>
-    <bean class="org.springframework.jmx.support.JmxUtils" factory-method="locateMBeanServer"/>
-  </constructor-arg>
-  <constructor-arg value="true"/>
-  <constructor-arg value="true"/>
-  <constructor-arg value="true"/>
-  <constructor-arg value="true"/>
-</bean>
------------------------------------------------------------------------------------------------------------------------------
-
-Of course you can do the same thing in straight Java:
-
-[source,java]
---------------------------------------------------------------------------------------------------
-ManagementService.registerMBeans(CacheManager.getInstance(), mbeanServer, true, true, true, true);
---------------------------------------------------------------------------------------------------
-
-You can get cache hits, misses, in-memory hits, disk hits, size stats
-this way. You can also change CacheConfiguration parameters on the fly.
-
-### Cache replication Camel 2.8
-
-The Camel Cache component is able to distribute a cache across server
-nodes using several different replication mechanisms including: RMI,
-JGroups, JMS and Cache Server.
-
-There are two different ways to make it work:
-
-*1.* You can configure `ehcache.xml` manually
-
-OR
-
-*2.* You can configure these three options:
-
-* cacheManagerFactory
-* eventListenerRegistry
-* cacheLoaderRegistry
-
-Configuring Camel Cache replication using the first option is a bit of
-hard work as you have to configure all caches separately. So in a
-situation when the all names of caches are not known, using
-`ehcache.xml` is not a good idea.
-
-The second option is much better when you want to use many different
-caches as you do not need to define options per cache. This is because
-replication options are set per `CacheManager` and per `CacheEndpoint`.
-Also it is the only way when cache names are not know at the development
-phase.
-
-*Note*: It might be useful to read the http://ehcache.org/documentation[EHCache
-manual] to get a better understanding of the Camel Cache replication
-mechanism.
-
-#### Example: JMS cache replication
-
-JMS replication is the most powerful and secured replication method.
-Used together with Camel Cache replication makes it also rather
-simple. An example is available on link:cachereplicationjmsexample.html[a
-separate page].
diff --git a/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheComponent.java b/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheComponent.java
deleted file mode 100644
index 4eeab3a..0000000
--- a/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheComponent.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.cache;
-
-import java.io.InputStream;
-import java.util.Map;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.Endpoint;
-import org.apache.camel.impl.UriEndpointComponent;
-import org.apache.camel.spi.Metadata;
-import org.apache.camel.util.ObjectHelper;
-import org.apache.camel.util.ResourceHelper;
-import org.apache.camel.util.ServiceHelper;
-
-public class CacheComponent extends UriEndpointComponent {
-    private CacheConfiguration configuration;
-    @Metadata(label = "advanced")
-    private CacheManagerFactory cacheManagerFactory;
-    @Metadata(defaultValue = "classpath:ehcache.xml")
-    private String configurationFile;
-
-    public CacheComponent() {
-        super(CacheEndpoint.class);
-        configuration = new CacheConfiguration();
-    }
-
-    public CacheComponent(CamelContext context) {
-        super(context, CacheEndpoint.class);
-        configuration = new CacheConfiguration();
-    }
-
-    @Override
-    @SuppressWarnings({"unchecked", "rawtypes"})
-    protected Endpoint createEndpoint(String uri, String remaining, Map parameters) throws Exception {
-        // must use copy as each endpoint can have different options
-        ObjectHelper.notNull(configuration, "configuration");
-
-        CacheConfiguration config = configuration.copy();
-        setProperties(config, parameters);
-        config.setCacheName(remaining);
-
-        CacheEndpoint cacheEndpoint = new CacheEndpoint(uri, this, config, cacheManagerFactory);
-        setProperties(cacheEndpoint, parameters);
-        return cacheEndpoint;
-    }
-
-    public CacheManagerFactory getCacheManagerFactory() {
-        return cacheManagerFactory;
-    }
-
-    /**
-     * To use the given CacheManagerFactory for creating the CacheManager.
-     * <p/>
-     * By default the DefaultCacheManagerFactory is used.
-     */
-    public void setCacheManagerFactory(CacheManagerFactory cacheManagerFactory) {
-        this.cacheManagerFactory = cacheManagerFactory;
-    }
-
-    public CacheConfiguration getConfiguration() {
-        return configuration;
-    }
-
-    /**
-     * Sets the Cache configuration
-     *
-     * @param configuration the configuration to use by default for endpoints
-     */
-    public void setConfiguration(CacheConfiguration configuration) {
-        this.configuration = configuration.copy();
-    }
-
-    public String getConfigurationFile() {
-        return configurationFile;
-    }
-
-    /**
-     * Sets the location of the <tt>ehcache.xml</tt> file to load from classpath or file system.
-     * <p/>
-     * By default the file is loaded from <tt>classpath:ehcache.xml</tt>
-     */
-    public void setConfigurationFile(String configurationFile) {
-        this.configurationFile = configurationFile;
-    }
-
-    @Override
-    protected void doStart() throws Exception {
-        super.doStart();
-        if (cacheManagerFactory == null) {
-            if (configurationFile != null) {
-                InputStream is = ResourceHelper.resolveMandatoryResourceAsInputStream(getCamelContext(), configurationFile);
-                cacheManagerFactory = new DefaultCacheManagerFactory(is, configurationFile);
-            } else {
-                cacheManagerFactory = new DefaultCacheManagerFactory();
-            }
-        }
-        ServiceHelper.startService(cacheManagerFactory);
-    }
-
-    @Override
-    protected void doStop() throws Exception {
-        ServiceHelper.stopService(cacheManagerFactory);
-        super.doStop();
-    }
-}
diff --git a/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheConfiguration.java b/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheConfiguration.java
deleted file mode 100644
index 6545c98..0000000
--- a/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheConfiguration.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.cache;
-
-import net.sf.ehcache.store.MemoryStoreEvictionPolicy;
-import org.apache.camel.RuntimeCamelException;
-import org.apache.camel.spi.Metadata;
-import org.apache.camel.spi.UriParam;
-import org.apache.camel.spi.UriParams;
-import org.apache.camel.spi.UriPath;
-
-@UriParams
-public class CacheConfiguration implements Cloneable {
-    @UriPath @Metadata(required = "true")
-    private String cacheName;
-    @UriParam(defaultValue = "1000")
-    private int maxElementsInMemory = 1000;
-    @UriParam(defaultValue = "LFU", enums = "LRU,LFU,FIFO")
-    private MemoryStoreEvictionPolicy memoryStoreEvictionPolicy = MemoryStoreEvictionPolicy.LFU;
-    @UriParam(defaultValue = "true")
-    private boolean overflowToDisk = true;
-    @UriParam
-    @Deprecated
-    private String diskStorePath;
-    @UriParam
-    private boolean eternal;
-    @UriParam(defaultValue = "300")
-    private long timeToLiveSeconds = 300;
-    @UriParam(defaultValue = "300")
-    private long timeToIdleSeconds = 300;
-    @UriParam
-    private boolean diskPersistent;
-    @UriParam
-    private long diskExpiryThreadIntervalSeconds;
-    @UriParam
-    private boolean objectCache;
-    @UriParam(label = "advanced")
-    private CacheEventListenerRegistry eventListenerRegistry = new CacheEventListenerRegistry();
-    @UriParam(label = "advanced")
-    private CacheLoaderRegistry cacheLoaderRegistry = new CacheLoaderRegistry();
-
-    public CacheConfiguration() {
-    }
-
-    public CacheConfiguration copy() {
-        try {
-            CacheConfiguration copy = (CacheConfiguration) clone();
-            // override any properties where a reference copy isn't what we want
-            return copy;
-        } catch (CloneNotSupportedException e) {
-            throw new RuntimeCamelException(e);
-        }
-    }
-    
-    public String getCacheName() {
-        return cacheName;
-    }
-
-    /**
-     * Name of the cache
-     */
-    public void setCacheName(String cacheName) {
-        this.cacheName = cacheName;
-    }
-
-    public int getMaxElementsInMemory() {
-        return maxElementsInMemory;
-    }
-
-    /**
-     * The number of elements that may be stored in the defined cache in memory.
-     */
-    public void setMaxElementsInMemory(int maxElementsInMemory) {
-        this.maxElementsInMemory = maxElementsInMemory;
-    }
-
-    public MemoryStoreEvictionPolicy getMemoryStoreEvictionPolicy() {
-        return memoryStoreEvictionPolicy;
-    }
-
-    /**
-     * Which eviction strategy to use when maximum number of elements in memory is reached. The strategy defines
-     * which elements to be removed.
-     * <ul>
-     *     <li>LRU - Lest Recently Used</li>
-     *     <li>LFU - Lest Frequently Used</li>
-     *     <li>FIFO - First In First Out</li>
-     * </ul>
-     */
-    public void setMemoryStoreEvictionPolicy(MemoryStoreEvictionPolicy memoryStoreEvictionPolicy) {
-        this.memoryStoreEvictionPolicy = memoryStoreEvictionPolicy;
-    }
-
-    public boolean isOverflowToDisk() {
-        return overflowToDisk;
-    }
-
-    /**
-     * Specifies whether cache may overflow to disk
-     */
-    public void setOverflowToDisk(boolean overflowToDisk) {
-        this.overflowToDisk = overflowToDisk;
-    }
-
-    @Deprecated
-    public String getDiskStorePath() {
-        return diskStorePath;
-    }
-
-    /**
-     * This parameter is ignored. CacheManager sets it using setter injection.
-     */
-    @Deprecated
-    public void setDiskStorePath(String diskStorePath) {
-        this.diskStorePath = diskStorePath;
-    }
-
-    public boolean isEternal() {
-        return eternal;
-    }
-
-    /**
-     * Sets whether elements are eternal. If eternal, timeouts are ignored and the element never expires.
-     */
-    public void setEternal(boolean eternal) {
-        this.eternal = eternal;
-    }
-
-    public long getTimeToLiveSeconds() {
-        return timeToLiveSeconds;
-    }
-
-    /**
-     * The maximum time between creation time and when an element expires. Is used only if the element is not eternal
-     */
-    public void setTimeToLiveSeconds(long timeToLiveSeconds) {
-        this.timeToLiveSeconds = timeToLiveSeconds;
-    }
-
-    public long getTimeToIdleSeconds() {
-        return timeToIdleSeconds;
-    }
-
-    /**
-     * The maximum amount of time between accesses before an element expires
-     */
-    public void setTimeToIdleSeconds(long timeToIdleSeconds) {
-        this.timeToIdleSeconds = timeToIdleSeconds;
-    }
-
-    public boolean isDiskPersistent() {
-        return diskPersistent;
-    }
-
-    /**
-     * Whether the disk store persists between restarts of the application.
-     */
-    public void setDiskPersistent(boolean diskPersistent) {
-        this.diskPersistent = diskPersistent;
-    }
-
-    public long getDiskExpiryThreadIntervalSeconds() {
-        return diskExpiryThreadIntervalSeconds;
-    }
-
-    /**
-     * The number of seconds between runs of the disk expiry thread.
-     */
-    public void setDiskExpiryThreadIntervalSeconds(long diskExpiryThreadIntervalSeconds) {
-        this.diskExpiryThreadIntervalSeconds = diskExpiryThreadIntervalSeconds;
-    }
-
-    /**
-     * To configure event listeners using the CacheEventListenerRegistry
-    */
-    public void setEventListenerRegistry(CacheEventListenerRegistry eventListenerRegistry) {
-        this.eventListenerRegistry = eventListenerRegistry;
-    }
-
-    public CacheEventListenerRegistry getEventListenerRegistry() {
-        return eventListenerRegistry;
-    }
-
-    /**
-     * To configure cache loader using the CacheLoaderRegistry
-     */
-    public void setCacheLoaderRegistry(CacheLoaderRegistry cacheLoaderRegistry) {
-        this.cacheLoaderRegistry = cacheLoaderRegistry;
-    }
-
-    public CacheLoaderRegistry getCacheLoaderRegistry() {
-        return cacheLoaderRegistry;
-    }
-
-    public boolean isObjectCache() {
-        return objectCache;
-    }
-
-    /**
-     * Whether to turn on allowing to store non serializable objects in the cache.
-     * If this option is enabled then overflow to disk cannot be enabled as well.
-     */
-    public void setObjectCache(boolean objectCache) {
-        this.objectCache = objectCache;
-    }
-}
diff --git a/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheConstants.java b/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheConstants.java
deleted file mode 100644
index 0bc9322..0000000
--- a/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheConstants.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.cache;
-
-/**
- * Constants used in this module
- */
-public interface CacheConstants {
-    String CACHE_HEADER_PREFIX = "CamelCache";
-    String CACHE_OPERATION = CACHE_HEADER_PREFIX + "Operation";
-    String CACHE_KEY = CACHE_HEADER_PREFIX + "Key";
-    String CACHE_ELEMENT_WAS_FOUND = CACHE_HEADER_PREFIX + "ElementWasFound";
-
-    String CACHE_ELEMENT_EXPIRY_TTL = CACHE_HEADER_PREFIX + "TimeToLive";
-    String CACHE_ELEMENT_EXPIRY_IDLE = CACHE_HEADER_PREFIX + "TimeToIdle";
-    String CACHE_ELEMENT_EXPIRY_ETERNAL = CACHE_HEADER_PREFIX + "Eternal";
-
-    String CACHE_OPERATION_URL_ADD = "Add";
-    String CACHE_OPERATION_URL_UPDATE = "Update";
-    String CACHE_OPERATION_URL_DELETE = "Delete";
-    String CACHE_OPERATION_URL_DELETEALL = "DeleteAll";
-    String CACHE_OPERATION_URL_GET = "Get";
-    String CACHE_OPERATION_URL_CHECK = "Check";
-
-    String CACHE_OPERATION_ADD = CACHE_HEADER_PREFIX + CACHE_OPERATION_URL_ADD;
-    String CACHE_OPERATION_UPDATE = CACHE_HEADER_PREFIX + CACHE_OPERATION_URL_UPDATE;
-    String CACHE_OPERATION_DELETE = CACHE_HEADER_PREFIX + CACHE_OPERATION_URL_DELETE;
-    String CACHE_OPERATION_DELETEALL = CACHE_HEADER_PREFIX + CACHE_OPERATION_URL_DELETEALL;
-    String CACHE_OPERATION_GET = CACHE_HEADER_PREFIX + CACHE_OPERATION_URL_GET;
-    String CACHE_OPERATION_CHECK = CACHE_HEADER_PREFIX + CACHE_OPERATION_URL_CHECK;
-}
\ No newline at end of file
diff --git a/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheConsumer.java b/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheConsumer.java
deleted file mode 100644
index 7e55723..0000000
--- a/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheConsumer.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.cache;
-
-import net.sf.ehcache.Ehcache;
-import org.apache.camel.Endpoint;
-import org.apache.camel.Processor;
-import org.apache.camel.impl.DefaultConsumer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class CacheConsumer extends DefaultConsumer {
-    private static final Logger LOG = LoggerFactory.getLogger(CacheConsumer.class);
-
-    private CacheEventListener cacheEventListener;
-    
-    private Ehcache cache;
-
-    public CacheConsumer(Endpoint endpoint, Processor processor, CacheConfiguration config) {
-        super(endpoint, processor);
-    }
-
-    @Override
-    protected void doStart() throws Exception {
-        super.doStart();
-        createConsumerCacheConnection();
-        LOG.debug("initialize the cache");
-    }
-    
-    @Override
-    protected void doStop() throws Exception {
-        // unregisty the listener when the consumer is stopped
-        cache.getCacheEventNotificationService().unregisterListener(cacheEventListener);
-    }
-
-    @Override
-    public CacheEndpoint getEndpoint() {
-        return (CacheEndpoint) super.getEndpoint();
-    }
-
-    protected void createConsumerCacheConnection() {
-        cacheEventListener = new CacheEventListener();
-        cacheEventListener.setCacheConsumer(this);
-        cache = getEndpoint().initializeCache();
-        // registry the CacheEventListener directly 
-        cache.getCacheEventNotificationService().registerListener(cacheEventListener);
-    }
-}
diff --git a/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheConverter.java b/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheConverter.java
deleted file mode 100644
index fed7395..0000000
--- a/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheConverter.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.cache;
-
-import net.sf.ehcache.store.MemoryStoreEvictionPolicy;
-import org.apache.camel.Converter;
-
-/**
- * @version 
- */
-@Converter
-public final class CacheConverter {
-
-    private CacheConverter() {
-    }
-
-    @Converter
-    public static MemoryStoreEvictionPolicy toPolicy(String s) {
-        if (s == null) {
-            return null;
-        }
-
-        s = s.replace("MemoryStoreEvictionPolicy.", "");
-        return MemoryStoreEvictionPolicy.fromString(s);
-    }
-
-}
diff --git a/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheEndpoint.java b/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheEndpoint.java
deleted file mode 100644
index 8761ca9..0000000
--- a/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheEndpoint.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.cache;
-
-import net.sf.ehcache.Cache;
-import net.sf.ehcache.CacheManager;
-import net.sf.ehcache.Ehcache;
-import net.sf.ehcache.event.CacheEventListener;
-import org.apache.camel.Component;
-import org.apache.camel.Consumer;
-import org.apache.camel.Exchange;
... 152654 lines suppressed ...