You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2020/10/26 14:35:48 UTC
[camel] branch master updated: CAMEL-15758: camel-core - Modularize
base into base-engine
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 2870bb9 CAMEL-15758: camel-core - Modularize base into base-engine
2870bb9 is described below
commit 2870bb9e619b4e18bfe8de11b449be9cd67d1f3c
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Oct 26 15:35:14 2020 +0100
CAMEL-15758: camel-core - Modularize base into base-engine
---
apache-camel/pom.xml | 4 ++
apache-camel/src/main/descriptors/common-bin.xml | 1 +
core/camel-base-engine/pom.xml | 51 ++++++++++++++++++++++
.../camel/impl/debugger/BacklogDebugger.java | 0
.../apache/camel/impl/debugger/BacklogTracer.java | 0
.../debugger/DefaultBacklogTracerEventMessage.java | 0
.../camel/impl/debugger/DefaultDebugger.java | 0
.../org/apache/camel/impl/debugger/package.html | 0
.../camel/impl/engine/AbstractCamelContext.java | 0
.../camel/impl/engine/AbstractDynamicRegistry.java | 0
.../impl/engine/BaseExecutorServiceManager.java | 0
.../camel/impl/engine/BasePackageScanResolver.java | 0
.../camel/impl/engine/BaseServiceResolver.java | 0
.../camel/impl/engine/CamelInternalProcessor.java | 0
.../impl/engine/CamelPostProcessorHelper.java | 0
.../apache/camel/impl/engine/CompoundIterator.java | 0
.../impl/engine/CustomizersLifecycleStrategy.java | 0
.../engine/DefaultAsyncProcessorAwaitManager.java | 0
.../impl/engine/DefaultBeanIntrospection.java | 0
.../impl/engine/DefaultCamelBeanPostProcessor.java | 0
.../engine/DefaultCamelContextNameStrategy.java | 0
.../apache/camel/impl/engine/DefaultChannel.java | 0
.../camel/impl/engine/DefaultClassResolver.java | 0
.../impl/engine/DefaultComponentNameResolver.java | 0
.../impl/engine/DefaultComponentResolver.java | 0
.../impl/engine/DefaultConfigurerResolver.java | 0
.../camel/impl/engine/DefaultConsumerTemplate.java | 0
.../impl/engine/DefaultDataFormatResolver.java | 0
.../camel/impl/engine/DefaultEndpointRegistry.java | 0
.../impl/engine/DefaultExecutorServiceManager.java | 0
.../camel/impl/engine/DefaultFactoryFinder.java | 0
.../impl/engine/DefaultFactoryFinderResolver.java | 0
.../impl/engine/DefaultFluentProducerTemplate.java | 0
.../engine/DefaultGlobalEndpointConfiguration.java | 0
.../impl/engine/DefaultHeadersMapFactory.java | 0
.../impl/engine/DefaultInflightRepository.java | 0
.../apache/camel/impl/engine/DefaultInjector.java | 0
.../engine/DefaultInterceptEndpointFactory.java | 0
.../camel/impl/engine/DefaultLanguageResolver.java | 0
.../impl/engine/DefaultManagementNameStrategy.java | 0
.../impl/engine/DefaultManagementStrategy.java | 0
.../engine/DefaultManagementStrategyFactory.java | 0
.../impl/engine/DefaultMessageHistoryFactory.java | 0
.../camel/impl/engine/DefaultNodeIdFactory.java | 0
.../engine/DefaultPackageScanClassResolver.java | 0
.../engine/DefaultPackageScanResourceResolver.java | 0
.../camel/impl/engine/DefaultProducerTemplate.java | 0
.../camel/impl/engine/DefaultReactiveExecutor.java | 0
.../org/apache/camel/impl/engine/DefaultRoute.java | 0
.../camel/impl/engine/DefaultRouteController.java | 0
.../camel/impl/engine/DefaultRouteError.java | 0
.../camel/impl/engine/DefaultRouteFactory.java | 0
.../impl/engine/DefaultRouteStartupOrder.java | 0
.../engine/DefaultRuntimeEndpointRegistry.java | 0
.../camel/impl/engine/DefaultShutdownStrategy.java | 0
.../impl/engine/DefaultStreamCachingStrategy.java | 0
.../engine/DefaultSupervisingRouteController.java | 0
.../apache/camel/impl/engine/DefaultTracer.java | 0
.../impl/engine/DefaultTransformerRegistry.java | 0
.../camel/impl/engine/DefaultUnitOfWork.java | 0
.../impl/engine/DefaultUnitOfWorkFactory.java | 0
.../impl/engine/DefaultUriFactoryResolver.java | 0
.../impl/engine/DefaultValidatorRegistry.java | 0
.../impl/engine/DeferServiceStartupListener.java | 0
.../camel/impl/engine/DurationRoutePolicy.java | 0
.../impl/engine/DurationRoutePolicyFactory.java | 0
.../org/apache/camel/impl/engine/EndpointKey.java | 0
.../engine/ExplicitCamelContextNameStrategy.java | 0
.../camel/impl/engine/FileStateRepository.java | 0
.../impl/engine/HashMapHeadersMapFactory.java | 0
.../camel/impl/engine/InternalRouteController.java | 0
.../impl/engine/InternalRouteStartupManager.java | 0
.../engine/LimitedPollingConsumerPollStrategy.java | 0
.../apache/camel/impl/engine/MDCUnitOfWork.java | 0
.../camel/impl/engine/MemoryStateRepository.java | 0
.../engine/OnCamelContextLifecycleStrategy.java | 0
.../impl/engine/ProvisionalEndpointRegistry.java | 0
.../org/apache/camel/impl/engine/RouteService.java | 0
.../impl/engine}/SharedCamelInternalProcessor.java | 2 +-
.../camel/impl/engine/SimpleCamelContext.java | 0
.../impl/engine/SubscribeMethodProcessor.java | 0
.../apache/camel/impl/engine/TransformerKey.java | 0
.../org/apache/camel/impl/engine/ValidatorKey.java | 0
.../engine/WebSpherePackageScanClassResolver.java | 0
.../impl/scan/InvertingPackageScanFilter.java | 1 -
core/camel-core-engine/pom.xml | 2 +-
core/camel-core-processor/pom.xml | 3 +-
.../camel/processor/ClaimCheckProcessor.java | 1 -
.../processor}/DefaultClaimCheckRepository.java | 2 +-
.../processor/DefaultInternalProcessorFactory.java | 1 +
.../ThrottlingExceptionHalfOpenHandler.java | 0
.../throttling/ThrottlingExceptionRoutePolicy.java | 0
.../throttling/ThrottlingInflightRoutePolicy.java | 0
core/pom.xml | 1 +
.../ROOT/pages/camel-3x-upgrade-guide-3_7.adoc | 2 +-
parent/pom.xml | 5 +++
96 files changed, 68 insertions(+), 8 deletions(-)
diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index 4ecb985..6735e22 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -66,6 +66,10 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-base-engine</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-support</artifactId>
</dependency>
<dependency>
diff --git a/apache-camel/src/main/descriptors/common-bin.xml b/apache-camel/src/main/descriptors/common-bin.xml
index 404a31d..0c6a863 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -32,6 +32,7 @@
<include>org.apache.camel:camel-management-api</include>
<include>org.apache.camel:camel-management</include>
<include>org.apache.camel:camel-base</include>
+ <include>org.apache.camel:camel-base-engine</include>
<include>org.apache.camel:camel-support</include>
<include>org.apache.camel:camel-core</include>
<include>org.apache.camel:camel-core-engine</include>
diff --git a/core/camel-base-engine/pom.xml b/core/camel-base-engine/pom.xml
new file mode 100644
index 0000000..f727826
--- /dev/null
+++ b/core/camel-base-engine/pom.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>core</artifactId>
+ <version>3.7.0-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
+
+ <artifactId>camel-base-engine</artifactId>
+ <packaging>jar</packaging>
+
+ <name>Camel :: Base Engine</name>
+ <description>The Base Engine Camel Framework</description>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-base</artifactId>
+ </dependency>
+
+ <!-- required logging api dependency by camel-base -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+
+ </dependencies>
+
+</project>
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/debugger/BacklogDebugger.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/debugger/BacklogDebugger.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/debugger/BacklogDebugger.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/debugger/BacklogDebugger.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/debugger/BacklogTracer.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/debugger/BacklogTracer.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/debugger/BacklogTracer.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/debugger/BacklogTracer.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/debugger/DefaultBacklogTracerEventMessage.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/debugger/DefaultBacklogTracerEventMessage.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/debugger/DefaultBacklogTracerEventMessage.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/debugger/DefaultBacklogTracerEventMessage.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/debugger/DefaultDebugger.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/debugger/DefaultDebugger.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/debugger/DefaultDebugger.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/debugger/DefaultDebugger.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/debugger/package.html b/core/camel-base-engine/src/main/java/org/apache/camel/impl/debugger/package.html
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/debugger/package.html
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/debugger/package.html
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractDynamicRegistry.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractDynamicRegistry.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractDynamicRegistry.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractDynamicRegistry.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/BaseExecutorServiceManager.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/BaseExecutorServiceManager.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/BaseExecutorServiceManager.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/BaseExecutorServiceManager.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/BasePackageScanResolver.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/BasePackageScanResolver.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/BasePackageScanResolver.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/BasePackageScanResolver.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/BaseServiceResolver.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/BaseServiceResolver.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/BaseServiceResolver.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/BaseServiceResolver.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/CamelInternalProcessor.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelInternalProcessor.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/CamelInternalProcessor.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelInternalProcessor.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/CamelPostProcessorHelper.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelPostProcessorHelper.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/CamelPostProcessorHelper.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelPostProcessorHelper.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/CompoundIterator.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CompoundIterator.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/CompoundIterator.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CompoundIterator.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/CustomizersLifecycleStrategy.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CustomizersLifecycleStrategy.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/CustomizersLifecycleStrategy.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CustomizersLifecycleStrategy.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultAsyncProcessorAwaitManager.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultAsyncProcessorAwaitManager.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultAsyncProcessorAwaitManager.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultAsyncProcessorAwaitManager.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultBeanIntrospection.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultBeanIntrospection.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultBeanIntrospection.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultBeanIntrospection.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultCamelBeanPostProcessor.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelBeanPostProcessor.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultCamelBeanPostProcessor.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelBeanPostProcessor.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultCamelContextNameStrategy.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelContextNameStrategy.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultCamelContextNameStrategy.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelContextNameStrategy.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultChannel.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultChannel.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultChannel.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultChannel.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultClassResolver.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultClassResolver.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultClassResolver.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultClassResolver.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultComponentNameResolver.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultComponentNameResolver.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultComponentNameResolver.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultComponentNameResolver.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultComponentResolver.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultComponentResolver.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultComponentResolver.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultComponentResolver.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultConfigurerResolver.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultConfigurerResolver.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultConfigurerResolver.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultConfigurerResolver.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultConsumerTemplate.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultConsumerTemplate.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultConsumerTemplate.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultConsumerTemplate.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultDataFormatResolver.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultDataFormatResolver.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultDataFormatResolver.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultDataFormatResolver.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultEndpointRegistry.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultEndpointRegistry.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultEndpointRegistry.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultEndpointRegistry.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultExecutorServiceManager.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultExecutorServiceManager.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultExecutorServiceManager.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultExecutorServiceManager.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultFactoryFinder.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultFactoryFinder.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultFactoryFinder.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultFactoryFinder.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultFactoryFinderResolver.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultFactoryFinderResolver.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultFactoryFinderResolver.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultFactoryFinderResolver.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultFluentProducerTemplate.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultFluentProducerTemplate.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultFluentProducerTemplate.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultFluentProducerTemplate.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultGlobalEndpointConfiguration.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultGlobalEndpointConfiguration.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultGlobalEndpointConfiguration.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultGlobalEndpointConfiguration.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultHeadersMapFactory.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultHeadersMapFactory.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultHeadersMapFactory.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultHeadersMapFactory.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultInflightRepository.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultInflightRepository.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultInflightRepository.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultInflightRepository.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultInjector.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultInjector.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultInjector.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultInjector.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultInterceptEndpointFactory.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultInterceptEndpointFactory.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultInterceptEndpointFactory.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultInterceptEndpointFactory.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultLanguageResolver.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultLanguageResolver.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultLanguageResolver.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultLanguageResolver.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultManagementNameStrategy.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultManagementNameStrategy.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultManagementNameStrategy.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultManagementNameStrategy.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultManagementStrategy.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultManagementStrategy.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultManagementStrategy.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultManagementStrategy.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultManagementStrategyFactory.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultManagementStrategyFactory.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultManagementStrategyFactory.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultManagementStrategyFactory.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultMessageHistoryFactory.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultMessageHistoryFactory.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultMessageHistoryFactory.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultMessageHistoryFactory.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultNodeIdFactory.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultNodeIdFactory.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultNodeIdFactory.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultNodeIdFactory.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultPackageScanClassResolver.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultPackageScanClassResolver.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultPackageScanClassResolver.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultPackageScanClassResolver.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultPackageScanResourceResolver.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultPackageScanResourceResolver.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultPackageScanResourceResolver.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultPackageScanResourceResolver.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultProducerTemplate.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultProducerTemplate.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultProducerTemplate.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultProducerTemplate.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultReactiveExecutor.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultReactiveExecutor.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultReactiveExecutor.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultReactiveExecutor.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultRoute.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRoute.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultRoute.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRoute.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultRouteController.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRouteController.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultRouteController.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRouteController.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultRouteError.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRouteError.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultRouteError.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRouteError.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultRouteFactory.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRouteFactory.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultRouteFactory.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRouteFactory.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultRouteStartupOrder.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRouteStartupOrder.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultRouteStartupOrder.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRouteStartupOrder.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultRuntimeEndpointRegistry.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRuntimeEndpointRegistry.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultRuntimeEndpointRegistry.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRuntimeEndpointRegistry.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultShutdownStrategy.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultShutdownStrategy.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultShutdownStrategy.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultShutdownStrategy.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultStreamCachingStrategy.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultStreamCachingStrategy.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultStreamCachingStrategy.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultStreamCachingStrategy.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultSupervisingRouteController.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultSupervisingRouteController.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultSupervisingRouteController.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultSupervisingRouteController.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultTracer.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultTracer.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultTracer.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultTracer.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultTransformerRegistry.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultTransformerRegistry.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultTransformerRegistry.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultTransformerRegistry.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultUnitOfWork.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultUnitOfWork.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultUnitOfWork.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultUnitOfWork.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultUnitOfWorkFactory.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultUnitOfWorkFactory.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultUnitOfWorkFactory.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultUnitOfWorkFactory.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultUriFactoryResolver.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultUriFactoryResolver.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultUriFactoryResolver.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultUriFactoryResolver.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultValidatorRegistry.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultValidatorRegistry.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultValidatorRegistry.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultValidatorRegistry.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DeferServiceStartupListener.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DeferServiceStartupListener.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/DeferServiceStartupListener.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DeferServiceStartupListener.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DurationRoutePolicy.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DurationRoutePolicy.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/DurationRoutePolicy.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DurationRoutePolicy.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DurationRoutePolicyFactory.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DurationRoutePolicyFactory.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/DurationRoutePolicyFactory.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DurationRoutePolicyFactory.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/EndpointKey.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/EndpointKey.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/EndpointKey.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/EndpointKey.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/ExplicitCamelContextNameStrategy.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/ExplicitCamelContextNameStrategy.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/ExplicitCamelContextNameStrategy.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/ExplicitCamelContextNameStrategy.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/FileStateRepository.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/FileStateRepository.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/FileStateRepository.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/FileStateRepository.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/HashMapHeadersMapFactory.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/HashMapHeadersMapFactory.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/HashMapHeadersMapFactory.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/HashMapHeadersMapFactory.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/InternalRouteController.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/InternalRouteController.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/InternalRouteController.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/InternalRouteController.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/InternalRouteStartupManager.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/InternalRouteStartupManager.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/InternalRouteStartupManager.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/InternalRouteStartupManager.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/LimitedPollingConsumerPollStrategy.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/LimitedPollingConsumerPollStrategy.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/LimitedPollingConsumerPollStrategy.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/LimitedPollingConsumerPollStrategy.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/MDCUnitOfWork.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/MDCUnitOfWork.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/MDCUnitOfWork.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/MDCUnitOfWork.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/MemoryStateRepository.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/MemoryStateRepository.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/MemoryStateRepository.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/MemoryStateRepository.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/OnCamelContextLifecycleStrategy.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/OnCamelContextLifecycleStrategy.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/OnCamelContextLifecycleStrategy.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/OnCamelContextLifecycleStrategy.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/ProvisionalEndpointRegistry.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/ProvisionalEndpointRegistry.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/ProvisionalEndpointRegistry.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/ProvisionalEndpointRegistry.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/RouteService.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/RouteService.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/RouteService.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/RouteService.java
diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/SharedCamelInternalProcessor.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/SharedCamelInternalProcessor.java
similarity index 99%
rename from core/camel-core-processor/src/main/java/org/apache/camel/processor/SharedCamelInternalProcessor.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/SharedCamelInternalProcessor.java
index f6c26f0..61e7faf 100644
--- a/core/camel-core-processor/src/main/java/org/apache/camel/processor/SharedCamelInternalProcessor.java
+++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/SharedCamelInternalProcessor.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.processor;
+package org.apache.camel.impl.engine;
import java.util.ArrayList;
import java.util.List;
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/SimpleCamelContext.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/SimpleCamelContext.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/SimpleCamelContext.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/SimpleCamelContext.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/SubscribeMethodProcessor.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/SubscribeMethodProcessor.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/SubscribeMethodProcessor.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/SubscribeMethodProcessor.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/TransformerKey.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/TransformerKey.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/TransformerKey.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/TransformerKey.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/ValidatorKey.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/ValidatorKey.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/ValidatorKey.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/ValidatorKey.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/WebSpherePackageScanClassResolver.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/WebSpherePackageScanClassResolver.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/impl/engine/WebSpherePackageScanClassResolver.java
rename to core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/WebSpherePackageScanClassResolver.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/scan/InvertingPackageScanFilter.java b/core/camel-base/src/main/java/org/apache/camel/impl/scan/InvertingPackageScanFilter.java
index 4ea1157..9c66577 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/scan/InvertingPackageScanFilter.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/scan/InvertingPackageScanFilter.java
@@ -22,7 +22,6 @@ import org.apache.camel.spi.PackageScanFilter;
* Package scan filter for inverting the match result of a subfilter. If the subfilter would match and return
* <tt>true</tt> this filter will invert that match and return <tt>false</tt>.
*/
-
public class InvertingPackageScanFilter implements PackageScanFilter {
private PackageScanFilter filter;
diff --git a/core/camel-core-engine/pom.xml b/core/camel-core-engine/pom.xml
index 490bc06..0414933 100644
--- a/core/camel-core-engine/pom.xml
+++ b/core/camel-core-engine/pom.xml
@@ -68,7 +68,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-base</artifactId>
+ <artifactId>camel-base-engine</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
diff --git a/core/camel-core-processor/pom.xml b/core/camel-core-processor/pom.xml
index f452120..e54e776 100644
--- a/core/camel-core-processor/pom.xml
+++ b/core/camel-core-processor/pom.xml
@@ -41,14 +41,13 @@
<dependencies>
- <!-- required dependencies by camel-core -->
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-base</artifactId>
+ <artifactId>camel-base-engine</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/ClaimCheckProcessor.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/ClaimCheckProcessor.java
index e22d323..cea51f9 100644
--- a/core/camel-core-processor/src/main/java/org/apache/camel/processor/ClaimCheckProcessor.java
+++ b/core/camel-core-processor/src/main/java/org/apache/camel/processor/ClaimCheckProcessor.java
@@ -28,7 +28,6 @@ import org.apache.camel.spi.RouteIdAware;
import org.apache.camel.support.AsyncProcessorSupport;
import org.apache.camel.support.ExchangeHelper;
import org.apache.camel.support.LanguageSupport;
-import org.apache.camel.support.processor.claimcheck.DefaultClaimCheckRepository;
import org.apache.camel.support.service.ServiceHelper;
import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/processor/claimcheck/DefaultClaimCheckRepository.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/DefaultClaimCheckRepository.java
similarity index 97%
rename from core/camel-support/src/main/java/org/apache/camel/support/processor/claimcheck/DefaultClaimCheckRepository.java
rename to core/camel-core-processor/src/main/java/org/apache/camel/processor/DefaultClaimCheckRepository.java
index af07b38..d86b8bf 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/processor/claimcheck/DefaultClaimCheckRepository.java
+++ b/core/camel-core-processor/src/main/java/org/apache/camel/processor/DefaultClaimCheckRepository.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.support.processor.claimcheck;
+package org.apache.camel.processor;
import java.util.ArrayDeque;
import java.util.Deque;
diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/DefaultInternalProcessorFactory.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/DefaultInternalProcessorFactory.java
index f416188..45920be 100644
--- a/core/camel-core-processor/src/main/java/org/apache/camel/processor/DefaultInternalProcessorFactory.java
+++ b/core/camel-core-processor/src/main/java/org/apache/camel/processor/DefaultInternalProcessorFactory.java
@@ -26,6 +26,7 @@ import org.apache.camel.Producer;
import org.apache.camel.Route;
import org.apache.camel.impl.engine.CamelInternalProcessor;
import org.apache.camel.impl.engine.DefaultChannel;
+import org.apache.camel.impl.engine.SharedCamelInternalProcessor;
import org.apache.camel.spi.InterceptSendToEndpoint;
import org.apache.camel.spi.InternalProcessor;
import org.apache.camel.spi.InternalProcessorFactory;
diff --git a/core/camel-base/src/main/java/org/apache/camel/throttling/ThrottlingExceptionHalfOpenHandler.java b/core/camel-support/src/main/java/org/apache/camel/throttling/ThrottlingExceptionHalfOpenHandler.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/throttling/ThrottlingExceptionHalfOpenHandler.java
rename to core/camel-support/src/main/java/org/apache/camel/throttling/ThrottlingExceptionHalfOpenHandler.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/throttling/ThrottlingExceptionRoutePolicy.java b/core/camel-support/src/main/java/org/apache/camel/throttling/ThrottlingExceptionRoutePolicy.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/throttling/ThrottlingExceptionRoutePolicy.java
rename to core/camel-support/src/main/java/org/apache/camel/throttling/ThrottlingExceptionRoutePolicy.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/throttling/ThrottlingInflightRoutePolicy.java b/core/camel-support/src/main/java/org/apache/camel/throttling/ThrottlingInflightRoutePolicy.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/throttling/ThrottlingInflightRoutePolicy.java
rename to core/camel-support/src/main/java/org/apache/camel/throttling/ThrottlingInflightRoutePolicy.java
diff --git a/core/pom.xml b/core/pom.xml
index 0808439..c85fe83 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -42,6 +42,7 @@
<module>camel-management-api</module>
<module>camel-management</module>
<module>camel-base</module>
+ <module>camel-base-engine</module>
<module>camel-xml-jaxp</module>
<module>camel-cluster</module>
<module>camel-core-engine</module>
diff --git a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_7.adoc b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_7.adoc
index a1656c7..4db6a41 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_7.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_7.adoc
@@ -35,7 +35,7 @@ The class `org.apache.camel.processor.ConvertBodyProcessor` is moved
to `org.apache.camel.support.ConvertBodyProcessor` in the `camel-support` JAR.
The class `org.apache.camel.impl.engine.DefaultClaimCheckRepository` moved
-to `org.apache.camel.support.processor.claimcheck.DefaultClaimCheckRepository` in the `camel-support` JAR.
+to `org.apache.camel.processor.DefaultClaimCheckRepository` in the `camel-core-processor` JAR.
The class `org.apache.camel.impl.engine.DefaultProducerCache` is moved to `org.apache.camel.support.cache.DefaultProducerCache`.
The class `org.apache.camel.impl.engine.DefaultConsumerCache` is moved to `org.apache.camel.support.cache.DefaultConsumerCache`.
diff --git a/parent/pom.xml b/parent/pom.xml
index 4c5ab38..8c154e3 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -660,6 +660,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-base-engine</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-core-catalog</artifactId>
<version>${project.version}</version>
</dependency>