You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2020/11/09 17:50:57 UTC
[camel-k-runtime] branch master updated: Switch to Quarkus as
runtime #359
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
The following commit(s) were added to refs/heads/master by this push:
new 6d3a8ca Switch to Quarkus as runtime #359
6d3a8ca is described below
commit 6d3a8cafffd4db42d039e84d135fba0c9b6bf1a1
Author: Luca Burgazzoli <lb...@users.noreply.github.com>
AuthorDate: Mon Nov 9 18:50:48 2020 +0100
Switch to Quarkus as runtime #359
Squashed as single commit to ease the revert process in case something goes wrong
---
.github/workflows/ci-build.yml | 69 +++-
README.adoc | 2 +-
{camel-k-runtime-core => camel-k-core/api}/pom.xml | 4 +-
.../apache/camel/k/SourceDefinitionConfigurer.java | 0
.../configurer/org.apache.camel.k.SourceDefinition | 0
.../org/apache/camel/k/CompositeClassloader.java | 0
.../java/org/apache/camel/k/ContextCustomizer.java | 0
.../src/main/java/org/apache/camel/k/Runtime.java | 0
.../main/java/org/apache/camel/k/RuntimeAware.java | 0
.../src/main/java/org/apache/camel/k/Source.java | 0
.../java/org/apache/camel/k/SourceDefinition.java | 64 ----
.../main/java/org/apache/camel/k/SourceLoader.java | 0
.../main/java/org/apache/camel/k/SourceType.java | 0
.../deployment/pom.xml | 6 +-
.../quarkus/deployment/DeploymentProcessor.java | 2 +-
.../core/quarkus/deployment/DeploymentSupport.java | 0
.../camel/k/core/quarkus/deployment/Feature.java | 0
.../deployment/devmode/HotDeploymentProcessor.java | 2 +-
.../camel-k-quarkus-cron => camel-k-core}/pom.xml | 6 +-
.../runtime/pom.xml | 10 +-
.../core/quarkus/devmode/HotReplacementSetup.java | 0
.../io.quarkus.dev.spi.HotReplacementSetup | 0
.../support}/pom.xml | 62 ++--
.../k/listener/SourcesConfigurerConfigurer.java | 0
.../org.apache.camel.k.listener.SourcesConfigurer | 0
.../camel/k/listener/AbstractPhaseListener.java | 0
.../apache/camel/k/listener/ContextConfigurer.java | 0
.../camel/k/listener/PropertiesConfigurer.java | 2 +-
.../apache/camel/k/listener/SourcesConfigurer.java | 2 +-
.../org/apache/camel/k/support}/Constants.java | 2 +-
.../apache/camel/k/support/DelegatingRuntime.java | 0
.../k/support/KubernetesPropertiesFunction.java | 0
.../apache/camel/k/support/PropertiesSupport.java | 1 -
.../org/apache/camel/k/support/RouteBuilders.java | 0
.../org/apache/camel/k/support/RuntimeSupport.java | 1 -
.../java/org/apache/camel/k/support}/Sources.java | 76 ++++-
.../org/apache/camel/k/support/SourcesSupport.java | 1 -
.../org/apache/camel/k/support/StringSupport.java | 0
.../services/org.apache.camel.k.Runtime$Listener | 0
.../test/java/org/apache/camel/k/SourceTest.java | 1 +
.../PropertiesFunctionsConfigurerTest.java | 0
.../org/apache/camel/k/support/NameCustomizer.java | 0
.../camel/k/support/PropertiesSupportTest.java | 0
.../apache/camel/k/support/RuntimeSupportTest.java | 1 -
.../services/org/apache/camel/k/customizer/name | 0
.../test/resources/configmaps/my-cm/my-property | 0
.../support}/src/test/resources/log4j2-test.xml | 0
.../support}/src/test/resources/my-cp-resource.txt | 0
.../src/test/resources/my-file-resource.txt | 0
.../test/resources/secrets/my-secret/my-property | 0
.../deployment/pom.xml | 8 +-
.../camel/k/quarkus/cron/deployment/Feature.java | 0
.../impl}/pom.xml | 13 +-
.../CronSourceLoaderInterceptorConfigurer.java | 0
...apache.camel.k.cron.CronSourceLoaderInterceptor | 0
.../camel/k/cron/CronSourceLoaderInterceptor.java | 0
.../java/org/apache/camel/k/cron/CronTest.java | 61 +++-
.../impl}/src/test/resources/log4j2-test.xml | 0
.../camel-k-quarkus-cron => camel-k-cron}/pom.xml | 5 +-
.../runtime/pom.xml | 8 +-
.../deployment/pom.xml | 8 +-
.../k/quarkus/kamelet/deployment/Feature.java | 0
.../pom.xml | 4 +-
.../runtime/pom.xml | 8 +-
.../deployment/pom.xml | 8 +-
.../knative/deployment/DeploymentProcessor.java | 0
.../k/quarkus/knative/deployment/Feature.java | 0
.../impl}/pom.xml | 55 +--
...tiveSinkBindingContextCustomizerConfigurer.java | 0
....customizer.KnativeSinkBindingContextCustomizer | 0
.../KnativeSinkBindingContextCustomizer.java | 0
.../knative/KnativeSourceLoaderInterceptor.java | 0
.../pom.xml | 6 +-
.../runtime/pom.xml | 15 +-
.../camel/k/quarkus/knative/KnativeRecorder.java | 0
.../deployment/pom.xml | 8 +-
.../loader/groovy/quarkus/deployment/Feature.java | 0
camel-k-loader-groovy/{ => impl}/pom.xml | 6 +-
.../k/loader/groovy/GroovySourceLoader.groovy | 0
.../k/loader/groovy/dsl/BeanConfiguration.groovy | 0
.../k/loader/groovy/dsl/BeansConfiguration.groovy | 0
.../k/loader/groovy/dsl/CamelConfiguration.groovy | 0
.../camel/k/loader/groovy/dsl/Components.groovy | 0
.../groovy/dsl/ComponentsConfiguration.groovy | 0
.../groovy/dsl/DataFormatsConfiguration.groovy | 0
.../groovy/dsl/IntegrationConfiguration.groovy | 0
.../groovy/dsl/LanguagesConfiguration.groovy | 0
.../k/loader/groovy/dsl/RestConfiguration.groovy | 0
.../loader/groovy/dsl/RestVerbConfiguration.groovy | 0
.../camel/k/loader/groovy/dsl/Support.groovy | 0
.../groovy/extension/CamelContextExtensions.groovy | 0
.../extension/ExpressionClauseExtensions.groovy | 0
.../groovy/extension/LogComponentExtension.groovy | 0
.../extension/ProcessorDefinitionExtensions.groovy | 0
.../org.codehaus.groovy.runtime.ExtensionModule | 0
.../services/org/apache/camel/k/loader/groovy | 0
.../{ => impl}/src/main/resources/integration.gdsl | 0
.../groovy/GroovySourceLoaderIssuesTest.groovy | 0
.../k/loader/groovy/GroovySourceLoaderTest.groovy | 0
.../extension/ExpressionClauseExtensionTest.groovy | 0
.../groovy/extension/LogExtensionTest.groovy | 0
.../camel/k/loader/groovy/support/MyBean.groovy | 0
.../k/loader/groovy/support/TestRuntime.groovy | 0
.../src/test/resources/issues/github-529.groovy | 0
.../impl}/src/test/resources/log4j2-test.xml | 0
.../src/test/resources/routes-with-beans.groovy | 0
...ith-component-wrong-method-configuration.groovy | 0
...h-component-wrong-property-configuration.groovy | 0
.../routes-with-components-configuration.groovy | 0
.../routes-with-dataformats-configuration.groovy | 0
.../src/test/resources/routes-with-eip.groovy | 0
.../test/resources/routes-with-endpoint-dsl.groovy | 0
.../resources/routes-with-error-handler.groovy | 0
.../routes-with-languages-configuration.groovy | 0
.../src/test/resources/routes-with-rest.groovy | 0
.../{ => impl}/src/test/resources/routes.groovy | 0
camel-k-loader-groovy/pom.xml | 131 +------
.../runtime/pom.xml | 8 +-
.../deployment/pom.xml | 8 +-
.../k/loader/java/quarkus/deployment/Feature.java | 0
.../deployment/JavaSourceLoaderProcessor.java | 0
camel-k-loader-java/{ => impl}/pom.xml | 6 +-
.../camel/k/loader/java/JavaSourceLoader.java | 0
.../k/loader/java/JavaSourceLoaderTest.groovy | 0
.../camel/k/loader/java/model/EmployeeDTO.groovy | 0
.../camel/k/loader/java/support/TestRuntime.groovy | 0
.../{ => impl}/src/test/resources/MyRoutes.java | 0
.../src/test/resources/MyRoutesWithBeans.java | 0
.../test/resources/MyRoutesWithEndpointDsl.java | 0
.../src/test/resources/MyRoutesWithModel.java | 0
.../test/resources/MyRoutesWithNameOverride.java | 0
.../test/resources/MyRoutesWithNestedClass.java | 0
.../test/resources/MyRoutesWithNestedTypes.java | 0
.../src/test/resources/MyRoutesWithPackage.java | 0
.../resources/MyRoutesWithPackageAndComment.java | 0
.../MyRoutesWithPackageAndLineComment.java | 0
.../resources/MyRoutesWithRestConfiguration.java | 0
.../impl}/src/test/resources/log4j2-test.xml | 0
camel-k-loader-java/pom.xml | 124 +------
.../runtime/pom.xml | 8 +-
.../java/quarkus/JavaSourceLoaderRecorder.java | 0
.../src/test/resources/log4j2-test.xml | 35 --
.../deployment/pom.xml | 8 +-
.../js/quarkus/deployment/DeploymentProcessor.java | 0
.../k/loader/js/quarkus/deployment/Feature.java | 0
camel-k-loader-js/{ => impl}/pom.xml | 6 +-
.../camel/k/loader/js/JavaScriptSourceLoader.java | 0
.../apache/camel/k/loader/js/dsl/Components.java | 0
.../k/loader/js/dsl/IntegrationConfiguration.java | 0
.../camel/k/loader/js/dsl/ProcessorSupport.java | 0
.../k/loader/js/JavaScriptSourceLoaderTest.groovy | 0
.../camel/k/loader/js/support/TestRuntime.groovy | 0
.../{ => impl}/src/test/resources/log4j2-test.xml | 0
.../src/test/resources/routes-compressed.js.gz.b64 | 0
.../routes-with-component-configuration.js | 0
.../resources/routes-with-context-configuration.js | 0
.../src/test/resources/routes-with-endpoint-dsl.js | 0
.../src/test/resources/routes-with-processors.js | 0
.../resources/routes-with-rest-configuration.js | 0
.../src/test/resources/routes-with-rest-dsl.js | 0
.../{ => impl}/src/test/resources/routes.js | 0
.../{ => impl}/src/test/resources/routes.mytype | 0
camel-k-loader-js/pom.xml | 124 +------
.../runtime/pom.xml | 8 +-
.../kotlin/itests/KotlinSourceLoaderTest.java | 48 ---
.../src/test/resources/log4j2-test.xml | 35 --
.../src/test/resources/routes.kts | 21 --
.../deployment/pom.xml | 8 +-
.../loader/kotlin/quarkus/deployment/Feature.java | 0
.../{camel-k-loader-kotlin => impl}/pom.xml | 16 +-
.../kotlin/KotlinCompilationConfiguration.kt | 0
.../camel/k/loader/kotlin/KotlinSourceLoader.kt | 0
.../k/loader/kotlin/dsl/BeansConfiguration.kt | 0
.../k/loader/kotlin/dsl/CamelConfiguration.kt | 0
.../k/loader/kotlin/dsl/ComponentsConfiguration.kt | 0
.../loader/kotlin/dsl/DataFormatsConfiguration.kt | 0
.../loader/kotlin/dsl/IntegrationConfiguration.kt | 0
.../k/loader/kotlin/dsl/LanguagesConfiguration.kt | 0
.../k/loader/kotlin/dsl/RegistryConfiguration.kt | 0
.../camel/k/loader/kotlin/dsl/RestConfiguration.kt | 0
.../k/loader/kotlin/dsl/RestVerbConfiguration.kt | 0
.../apache/camel/k/loader/kotlin/dsl/Support.kt | 0
.../kotlin/extension/LogComponentExtensions.kt | 0
...r.kotlin.dsl.IntegrationConfiguration.classname | 0
.../services/org/apache/camel/k/loader/kts | 0
.../k/loader/kotlin/KotlinSourceLoaderTest.kt | 0
.../k/loader/kotlin/extension/LogExtensionTest.kt | 0
.../apache/camel/k/loader/kotlin/support/MyBean.kt | 0
.../camel/k/loader/kotlin/support/TestRuntime.kt | 0
.../impl}/src/test/resources/log4j2-test.xml | 0
.../src/test/resources/routes-new.kts | 0
.../src/test/resources/routes-with-beans.kts | 0
.../routes-with-components-configuration-error.kts | 0
.../routes-with-components-configuration.kts | 0
.../routes-with-dataformats-configuration.kts | 0
.../test/resources/routes-with-endpoint-dsl.kts | 0
.../test/resources/routes-with-error-handler.kts | 0
.../routes-with-languages-configuration.kts | 0
.../src/test/resources/routes-with-rest.kts | 0
.../src/test/resources/routes.kts | 0
camel-k-loader-kotlin/pom.xml | 7 +-
.../runtime/pom.xml | 8 +-
.../deployment/pom.xml | 8 +-
.../k/loader/xml/quarkus/deployment/Feature.java | 0
camel-k-loader-xml/{ => impl}/pom.xml | 7 +-
.../apache/camel/k/loader/xml/XmlSourceLoader.java | 0
.../camel/k/loader/xml/XmlSourceLoaderTest.groovy | 0
.../camel/k/loader/xml/support/TestRuntime.groovy | 0
.../impl}/src/test/resources/log4j2-test.xml | 0
.../impl}/src/test/resources/rests.xml | 0
.../impl}/src/test/resources/routes.xml | 0
camel-k-loader-xml/pom.xml | 120 +------
.../runtime/pom.xml | 8 +-
.../deployment/pom.xml | 8 +-
.../quarkus/deployment/DeploymentProcessor.java | 0
.../k/loader/yaml/quarkus/deployment/Feature.java | 0
.../pom.xml | 4 +-
.../org/apache/camel/k/loader/yaml/model/Step.java | 0
.../k/loader/yaml/parser/AggregateStepParser.java | 0
.../k/loader/yaml/parser/BeansStepParser.java | 0
.../k/loader/yaml/parser/ChoiceStepParser.java | 0
.../yaml/parser/CircuitBreakerStepParser.java | 0
.../k/loader/yaml/parser/DelayStepParser.java | 0
.../k/loader/yaml/parser/DoTryStepParser.java | 0
.../yaml/parser/DynamicRouterStepParser.java | 0
.../k/loader/yaml/parser/EndpointStepParser.java | 0
.../k/loader/yaml/parser/EnrichStepParser.java | 0
.../loader/yaml/parser/ErrorHandlerStepParser.java | 0
.../k/loader/yaml/parser/FilterStepParser.java | 0
.../camel/k/loader/yaml/parser/FromStepParser.java | 0
.../yaml/parser/IdempotentConsumerParser.java | 0
.../loader/yaml/parser/LoadBalanceStepParser.java | 0
.../camel/k/loader/yaml/parser/LoopStepParser.java | 0
.../k/loader/yaml/parser/MarshalStepParser.java | 0
.../k/loader/yaml/parser/MulticastStepParser.java | 0
.../loader/yaml/parser/OnExceptionStepParser.java | 0
.../k/loader/yaml/parser/PipelineStepParser.java | 0
.../k/loader/yaml/parser/PollEnrichStepParser.java | 0
.../k/loader/yaml/parser/ProcessStepParser.java | 0
.../yaml/parser/RecipientListStepParser.java | 0
.../k/loader/yaml/parser/ResequenceStepParser.java | 0
.../camel/k/loader/yaml/parser/RestStepParser.java | 0
.../k/loader/yaml/parser/RouteStepParser.java | 0
.../loader/yaml/parser/RoutingSlipStepParser.java | 0
.../camel/k/loader/yaml/parser/SagaStepParser.java | 0
.../k/loader/yaml/parser/SampleStepParser.java | 0
.../k/loader/yaml/parser/ScriptStepParser.java | 0
.../loader/yaml/parser/ServiceCallStepParser.java | 0
.../k/loader/yaml/parser/SetBodyStepParser.java | 0
.../yaml/parser/SetExchangePatternStepParser.java | 0
.../k/loader/yaml/parser/SetHeaderStepParser.java | 0
.../loader/yaml/parser/SetPropertyStepParser.java | 0
.../camel/k/loader/yaml/parser/SortStepParser.java | 0
.../k/loader/yaml/parser/SplitStepParser.java | 0
.../camel/k/loader/yaml/parser/StepStepParser.java | 0
.../k/loader/yaml/parser/ThrottleStepParser.java | 0
.../yaml/parser/ThrowExceptionStepParser.java | 0
.../k/loader/yaml/parser/ToDynamicStepParser.java | 0
.../camel/k/loader/yaml/parser/ToStepParser.java | 0
.../k/loader/yaml/parser/TransactedStepParser.java | 0
.../k/loader/yaml/parser/TransformStepParser.java | 0
.../yaml/parser/TypedProcessorStepParser.java | 0
.../k/loader/yaml/parser/UnmarshalStepParser.java | 0
.../k/loader/yaml/parser/ValidateStepParser.java | 0
.../k/loader/yaml/parser/WireTapStepParser.java | 0
.../camel/k/loader/yaml/spi/HasEndpoint.java | 0
.../org/apache/camel/k/loader/yaml/spi/HasUri.java | 0
.../k/loader/yaml/spi/ProcessorStepParser.java | 0
.../camel/k/loader/yaml/spi/StartStepParser.java | 0
.../apache/camel/k/loader/yaml/spi/StepParser.java | 0
.../k/loader/yaml/spi/StepParserException.java | 0
.../loader/yaml/support/Any23DataFormatMixIn.java | 0
.../k/loader/yaml/support/ExpressionNodeMixIn.java | 0
.../yaml/support/ProcessorDefinitionMixIn.java | 0
.../yaml/support/RemoveHeaderDefinitionMixIn.java | 0
.../support/RemovePropertyDefinitionMixIn.java | 0
.../k/loader/yaml/support/StepParserSupport.java | 0
.../yaml/support/XStreamDataFormatMixIn.java | 0
.../pom.xml | 6 +-
.../{camel-k-loader-yaml => impl}/pom.xml | 12 +-
.../src/generated/resources/camel-yaml-dsl.json | 0
.../generated/resources/camel-yaml-endpoint.json | 0
.../camel/k/loader/yaml/YamlSourceLoader.java | 0
.../camel/k/loader/yaml/DefinitionsTest.groovy | 0
.../apache/camel/k/loader/yaml/RoutesTest.groovy | 0
.../k/loader/yaml/RoutesValidationTest.groovy | 0
.../k/loader/yaml/RoutesWithEndpointTest.groovy | 0
.../loader/yaml/RoutesWithPlaceholdersTest.groovy | 0
.../k/loader/yaml/RoutesWithSecretsTest.groovy | 0
.../k/loader/yaml/parser/AggregateTest.groovy | 0
.../camel/k/loader/yaml/parser/BeanTest.groovy | 0
.../camel/k/loader/yaml/parser/ChoiceTest.groovy | 0
.../k/loader/yaml/parser/CircuitBreakerTest.groovy | 0
.../k/loader/yaml/parser/ClaimCheckTest.groovy | 0
.../k/loader/yaml/parser/ConvertBodyTest.groovy | 0
.../camel/k/loader/yaml/parser/DelayTest.groovy | 0
.../camel/k/loader/yaml/parser/DoTryTest.groovy | 0
.../k/loader/yaml/parser/DynamicRouterTest.groovy | 0
.../camel/k/loader/yaml/parser/EnrichTest.groovy | 0
.../k/loader/yaml/parser/ErrorHandlerTest.groovy | 0
.../camel/k/loader/yaml/parser/FilterTest.groovy | 0
.../camel/k/loader/yaml/parser/FromTest.groovy | 0
.../yaml/parser/IdempotentConsumerTest.groovy | 0
.../k/loader/yaml/parser/LoadBalanceTest.groovy | 0
.../camel/k/loader/yaml/parser/LogTest.groovy | 0
.../camel/k/loader/yaml/parser/LoopTest.groovy | 0
.../camel/k/loader/yaml/parser/MarshalTest.groovy | 0
.../k/loader/yaml/parser/MulticastTest.groovy | 0
.../k/loader/yaml/parser/OnExceptionTest.groovy | 0
.../camel/k/loader/yaml/parser/PipelineTest.groovy | 0
.../k/loader/yaml/parser/PollEnrichTest.groovy | 0
.../camel/k/loader/yaml/parser/ProcessTest.groovy | 0
.../k/loader/yaml/parser/RecipientListTest.groovy | 0
.../k/loader/yaml/parser/RemoveHeaderTest.groovy | 0
.../k/loader/yaml/parser/RemoveHeadersTest.groovy | 0
.../loader/yaml/parser/RemovePropertiesTest.groovy | 0
.../k/loader/yaml/parser/RemovePropertyTest.groovy | 0
.../k/loader/yaml/parser/ResequenceTest.groovy | 0
.../camel/k/loader/yaml/parser/RestTest.groovy | 0
.../camel/k/loader/yaml/parser/RollbackTest.groovy | 0
.../k/loader/yaml/parser/RoutingSlipTest.groovy | 0
.../camel/k/loader/yaml/parser/SagaTest.groovy | 0
.../camel/k/loader/yaml/parser/SampleTest.groovy | 0
.../camel/k/loader/yaml/parser/ScriptTest.groovy | 0
.../k/loader/yaml/parser/ServiceCallTest.groovy | 0
.../camel/k/loader/yaml/parser/SetBodyTest.groovy | 0
.../yaml/parser/SetExchangePatternTest.groovy | 0
.../k/loader/yaml/parser/SetHeaderTest.groovy | 0
.../k/loader/yaml/parser/SetPropertyTest.groovy | 0
.../camel/k/loader/yaml/parser/SortTest.groovy | 0
.../camel/k/loader/yaml/parser/SplitTest.groovy | 0
.../camel/k/loader/yaml/parser/StepTest.groovy | 0
.../camel/k/loader/yaml/parser/StopTest.groovy | 0
.../camel/k/loader/yaml/parser/ThreadsTest.groovy | 0
.../camel/k/loader/yaml/parser/ThrottleTest.groovy | 0
.../k/loader/yaml/parser/ThrowExceptionTest.groovy | 0
.../k/loader/yaml/parser/ToDynamicTest.groovy | 0
.../camel/k/loader/yaml/parser/ToTest.groovy | 0
.../k/loader/yaml/parser/TransactedTest.groovy | 0
.../k/loader/yaml/parser/UnmarshalTest.groovy | 0
.../camel/k/loader/yaml/parser/ValidateTest.groovy | 0
.../camel/k/loader/yaml/parser/WireTapTest.groovy | 0
.../camel/k/loader/yaml/support/MyBean.groovy | 0
.../camel/k/loader/yaml/support/MyException.groovy | 0
.../loader/yaml/support/MyFailingProcessor.groovy | 0
.../yaml/support/MyUppercaseProcessor.groovy | 0
.../camel/k/loader/yaml/support/TestSupport.groovy | 2 +-
.../impl}/src/test/resources/log4j2-test.xml | 0
.../resources/routes/RoutesTest_aggregator.yaml | 0
.../src/test/resources/routes/RoutesTest_bean.yaml | 0
.../test/resources/routes/RoutesTest_beans.yaml | 0
.../resources/routes/RoutesTest_errorHandler.yaml | 0
.../test/resources/routes/RoutesTest_filter.yaml | 0
.../routes/RoutesTest_idempotentConsumer.yaml | 0
.../routes/RoutesTest_onExceptionHandled.yaml | 0
.../test/resources/routes/RoutesTest_split.yaml | 0
.../routes/RoutesWithEndpointTest_from.yaml | 0
.../routes/RoutesWithEndpointTest_route.yaml | 0
.../routes/RoutesWithPlaceholdersTest_from.yaml | 0
.../routes/RoutesWithPlaceholdersTest_route.yaml | 0
.../routes/RoutesWithPlaceholdersTest_to.yaml | 0
.../routes/RoutesWithPlaceholdersTest_tod.yaml | 0
.../routes/RoutesWithSecretsTest_route.yaml | 0
.../RoutesWithSecretsTest_route_property.yaml | 0
.../routes/RoutesWithSecretsTest_route_raw.yaml | 0
camel-k-loader-yaml/pom.xml | 10 +-
.../runtime/pom.xml | 8 +-
.../health/HealthContextCustomizerConfigurer.java | 65 ----
...g.apache.camel.k.health.HealthContextCustomizer | 2 -
.../camel/k/health/HealthContextCustomizer.java | 173 ----------
.../camel/k/health/HealthCustomizerTest.java | 82 -----
.../src/test/resources/log4j2-test.xml | 36 --
camel-k-main/camel-k-runtime-main/pom.xml | 178 ----------
.../java/org/apache/camel/k/main/Application.java | 44 ---
.../apache/camel/k/main/ApplicationRuntime.java | 240 -------------
.../apache/camel/k/main/ApplicationSupport.java | 55 ---
.../src/main/resources/log4j2.properties | 23 --
.../camel/k/main/ApplicationSupportTest.java | 42 ---
.../org/apache/camel/k/main/PropertiesTest.java | 206 -----------
.../java/org/apache/camel/k/main/RuntimeTest.java | 192 -----------
.../org/apache/camel/k/main/TemplatesTest.java | 89 -----
.../camel/k/main/support/RuntimeTestSupport.java | 48 ---
.../src/test/resources/MyRouteTemplate.java | 29 --
.../src/test/resources/MyRoutesWithBeans.java | 35 --
.../src/test/resources/MyRoutesWithKamelets.java | 32 --
.../src/test/resources/log4j2-test.xml | 35 --
.../src/test/resources/logger.properties | 18 -
.../src/test/resources/my-resource.txt | 1 -
.../camel-k-runtime-main/src/test/resources/r1.js | 20 --
.../src/test/resources/r2.mytype | 4 -
.../TracingContextCustomizerConfigurer.java | 74 ----
...apache.camel.k.tracing.TracingContextCustomizer | 2 -
.../camel/k/tracing/TracingContextCustomizer.java | 86 -----
.../k/tracing/TracingContextCustomizerTest.java | 56 ---
.../src/test/resources/log4j2-test.xml | 36 --
.../deployment/pom.xml | 8 +-
.../camel/k/quarkus/master/deployment/Feature.java | 0
.../impl}/pom.xml | 33 +-
.../camel/k/master/MasterContextCustomizer.java | 0
.../pom.xml | 6 +-
.../runtime/pom.xml | 8 +-
.../org/apache/camel/k/quarkus/it/Application.java | 60 ----
.../src/test/resources/test.properties | 18 -
camel-k-quarkus/camel-k-quarkus-itests/pom.xml | 49 ---
.../camel-k-quarkus-loader-groovy/pom.xml | 36 --
.../camel-k-quarkus-loader-java/pom.xml | 36 --
camel-k-quarkus/camel-k-quarkus-loader-js/pom.xml | 36 --
.../deployment/pom.xml | 59 ----
.../camel-k-quarkus-loader-kotlin/pom.xml | 48 ---
.../camel-k-quarkus-loader-kotlin/runtime/pom.xml | 86 -----
camel-k-quarkus/camel-k-quarkus-loader-xml/pom.xml | 36 --
.../camel-k-quarkus-loader-yaml/pom.xml | 36 --
.../camel-k-quarkus-loader-yaml/runtime/pom.xml | 86 -----
camel-k-quarkus/camel-k-quarkus-master/pom.xml | 36 --
camel-k-quarkus/camel-k-quarkus-wrap/pom.xml | 36 --
camel-k-quarkus/camel-k-runtime-quarkus/pom.xml | 36 --
camel-k-quarkus/pom.xml | 70 ----
.../src/test/resources/log4j2-test.xml | 37 --
.../src/test/resources/routes-quartz.js | 19 --
.../src/test/resources/routes-timer.js | 19 --
...formHttpServiceContextCustomizerConfigurer.java | 85 -----
...mel.k.http.PlatformHttpServiceContextCustomizer | 2 -
.../http/PlatformHttpServiceContextCustomizer.java | 60 ----
.../k/http/PlatformHttpServiceCustomizerTest.java | 353 -------------------
.../src/test/resources/jsse/service.jks | Bin 1969 -> 0 bytes
.../src/test/resources/jsse/truststore.jks | Bin 582 -> 0 bytes
.../src/test/resources/log4j2-test.xml | 36 --
camel-k-runtime-knative/pom.xml | 180 ----------
.../k/knative/yaml/parser/KnativeStepParser.java | 78 -----
.../org/apache/camel/k/loader/yaml-parser/knative | 18 -
.../KnativeSinkBindingCustomizerTest.java | 185 ----------
.../knative/yaml/parser/KnativeConverterTest.java | 110 ------
.../knative/KnativeSourceRoutesLoaderTest.java | 161 ---------
.../src/test/resources/route.yaml | 26 --
.../src/test/resources/sources/routes.kts | 20 --
.../camel/k/master/MasterCustomizerTest.java | 37 --
camel-k-runtime-webhook/pom.xml | 160 ---------
.../org/apache/camel/k/webhook/WebhookTest.java | 154 ---------
.../src/test/resources/log4j2-test.xml | 37 --
.../src/test/resources/webhook.js | 21 --
.../deployment/pom.xml | 8 +-
.../k/quarkus/deployment/DeploymentProcessor.java | 0
.../apache/camel/k/quarkus/deployment/Feature.java | 0
.../pom.xml | 4 +-
.../runtime/pom.xml | 6 +-
.../org/apache/camel/k/quarkus/Application.java | 1 +
.../k/quarkus/ApplicationConfigSourceProvider.java | 0
.../camel/k/quarkus/ApplicationProducers.java | 0
.../camel/k/quarkus/ApplicationRecorder.java | 0
...se.microprofile.config.spi.ConfigSourceProvider | 0
.../deployment/pom.xml | 14 +-
.../quarkus/webhook/deployment/WebhookFeature.java | 17 +-
.../impl}/pom.xml | 27 +-
.../WebhookContextCustomizerConfigurer.java | 0
...apache.camel.k.webhook.WebhookContextCustomizer | 0
.../org/apache/camel/k/webhook/WebhookAction.java | 0
.../camel/k/webhook/WebhookContextCustomizer.java | 0
.../camel/k/webhook/WebhookRoutePolicyFactory.java | 0
.../pom.xml | 5 +-
.../runtime/pom.xml | 14 +-
.../deployment/pom.xml | 8 +-
.../camel/k/quarkus/wrap/deployment/Feature.java | 0
.../camel-k-quarkus-cron => camel-k-wrap}/pom.xml | 4 +-
.../runtime/pom.xml | 6 +-
.../camel-knative/camel-knative-http/pom.xml | 9 +-
.../component/knative/http/KnativeHttpTest.java | 6 +-
.../knative/http/KnativeHttpTestSupport.java | 30 ++
components/pom.xml | 2 +-
distribution/pom.xml | 2 +-
.../data/application.properties | 39 ---
.../camel-k-runtime-example-api/data/rests.xml | 17 -
.../camel-k-runtime-example-api/data/routes.groovy | 25 --
examples/camel-k-runtime-example-api/pom.xml | 97 ------
.../data/application.properties | 40 ---
.../data/routes.groovy | 19 --
examples/camel-k-runtime-example-groovy/pom.xml | 81 -----
.../data/application.properties | 46 ---
.../data/routes.groovy | 20 --
examples/camel-k-runtime-example-kamelets/pom.xml | 89 -----
.../data/application.properties | 39 ---
.../camel-k-runtime-example-knative/data/env.json | 10 -
.../data/routes.yaml | 43 ---
examples/camel-k-runtime-example-knative/pom.xml | 86 -----
examples/camel-k-runtime-example-rest/README.adoc | 58 ----
.../data/application.properties | 40 ---
.../data/routes.groovy | 30 --
examples/camel-k-runtime-example-rest/pom.xml | 93 -----
examples/camel-k-runtime-example-yaml/pom.xml | 97 ------
.../java/org/apache/camel/k/example/Event.java | 38 ---
.../src/main/resources/conf.d/user.properties | 21 --
.../src/main/resources/conf/application.properties | 44 ---
.../src/main/resources/routes.yaml | 122 -------
.../data/application.properties | 0
.../data/routes.yaml | 0
.../pom.xml | 20 +-
.../src/main/resources/application.properties | 0
.../data/application.properties | 0
.../data/routes.groovy | 0
.../pom.xml | 18 +-
.../src/main/resources/application.properties | 0
.../data/MyRoutes.java | 0
.../data/application.properties | 0
.../pom.xml | 18 +-
.../src/main/resources/application.properties | 0
.../data/application.properties | 0
.../data/routes.js | 0
.../pom.xml | 18 +-
.../src/main/resources/application.properties | 0
.../Dockerfile | 0
.../data/application.properties | 0
.../data/logger.yaml | 0
.../data/routes.yaml | 0
.../pom.xml | 20 +-
.../src/main/resources/application.properties | 0
.../Dockerfile | 0
.../data/application.properties | 0
.../data/env.json | 0
.../data/routes.yaml | 0
.../pom.xml | 20 +-
.../src/main/resources/application.properties | 0
.../data/application.properties | 0
.../data/routes.kts | 0
.../pom.xml | 25 +-
.../src/main/resources/application.properties | 0
examples/pom.xml | 26 +-
.../data/application.properties | 0
.../data/routes.xml | 0
.../pom.xml | 18 +-
.../src/main/resources/application.properties | 0
.../data/application.properties | 0
.../data/conf.d/user.properties | 0
.../data/routes.yaml | 0
.../pom.xml | 18 +-
.../src/main/resources/application.properties | 0
.../camel-k-itests-core}/pom.xml | 8 +-
.../k/core/quarkus/deployment/Application.java | 0
.../src/main/resources/application.properties | 0
.../camel/k/core/quarkus/deployment/CoreIT.java | 0
.../camel/k/core/quarkus/deployment/CoreTest.java | 0
.../camel-k-itests-cron}/pom.xml | 16 +-
.../k/quarkus/cron/deployment/Application.java | 4 +-
.../src/main/resources/application.properties | 0
.../camel/k/quarkus/cron/deployment/CronIT.java | 0
.../camel/k/quarkus/cron/deployment/CronTest.java | 0
.../camel-k-itests-kamelet}/pom.xml | 16 +-
.../org/apache/camel/k/quarkus/it/Application.java | 0
.../src/main/resources/application.properties | 0
.../org/apache/camel/k/quarkus/it/RuntimeIT.java | 0
.../org/apache/camel/k/quarkus/it/RuntimeTest.java | 12 +-
.../src/test/resources/routes.properties | 0
.../src/test/resources/routes/process.yaml | 0
.../src/test/resources/routes/set-body.yaml | 0
.../src/test/resources/routes/to-upper.yaml | 0
.../camel-k-itests-knative-sinkbinding}/pom.xml | 32 +-
.../quarkus/it/KnativeSinkBindingApplication.java | 75 +++++
.../src/main/resources/application.properties | 0
.../camel/k/quarkus/it/KnativeSinkBindingIT.java | 2 +-
.../camel/k/quarkus/it/KnativeSinkBindingTest.java | 89 +++++
.../camel-k-itests-knative-source-groovy}/pom.xml | 81 ++---
.../knative/source/KnativeSourceApplication.java | 113 +++++++
.../src/main/resources/application.properties | 5 +-
.../it/knative/source/KnativeSourceGroovyTest.java | 88 +++++
.../src/test/resources/source.groovy | 0
.../camel-k-itests-knative-source-java}/pom.xml | 81 ++---
.../knative/source/KnativeSourceApplication.java | 113 +++++++
.../src/main/resources/application.properties | 5 +-
.../it/knative/source/KnativeSourceJavaTest.java | 88 +++++
.../src/test/resources/MySource.java | 2 +-
.../camel-k-itests-knative-source-js}/pom.xml | 44 ++-
.../knative/source/KnativeSourceApplication.java | 113 +++++++
.../src/main/resources/application.properties | 5 +-
.../it/knative/source/KnativeSourceJsIT.java | 4 +-
.../it/knative/source/KnativeSourceJsTest.java | 88 +++++
.../src/test/resources/source.js | 0
.../camel-k-itests-knative-source-xml}/pom.xml | 39 +--
.../knative/source/KnativeSourceApplication.java | 113 +++++++
.../src/main/resources/application.properties | 7 +-
.../it/knative/source/KnativeSourceXmlIT.java | 4 +-
.../it/knative/source/KnativeSourceXmlTest.java | 88 +++++
.../src/test/resources/source.xml | 0
.../camel-k-itests-knative-source-yaml}/pom.xml | 39 +--
.../knative/source/KnativeSourceApplication.java | 113 +++++++
.../src/main/resources/application.properties | 5 +-
.../it/knative/source/KnativeSourceYamlIT.java | 4 +-
.../it/knative/source/KnativeSourceYamlTest.java | 88 +++++
.../src/test/resources/source.yaml | 0
.../camel-k-itests-knative}/pom.xml | 16 +-
.../camel/k/quarkus/it/KnativeApplication.java | 0
.../src/main/resources/application.properties | 0
.../org/apache/camel/k/quarkus/it/KnativeIT.java | 0
.../org/apache/camel/k/quarkus/it/KnativeTest.java | 0
.../src/test/resources/routes.properties | 0
.../src/test/resources/routes.yaml | 0
.../camel-k-itests-loader-groovy}/pom.xml | 10 +-
.../camel/k/loader/yaml/quarkus/Application.java | 0
.../src/main/resources/application.properties | 0
.../k/loader/yaml/quarkus/GroovyLoaderTest.java | 0
.../src/test/resources/routes.groovy | 0
.../camel-k-itests-loader-java}/pom.xml | 10 +-
.../camel/k/loader/java/quarkus/Application.java | 0
.../src/main/resources/application.properties | 0
.../camel/k/loader/java/java/JavaLoaderTest.java | 0
.../src/test/resources/MyRoutes.java | 0
.../camel-k-itests-loader-js}/pom.xml | 10 +-
.../camel/k/loader/js/quarkus/Application.java | 0
.../src/main/resources/application.properties | 0
.../k/loader/js/quarkus/JavaScriptLoaderIT.java | 0
.../k/loader/js/quarkus/JavaScriptLoaderTest.java | 0
.../src/test/resources/routes.js | 0
.../camel-k-itests-loader-kotlin}/pom.xml | 10 +-
.../camel/k/loader/kotlin/quarkus/Application.java | 0
.../src/main/resources/application.properties | 0
.../k/loader/kotlin/quarkus/KotlinLoaderTest.java | 0
.../src/test/resources/routes.kts | 0
.../camel-k-itests-loader-polyglot}/pom.xml | 16 +-
.../k/itests/polyglot/quarkus/Application.java | 0
.../src/main/resources/application.properties | 0
.../k/itests/polyglot/quarkus/PolyglotIT.java | 0
.../k/itests/polyglot/quarkus/PolyglotTest.java | 0
.../src/test/resources/routes.xml | 0
.../src/test/resources/routes.yaml | 0
.../camel-k-itests-loader-xml}/pom.xml | 10 +-
.../camel/k/loader/xml/quarkus/Application.java | 0
.../src/main/resources/application.properties | 0
.../camel/k/loader/xml/quarkus/XmlLoaderIT.java | 0
.../camel/k/loader/xml/quarkus/XmlLoaderTest.java | 0
.../src/test/resources/routes.xml | 0
.../camel-k-itests-loader-yaml}/pom.xml | 10 +-
.../camel/k/loader/yaml/quarkus/Application.java | 0
.../src/main/resources/application.properties | 0
.../camel/k/loader/yaml/quarkus/YamlLoaderIT.java | 0
.../k/loader/yaml/quarkus/YamlLoaderTest.java | 0
.../src/test/resources/routes.yaml | 0
.../test/resources/routes_with_endpointdsl.yaml | 0
.../camel-k-itests-master}/pom.xml | 12 +-
.../apache/camel/k/quarkus/master/Application.java | 0
.../src/main/resources/application.properties | 0
.../apache/camel/k/quarkus/master/MasterIT.java | 0
.../apache/camel/k/quarkus/master/MasterTest.java | 0
.../camel-k-itests-runtime-xml}/pom.xml | 58 ++--
.../org/apache/camel/k/quarkus/it/Application.java | 8 +-
.../src/main/resources/application.properties | 1 -
.../camel/k/quarkus/it/RuntimeWithXmlIT.java | 2 +-
.../camel/k/quarkus/it/RuntimeWithXmlTest.java | 79 +++++
.../src/test/resources/rests.xml | 4 +-
.../src/test/resources/routes-with-expression.xml | 2 +-
.../src/test/resources/routes.mytype | 6 +-
.../src/test/resources/routes.xml | 2 +-
.../camel-k-itests-runtime-yaml}/pom.xml | 67 ++--
.../org/apache/camel/k/quarkus/it/Application.java | 24 +-
.../apache/camel/k/quarkus/it}/support/MyBean.java | 18 +-
.../camel/k/quarkus/it}/support/MyProcessor.java | 4 +-
.../src/main/resources/application.properties | 1 -
.../k/quarkus/it/RuntimeWithInterceptorIT.java | 2 +-
.../k/quarkus/it/RuntimeWithInterceptorTest.java | 62 ++--
.../camel/k/quarkus/it/RuntimeWithYamlIT.java | 2 +-
.../camel/k/quarkus/it/RuntimeWithYamlTest.java | 78 +++++
.../src/test/resources/routes-with-beans.yaml | 14 +-
.../camel-k-itests-runtime}/pom.xml | 15 +-
.../org/apache/camel/k/quarkus/it/Application.java | 116 +++++++
.../k/quarkus/it}/support/TestCustomizer.java | 3 +-
.../services/org/apache/camel/k/customizer/test | 2 +-
.../src/main/resources/application.properties | 0
.../k/quarkus/it/RuntimeCustomizerFallbackIT.java | 2 +-
.../quarkus/it/RuntimeCustomizerFallbackTest.java | 49 +--
.../camel/k/quarkus/it/RuntimeCustomizerIT.java | 2 +-
.../camel/k/quarkus/it/RuntimeCustomizerTest.java | 45 ++-
.../org/apache/camel/k/quarkus/it/RuntimeIT.java | 0
.../org/apache/camel/k/quarkus/it/RuntimeTest.java | 82 +++++
.../src/test/resources/conf.d/001/conf.properties | 0
.../src/test/resources/conf.d/002/conf.properties | 0
.../src/test/resources/conf.properties | 5 +-
.../camel-k-itests-webhook}/pom.xml | 67 ++--
.../camel/k/quarkus/it/webhook/Application.java | 120 +++++++
.../it/webhook/support}/DummyWebhookComponent.java | 15 +-
.../src/main/resources/application.properties | 0
.../WebhookFailureWithAutoRegisterDisbledTest.java | 62 ++++
.../WebhookFailureWithComponentFailingTest.java | 63 ++++
.../k/quarkus/it/webhook/WebhookRegisterTest.java | 48 +--
.../quarkus/it/webhook/WebhookUnregisterTest.java | 48 +--
.../test/resources/routes/registration_routes.yaml | 9 +-
.../camel-k-itests-wrap}/pom.xml | 16 +-
.../camel/k/quarkus/wrap/WrapApplication.java | 0
.../src/main/resources/application.properties | 0
.../org/apache/camel/k/quarkus/wrap/WrapIT.java | 0
.../org/apache/camel/k/quarkus/wrap/WrapTest.java | 0
.../camel/k/quarkus/wrap/WrapTestResource.java | 0
.../src/test/resources/routes.properties | 0
.../src/test/resources/routes.yaml | 0
itests/pom.xml | 60 ++++
pom.xml | 197 ++++++-----
{tooling => support}/camel-k-annotations/pom.xml | 2 +-
.../org/apache/camel/k/annotation/Customizer.java | 0
.../java/org/apache/camel/k/annotation/Loader.java | 0
.../camel/k/annotation/LoaderInterceptor.java | 0
.../camel/k/annotation/yaml/JsonSchemaIgnore.java | 0
.../apache/camel/k/annotation/yaml/YAMLMixIn.java | 0
.../k/annotation/yaml/YAMLNodeDefinition.java | 0
.../camel/k/annotation/yaml/YAMLStepParser.java | 0
{tooling => support}/camel-k-apt/pom.xml | 2 +-
.../apache/camel/k/tooling/apt/CamelProcessor.java | 0
.../services/javax.annotation.processing.Processor | 0
.../camel-k-catalog-model}/pom.xml | 52 ++-
.../apache/camel/k/catalog}/model/Artifact.java | 2 +-
.../camel/k/catalog}/model/CamelArtifact.java | 9 +-
.../camel/k/catalog}/model/CamelCapability.java | 2 +-
.../apache/camel/k/catalog}/model/CamelLoader.java | 2 +-
.../apache/camel/k/catalog}/model/CamelScheme.java | 2 +-
.../catalog}/model/CatalogComponentDefinition.java | 15 +-
.../model/CatalogDataFormatDefinition.java | 2 +-
.../camel/k/catalog}/model/CatalogDefinition.java | 2 +-
.../catalog}/model/CatalogLanguageDefinition.java | 2 +-
.../camel/k/catalog}/model/CatalogSupport.java | 2 +-
.../camel/k/catalog}/model/MavenArtifact.java | 2 +-
.../camel/k/catalog}/model/k8s/ObjectMeta.java | 2 +-
.../camel/k/catalog}/model/k8s/TypeMeta.java | 2 +-
.../k/catalog/model/k8s}/crd/CamelCatalog.java | 4 +-
.../k/catalog/model/k8s}/crd/CamelCatalogSpec.java | 6 +-
.../k/catalog/model/k8s}/crd/RuntimeSpec.java | 8 +-
{tooling => support}/camel-k-catalog/pom.xml | 26 +-
.../camel-k-itests-loader-inspector}/pom.xml | 6 +-
.../camel/k/loader/support/LoaderSupport.java | 2 +-
.../deployment/pom.xml | 8 +-
.../deployment/TestBootstrapProcessor.java | 55 +++
.../camel-k-itests-runtime-bootstrap}/pom.xml | 4 +-
.../runtime/pom.xml | 10 +-
.../quarkus/it/bootstrap/TestBoostrapRecorder.java | 52 +++
.../camel-k-itests-runtime-inspector}/pom.xml | 23 +-
.../camel/k/runtime/support/RuntimeInspector.java | 111 ++++++
.../camel-k-itests-support}/pom.xml | 13 +-
support/camel-k-maven-plugin/pom.xml | 259 ++++++++++++++
.../src/it/generate-catalog}/pom.xml | 0
.../src/it/generate-catalog}/verify.groovy | 23 +-
.../src/it/generate-dependencies/pom.xml | 0
.../src/it/generate-dependencies/verify.groovy | 0
.../src/it/generate-rest-dsl-from-v2/document.json | 0
.../src/it/generate-rest-dsl-from-v2/pom.xml | 0
.../src/it/generate-rest-dsl-from-v2/verify.groovy | 0
.../src/it/generate-rest-dsl-from-v3/document.yaml | 0
.../src/it/generate-rest-dsl-from-v3/pom.xml | 0
.../src/it/generate-rest-dsl-from-v3/verify.groovy | 0
.../camel/k/tooling/maven/GenerateCatalogMojo.java | 131 +++----
.../tooling/maven/GenerateDependencyListMojo.java | 0
.../camel/k/tooling/maven/GenerateRestXML.java | 0
.../camel/k/tooling/maven/GenerateSupport.java | 0
.../tooling/maven/GenerateYamlEndpointsSchema.java | 0
.../maven/GenerateYamlLoaderSupportClasses.java | 0
.../maven/GenerateYamlParserSupportClasses.java | 0
.../camel/k/tooling/maven/GenerateYamlSchema.java | 0
.../camel/k/tooling/maven/GenerateYamlSupport.java | 0
.../maven/processors/CatalogProcessor3x.java | 285 ++++++++++++++++
.../k/tooling/maven/support}/CatalogProcessor.java | 4 +-
.../k/tooling/maven/support/IndexerSupport.java | 0
.../k/tooling/maven/support/MavenSupport.java | 0
.../k/tooling/maven/support/ToolingSupport.java | 0
....camel.k.tooling.maven.support.CatalogProcessor | 0
.../src/main/resources/catalog-license.txt | 0
.../processors/AbstractCatalogProcessorTest.java | 0
.../maven/processors/CatalogProcessor3Test.java | 34 +-
.../processors/GenerateYamlSupportClassesTest.java | 0
.../camel-k-runtime-bom}/pom.xml | 180 ++--------
{tooling => support}/camel-k-test/pom.xml | 2 +-
.../apache/camel/k/test/AvailablePortFinder.java | 0
.../org/apache/camel/k/test/CamelKTestSupport.java | 0
{tooling => support}/pmd-ruleset.xml | 0
{tooling => support}/pom.xml | 7 +-
tooling/camel-k-maven-plugin/pom.xml | 259 --------------
.../src/it/generate-catalog-main/pom.xml | 103 ------
.../src/it/generate-catalog-main/verify.groovy | 65 ----
.../maven/processors/CatalogProcessor3x.java | 375 ---------------------
770 files changed, 3968 insertions(+), 8744 deletions(-)
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index c6d4d1a..1518c87 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -42,8 +42,6 @@ on:
jobs:
build:
runs-on: ubuntu-latest
- env:
- MAVEN_OPTS: -Xmx3000m
steps:
- uses: actions/checkout@v2
- name: Set up JDK 11
@@ -82,20 +80,55 @@ jobs:
fail-fast: false
matrix:
native-image-project:
- - :camel-k-quarkus-itests-core
- - :camel-k-quarkus-itests-runtime
- - :camel-k-quarkus-itests-cron
- - :camel-k-quarkus-itests-master
- - :camel-k-quarkus-itests-kamelet
- - :camel-k-quarkus-itests-knative
- - :camel-k-quarkus-itests-wrap
- - :camel-k-quarkus-itests-loader-xml
- - :camel-k-quarkus-itests-loader-yaml
- - :camel-k-quarkus-itests-loader-js
- - :camel-k-quarkus-itests-polyglot
- - :camel-k-runtime-example-quarkus-xml
- - :camel-k-runtime-example-quarkus-yaml
- - :camel-k-runtime-example-quarkus-knative
+ - :camel-k-itests-core
+ - :camel-k-itests-cron
+ - :camel-k-itests-kamelet
+ - :camel-k-itests-knative
+ - :camel-k-itests-knative-sinkbinding
+ - :camel-k-itests-knative-source-js
+ - :camel-k-itests-knative-source-xml
+ - :camel-k-itests-knative-source-yaml
+ - :camel-k-itests-loader-xml
+ - :camel-k-itests-loader-yaml
+ - :camel-k-itests-loader-js
+ - :camel-k-itests-loader-polyglot
+ - :camel-k-itests-master
+ - :camel-k-itests-runtime
+ - :camel-k-itests-runtime-xml
+ - :camel-k-itests-runtime-yaml
+ - :camel-k-itests-wrap
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v2
+ - name: Set up JDK 11
+ uses: AdoptOpenJDK/install-jdk@v1
+ with:
+ version: '11'
+ - name: Download Maven Repo
+ uses: actions/download-artifact@v1
+ with:
+ name: maven-repo-${{ github.run_id }}-${{ github.run_number }}
+ path: .
+ - name: Extract Maven Repo
+ shell: bash
+ run: tar -xzf maven-repo-${{ github.run_id }}-${{ github.run_number }}.tgz -C ~
+ - name: Integration Test - ${{ matrix.native-image-project }}
+ run: |
+ ./mvnw ${MAVEN_ARGS} -B -nsu clean install \
+ -Dnative \
+ -Dnative-image.xmx=6g \
+ -Ddocker \
+ -pl ${{ matrix.native-image-project }}
+ build-native-examples:
+ runs-on: ubuntu-latest
+ needs: build
+ strategy:
+ fail-fast: false
+ matrix:
+ native-image-project:
+ - :camel-k-runtime-example-xml
+ - :camel-k-runtime-example-yaml
+ - :camel-k-runtime-example-knative
steps:
- name: Checkout
uses: actions/checkout@v2
@@ -120,7 +153,9 @@ jobs:
-pl ${{ matrix.native-image-project }}
deploy:
runs-on: ubuntu-latest
- needs: build-native
+ needs:
+ - build-native
+ - build-native-examples
if: github.ref == 'refs/heads/master'
env:
NEXUS_DEPLOY_USERNAME: ${{ secrets.NEXUS_USER }}
diff --git a/README.adoc b/README.adoc
index b783a6b..372373b 100644
--- a/README.adoc
+++ b/README.adoc
@@ -1,7 +1,7 @@
Apache Camel K Runtime
======================
-image:https://img.shields.io/maven-central/v/org.apache.camel.k/camel-k-runtime-bom.svg["Maven Central", link="http://search.maven.org/#search%7Cga%7C1%7Corg.apache.camel.k"]
+image:https://img.shields.io/maven-central/v/org.apache.camel.k/camel-k-runtime.svg["Maven Central", link="http://search.maven.org/#search%7Cga%7C1%7Corg.apache.camel.k"]
image:https://img.shields.io/github/license/openshift/origin.svg?maxAge=2592000["Licensed under Apache License version 2.0", link="https://www.apache.org/licenses/LICENSE-2.0"]
image:https://img.shields.io/badge/zulip-join_chat-brightgreen.svg["Chat on Zulip", link="https://camel.zulipchat.com"]
image:https://github.com/apache/camel-k-runtime/workflows/Build/badge.svg["Build Status", link="https://github.com/apache/camel-k-runtime/actions?query=workflow%3ABuild"]
diff --git a/camel-k-runtime-core/pom.xml b/camel-k-core/api/pom.xml
similarity index 98%
rename from camel-k-runtime-core/pom.xml
rename to camel-k-core/api/pom.xml
index f16e7bb..e86ff76 100644
--- a/camel-k-runtime-core/pom.xml
+++ b/camel-k-core/api/pom.xml
@@ -20,12 +20,12 @@
<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">
<parent>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-parent</artifactId>
+ <artifactId>camel-k-core-parent</artifactId>
<version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>camel-k-runtime-core</artifactId>
+ <artifactId>camel-k-core-api</artifactId>
<dependencies>
diff --git a/camel-k-runtime-core/src/generated/java/org/apache/camel/k/SourceDefinitionConfigurer.java b/camel-k-core/api/src/generated/java/org/apache/camel/k/SourceDefinitionConfigurer.java
similarity index 100%
rename from camel-k-runtime-core/src/generated/java/org/apache/camel/k/SourceDefinitionConfigurer.java
rename to camel-k-core/api/src/generated/java/org/apache/camel/k/SourceDefinitionConfigurer.java
diff --git a/camel-k-runtime-core/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.k.SourceDefinition b/camel-k-core/api/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.k.SourceDefinition
similarity index 100%
rename from camel-k-runtime-core/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.k.SourceDefinition
rename to camel-k-core/api/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.k.SourceDefinition
diff --git a/camel-k-runtime-core/src/main/java/org/apache/camel/k/CompositeClassloader.java b/camel-k-core/api/src/main/java/org/apache/camel/k/CompositeClassloader.java
similarity index 100%
rename from camel-k-runtime-core/src/main/java/org/apache/camel/k/CompositeClassloader.java
rename to camel-k-core/api/src/main/java/org/apache/camel/k/CompositeClassloader.java
diff --git a/camel-k-runtime-core/src/main/java/org/apache/camel/k/ContextCustomizer.java b/camel-k-core/api/src/main/java/org/apache/camel/k/ContextCustomizer.java
similarity index 100%
rename from camel-k-runtime-core/src/main/java/org/apache/camel/k/ContextCustomizer.java
rename to camel-k-core/api/src/main/java/org/apache/camel/k/ContextCustomizer.java
diff --git a/camel-k-runtime-core/src/main/java/org/apache/camel/k/Runtime.java b/camel-k-core/api/src/main/java/org/apache/camel/k/Runtime.java
similarity index 100%
rename from camel-k-runtime-core/src/main/java/org/apache/camel/k/Runtime.java
rename to camel-k-core/api/src/main/java/org/apache/camel/k/Runtime.java
diff --git a/camel-k-runtime-core/src/main/java/org/apache/camel/k/RuntimeAware.java b/camel-k-core/api/src/main/java/org/apache/camel/k/RuntimeAware.java
similarity index 100%
rename from camel-k-runtime-core/src/main/java/org/apache/camel/k/RuntimeAware.java
rename to camel-k-core/api/src/main/java/org/apache/camel/k/RuntimeAware.java
diff --git a/camel-k-runtime-core/src/main/java/org/apache/camel/k/Source.java b/camel-k-core/api/src/main/java/org/apache/camel/k/Source.java
similarity index 100%
rename from camel-k-runtime-core/src/main/java/org/apache/camel/k/Source.java
rename to camel-k-core/api/src/main/java/org/apache/camel/k/Source.java
diff --git a/camel-k-runtime-core/src/main/java/org/apache/camel/k/SourceDefinition.java b/camel-k-core/api/src/main/java/org/apache/camel/k/SourceDefinition.java
similarity index 64%
rename from camel-k-runtime-core/src/main/java/org/apache/camel/k/SourceDefinition.java
rename to camel-k-core/api/src/main/java/org/apache/camel/k/SourceDefinition.java
index 4844030..ff3f0ea 100644
--- a/camel-k-runtime-core/src/main/java/org/apache/camel/k/SourceDefinition.java
+++ b/camel-k-core/api/src/main/java/org/apache/camel/k/SourceDefinition.java
@@ -16,15 +16,10 @@
*/
package org.apache.camel.k;
-import java.util.Collections;
import java.util.List;
-import java.util.Map;
-import org.apache.camel.k.support.StringSupport;
import org.apache.camel.spi.Configurer;
import org.apache.camel.spi.IdAware;
-import org.apache.camel.util.ObjectHelper;
-import org.apache.camel.util.URISupport;
@Configurer
public class SourceDefinition implements IdAware {
@@ -185,63 +180,4 @@ public class SourceDefinition implements IdAware {
return "SourceDefinition{" + answer + '}';
}
-
- // ***********************************
- //
- // Helpers
- //
- // ***********************************
-
- public static SourceDefinition fromURI(String uri) throws Exception {
- final String location = StringSupport.substringBefore(uri, "?");
-
- if (!location.startsWith(Constants.SCHEME_PREFIX_CLASSPATH) && !location.startsWith(Constants.SCHEME_PREFIX_FILE)) {
- throw new IllegalArgumentException("No valid resource format, expected scheme:path, found " + uri);
- }
-
- final String query = StringSupport.substringAfter(uri, "?");
- final Map<String, Object> params = URISupport.parseQuery(query);
-
- String language = (String) params.get("language");
- if (ObjectHelper.isEmpty(language)) {
- language = StringSupport.substringAfterLast(location, ":");
- language = StringSupport.substringAfterLast(language, ".");
- }
- if (ObjectHelper.isEmpty(language)) {
- throw new IllegalArgumentException("Unknown language " + language);
- }
-
- String name = (String) params.get("name");
- if (name == null) {
- name = StringSupport.substringAfter(location, ":");
- name = StringSupport.substringBeforeLast(name, ".");
-
- if (name.contains("/")) {
- name = StringSupport.substringAfterLast(name, "/");
- }
- }
-
- SourceDefinition answer = new SourceDefinition();
- answer.id = (String) params.get("id");
- answer.location = location;
- answer.name = name;
- answer.language = language;
- answer.loader = (String) params.get("loader");
- answer.interceptors = StringSupport.split((String) params.get("interceptors"), ",");
- answer.compressed = Boolean.parseBoolean((String) params.get("compression"));
-
- return answer;
- }
-
- public static SourceDefinition fromBytes(String id, String name, String language, String loader, List<String> interceptors, byte[] content) {
- SourceDefinition answer = new SourceDefinition();
- answer.id = id;
- answer.name = name;
- answer.language = language;
- answer.loader = loader;
- answer.interceptors = interceptors != null ? interceptors : Collections.emptyList();
- answer.content = content;
-
- return answer;
- }
}
diff --git a/camel-k-runtime-core/src/main/java/org/apache/camel/k/SourceLoader.java b/camel-k-core/api/src/main/java/org/apache/camel/k/SourceLoader.java
similarity index 100%
rename from camel-k-runtime-core/src/main/java/org/apache/camel/k/SourceLoader.java
rename to camel-k-core/api/src/main/java/org/apache/camel/k/SourceLoader.java
diff --git a/camel-k-runtime-core/src/main/java/org/apache/camel/k/SourceType.java b/camel-k-core/api/src/main/java/org/apache/camel/k/SourceType.java
similarity index 100%
rename from camel-k-runtime-core/src/main/java/org/apache/camel/k/SourceType.java
rename to camel-k-core/api/src/main/java/org/apache/camel/k/SourceType.java
diff --git a/camel-k-quarkus/camel-k-quarkus-core/deployment/pom.xml b/camel-k-core/deployment/pom.xml
similarity index 92%
rename from camel-k-quarkus/camel-k-quarkus-core/deployment/pom.xml
rename to camel-k-core/deployment/pom.xml
index 809a146..fa7f93d 100644
--- a/camel-k-quarkus/camel-k-quarkus-core/deployment/pom.xml
+++ b/camel-k-core/deployment/pom.xml
@@ -20,17 +20,17 @@
<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">
<parent>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus-core-parent</artifactId>
+ <artifactId>camel-k-core-parent</artifactId>
<version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>camel-k-quarkus-core-deployment</artifactId>
+ <artifactId>camel-k-core-deployment</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus-core</artifactId>
+ <artifactId>camel-k-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
diff --git a/camel-k-quarkus/camel-k-quarkus-core/deployment/src/main/java/org/apache/camel/k/core/quarkus/deployment/DeploymentProcessor.java b/camel-k-core/deployment/src/main/java/org/apache/camel/k/core/quarkus/deployment/DeploymentProcessor.java
similarity index 98%
rename from camel-k-quarkus/camel-k-quarkus-core/deployment/src/main/java/org/apache/camel/k/core/quarkus/deployment/DeploymentProcessor.java
rename to camel-k-core/deployment/src/main/java/org/apache/camel/k/core/quarkus/deployment/DeploymentProcessor.java
index c89b608..f9a73a7 100644
--- a/camel-k-quarkus/camel-k-quarkus-core/deployment/src/main/java/org/apache/camel/k/core/quarkus/deployment/DeploymentProcessor.java
+++ b/camel-k-core/deployment/src/main/java/org/apache/camel/k/core/quarkus/deployment/DeploymentProcessor.java
@@ -24,10 +24,10 @@ import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
import io.quarkus.deployment.builditem.nativeimage.ServiceProviderBuildItem;
-import org.apache.camel.k.Constants;
import org.apache.camel.k.ContextCustomizer;
import org.apache.camel.k.SourceDefinition;
import org.apache.camel.k.SourceLoader;
+import org.apache.camel.k.support.Constants;
import org.apache.camel.quarkus.core.deployment.spi.CamelServiceDestination;
import org.apache.camel.quarkus.core.deployment.spi.CamelServicePatternBuildItem;
import org.apache.camel.spi.StreamCachingStrategy;
diff --git a/camel-k-quarkus/camel-k-quarkus-core/deployment/src/main/java/org/apache/camel/k/core/quarkus/deployment/DeploymentSupport.java b/camel-k-core/deployment/src/main/java/org/apache/camel/k/core/quarkus/deployment/DeploymentSupport.java
similarity index 100%
rename from camel-k-quarkus/camel-k-quarkus-core/deployment/src/main/java/org/apache/camel/k/core/quarkus/deployment/DeploymentSupport.java
rename to camel-k-core/deployment/src/main/java/org/apache/camel/k/core/quarkus/deployment/DeploymentSupport.java
diff --git a/camel-k-quarkus/camel-k-quarkus-core/deployment/src/main/java/org/apache/camel/k/core/quarkus/deployment/Feature.java b/camel-k-core/deployment/src/main/java/org/apache/camel/k/core/quarkus/deployment/Feature.java
similarity index 100%
rename from camel-k-quarkus/camel-k-quarkus-core/deployment/src/main/java/org/apache/camel/k/core/quarkus/deployment/Feature.java
rename to camel-k-core/deployment/src/main/java/org/apache/camel/k/core/quarkus/deployment/Feature.java
diff --git a/camel-k-quarkus/camel-k-quarkus-core/deployment/src/main/java/org/apache/camel/k/core/quarkus/deployment/devmode/HotDeploymentProcessor.java b/camel-k-core/deployment/src/main/java/org/apache/camel/k/core/quarkus/deployment/devmode/HotDeploymentProcessor.java
similarity index 98%
rename from camel-k-quarkus/camel-k-quarkus-core/deployment/src/main/java/org/apache/camel/k/core/quarkus/deployment/devmode/HotDeploymentProcessor.java
rename to camel-k-core/deployment/src/main/java/org/apache/camel/k/core/quarkus/deployment/devmode/HotDeploymentProcessor.java
index 7bc896a..5654735 100644
--- a/camel-k-quarkus/camel-k-quarkus-core/deployment/src/main/java/org/apache/camel/k/core/quarkus/deployment/devmode/HotDeploymentProcessor.java
+++ b/camel-k-core/deployment/src/main/java/org/apache/camel/k/core/quarkus/deployment/devmode/HotDeploymentProcessor.java
@@ -31,7 +31,7 @@ import java.util.Optional;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.HotDeploymentWatchedFileBuildItem;
-import org.apache.camel.k.Constants;
+import org.apache.camel.k.support.Constants;
import org.apache.camel.util.StringHelper;
import org.apache.commons.io.FilenameUtils;
import org.eclipse.microprofile.config.Config;
diff --git a/camel-k-quarkus/camel-k-quarkus-cron/pom.xml b/camel-k-core/pom.xml
similarity index 88%
copy from camel-k-quarkus/camel-k-quarkus-cron/pom.xml
copy to camel-k-core/pom.xml
index e2b9864..ae00de6 100644
--- a/camel-k-quarkus/camel-k-quarkus-cron/pom.xml
+++ b/camel-k-core/pom.xml
@@ -20,15 +20,17 @@
<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">
<parent>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus</artifactId>
+ <artifactId>camel-k-runtime-project</artifactId>
<version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
- <artifactId>camel-k-quarkus-cron-parent</artifactId>
+ <artifactId>camel-k-core-parent</artifactId>
<modules>
+ <module>api</module>
+ <module>support</module>
<module>runtime</module>
<module>deployment</module>
</modules>
diff --git a/camel-k-quarkus/camel-k-quarkus-core/runtime/pom.xml b/camel-k-core/runtime/pom.xml
similarity index 92%
rename from camel-k-quarkus/camel-k-quarkus-core/runtime/pom.xml
rename to camel-k-core/runtime/pom.xml
index 2309bbd..c68e524 100644
--- a/camel-k-quarkus/camel-k-quarkus-core/runtime/pom.xml
+++ b/camel-k-core/runtime/pom.xml
@@ -20,12 +20,12 @@
<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">
<parent>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus-core-parent</artifactId>
+ <artifactId>camel-k-core-parent</artifactId>
<version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>camel-k-quarkus-core</artifactId>
+ <artifactId>camel-k-core</artifactId>
<dependencies>
<dependency>
@@ -38,7 +38,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-core</artifactId>
+ <artifactId>camel-k-core-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.k</groupId>
+ <artifactId>camel-k-core-support</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
diff --git a/camel-k-quarkus/camel-k-quarkus-core/runtime/src/main/java/org/apache/camel/k/core/quarkus/devmode/HotReplacementSetup.java b/camel-k-core/runtime/src/main/java/org/apache/camel/k/core/quarkus/devmode/HotReplacementSetup.java
similarity index 100%
rename from camel-k-quarkus/camel-k-quarkus-core/runtime/src/main/java/org/apache/camel/k/core/quarkus/devmode/HotReplacementSetup.java
rename to camel-k-core/runtime/src/main/java/org/apache/camel/k/core/quarkus/devmode/HotReplacementSetup.java
diff --git a/camel-k-quarkus/camel-k-quarkus-core/runtime/src/main/resources/META-INF/services/io.quarkus.dev.spi.HotReplacementSetup b/camel-k-core/runtime/src/main/resources/META-INF/services/io.quarkus.dev.spi.HotReplacementSetup
similarity index 100%
rename from camel-k-quarkus/camel-k-quarkus-core/runtime/src/main/resources/META-INF/services/io.quarkus.dev.spi.HotReplacementSetup
rename to camel-k-core/runtime/src/main/resources/META-INF/services/io.quarkus.dev.spi.HotReplacementSetup
diff --git a/camel-k-runtime-http/pom.xml b/camel-k-core/support/pom.xml
similarity index 75%
rename from camel-k-runtime-http/pom.xml
rename to camel-k-core/support/pom.xml
index 2c3188e..789381b 100644
--- a/camel-k-runtime-http/pom.xml
+++ b/camel-k-core/support/pom.xml
@@ -20,13 +20,12 @@
<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">
<parent>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-parent</artifactId>
+ <artifactId>camel-k-core-parent</artifactId>
<version>1.6.0-SNAPSHOT</version>
</parent>
-
<modelVersion>4.0.0</modelVersion>
- <artifactId>camel-k-runtime-http</artifactId>
+ <artifactId>camel-k-core-support</artifactId>
<dependencies>
@@ -37,35 +36,20 @@
<!-- ****************************** -->
<dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core-engine</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-platform-http-vertx</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-core</artifactId>
+ <artifactId>camel-k-core-api</artifactId>
</dependency>
-
<dependency>
- <groupId>io.vertx</groupId>
- <artifactId>vertx-web</artifactId>
- <version>${vertx-version}</version>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core-engine</artifactId>
</dependency>
-
<dependency>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-apt</artifactId>
- <scope>provided</scope>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core-languages</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-annotations</artifactId>
- <scope>provided</scope>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-endpointdsl</artifactId>
</dependency>
<!-- ****************************** -->
@@ -79,21 +63,29 @@
<artifactId>camel-k-test</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-jetty</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-http</artifactId>
- <scope>test</scope>
- </dependency>
+
</dependencies>
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <environmentVariables>
+ <CAMEL_K_RESOURCE_001>my env content</CAMEL_K_RESOURCE_001>
+ <MY_ENV_RESOURCE_TXT>env:CAMEL_K_RESOURCE_001</MY_ENV_RESOURCE_TXT>
+ <CAMEL_K_RESOURCE_002>H4sIAFlah1wAA8utVEjOzy0oSi0uTk1RSM0rA3LzSlLzSrgAUbkzGRoAAAA=</CAMEL_K_RESOURCE_002>
+ <MY_COMPRESSED_ENV_RESOURCE_TXT>env:CAMEL_K_RESOURCE_002?compression=true</MY_COMPRESSED_ENV_RESOURCE_TXT>
+ </environmentVariables>
+ <systemPropertyVariables>
+ <root>${project.basedir}</root>
+ <camel.k.mount-path.configmaps>${project.basedir}/src/test/resources/configmaps</camel.k.mount-path.configmaps>
+ <camel.k.mount-path.secrets>${project.basedir}/src/test/resources/secrets</camel.k.mount-path.secrets>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.jboss.jandex</groupId>
<artifactId>jandex-maven-plugin</artifactId>
<executions>
diff --git a/camel-k-runtime-core/src/generated/java/org/apache/camel/k/listener/SourcesConfigurerConfigurer.java b/camel-k-core/support/src/generated/java/org/apache/camel/k/listener/SourcesConfigurerConfigurer.java
similarity index 100%
rename from camel-k-runtime-core/src/generated/java/org/apache/camel/k/listener/SourcesConfigurerConfigurer.java
rename to camel-k-core/support/src/generated/java/org/apache/camel/k/listener/SourcesConfigurerConfigurer.java
diff --git a/camel-k-runtime-core/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.k.listener.SourcesConfigurer b/camel-k-core/support/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.k.listener.SourcesConfigurer
similarity index 100%
rename from camel-k-runtime-core/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.k.listener.SourcesConfigurer
rename to camel-k-core/support/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.k.listener.SourcesConfigurer
diff --git a/camel-k-runtime-core/src/main/java/org/apache/camel/k/listener/AbstractPhaseListener.java b/camel-k-core/support/src/main/java/org/apache/camel/k/listener/AbstractPhaseListener.java
similarity index 100%
rename from camel-k-runtime-core/src/main/java/org/apache/camel/k/listener/AbstractPhaseListener.java
rename to camel-k-core/support/src/main/java/org/apache/camel/k/listener/AbstractPhaseListener.java
diff --git a/camel-k-runtime-core/src/main/java/org/apache/camel/k/listener/ContextConfigurer.java b/camel-k-core/support/src/main/java/org/apache/camel/k/listener/ContextConfigurer.java
similarity index 100%
rename from camel-k-runtime-core/src/main/java/org/apache/camel/k/listener/ContextConfigurer.java
rename to camel-k-core/support/src/main/java/org/apache/camel/k/listener/ContextConfigurer.java
diff --git a/camel-k-runtime-core/src/main/java/org/apache/camel/k/listener/PropertiesConfigurer.java b/camel-k-core/support/src/main/java/org/apache/camel/k/listener/PropertiesConfigurer.java
similarity index 98%
rename from camel-k-runtime-core/src/main/java/org/apache/camel/k/listener/PropertiesConfigurer.java
rename to camel-k-core/support/src/main/java/org/apache/camel/k/listener/PropertiesConfigurer.java
index 45247df..5baeb4a 100644
--- a/camel-k-runtime-core/src/main/java/org/apache/camel/k/listener/PropertiesConfigurer.java
+++ b/camel-k-core/support/src/main/java/org/apache/camel/k/listener/PropertiesConfigurer.java
@@ -17,8 +17,8 @@
package org.apache.camel.k.listener;
import org.apache.camel.Ordered;
-import org.apache.camel.k.Constants;
import org.apache.camel.k.Runtime;
+import org.apache.camel.k.support.Constants;
import org.apache.camel.k.support.KubernetesPropertiesFunction;
import org.apache.camel.k.support.PropertiesSupport;
diff --git a/camel-k-runtime-core/src/main/java/org/apache/camel/k/listener/SourcesConfigurer.java b/camel-k-core/support/src/main/java/org/apache/camel/k/listener/SourcesConfigurer.java
similarity index 98%
rename from camel-k-runtime-core/src/main/java/org/apache/camel/k/listener/SourcesConfigurer.java
rename to camel-k-core/support/src/main/java/org/apache/camel/k/listener/SourcesConfigurer.java
index 5545947..30c2efe 100644
--- a/camel-k-runtime-core/src/main/java/org/apache/camel/k/listener/SourcesConfigurer.java
+++ b/camel-k-core/support/src/main/java/org/apache/camel/k/listener/SourcesConfigurer.java
@@ -16,9 +16,9 @@
*/
package org.apache.camel.k.listener;
-import org.apache.camel.k.Constants;
import org.apache.camel.k.Runtime;
import org.apache.camel.k.SourceDefinition;
+import org.apache.camel.k.support.Constants;
import org.apache.camel.k.support.PropertiesSupport;
import org.apache.camel.k.support.SourcesSupport;
import org.apache.camel.spi.Configurer;
diff --git a/camel-k-runtime-core/src/main/java/org/apache/camel/k/Constants.java b/camel-k-core/support/src/main/java/org/apache/camel/k/support/Constants.java
similarity index 98%
rename from camel-k-runtime-core/src/main/java/org/apache/camel/k/Constants.java
rename to camel-k-core/support/src/main/java/org/apache/camel/k/support/Constants.java
index 83df4f7..09757f8 100644
--- a/camel-k-runtime-core/src/main/java/org/apache/camel/k/Constants.java
+++ b/camel-k-core/support/src/main/java/org/apache/camel/k/support/Constants.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k;
+package org.apache.camel.k.support;
public final class Constants {
public static final String ENV_CAMEL_K_ROUTES = "CAMEL_K_ROUTES";
diff --git a/camel-k-runtime-core/src/main/java/org/apache/camel/k/support/DelegatingRuntime.java b/camel-k-core/support/src/main/java/org/apache/camel/k/support/DelegatingRuntime.java
similarity index 100%
rename from camel-k-runtime-core/src/main/java/org/apache/camel/k/support/DelegatingRuntime.java
rename to camel-k-core/support/src/main/java/org/apache/camel/k/support/DelegatingRuntime.java
diff --git a/camel-k-runtime-core/src/main/java/org/apache/camel/k/support/KubernetesPropertiesFunction.java b/camel-k-core/support/src/main/java/org/apache/camel/k/support/KubernetesPropertiesFunction.java
similarity index 100%
rename from camel-k-runtime-core/src/main/java/org/apache/camel/k/support/KubernetesPropertiesFunction.java
rename to camel-k-core/support/src/main/java/org/apache/camel/k/support/KubernetesPropertiesFunction.java
diff --git a/camel-k-runtime-core/src/main/java/org/apache/camel/k/support/PropertiesSupport.java b/camel-k-core/support/src/main/java/org/apache/camel/k/support/PropertiesSupport.java
similarity index 99%
rename from camel-k-runtime-core/src/main/java/org/apache/camel/k/support/PropertiesSupport.java
rename to camel-k-core/support/src/main/java/org/apache/camel/k/support/PropertiesSupport.java
index 113a7ef..b88d64d 100644
--- a/camel-k-runtime-core/src/main/java/org/apache/camel/k/support/PropertiesSupport.java
+++ b/camel-k-core/support/src/main/java/org/apache/camel/k/support/PropertiesSupport.java
@@ -37,7 +37,6 @@ import java.util.function.Predicate;
import org.apache.camel.CamelContext;
import org.apache.camel.Component;
import org.apache.camel.ExtendedCamelContext;
-import org.apache.camel.k.Constants;
import org.apache.camel.spi.PropertiesComponent;
import org.apache.camel.spi.PropertyConfigurer;
import org.apache.camel.support.PropertyBindingSupport;
diff --git a/camel-k-runtime-core/src/main/java/org/apache/camel/k/support/RouteBuilders.java b/camel-k-core/support/src/main/java/org/apache/camel/k/support/RouteBuilders.java
similarity index 100%
rename from camel-k-runtime-core/src/main/java/org/apache/camel/k/support/RouteBuilders.java
rename to camel-k-core/support/src/main/java/org/apache/camel/k/support/RouteBuilders.java
diff --git a/camel-k-runtime-core/src/main/java/org/apache/camel/k/support/RuntimeSupport.java b/camel-k-core/support/src/main/java/org/apache/camel/k/support/RuntimeSupport.java
similarity index 99%
rename from camel-k-runtime-core/src/main/java/org/apache/camel/k/support/RuntimeSupport.java
rename to camel-k-core/support/src/main/java/org/apache/camel/k/support/RuntimeSupport.java
index 8b16e03..b211307 100644
--- a/camel-k-runtime-core/src/main/java/org/apache/camel/k/support/RuntimeSupport.java
+++ b/camel-k-core/support/src/main/java/org/apache/camel/k/support/RuntimeSupport.java
@@ -30,7 +30,6 @@ import java.util.regex.Pattern;
import org.apache.camel.CamelContext;
import org.apache.camel.ExtendedCamelContext;
-import org.apache.camel.k.Constants;
import org.apache.camel.k.ContextCustomizer;
import org.apache.camel.k.Source;
import org.apache.camel.k.SourceLoader;
diff --git a/camel-k-runtime-core/src/main/java/org/apache/camel/k/Sources.java b/camel-k-core/support/src/main/java/org/apache/camel/k/support/Sources.java
similarity index 62%
rename from camel-k-runtime-core/src/main/java/org/apache/camel/k/Sources.java
rename to camel-k-core/support/src/main/java/org/apache/camel/k/support/Sources.java
index 239f505..76c3464 100644
--- a/camel-k-runtime-core/src/main/java/org/apache/camel/k/Sources.java
+++ b/camel-k-core/support/src/main/java/org/apache/camel/k/support/Sources.java
@@ -14,40 +14,56 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k;
+package org.apache.camel.k.support;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.util.Base64;
import java.util.Collections;
import java.util.List;
+import java.util.Map;
import java.util.Optional;
import java.util.UUID;
import java.util.zip.GZIPInputStream;
import org.apache.camel.CamelContext;
-import org.apache.camel.k.support.StringSupport;
+import org.apache.camel.k.Source;
+import org.apache.camel.k.SourceDefinition;
+import org.apache.camel.k.SourceType;
import org.apache.camel.support.ResourceHelper;
import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.URISupport;
public final class Sources {
private Sources() {
}
public static Source fromURI(String uri) throws Exception {
- return fromDefinition(SourceDefinition.fromURI(uri));
+ return fromDefinition(computeDefinitionFromURI(uri));
+ }
+
+ public static SourceDefinition fromBytes(String id, String name, String language, String loader, List<String> interceptors, byte[] content) {
+ SourceDefinition answer = new SourceDefinition();
+ answer.setId(id);
+ answer.setName(name);
+ answer.setLanguage(language);
+ answer.setLoader(loader);
+ answer.setInterceptors(interceptors != null ? interceptors : Collections.emptyList());
+ answer.setContent(content);
+
+ return answer;
}
public static Source fromBytes(String name, String language, String loader, List<String> interceptors, byte[] content) {
- return fromDefinition(SourceDefinition.fromBytes(null, name, language, loader, interceptors, content));
+ return fromDefinition(fromBytes(null, name, language, loader, interceptors, content));
}
public static Source fromBytes(String name, String language, String loader, byte[] content) {
- return fromDefinition(SourceDefinition.fromBytes(null, name, language, loader, null, content));
+ return fromDefinition(fromBytes(null, name, language, loader, null, content));
}
public static Source fromBytes(String language, byte[] content) {
- return fromDefinition(SourceDefinition.fromBytes(null, UUID.randomUUID().toString(), language, null, null, content));
+ return fromDefinition(fromBytes(null, UUID.randomUUID().toString(), language, null, null, content));
}
public static Source fromDefinition(SourceDefinition definition) {
@@ -133,4 +149,52 @@ public final class Sources {
}
};
}
+
+ // ******************************
+ //
+ // Helpers
+ //
+ // ******************************
+
+
+ public static SourceDefinition computeDefinitionFromURI(String uri) throws Exception {
+ final String location = StringSupport.substringBefore(uri, "?");
+
+ if (!location.startsWith(Constants.SCHEME_PREFIX_CLASSPATH) && !location.startsWith(Constants.SCHEME_PREFIX_FILE)) {
+ throw new IllegalArgumentException("No valid resource format, expected scheme:path, found " + uri);
+ }
+
+ final String query = StringSupport.substringAfter(uri, "?");
+ final Map<String, Object> params = URISupport.parseQuery(query);
+
+ String language = (String) params.get("language");
+ if (ObjectHelper.isEmpty(language)) {
+ language = StringSupport.substringAfterLast(location, ":");
+ language = StringSupport.substringAfterLast(language, ".");
+ }
+ if (ObjectHelper.isEmpty(language)) {
+ throw new IllegalArgumentException("Unknown language " + language);
+ }
+
+ String name = (String) params.get("name");
+ if (name == null) {
+ name = StringSupport.substringAfter(location, ":");
+ name = StringSupport.substringBeforeLast(name, ".");
+
+ if (name.contains("/")) {
+ name = StringSupport.substringAfterLast(name, "/");
+ }
+ }
+
+ SourceDefinition answer = new SourceDefinition();
+ answer.setId((String) params.get("id"));
+ answer.setLocation(location);
+ answer.setName(name);
+ answer.setLanguage(language);
+ answer.setLoader((String) params.get("loader"));
+ answer.setInterceptors(StringSupport.split((String) params.get("interceptors"), ","));
+ answer.setCompressed(Boolean.parseBoolean((String) params.get("compression")));
+
+ return answer;
+ }
}
diff --git a/camel-k-runtime-core/src/main/java/org/apache/camel/k/support/SourcesSupport.java b/camel-k-core/support/src/main/java/org/apache/camel/k/support/SourcesSupport.java
similarity index 99%
rename from camel-k-runtime-core/src/main/java/org/apache/camel/k/support/SourcesSupport.java
rename to camel-k-core/support/src/main/java/org/apache/camel/k/support/SourcesSupport.java
index 971e796..968ff95 100644
--- a/camel-k-runtime-core/src/main/java/org/apache/camel/k/support/SourcesSupport.java
+++ b/camel-k-core/support/src/main/java/org/apache/camel/k/support/SourcesSupport.java
@@ -29,7 +29,6 @@ import org.apache.camel.k.Source;
import org.apache.camel.k.SourceDefinition;
import org.apache.camel.k.SourceLoader;
import org.apache.camel.k.SourceType;
-import org.apache.camel.k.Sources;
import org.apache.camel.k.listener.AbstractPhaseListener;
import org.apache.camel.k.listener.SourcesConfigurer;
import org.apache.camel.model.RouteDefinition;
diff --git a/camel-k-runtime-core/src/main/java/org/apache/camel/k/support/StringSupport.java b/camel-k-core/support/src/main/java/org/apache/camel/k/support/StringSupport.java
similarity index 100%
rename from camel-k-runtime-core/src/main/java/org/apache/camel/k/support/StringSupport.java
rename to camel-k-core/support/src/main/java/org/apache/camel/k/support/StringSupport.java
diff --git a/camel-k-runtime-core/src/main/resources/META-INF/services/org.apache.camel.k.Runtime$Listener b/camel-k-core/support/src/main/resources/META-INF/services/org.apache.camel.k.Runtime$Listener
similarity index 100%
rename from camel-k-runtime-core/src/main/resources/META-INF/services/org.apache.camel.k.Runtime$Listener
rename to camel-k-core/support/src/main/resources/META-INF/services/org.apache.camel.k.Runtime$Listener
diff --git a/camel-k-runtime-core/src/test/java/org/apache/camel/k/SourceTest.java b/camel-k-core/support/src/test/java/org/apache/camel/k/SourceTest.java
similarity index 97%
rename from camel-k-runtime-core/src/test/java/org/apache/camel/k/SourceTest.java
rename to camel-k-core/support/src/test/java/org/apache/camel/k/SourceTest.java
index 87279cf..deee1c9 100644
--- a/camel-k-runtime-core/src/test/java/org/apache/camel/k/SourceTest.java
+++ b/camel-k-core/support/src/test/java/org/apache/camel/k/SourceTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.k;
+import org.apache.camel.k.support.Sources;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/camel-k-runtime-core/src/test/java/org/apache/camel/k/listener/PropertiesFunctionsConfigurerTest.java b/camel-k-core/support/src/test/java/org/apache/camel/k/listener/PropertiesFunctionsConfigurerTest.java
similarity index 100%
rename from camel-k-runtime-core/src/test/java/org/apache/camel/k/listener/PropertiesFunctionsConfigurerTest.java
rename to camel-k-core/support/src/test/java/org/apache/camel/k/listener/PropertiesFunctionsConfigurerTest.java
diff --git a/camel-k-runtime-core/src/test/java/org/apache/camel/k/support/NameCustomizer.java b/camel-k-core/support/src/test/java/org/apache/camel/k/support/NameCustomizer.java
similarity index 100%
rename from camel-k-runtime-core/src/test/java/org/apache/camel/k/support/NameCustomizer.java
rename to camel-k-core/support/src/test/java/org/apache/camel/k/support/NameCustomizer.java
diff --git a/camel-k-runtime-core/src/test/java/org/apache/camel/k/support/PropertiesSupportTest.java b/camel-k-core/support/src/test/java/org/apache/camel/k/support/PropertiesSupportTest.java
similarity index 100%
rename from camel-k-runtime-core/src/test/java/org/apache/camel/k/support/PropertiesSupportTest.java
rename to camel-k-core/support/src/test/java/org/apache/camel/k/support/PropertiesSupportTest.java
diff --git a/camel-k-runtime-core/src/test/java/org/apache/camel/k/support/RuntimeSupportTest.java b/camel-k-core/support/src/test/java/org/apache/camel/k/support/RuntimeSupportTest.java
similarity index 99%
rename from camel-k-runtime-core/src/test/java/org/apache/camel/k/support/RuntimeSupportTest.java
rename to camel-k-core/support/src/test/java/org/apache/camel/k/support/RuntimeSupportTest.java
index 962cc05..632f3e6 100644
--- a/camel-k-runtime-core/src/test/java/org/apache/camel/k/support/RuntimeSupportTest.java
+++ b/camel-k-core/support/src/test/java/org/apache/camel/k/support/RuntimeSupportTest.java
@@ -23,7 +23,6 @@ import org.apache.camel.CamelContext;
import org.apache.camel.Ordered;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.impl.engine.ExplicitCamelContextNameStrategy;
-import org.apache.camel.k.Constants;
import org.apache.camel.k.ContextCustomizer;
import org.junit.jupiter.api.Test;
diff --git a/camel-k-runtime-core/src/test/resources/META-INF/services/org/apache/camel/k/customizer/name b/camel-k-core/support/src/test/resources/META-INF/services/org/apache/camel/k/customizer/name
similarity index 100%
rename from camel-k-runtime-core/src/test/resources/META-INF/services/org/apache/camel/k/customizer/name
rename to camel-k-core/support/src/test/resources/META-INF/services/org/apache/camel/k/customizer/name
diff --git a/camel-k-runtime-core/src/test/resources/configmaps/my-cm/my-property b/camel-k-core/support/src/test/resources/configmaps/my-cm/my-property
similarity index 100%
rename from camel-k-runtime-core/src/test/resources/configmaps/my-cm/my-property
rename to camel-k-core/support/src/test/resources/configmaps/my-cm/my-property
diff --git a/camel-k-runtime-knative/src/test/resources/log4j2-test.xml b/camel-k-core/support/src/test/resources/log4j2-test.xml
similarity index 100%
rename from camel-k-runtime-knative/src/test/resources/log4j2-test.xml
rename to camel-k-core/support/src/test/resources/log4j2-test.xml
diff --git a/camel-k-runtime-core/src/test/resources/my-cp-resource.txt b/camel-k-core/support/src/test/resources/my-cp-resource.txt
similarity index 100%
rename from camel-k-runtime-core/src/test/resources/my-cp-resource.txt
rename to camel-k-core/support/src/test/resources/my-cp-resource.txt
diff --git a/camel-k-runtime-core/src/test/resources/my-file-resource.txt b/camel-k-core/support/src/test/resources/my-file-resource.txt
similarity index 100%
rename from camel-k-runtime-core/src/test/resources/my-file-resource.txt
rename to camel-k-core/support/src/test/resources/my-file-resource.txt
diff --git a/camel-k-runtime-core/src/test/resources/secrets/my-secret/my-property b/camel-k-core/support/src/test/resources/secrets/my-secret/my-property
similarity index 100%
rename from camel-k-runtime-core/src/test/resources/secrets/my-secret/my-property
rename to camel-k-core/support/src/test/resources/secrets/my-secret/my-property
diff --git a/camel-k-quarkus/camel-k-quarkus-wrap/deployment/pom.xml b/camel-k-cron/deployment/pom.xml
similarity index 89%
copy from camel-k-quarkus/camel-k-quarkus-wrap/deployment/pom.xml
copy to camel-k-cron/deployment/pom.xml
index 3082ed2..67ac62a 100644
--- a/camel-k-quarkus/camel-k-quarkus-wrap/deployment/pom.xml
+++ b/camel-k-cron/deployment/pom.xml
@@ -20,21 +20,21 @@
<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">
<parent>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus-wrap-parent</artifactId>
+ <artifactId>camel-k-cron-parent</artifactId>
<version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>camel-k-quarkus-wrap-deployment</artifactId>
+ <artifactId>camel-k-cron-deployment</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus-core-deployment</artifactId>
+ <artifactId>camel-k-core-deployment</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus-wrap</artifactId>
+ <artifactId>camel-k-cron</artifactId>
</dependency>
</dependencies>
diff --git a/camel-k-quarkus/camel-k-quarkus-cron/deployment/src/main/java/org/apache/camel/k/quarkus/cron/deployment/Feature.java b/camel-k-cron/deployment/src/main/java/org/apache/camel/k/quarkus/cron/deployment/Feature.java
similarity index 100%
rename from camel-k-quarkus/camel-k-quarkus-cron/deployment/src/main/java/org/apache/camel/k/quarkus/cron/deployment/Feature.java
rename to camel-k-cron/deployment/src/main/java/org/apache/camel/k/quarkus/cron/deployment/Feature.java
diff --git a/camel-k-runtime-cron/pom.xml b/camel-k-cron/impl/pom.xml
similarity index 92%
rename from camel-k-runtime-cron/pom.xml
rename to camel-k-cron/impl/pom.xml
index 6a20c2d..40248e7 100644
--- a/camel-k-runtime-cron/pom.xml
+++ b/camel-k-cron/impl/pom.xml
@@ -20,12 +20,12 @@
<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">
<parent>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-parent</artifactId>
+ <artifactId>camel-k-cron-parent</artifactId>
<version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>camel-k-runtime-cron</artifactId>
+ <artifactId>camel-k-cron-impl</artifactId>
<dependencies>
@@ -45,7 +45,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-core</artifactId>
+ <artifactId>camel-k-core-support</artifactId>
</dependency>
<dependency>
@@ -73,12 +73,7 @@
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-loader-js</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-main</artifactId>
+ <artifactId>camel-k-loader-yaml</artifactId>
<scope>test</scope>
</dependency>
diff --git a/camel-k-runtime-cron/src/generated/java/org/apache/camel/k/cron/CronSourceLoaderInterceptorConfigurer.java b/camel-k-cron/impl/src/generated/java/org/apache/camel/k/cron/CronSourceLoaderInterceptorConfigurer.java
similarity index 100%
rename from camel-k-runtime-cron/src/generated/java/org/apache/camel/k/cron/CronSourceLoaderInterceptorConfigurer.java
rename to camel-k-cron/impl/src/generated/java/org/apache/camel/k/cron/CronSourceLoaderInterceptorConfigurer.java
diff --git a/camel-k-runtime-cron/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.k.cron.CronSourceLoaderInterceptor b/camel-k-cron/impl/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.k.cron.CronSourceLoaderInterceptor
similarity index 100%
rename from camel-k-runtime-cron/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.k.cron.CronSourceLoaderInterceptor
rename to camel-k-cron/impl/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.k.cron.CronSourceLoaderInterceptor
diff --git a/camel-k-runtime-cron/src/main/java/org/apache/camel/k/cron/CronSourceLoaderInterceptor.java b/camel-k-cron/impl/src/main/java/org/apache/camel/k/cron/CronSourceLoaderInterceptor.java
similarity index 100%
rename from camel-k-runtime-cron/src/main/java/org/apache/camel/k/cron/CronSourceLoaderInterceptor.java
rename to camel-k-cron/impl/src/main/java/org/apache/camel/k/cron/CronSourceLoaderInterceptor.java
diff --git a/camel-k-runtime-cron/src/test/java/org/apache/camel/k/cron/CronTest.java b/camel-k-cron/impl/src/test/java/org/apache/camel/k/cron/CronTest.java
similarity index 50%
rename from camel-k-runtime-cron/src/test/java/org/apache/camel/k/cron/CronTest.java
rename to camel-k-cron/impl/src/test/java/org/apache/camel/k/cron/CronTest.java
index 5c30e15..1be90e4 100644
--- a/camel-k-runtime-cron/src/test/java/org/apache/camel/k/cron/CronTest.java
+++ b/camel-k-cron/impl/src/test/java/org/apache/camel/k/cron/CronTest.java
@@ -16,14 +16,21 @@
*/
package org.apache.camel.k.cron;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.stream.Stream;
import org.apache.camel.CamelContext;
+import org.apache.camel.RoutesBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.k.main.ApplicationRuntime;
-import org.apache.camel.k.support.SourcesSupport;
+import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.k.Runtime;
+import org.apache.camel.k.Source;
+import org.apache.camel.k.SourceLoader;
+import org.apache.camel.k.loader.yaml.YamlSourceLoader;
+import org.apache.camel.k.support.Sources;
import org.apache.camel.support.LifecycleStrategySupport;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
@@ -34,18 +41,26 @@ import static org.assertj.core.api.Assertions.assertThat;
public class CronTest {
@ParameterizedTest
@MethodSource("parameters")
- public void testCronTimerActivation(String routes, String cronOverride) throws Exception {
- ApplicationRuntime runtime = new ApplicationRuntime();
- runtime.setProperties(
- "loader.interceptor.cron.overridable-components", cronOverride
- );
- runtime.addListener(SourcesSupport.forRoutes(routes));
+ public void testCronTimerActivation(String code, String cronOverride) throws Exception {
+ final Runtime runtime = Runtime.on(new DefaultCamelContext());
+ final SourceLoader loader = new YamlSourceLoader();
+ final Source source = Sources.fromBytes("my-cron", "yaml", null, List.of("cron"), code.getBytes(StandardCharsets.UTF_8));
+
+ final CronSourceLoaderInterceptor interceptor = new CronSourceLoaderInterceptor();
+ interceptor.setRuntime(runtime);
+ interceptor.setOverridableComponents(cronOverride);
+
+ RoutesBuilder builder = interceptor.afterLoad(
+ loader,
+ source,
+ loader.load(runtime, source));
+
+ runtime.getCamelContext().addRoutes(builder);
- // To check auto-termination of Camel context
CountDownLatch termination = new CountDownLatch(1);
runtime.getCamelContext().addLifecycleStrategy(new LifecycleStrategySupport() {
@Override
- public void onContextStop(CamelContext context) {
+ public void onContextStopped(CamelContext context) {
termination.countDown();
}
});
@@ -54,7 +69,7 @@ public class CronTest {
mock.expectedMessageCount(1);
mock.setResultWaitTime(10000);
- runtime.run();
+ runtime.getCamelContext().start();
mock.assertIsSatisfied();
termination.await(10, TimeUnit.SECONDS);
@@ -63,9 +78,27 @@ public class CronTest {
static Stream<Arguments> parameters() {
return Stream.of(
- Arguments.arguments("classpath:routes-timer.js?interceptors=cron", "timer"),
- Arguments.arguments("classpath:routes-quartz.js?interceptors=cron", "quartz"),
- Arguments.arguments("classpath:routes-quartz.js?interceptors=cron", "timer,quartz")
+ Arguments.arguments(
+ ""
+ + "\n- from:"
+ + "\n uri: \"timer:tick?period=1&delay=600000\""
+ + "\n steps:"
+ + "\n - to: \"mock:result\"",
+ "timer"),
+ Arguments.arguments(
+ ""
+ + "\n- from:"
+ + "\n uri: \"quartz:tick?cron=0 0 0 * * ? 2099\""
+ + "\n steps:"
+ + "\n - to: \"mock:result\"",
+ "quartz"),
+ Arguments.arguments(
+ ""
+ + "\n- from:"
+ + "\n uri: \"quartz:tick?cron=0 0 0 * * ? 2099\""
+ + "\n steps:"
+ + "\n - to: \"mock:result\"",
+ "timer,quartz")
);
}
diff --git a/camel-k-runtime-master/src/test/resources/log4j2-test.xml b/camel-k-cron/impl/src/test/resources/log4j2-test.xml
similarity index 100%
rename from camel-k-runtime-master/src/test/resources/log4j2-test.xml
rename to camel-k-cron/impl/src/test/resources/log4j2-test.xml
diff --git a/camel-k-quarkus/camel-k-quarkus-cron/pom.xml b/camel-k-cron/pom.xml
similarity index 90%
copy from camel-k-quarkus/camel-k-quarkus-cron/pom.xml
copy to camel-k-cron/pom.xml
index e2b9864..2444ea6 100644
--- a/camel-k-quarkus/camel-k-quarkus-cron/pom.xml
+++ b/camel-k-cron/pom.xml
@@ -20,15 +20,16 @@
<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">
<parent>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus</artifactId>
+ <artifactId>camel-k-runtime-project</artifactId>
<version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
- <artifactId>camel-k-quarkus-cron-parent</artifactId>
+ <artifactId>camel-k-cron-parent</artifactId>
<modules>
+ <module>impl</module>
<module>runtime</module>
<module>deployment</module>
</modules>
diff --git a/camel-k-quarkus/camel-k-quarkus-cron/runtime/pom.xml b/camel-k-cron/runtime/pom.xml
similarity index 93%
rename from camel-k-quarkus/camel-k-quarkus-cron/runtime/pom.xml
rename to camel-k-cron/runtime/pom.xml
index d9dffaf..ec2ad11 100644
--- a/camel-k-quarkus/camel-k-quarkus-cron/runtime/pom.xml
+++ b/camel-k-cron/runtime/pom.xml
@@ -20,21 +20,21 @@
<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">
<parent>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus-cron-parent</artifactId>
+ <artifactId>camel-k-cron-parent</artifactId>
<version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>camel-k-quarkus-cron</artifactId>
+ <artifactId>camel-k-cron</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus-core</artifactId>
+ <artifactId>camel-k-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-cron</artifactId>
+ <artifactId>camel-k-cron-impl</artifactId>
</dependency>
</dependencies>
diff --git a/camel-k-quarkus/camel-k-quarkus-kamelet/deployment/pom.xml b/camel-k-kamelet/deployment/pom.xml
similarity index 90%
rename from camel-k-quarkus/camel-k-quarkus-kamelet/deployment/pom.xml
rename to camel-k-kamelet/deployment/pom.xml
index 18710f2..874a6dc 100644
--- a/camel-k-quarkus/camel-k-quarkus-kamelet/deployment/pom.xml
+++ b/camel-k-kamelet/deployment/pom.xml
@@ -20,21 +20,21 @@
<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">
<parent>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus-kamelet-parent</artifactId>
+ <artifactId>camel-k-kamelet-parent</artifactId>
<version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>camel-k-quarkus-kamelet-deployment</artifactId>
+ <artifactId>camel-k-kamelet-deployment</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus-kamelet</artifactId>
+ <artifactId>camel-k-kamelet</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus-core-deployment</artifactId>
+ <artifactId>camel-k-core-deployment</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
diff --git a/camel-k-quarkus/camel-k-quarkus-kamelet/deployment/src/main/java/org/apache/camel/k/quarkus/kamelet/deployment/Feature.java b/camel-k-kamelet/deployment/src/main/java/org/apache/camel/k/quarkus/kamelet/deployment/Feature.java
similarity index 100%
rename from camel-k-quarkus/camel-k-quarkus-kamelet/deployment/src/main/java/org/apache/camel/k/quarkus/kamelet/deployment/Feature.java
rename to camel-k-kamelet/deployment/src/main/java/org/apache/camel/k/quarkus/kamelet/deployment/Feature.java
diff --git a/camel-k-quarkus/camel-k-quarkus-knative/pom.xml b/camel-k-kamelet/pom.xml
similarity index 92%
copy from camel-k-quarkus/camel-k-quarkus-knative/pom.xml
copy to camel-k-kamelet/pom.xml
index 756e006..34c85c7 100644
--- a/camel-k-quarkus/camel-k-quarkus-knative/pom.xml
+++ b/camel-k-kamelet/pom.xml
@@ -20,13 +20,13 @@
<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">
<parent>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus</artifactId>
+ <artifactId>camel-k-runtime-project</artifactId>
<version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
- <artifactId>camel-k-quarkus-knative-parent</artifactId>
+ <artifactId>camel-k-kamelet-parent</artifactId>
<modules>
<module>runtime</module>
diff --git a/camel-k-quarkus/camel-k-quarkus-kamelet/runtime/pom.xml b/camel-k-kamelet/runtime/pom.xml
similarity index 92%
rename from camel-k-quarkus/camel-k-quarkus-kamelet/runtime/pom.xml
rename to camel-k-kamelet/runtime/pom.xml
index 3ff7789..e876869 100644
--- a/camel-k-quarkus/camel-k-quarkus-kamelet/runtime/pom.xml
+++ b/camel-k-kamelet/runtime/pom.xml
@@ -20,12 +20,12 @@
<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">
<parent>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus-kamelet-parent</artifactId>
+ <artifactId>camel-k-kamelet-parent</artifactId>
<version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>camel-k-quarkus-kamelet</artifactId>
+ <artifactId>camel-k-kamelet</artifactId>
<dependencies>
<dependency>
@@ -33,10 +33,6 @@
<artifactId>camel-kamelet</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus-core</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-core</artifactId>
</dependency>
diff --git a/camel-k-quarkus/camel-k-quarkus-knative/deployment/pom.xml b/camel-k-knative/deployment/pom.xml
similarity index 91%
rename from camel-k-quarkus/camel-k-quarkus-knative/deployment/pom.xml
rename to camel-k-knative/deployment/pom.xml
index a66d921..31f4edb 100644
--- a/camel-k-quarkus/camel-k-quarkus-knative/deployment/pom.xml
+++ b/camel-k-knative/deployment/pom.xml
@@ -20,21 +20,21 @@
<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">
<parent>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus-knative-parent</artifactId>
+ <artifactId>camel-k-knative-parent</artifactId>
<version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>camel-k-quarkus-knative-deployment</artifactId>
+ <artifactId>camel-k-knative-deployment</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus-knative</artifactId>
+ <artifactId>camel-k-knative</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus-core-deployment</artifactId>
+ <artifactId>camel-k-core-deployment</artifactId>
</dependency>
<dependency>
diff --git a/camel-k-quarkus/camel-k-quarkus-knative/deployment/src/main/java/org/apache/camel/k/quarkus/knative/deployment/DeploymentProcessor.java b/camel-k-knative/deployment/src/main/java/org/apache/camel/k/quarkus/knative/deployment/DeploymentProcessor.java
similarity index 100%
rename from camel-k-quarkus/camel-k-quarkus-knative/deployment/src/main/java/org/apache/camel/k/quarkus/knative/deployment/DeploymentProcessor.java
rename to camel-k-knative/deployment/src/main/java/org/apache/camel/k/quarkus/knative/deployment/DeploymentProcessor.java
diff --git a/camel-k-quarkus/camel-k-quarkus-knative/deployment/src/main/java/org/apache/camel/k/quarkus/knative/deployment/Feature.java b/camel-k-knative/deployment/src/main/java/org/apache/camel/k/quarkus/knative/deployment/Feature.java
similarity index 100%
rename from camel-k-quarkus/camel-k-quarkus-knative/deployment/src/main/java/org/apache/camel/k/quarkus/knative/deployment/Feature.java
rename to camel-k-knative/deployment/src/main/java/org/apache/camel/k/quarkus/knative/deployment/Feature.java
diff --git a/camel-k-main/camel-k-runtime-health/pom.xml b/camel-k-knative/impl/pom.xml
similarity index 70%
rename from camel-k-main/camel-k-runtime-health/pom.xml
rename to camel-k-knative/impl/pom.xml
index 594ae6d..8070078 100644
--- a/camel-k-main/camel-k-runtime-health/pom.xml
+++ b/camel-k-knative/impl/pom.xml
@@ -20,75 +20,36 @@
<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">
<parent>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-main</artifactId>
+ <artifactId>camel-k-knative-parent</artifactId>
<version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>camel-k-runtime-health</artifactId>
+ <artifactId>camel-k-knative-impl</artifactId>
<dependencies>
-
- <!-- ****************************** -->
- <!-- -->
- <!-- RUNTIME -->
- <!-- -->
- <!-- ****************************** -->
-
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core-engine</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-health</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-core</artifactId>
+ <artifactId>camel-k-core-support</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-http</artifactId>
+ <artifactId>camel-knative</artifactId>
</dependency>
-
<dependency>
- <groupId>io.vertx</groupId>
- <artifactId>vertx-web</artifactId>
- <version>${vertx-version}</version>
+ <groupId>org.apache.camel.k</groupId>
+ <artifactId>camel-knative-http</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
<artifactId>camel-k-apt</artifactId>
- <scope>provided</scope>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
<artifactId>camel-k-annotations</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <!-- ****************************** -->
- <!-- -->
- <!-- TESTS -->
- <!-- -->
- <!-- ****************************** -->
-
- <dependency>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-direct</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-mock</artifactId>
- <scope>test</scope>
+ <optional>true</optional>
</dependency>
</dependencies>
diff --git a/camel-k-runtime-knative/src/generated/java/org/apache/camel/k/knative/customizer/KnativeSinkBindingContextCustomizerConfigurer.java b/camel-k-knative/impl/src/generated/java/org/apache/camel/k/knative/customizer/KnativeSinkBindingContextCustomizerConfigurer.java
similarity index 100%
rename from camel-k-runtime-knative/src/generated/java/org/apache/camel/k/knative/customizer/KnativeSinkBindingContextCustomizerConfigurer.java
rename to camel-k-knative/impl/src/generated/java/org/apache/camel/k/knative/customizer/KnativeSinkBindingContextCustomizerConfigurer.java
diff --git a/camel-k-runtime-knative/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.k.knative.customizer.KnativeSinkBindingContextCustomizer b/camel-k-knative/impl/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.k.knative.customizer.KnativeSinkBindingContextCustomizer
similarity index 100%
rename from camel-k-runtime-knative/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.k.knative.customizer.KnativeSinkBindingContextCustomizer
rename to camel-k-knative/impl/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.k.knative.customizer.KnativeSinkBindingContextCustomizer
diff --git a/camel-k-runtime-knative/src/main/java/org/apache/camel/k/knative/customizer/KnativeSinkBindingContextCustomizer.java b/camel-k-knative/impl/src/main/java/org/apache/camel/k/knative/customizer/KnativeSinkBindingContextCustomizer.java
similarity index 100%
rename from camel-k-runtime-knative/src/main/java/org/apache/camel/k/knative/customizer/KnativeSinkBindingContextCustomizer.java
rename to camel-k-knative/impl/src/main/java/org/apache/camel/k/knative/customizer/KnativeSinkBindingContextCustomizer.java
diff --git a/camel-k-runtime-knative/src/main/java/org/apache/camel/k/loader/knative/KnativeSourceLoaderInterceptor.java b/camel-k-knative/impl/src/main/java/org/apache/camel/k/loader/knative/KnativeSourceLoaderInterceptor.java
similarity index 100%
rename from camel-k-runtime-knative/src/main/java/org/apache/camel/k/loader/knative/KnativeSourceLoaderInterceptor.java
rename to camel-k-knative/impl/src/main/java/org/apache/camel/k/loader/knative/KnativeSourceLoaderInterceptor.java
diff --git a/camel-k-quarkus/camel-k-quarkus-knative/pom.xml b/camel-k-knative/pom.xml
similarity index 90%
copy from camel-k-quarkus/camel-k-quarkus-knative/pom.xml
copy to camel-k-knative/pom.xml
index 756e006..deba840 100644
--- a/camel-k-quarkus/camel-k-quarkus-knative/pom.xml
+++ b/camel-k-knative/pom.xml
@@ -20,17 +20,19 @@
<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">
<parent>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus</artifactId>
+ <artifactId>camel-k-runtime-project</artifactId>
<version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
- <artifactId>camel-k-quarkus-knative-parent</artifactId>
+ <artifactId>camel-k-knative-parent</artifactId>
<modules>
+ <module>impl</module>
<module>runtime</module>
<module>deployment</module>
</modules>
+
</project>
diff --git a/camel-k-quarkus/camel-k-quarkus-knative/runtime/pom.xml b/camel-k-knative/runtime/pom.xml
similarity index 92%
rename from camel-k-quarkus/camel-k-quarkus-knative/runtime/pom.xml
rename to camel-k-knative/runtime/pom.xml
index 7317588..d4bf7c2 100644
--- a/camel-k-quarkus/camel-k-quarkus-knative/runtime/pom.xml
+++ b/camel-k-knative/runtime/pom.xml
@@ -20,12 +20,12 @@
<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">
<parent>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus-knative-parent</artifactId>
+ <artifactId>camel-k-knative-parent</artifactId>
<version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>camel-k-quarkus-knative</artifactId>
+ <artifactId>camel-k-knative</artifactId>
<dependencies>
<dependency>
@@ -38,7 +38,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus-core</artifactId>
+ <artifactId>camel-k-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
@@ -53,13 +53,12 @@
<artifactId>camel-knative-http</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-http-common</artifactId>
+ <groupId>org.apache.camel.k</groupId>
+ <artifactId>camel-k-knative-impl</artifactId>
</dependency>
<dependency>
- <groupId>org.graalvm.nativeimage</groupId>
- <artifactId>svm</artifactId>
- <scope>provided</scope>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-http-common</artifactId>
</dependency>
</dependencies>
diff --git a/camel-k-quarkus/camel-k-quarkus-knative/runtime/src/main/java/org/apache/camel/k/quarkus/knative/KnativeRecorder.java b/camel-k-knative/runtime/src/main/java/org/apache/camel/k/quarkus/knative/KnativeRecorder.java
similarity index 100%
rename from camel-k-quarkus/camel-k-quarkus-knative/runtime/src/main/java/org/apache/camel/k/quarkus/knative/KnativeRecorder.java
rename to camel-k-knative/runtime/src/main/java/org/apache/camel/k/quarkus/knative/KnativeRecorder.java
diff --git a/camel-k-quarkus/camel-k-quarkus-cron/deployment/pom.xml b/camel-k-loader-groovy/deployment/pom.xml
similarity index 89%
rename from camel-k-quarkus/camel-k-quarkus-cron/deployment/pom.xml
rename to camel-k-loader-groovy/deployment/pom.xml
index 971e74b..29e7301 100644
--- a/camel-k-quarkus/camel-k-quarkus-cron/deployment/pom.xml
+++ b/camel-k-loader-groovy/deployment/pom.xml
@@ -20,21 +20,21 @@
<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">
<parent>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus-cron-parent</artifactId>
+ <artifactId>camel-k-loader-groovy-parent</artifactId>
<version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>camel-k-quarkus-cron-deployment</artifactId>
+ <artifactId>camel-k-loader-groovy-deployment</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus-core-deployment</artifactId>
+ <artifactId>camel-k-loader-groovy</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus-cron</artifactId>
+ <artifactId>camel-k-core-deployment</artifactId>
</dependency>
</dependencies>
diff --git a/camel-k-quarkus/camel-k-quarkus-loader-groovy/deployment/src/main/java/org/apache/camel/k/loader/groovy/quarkus/deployment/Feature.java b/camel-k-loader-groovy/deployment/src/main/java/org/apache/camel/k/loader/groovy/quarkus/deployment/Feature.java
similarity index 100%
rename from camel-k-quarkus/camel-k-quarkus-loader-groovy/deployment/src/main/java/org/apache/camel/k/loader/groovy/quarkus/deployment/Feature.java
rename to camel-k-loader-groovy/deployment/src/main/java/org/apache/camel/k/loader/groovy/quarkus/deployment/Feature.java
diff --git a/camel-k-loader-groovy/pom.xml b/camel-k-loader-groovy/impl/pom.xml
similarity index 96%
copy from camel-k-loader-groovy/pom.xml
copy to camel-k-loader-groovy/impl/pom.xml
index 609df6e..e307226 100644
--- a/camel-k-loader-groovy/pom.xml
+++ b/camel-k-loader-groovy/impl/pom.xml
@@ -20,17 +20,17 @@
<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">
<parent>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-parent</artifactId>
+ <artifactId>camel-k-loader-groovy-parent</artifactId>
<version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>camel-k-loader-groovy</artifactId>
+ <artifactId>camel-k-loader-groovy-impl</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-core</artifactId>
+ <artifactId>camel-k-core-support</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
diff --git a/camel-k-loader-groovy/src/main/groovy/org/apache/camel/k/loader/groovy/GroovySourceLoader.groovy b/camel-k-loader-groovy/impl/src/main/groovy/org/apache/camel/k/loader/groovy/GroovySourceLoader.groovy
similarity index 100%
rename from camel-k-loader-groovy/src/main/groovy/org/apache/camel/k/loader/groovy/GroovySourceLoader.groovy
rename to camel-k-loader-groovy/impl/src/main/groovy/org/apache/camel/k/loader/groovy/GroovySourceLoader.groovy
diff --git a/camel-k-loader-groovy/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/BeanConfiguration.groovy b/camel-k-loader-groovy/impl/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/BeanConfiguration.groovy
similarity index 100%
rename from camel-k-loader-groovy/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/BeanConfiguration.groovy
rename to camel-k-loader-groovy/impl/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/BeanConfiguration.groovy
diff --git a/camel-k-loader-groovy/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/BeansConfiguration.groovy b/camel-k-loader-groovy/impl/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/BeansConfiguration.groovy
similarity index 100%
rename from camel-k-loader-groovy/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/BeansConfiguration.groovy
rename to camel-k-loader-groovy/impl/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/BeansConfiguration.groovy
diff --git a/camel-k-loader-groovy/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/CamelConfiguration.groovy b/camel-k-loader-groovy/impl/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/CamelConfiguration.groovy
similarity index 100%
rename from camel-k-loader-groovy/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/CamelConfiguration.groovy
rename to camel-k-loader-groovy/impl/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/CamelConfiguration.groovy
diff --git a/camel-k-loader-groovy/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/Components.groovy b/camel-k-loader-groovy/impl/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/Components.groovy
similarity index 100%
rename from camel-k-loader-groovy/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/Components.groovy
rename to camel-k-loader-groovy/impl/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/Components.groovy
diff --git a/camel-k-loader-groovy/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/ComponentsConfiguration.groovy b/camel-k-loader-groovy/impl/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/ComponentsConfiguration.groovy
similarity index 100%
rename from camel-k-loader-groovy/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/ComponentsConfiguration.groovy
rename to camel-k-loader-groovy/impl/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/ComponentsConfiguration.groovy
diff --git a/camel-k-loader-groovy/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/DataFormatsConfiguration.groovy b/camel-k-loader-groovy/impl/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/DataFormatsConfiguration.groovy
similarity index 100%
rename from camel-k-loader-groovy/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/DataFormatsConfiguration.groovy
rename to camel-k-loader-groovy/impl/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/DataFormatsConfiguration.groovy
diff --git a/camel-k-loader-groovy/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/IntegrationConfiguration.groovy b/camel-k-loader-groovy/impl/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/IntegrationConfiguration.groovy
similarity index 100%
rename from camel-k-loader-groovy/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/IntegrationConfiguration.groovy
rename to camel-k-loader-groovy/impl/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/IntegrationConfiguration.groovy
diff --git a/camel-k-loader-groovy/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/LanguagesConfiguration.groovy b/camel-k-loader-groovy/impl/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/LanguagesConfiguration.groovy
similarity index 100%
rename from camel-k-loader-groovy/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/LanguagesConfiguration.groovy
rename to camel-k-loader-groovy/impl/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/LanguagesConfiguration.groovy
diff --git a/camel-k-loader-groovy/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/RestConfiguration.groovy b/camel-k-loader-groovy/impl/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/RestConfiguration.groovy
similarity index 100%
rename from camel-k-loader-groovy/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/RestConfiguration.groovy
rename to camel-k-loader-groovy/impl/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/RestConfiguration.groovy
diff --git a/camel-k-loader-groovy/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/RestVerbConfiguration.groovy b/camel-k-loader-groovy/impl/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/RestVerbConfiguration.groovy
similarity index 100%
rename from camel-k-loader-groovy/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/RestVerbConfiguration.groovy
rename to camel-k-loader-groovy/impl/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/RestVerbConfiguration.groovy
diff --git a/camel-k-loader-groovy/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/Support.groovy b/camel-k-loader-groovy/impl/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/Support.groovy
similarity index 100%
rename from camel-k-loader-groovy/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/Support.groovy
rename to camel-k-loader-groovy/impl/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/Support.groovy
diff --git a/camel-k-loader-groovy/src/main/groovy/org/apache/camel/k/loader/groovy/extension/CamelContextExtensions.groovy b/camel-k-loader-groovy/impl/src/main/groovy/org/apache/camel/k/loader/groovy/extension/CamelContextExtensions.groovy
similarity index 100%
rename from camel-k-loader-groovy/src/main/groovy/org/apache/camel/k/loader/groovy/extension/CamelContextExtensions.groovy
rename to camel-k-loader-groovy/impl/src/main/groovy/org/apache/camel/k/loader/groovy/extension/CamelContextExtensions.groovy
diff --git a/camel-k-loader-groovy/src/main/groovy/org/apache/camel/k/loader/groovy/extension/ExpressionClauseExtensions.groovy b/camel-k-loader-groovy/impl/src/main/groovy/org/apache/camel/k/loader/groovy/extension/ExpressionClauseExtensions.groovy
similarity index 100%
rename from camel-k-loader-groovy/src/main/groovy/org/apache/camel/k/loader/groovy/extension/ExpressionClauseExtensions.groovy
rename to camel-k-loader-groovy/impl/src/main/groovy/org/apache/camel/k/loader/groovy/extension/ExpressionClauseExtensions.groovy
diff --git a/camel-k-loader-groovy/src/main/groovy/org/apache/camel/k/loader/groovy/extension/LogComponentExtension.groovy b/camel-k-loader-groovy/impl/src/main/groovy/org/apache/camel/k/loader/groovy/extension/LogComponentExtension.groovy
similarity index 100%
rename from camel-k-loader-groovy/src/main/groovy/org/apache/camel/k/loader/groovy/extension/LogComponentExtension.groovy
rename to camel-k-loader-groovy/impl/src/main/groovy/org/apache/camel/k/loader/groovy/extension/LogComponentExtension.groovy
diff --git a/camel-k-loader-groovy/src/main/groovy/org/apache/camel/k/loader/groovy/extension/ProcessorDefinitionExtensions.groovy b/camel-k-loader-groovy/impl/src/main/groovy/org/apache/camel/k/loader/groovy/extension/ProcessorDefinitionExtensions.groovy
similarity index 100%
rename from camel-k-loader-groovy/src/main/groovy/org/apache/camel/k/loader/groovy/extension/ProcessorDefinitionExtensions.groovy
rename to camel-k-loader-groovy/impl/src/main/groovy/org/apache/camel/k/loader/groovy/extension/ProcessorDefinitionExtensions.groovy
diff --git a/camel-k-loader-groovy/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule b/camel-k-loader-groovy/impl/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule
similarity index 100%
rename from camel-k-loader-groovy/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule
rename to camel-k-loader-groovy/impl/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule
diff --git a/camel-k-loader-groovy/src/main/resources/META-INF/services/org/apache/camel/k/loader/groovy b/camel-k-loader-groovy/impl/src/main/resources/META-INF/services/org/apache/camel/k/loader/groovy
similarity index 100%
rename from camel-k-loader-groovy/src/main/resources/META-INF/services/org/apache/camel/k/loader/groovy
rename to camel-k-loader-groovy/impl/src/main/resources/META-INF/services/org/apache/camel/k/loader/groovy
diff --git a/camel-k-loader-groovy/src/main/resources/integration.gdsl b/camel-k-loader-groovy/impl/src/main/resources/integration.gdsl
similarity index 100%
rename from camel-k-loader-groovy/src/main/resources/integration.gdsl
rename to camel-k-loader-groovy/impl/src/main/resources/integration.gdsl
diff --git a/camel-k-loader-groovy/src/test/groovy/org/apache/camel/k/loader/groovy/GroovySourceLoaderIssuesTest.groovy b/camel-k-loader-groovy/impl/src/test/groovy/org/apache/camel/k/loader/groovy/GroovySourceLoaderIssuesTest.groovy
similarity index 100%
rename from camel-k-loader-groovy/src/test/groovy/org/apache/camel/k/loader/groovy/GroovySourceLoaderIssuesTest.groovy
rename to camel-k-loader-groovy/impl/src/test/groovy/org/apache/camel/k/loader/groovy/GroovySourceLoaderIssuesTest.groovy
diff --git a/camel-k-loader-groovy/src/test/groovy/org/apache/camel/k/loader/groovy/GroovySourceLoaderTest.groovy b/camel-k-loader-groovy/impl/src/test/groovy/org/apache/camel/k/loader/groovy/GroovySourceLoaderTest.groovy
similarity index 100%
rename from camel-k-loader-groovy/src/test/groovy/org/apache/camel/k/loader/groovy/GroovySourceLoaderTest.groovy
rename to camel-k-loader-groovy/impl/src/test/groovy/org/apache/camel/k/loader/groovy/GroovySourceLoaderTest.groovy
diff --git a/camel-k-loader-groovy/src/test/groovy/org/apache/camel/k/loader/groovy/extension/ExpressionClauseExtensionTest.groovy b/camel-k-loader-groovy/impl/src/test/groovy/org/apache/camel/k/loader/groovy/extension/ExpressionClauseExtensionTest.groovy
similarity index 100%
rename from camel-k-loader-groovy/src/test/groovy/org/apache/camel/k/loader/groovy/extension/ExpressionClauseExtensionTest.groovy
rename to camel-k-loader-groovy/impl/src/test/groovy/org/apache/camel/k/loader/groovy/extension/ExpressionClauseExtensionTest.groovy
diff --git a/camel-k-loader-groovy/src/test/groovy/org/apache/camel/k/loader/groovy/extension/LogExtensionTest.groovy b/camel-k-loader-groovy/impl/src/test/groovy/org/apache/camel/k/loader/groovy/extension/LogExtensionTest.groovy
similarity index 100%
rename from camel-k-loader-groovy/src/test/groovy/org/apache/camel/k/loader/groovy/extension/LogExtensionTest.groovy
rename to camel-k-loader-groovy/impl/src/test/groovy/org/apache/camel/k/loader/groovy/extension/LogExtensionTest.groovy
diff --git a/camel-k-loader-groovy/src/test/groovy/org/apache/camel/k/loader/groovy/support/MyBean.groovy b/camel-k-loader-groovy/impl/src/test/groovy/org/apache/camel/k/loader/groovy/support/MyBean.groovy
similarity index 100%
rename from camel-k-loader-groovy/src/test/groovy/org/apache/camel/k/loader/groovy/support/MyBean.groovy
rename to camel-k-loader-groovy/impl/src/test/groovy/org/apache/camel/k/loader/groovy/support/MyBean.groovy
diff --git a/camel-k-loader-groovy/src/test/groovy/org/apache/camel/k/loader/groovy/support/TestRuntime.groovy b/camel-k-loader-groovy/impl/src/test/groovy/org/apache/camel/k/loader/groovy/support/TestRuntime.groovy
similarity index 100%
rename from camel-k-loader-groovy/src/test/groovy/org/apache/camel/k/loader/groovy/support/TestRuntime.groovy
rename to camel-k-loader-groovy/impl/src/test/groovy/org/apache/camel/k/loader/groovy/support/TestRuntime.groovy
diff --git a/camel-k-loader-groovy/src/test/resources/issues/github-529.groovy b/camel-k-loader-groovy/impl/src/test/resources/issues/github-529.groovy
similarity index 100%
rename from camel-k-loader-groovy/src/test/resources/issues/github-529.groovy
rename to camel-k-loader-groovy/impl/src/test/resources/issues/github-529.groovy
diff --git a/camel-k-loader-xml/src/test/resources/log4j2-test.xml b/camel-k-loader-groovy/impl/src/test/resources/log4j2-test.xml
similarity index 100%
rename from camel-k-loader-xml/src/test/resources/log4j2-test.xml
rename to camel-k-loader-groovy/impl/src/test/resources/log4j2-test.xml
diff --git a/camel-k-loader-groovy/src/test/resources/routes-with-beans.groovy b/camel-k-loader-groovy/impl/src/test/resources/routes-with-beans.groovy
similarity index 100%
rename from camel-k-loader-groovy/src/test/resources/routes-with-beans.groovy
rename to camel-k-loader-groovy/impl/src/test/resources/routes-with-beans.groovy
diff --git a/camel-k-loader-groovy/src/test/resources/routes-with-component-wrong-method-configuration.groovy b/camel-k-loader-groovy/impl/src/test/resources/routes-with-component-wrong-method-configuration.groovy
similarity index 100%
rename from camel-k-loader-groovy/src/test/resources/routes-with-component-wrong-method-configuration.groovy
rename to camel-k-loader-groovy/impl/src/test/resources/routes-with-component-wrong-method-configuration.groovy
diff --git a/camel-k-loader-groovy/src/test/resources/routes-with-component-wrong-property-configuration.groovy b/camel-k-loader-groovy/impl/src/test/resources/routes-with-component-wrong-property-configuration.groovy
similarity index 100%
rename from camel-k-loader-groovy/src/test/resources/routes-with-component-wrong-property-configuration.groovy
rename to camel-k-loader-groovy/impl/src/test/resources/routes-with-component-wrong-property-configuration.groovy
diff --git a/camel-k-loader-groovy/src/test/resources/routes-with-components-configuration.groovy b/camel-k-loader-groovy/impl/src/test/resources/routes-with-components-configuration.groovy
similarity index 100%
rename from camel-k-loader-groovy/src/test/resources/routes-with-components-configuration.groovy
rename to camel-k-loader-groovy/impl/src/test/resources/routes-with-components-configuration.groovy
diff --git a/camel-k-loader-groovy/src/test/resources/routes-with-dataformats-configuration.groovy b/camel-k-loader-groovy/impl/src/test/resources/routes-with-dataformats-configuration.groovy
similarity index 100%
rename from camel-k-loader-groovy/src/test/resources/routes-with-dataformats-configuration.groovy
rename to camel-k-loader-groovy/impl/src/test/resources/routes-with-dataformats-configuration.groovy
diff --git a/camel-k-loader-groovy/src/test/resources/routes-with-eip.groovy b/camel-k-loader-groovy/impl/src/test/resources/routes-with-eip.groovy
similarity index 100%
rename from camel-k-loader-groovy/src/test/resources/routes-with-eip.groovy
rename to camel-k-loader-groovy/impl/src/test/resources/routes-with-eip.groovy
diff --git a/camel-k-loader-groovy/src/test/resources/routes-with-endpoint-dsl.groovy b/camel-k-loader-groovy/impl/src/test/resources/routes-with-endpoint-dsl.groovy
similarity index 100%
rename from camel-k-loader-groovy/src/test/resources/routes-with-endpoint-dsl.groovy
rename to camel-k-loader-groovy/impl/src/test/resources/routes-with-endpoint-dsl.groovy
diff --git a/camel-k-loader-groovy/src/test/resources/routes-with-error-handler.groovy b/camel-k-loader-groovy/impl/src/test/resources/routes-with-error-handler.groovy
similarity index 100%
rename from camel-k-loader-groovy/src/test/resources/routes-with-error-handler.groovy
rename to camel-k-loader-groovy/impl/src/test/resources/routes-with-error-handler.groovy
diff --git a/camel-k-loader-groovy/src/test/resources/routes-with-languages-configuration.groovy b/camel-k-loader-groovy/impl/src/test/resources/routes-with-languages-configuration.groovy
similarity index 100%
rename from camel-k-loader-groovy/src/test/resources/routes-with-languages-configuration.groovy
rename to camel-k-loader-groovy/impl/src/test/resources/routes-with-languages-configuration.groovy
diff --git a/camel-k-loader-groovy/src/test/resources/routes-with-rest.groovy b/camel-k-loader-groovy/impl/src/test/resources/routes-with-rest.groovy
similarity index 100%
rename from camel-k-loader-groovy/src/test/resources/routes-with-rest.groovy
rename to camel-k-loader-groovy/impl/src/test/resources/routes-with-rest.groovy
diff --git a/camel-k-loader-groovy/src/test/resources/routes.groovy b/camel-k-loader-groovy/impl/src/test/resources/routes.groovy
similarity index 100%
rename from camel-k-loader-groovy/src/test/resources/routes.groovy
rename to camel-k-loader-groovy/impl/src/test/resources/routes.groovy
diff --git a/camel-k-loader-groovy/pom.xml b/camel-k-loader-groovy/pom.xml
index 609df6e..20b3f1c 100644
--- a/camel-k-loader-groovy/pom.xml
+++ b/camel-k-loader-groovy/pom.xml
@@ -20,133 +20,18 @@
<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">
<parent>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-parent</artifactId>
+ <artifactId>camel-k-runtime-project</artifactId>
<version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
+ <packaging>pom</packaging>
- <artifactId>camel-k-loader-groovy</artifactId>
+ <artifactId>camel-k-loader-groovy-parent</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core-engine</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-log</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-groovy</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-apt</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-annotations</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <!-- ****************************** -->
- <!-- -->
- <!-- TESTS -->
- <!-- -->
- <!-- ****************************** -->
-
- <dependency>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-main</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-timer</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-seda</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-rest</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-direct</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-bean</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-jackson</artifactId>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.gmavenplus</groupId>
- <artifactId>gmavenplus-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>addSources</goal>
- <goal>addTestSources</goal>
- <goal>compile</goal>
- <goal>compileTests</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <invokeDynamic>true</invokeDynamic>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.jboss.jandex</groupId>
- <artifactId>jandex-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>make-index</id>
- <goals>
- <goal>jandex</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <modules>
+ <module>impl</module>
+ <module>runtime</module>
+ <module>deployment</module>
+ </modules>
</project>
diff --git a/camel-k-quarkus/camel-k-quarkus-loader-groovy/runtime/pom.xml b/camel-k-loader-groovy/runtime/pom.xml
similarity index 93%
rename from camel-k-quarkus/camel-k-quarkus-loader-groovy/runtime/pom.xml
rename to camel-k-loader-groovy/runtime/pom.xml
index fe9f07e..8a0d8ed 100644
--- a/camel-k-quarkus/camel-k-quarkus-loader-groovy/runtime/pom.xml
+++ b/camel-k-loader-groovy/runtime/pom.xml
@@ -20,21 +20,21 @@
<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">
<parent>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus-loader-groovy-parent</artifactId>
+ <artifactId>camel-k-loader-groovy-parent</artifactId>
<version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>camel-k-quarkus-loader-groovy</artifactId>
+ <artifactId>camel-k-loader-groovy</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus-core</artifactId>
+ <artifactId>camel-k-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-loader-groovy</artifactId>
+ <artifactId>camel-k-loader-groovy-impl</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
diff --git a/camel-k-quarkus/camel-k-quarkus-loader-js/deployment/pom.xml b/camel-k-loader-java/deployment/pom.xml
similarity index 88%
rename from camel-k-quarkus/camel-k-quarkus-loader-js/deployment/pom.xml
rename to camel-k-loader-java/deployment/pom.xml
index 5435887..8a0aaaa 100644
--- a/camel-k-quarkus/camel-k-quarkus-loader-js/deployment/pom.xml
+++ b/camel-k-loader-java/deployment/pom.xml
@@ -20,21 +20,21 @@
<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">
<parent>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus-loader-js-parent</artifactId>
+ <artifactId>camel-k-loader-java-parent</artifactId>
<version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>camel-k-quarkus-loader-js-deployment</artifactId>
+ <artifactId>camel-k-loader-java-deployment</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus-loader-js</artifactId>
+ <artifactId>camel-k-loader-java</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus-core-deployment</artifactId>
+ <artifactId>camel-k-core-deployment</artifactId>
</dependency>
</dependencies>
diff --git a/camel-k-quarkus/camel-k-quarkus-loader-java/deployment/src/main/java/org/apache/camel/k/loader/java/quarkus/deployment/Feature.java b/camel-k-loader-java/deployment/src/main/java/org/apache/camel/k/loader/java/quarkus/deployment/Feature.java
similarity index 100%
copy from camel-k-quarkus/camel-k-quarkus-loader-java/deployment/src/main/java/org/apache/camel/k/loader/java/quarkus/deployment/Feature.java
copy to camel-k-loader-java/deployment/src/main/java/org/apache/camel/k/loader/java/quarkus/deployment/Feature.java
diff --git a/camel-k-quarkus/camel-k-quarkus-loader-java/deployment/src/main/java/org/apache/camel/k/loader/java/quarkus/deployment/JavaSourceLoaderProcessor.java b/camel-k-loader-java/deployment/src/main/java/org/apache/camel/k/loader/java/quarkus/deployment/JavaSourceLoaderProcessor.java
similarity index 100%
rename from camel-k-quarkus/camel-k-quarkus-loader-java/deployment/src/main/java/org/apache/camel/k/loader/java/quarkus/deployment/JavaSourceLoaderProcessor.java
rename to camel-k-loader-java/deployment/src/main/java/org/apache/camel/k/loader/java/quarkus/deployment/JavaSourceLoaderProcessor.java
diff --git a/camel-k-loader-java/pom.xml b/camel-k-loader-java/impl/pom.xml
similarity index 96%
copy from camel-k-loader-java/pom.xml
copy to camel-k-loader-java/impl/pom.xml
index 1f0d97a..59d2849 100644
--- a/camel-k-loader-java/pom.xml
+++ b/camel-k-loader-java/impl/pom.xml
@@ -20,17 +20,17 @@
<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">
<parent>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-parent</artifactId>
+ <artifactId>camel-k-loader-java-parent</artifactId>
<version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>camel-k-loader-java</artifactId>
+ <artifactId>camel-k-loader-java-impl</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-core</artifactId>
+ <artifactId>camel-k-core-support</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
diff --git a/camel-k-loader-java/src/main/java/org/apache/camel/k/loader/java/JavaSourceLoader.java b/camel-k-loader-java/impl/src/main/java/org/apache/camel/k/loader/java/JavaSourceLoader.java
similarity index 100%
rename from camel-k-loader-java/src/main/java/org/apache/camel/k/loader/java/JavaSourceLoader.java
rename to camel-k-loader-java/impl/src/main/java/org/apache/camel/k/loader/java/JavaSourceLoader.java
diff --git a/camel-k-loader-java/src/test/groovy/org/apache/camel/k/loader/java/JavaSourceLoaderTest.groovy b/camel-k-loader-java/impl/src/test/groovy/org/apache/camel/k/loader/java/JavaSourceLoaderTest.groovy
similarity index 100%
rename from camel-k-loader-java/src/test/groovy/org/apache/camel/k/loader/java/JavaSourceLoaderTest.groovy
rename to camel-k-loader-java/impl/src/test/groovy/org/apache/camel/k/loader/java/JavaSourceLoaderTest.groovy
diff --git a/camel-k-loader-java/src/test/groovy/org/apache/camel/k/loader/java/model/EmployeeDTO.groovy b/camel-k-loader-java/impl/src/test/groovy/org/apache/camel/k/loader/java/model/EmployeeDTO.groovy
similarity index 100%
rename from camel-k-loader-java/src/test/groovy/org/apache/camel/k/loader/java/model/EmployeeDTO.groovy
rename to camel-k-loader-java/impl/src/test/groovy/org/apache/camel/k/loader/java/model/EmployeeDTO.groovy
diff --git a/camel-k-loader-java/src/test/groovy/org/apache/camel/k/loader/java/support/TestRuntime.groovy b/camel-k-loader-java/impl/src/test/groovy/org/apache/camel/k/loader/java/support/TestRuntime.groovy
similarity index 100%
rename from camel-k-loader-java/src/test/groovy/org/apache/camel/k/loader/java/support/TestRuntime.groovy
rename to camel-k-loader-java/impl/src/test/groovy/org/apache/camel/k/loader/java/support/TestRuntime.groovy
diff --git a/camel-k-loader-java/src/test/resources/MyRoutes.java b/camel-k-loader-java/impl/src/test/resources/MyRoutes.java
similarity index 100%
rename from camel-k-loader-java/src/test/resources/MyRoutes.java
rename to camel-k-loader-java/impl/src/test/resources/MyRoutes.java
diff --git a/camel-k-loader-java/src/test/resources/MyRoutesWithBeans.java b/camel-k-loader-java/impl/src/test/resources/MyRoutesWithBeans.java
similarity index 100%
rename from camel-k-loader-java/src/test/resources/MyRoutesWithBeans.java
rename to camel-k-loader-java/impl/src/test/resources/MyRoutesWithBeans.java
diff --git a/camel-k-loader-java/src/test/resources/MyRoutesWithEndpointDsl.java b/camel-k-loader-java/impl/src/test/resources/MyRoutesWithEndpointDsl.java
similarity index 100%
rename from camel-k-loader-java/src/test/resources/MyRoutesWithEndpointDsl.java
rename to camel-k-loader-java/impl/src/test/resources/MyRoutesWithEndpointDsl.java
diff --git a/camel-k-loader-java/src/test/resources/MyRoutesWithModel.java b/camel-k-loader-java/impl/src/test/resources/MyRoutesWithModel.java
similarity index 100%
rename from camel-k-loader-java/src/test/resources/MyRoutesWithModel.java
rename to camel-k-loader-java/impl/src/test/resources/MyRoutesWithModel.java
diff --git a/camel-k-loader-java/src/test/resources/MyRoutesWithNameOverride.java b/camel-k-loader-java/impl/src/test/resources/MyRoutesWithNameOverride.java
similarity index 100%
rename from camel-k-loader-java/src/test/resources/MyRoutesWithNameOverride.java
rename to camel-k-loader-java/impl/src/test/resources/MyRoutesWithNameOverride.java
diff --git a/camel-k-loader-java/src/test/resources/MyRoutesWithNestedClass.java b/camel-k-loader-java/impl/src/test/resources/MyRoutesWithNestedClass.java
similarity index 100%
rename from camel-k-loader-java/src/test/resources/MyRoutesWithNestedClass.java
rename to camel-k-loader-java/impl/src/test/resources/MyRoutesWithNestedClass.java
diff --git a/camel-k-loader-java/src/test/resources/MyRoutesWithNestedTypes.java b/camel-k-loader-java/impl/src/test/resources/MyRoutesWithNestedTypes.java
similarity index 100%
rename from camel-k-loader-java/src/test/resources/MyRoutesWithNestedTypes.java
rename to camel-k-loader-java/impl/src/test/resources/MyRoutesWithNestedTypes.java
diff --git a/camel-k-loader-java/src/test/resources/MyRoutesWithPackage.java b/camel-k-loader-java/impl/src/test/resources/MyRoutesWithPackage.java
similarity index 100%
rename from camel-k-loader-java/src/test/resources/MyRoutesWithPackage.java
rename to camel-k-loader-java/impl/src/test/resources/MyRoutesWithPackage.java
diff --git a/camel-k-loader-java/src/test/resources/MyRoutesWithPackageAndComment.java b/camel-k-loader-java/impl/src/test/resources/MyRoutesWithPackageAndComment.java
similarity index 100%
rename from camel-k-loader-java/src/test/resources/MyRoutesWithPackageAndComment.java
rename to camel-k-loader-java/impl/src/test/resources/MyRoutesWithPackageAndComment.java
diff --git a/camel-k-loader-java/src/test/resources/MyRoutesWithPackageAndLineComment.java b/camel-k-loader-java/impl/src/test/resources/MyRoutesWithPackageAndLineComment.java
similarity index 100%
rename from camel-k-loader-java/src/test/resources/MyRoutesWithPackageAndLineComment.java
rename to camel-k-loader-java/impl/src/test/resources/MyRoutesWithPackageAndLineComment.java
diff --git a/camel-k-loader-java/src/test/resources/MyRoutesWithRestConfiguration.java b/camel-k-loader-java/impl/src/test/resources/MyRoutesWithRestConfiguration.java
similarity index 100%
rename from camel-k-loader-java/src/test/resources/MyRoutesWithRestConfiguration.java
rename to camel-k-loader-java/impl/src/test/resources/MyRoutesWithRestConfiguration.java
diff --git a/camel-k-runtime-core/src/test/resources/log4j2-test.xml b/camel-k-loader-java/impl/src/test/resources/log4j2-test.xml
similarity index 100%
rename from camel-k-runtime-core/src/test/resources/log4j2-test.xml
rename to camel-k-loader-java/impl/src/test/resources/log4j2-test.xml
diff --git a/camel-k-loader-java/pom.xml b/camel-k-loader-java/pom.xml
index 1f0d97a..144c3f5 100644
--- a/camel-k-loader-java/pom.xml
+++ b/camel-k-loader-java/pom.xml
@@ -20,126 +20,18 @@
<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">
<parent>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-parent</artifactId>
+ <artifactId>camel-k-runtime-project</artifactId>
<version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
+ <packaging>pom</packaging>
- <artifactId>camel-k-loader-java</artifactId>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core-engine</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jooq</groupId>
- <artifactId>joor</artifactId>
- <version>${joor-version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-apt</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-annotations</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <!-- ****************************** -->
- <!-- -->
- <!-- TESTS -->
- <!-- -->
- <!-- ****************************** -->
-
- <dependency>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-test</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-main</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-bean</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-undertow</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-timer</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-seda</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-log</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-rest</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-direct</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.gmavenplus</groupId>
- <artifactId>gmavenplus-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>addSources</goal>
- <goal>addTestSources</goal>
- <goal>compile</goal>
- <goal>compileTests</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <invokeDynamic>true</invokeDynamic>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.jboss.jandex</groupId>
- <artifactId>jandex-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>make-index</id>
- <goals>
- <goal>jandex</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <artifactId>camel-k-loader-java-parent</artifactId>
+ <modules>
+ <module>impl</module>
+ <module>runtime</module>
+ <module>deployment</module>
+ </modules>
</project>
diff --git a/camel-k-quarkus/camel-k-quarkus-loader-js/runtime/pom.xml b/camel-k-loader-java/runtime/pom.xml
similarity index 93%
rename from camel-k-quarkus/camel-k-quarkus-loader-js/runtime/pom.xml
rename to camel-k-loader-java/runtime/pom.xml
index 01bcf95..95c7459 100644
--- a/camel-k-quarkus/camel-k-quarkus-loader-js/runtime/pom.xml
+++ b/camel-k-loader-java/runtime/pom.xml
@@ -20,21 +20,21 @@
<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">
<parent>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus-loader-js-parent</artifactId>
+ <artifactId>camel-k-loader-java-parent</artifactId>
<version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>camel-k-quarkus-loader-js</artifactId>
+ <artifactId>camel-k-loader-java</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus-core</artifactId>
+ <artifactId>camel-k-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-loader-js</artifactId>
+ <artifactId>camel-k-loader-java-impl</artifactId>
</dependency>
</dependencies>
diff --git a/camel-k-quarkus/camel-k-quarkus-loader-java/runtime/src/main/java/org/apache/camel/k/loader/java/quarkus/JavaSourceLoaderRecorder.java b/camel-k-loader-java/runtime/src/main/java/org/apache/camel/k/loader/java/quarkus/JavaSourceLoaderRecorder.java
similarity index 100%
rename from camel-k-quarkus/camel-k-quarkus-loader-java/runtime/src/main/java/org/apache/camel/k/loader/java/quarkus/JavaSourceLoaderRecorder.java
rename to camel-k-loader-java/runtime/src/main/java/org/apache/camel/k/loader/java/quarkus/JavaSourceLoaderRecorder.java
diff --git a/camel-k-loader-java/src/test/resources/log4j2-test.xml b/camel-k-loader-java/src/test/resources/log4j2-test.xml
deleted file mode 100644
index e2e9f42..0000000
--- a/camel-k-loader-java/src/test/resources/log4j2-test.xml
+++ /dev/null
@@ -1,35 +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.
-
--->
-<Configuration status="INFO">
- <Appenders>
- <Console name="STDOUT" target="SYSTEM_OUT">
- <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS}|%-5level|%t|%c{1} - %msg%n"/>
- </Console>
- <Null name="NONE"/>
- </Appenders>
-
- <Loggers>
- <Root level="INFO">
- <!--<AppenderRef ref="STDOUT"/>-->
- <AppenderRef ref="NONE"/>
- </Root>
- </Loggers>
-
-</Configuration>
\ No newline at end of file
diff --git a/camel-k-quarkus/camel-k-quarkus-loader-java/deployment/pom.xml b/camel-k-loader-js/deployment/pom.xml
similarity index 88%
rename from camel-k-quarkus/camel-k-quarkus-loader-java/deployment/pom.xml
rename to camel-k-loader-js/deployment/pom.xml
index a30556f..0588be4 100644
--- a/camel-k-quarkus/camel-k-quarkus-loader-java/deployment/pom.xml
+++ b/camel-k-loader-js/deployment/pom.xml
@@ -20,21 +20,21 @@
<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">
<parent>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus-loader-java-parent</artifactId>
+ <artifactId>camel-k-loader-js-parent</artifactId>
<version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>camel-k-quarkus-loader-java-deployment</artifactId>
+ <artifactId>camel-k-loader-js-deployment</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus-loader-java</artifactId>
+ <artifactId>camel-k-loader-js</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus-core-deployment</artifactId>
+ <artifactId>camel-k-core-deployment</artifactId>
</dependency>
</dependencies>
diff --git a/camel-k-quarkus/camel-k-quarkus-loader-js/deployment/src/main/java/org/apache/camel/k/loader/js/quarkus/deployment/DeploymentProcessor.java b/camel-k-loader-js/deployment/src/main/java/org/apache/camel/k/loader/js/quarkus/deployment/DeploymentProcessor.java
similarity index 100%
rename from camel-k-quarkus/camel-k-quarkus-loader-js/deployment/src/main/java/org/apache/camel/k/loader/js/quarkus/deployment/DeploymentProcessor.java
rename to camel-k-loader-js/deployment/src/main/java/org/apache/camel/k/loader/js/quarkus/deployment/DeploymentProcessor.java
diff --git a/camel-k-quarkus/camel-k-quarkus-loader-js/deployment/src/main/java/org/apache/camel/k/loader/js/quarkus/deployment/Feature.java b/camel-k-loader-js/deployment/src/main/java/org/apache/camel/k/loader/js/quarkus/deployment/Feature.java
similarity index 100%
rename from camel-k-quarkus/camel-k-quarkus-loader-js/deployment/src/main/java/org/apache/camel/k/loader/js/quarkus/deployment/Feature.java
rename to camel-k-loader-js/deployment/src/main/java/org/apache/camel/k/loader/js/quarkus/deployment/Feature.java
diff --git a/camel-k-loader-js/pom.xml b/camel-k-loader-js/impl/pom.xml
similarity index 96%
copy from camel-k-loader-js/pom.xml
copy to camel-k-loader-js/impl/pom.xml
index 5330f55..87f682c 100644
--- a/camel-k-loader-js/pom.xml
+++ b/camel-k-loader-js/impl/pom.xml
@@ -20,17 +20,17 @@
<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">
<parent>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-parent</artifactId>
+ <artifactId>camel-k-loader-js-parent</artifactId>
<version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>camel-k-loader-js</artifactId>
+ <artifactId>camel-k-loader-js-impl</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-core</artifactId>
+ <artifactId>camel-k-core-support</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
diff --git a/camel-k-loader-js/src/main/java/org/apache/camel/k/loader/js/JavaScriptSourceLoader.java b/camel-k-loader-js/impl/src/main/java/org/apache/camel/k/loader/js/JavaScriptSourceLoader.java
similarity index 100%
rename from camel-k-loader-js/src/main/java/org/apache/camel/k/loader/js/JavaScriptSourceLoader.java
rename to camel-k-loader-js/impl/src/main/java/org/apache/camel/k/loader/js/JavaScriptSourceLoader.java
diff --git a/camel-k-loader-js/src/main/java/org/apache/camel/k/loader/js/dsl/Components.java b/camel-k-loader-js/impl/src/main/java/org/apache/camel/k/loader/js/dsl/Components.java
similarity index 100%
rename from camel-k-loader-js/src/main/java/org/apache/camel/k/loader/js/dsl/Components.java
rename to camel-k-loader-js/impl/src/main/java/org/apache/camel/k/loader/js/dsl/Components.java
diff --git a/camel-k-loader-js/src/main/java/org/apache/camel/k/loader/js/dsl/IntegrationConfiguration.java b/camel-k-loader-js/impl/src/main/java/org/apache/camel/k/loader/js/dsl/IntegrationConfiguration.java
similarity index 100%
rename from camel-k-loader-js/src/main/java/org/apache/camel/k/loader/js/dsl/IntegrationConfiguration.java
rename to camel-k-loader-js/impl/src/main/java/org/apache/camel/k/loader/js/dsl/IntegrationConfiguration.java
diff --git a/camel-k-loader-js/src/main/java/org/apache/camel/k/loader/js/dsl/ProcessorSupport.java b/camel-k-loader-js/impl/src/main/java/org/apache/camel/k/loader/js/dsl/ProcessorSupport.java
similarity index 100%
rename from camel-k-loader-js/src/main/java/org/apache/camel/k/loader/js/dsl/ProcessorSupport.java
rename to camel-k-loader-js/impl/src/main/java/org/apache/camel/k/loader/js/dsl/ProcessorSupport.java
diff --git a/camel-k-loader-js/src/test/groovy/org/apache/camel/k/loader/js/JavaScriptSourceLoaderTest.groovy b/camel-k-loader-js/impl/src/test/groovy/org/apache/camel/k/loader/js/JavaScriptSourceLoaderTest.groovy
similarity index 100%
rename from camel-k-loader-js/src/test/groovy/org/apache/camel/k/loader/js/JavaScriptSourceLoaderTest.groovy
rename to camel-k-loader-js/impl/src/test/groovy/org/apache/camel/k/loader/js/JavaScriptSourceLoaderTest.groovy
diff --git a/camel-k-loader-js/src/test/groovy/org/apache/camel/k/loader/js/support/TestRuntime.groovy b/camel-k-loader-js/impl/src/test/groovy/org/apache/camel/k/loader/js/support/TestRuntime.groovy
similarity index 100%
rename from camel-k-loader-js/src/test/groovy/org/apache/camel/k/loader/js/support/TestRuntime.groovy
rename to camel-k-loader-js/impl/src/test/groovy/org/apache/camel/k/loader/js/support/TestRuntime.groovy
diff --git a/camel-k-loader-js/src/test/resources/log4j2-test.xml b/camel-k-loader-js/impl/src/test/resources/log4j2-test.xml
similarity index 100%
rename from camel-k-loader-js/src/test/resources/log4j2-test.xml
rename to camel-k-loader-js/impl/src/test/resources/log4j2-test.xml
diff --git a/camel-k-loader-js/src/test/resources/routes-compressed.js.gz.b64 b/camel-k-loader-js/impl/src/test/resources/routes-compressed.js.gz.b64
similarity index 100%
rename from camel-k-loader-js/src/test/resources/routes-compressed.js.gz.b64
rename to camel-k-loader-js/impl/src/test/resources/routes-compressed.js.gz.b64
diff --git a/camel-k-loader-js/src/test/resources/routes-with-component-configuration.js b/camel-k-loader-js/impl/src/test/resources/routes-with-component-configuration.js
similarity index 100%
rename from camel-k-loader-js/src/test/resources/routes-with-component-configuration.js
rename to camel-k-loader-js/impl/src/test/resources/routes-with-component-configuration.js
diff --git a/camel-k-loader-js/src/test/resources/routes-with-context-configuration.js b/camel-k-loader-js/impl/src/test/resources/routes-with-context-configuration.js
similarity index 100%
rename from camel-k-loader-js/src/test/resources/routes-with-context-configuration.js
rename to camel-k-loader-js/impl/src/test/resources/routes-with-context-configuration.js
diff --git a/camel-k-loader-js/src/test/resources/routes-with-endpoint-dsl.js b/camel-k-loader-js/impl/src/test/resources/routes-with-endpoint-dsl.js
similarity index 100%
rename from camel-k-loader-js/src/test/resources/routes-with-endpoint-dsl.js
rename to camel-k-loader-js/impl/src/test/resources/routes-with-endpoint-dsl.js
diff --git a/camel-k-loader-js/src/test/resources/routes-with-processors.js b/camel-k-loader-js/impl/src/test/resources/routes-with-processors.js
similarity index 100%
rename from camel-k-loader-js/src/test/resources/routes-with-processors.js
rename to camel-k-loader-js/impl/src/test/resources/routes-with-processors.js
diff --git a/camel-k-loader-js/src/test/resources/routes-with-rest-configuration.js b/camel-k-loader-js/impl/src/test/resources/routes-with-rest-configuration.js
similarity index 100%
rename from camel-k-loader-js/src/test/resources/routes-with-rest-configuration.js
rename to camel-k-loader-js/impl/src/test/resources/routes-with-rest-configuration.js
diff --git a/camel-k-loader-js/src/test/resources/routes-with-rest-dsl.js b/camel-k-loader-js/impl/src/test/resources/routes-with-rest-dsl.js
similarity index 100%
rename from camel-k-loader-js/src/test/resources/routes-with-rest-dsl.js
rename to camel-k-loader-js/impl/src/test/resources/routes-with-rest-dsl.js
diff --git a/camel-k-loader-js/src/test/resources/routes.js b/camel-k-loader-js/impl/src/test/resources/routes.js
similarity index 100%
rename from camel-k-loader-js/src/test/resources/routes.js
rename to camel-k-loader-js/impl/src/test/resources/routes.js
diff --git a/camel-k-loader-js/src/test/resources/routes.mytype b/camel-k-loader-js/impl/src/test/resources/routes.mytype
similarity index 100%
rename from camel-k-loader-js/src/test/resources/routes.mytype
rename to camel-k-loader-js/impl/src/test/resources/routes.mytype
diff --git a/camel-k-loader-js/pom.xml b/camel-k-loader-js/pom.xml
index 5330f55..0a44345 100644
--- a/camel-k-loader-js/pom.xml
+++ b/camel-k-loader-js/pom.xml
@@ -20,126 +20,18 @@
<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">
<parent>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-parent</artifactId>
+ <artifactId>camel-k-runtime-project</artifactId>
<version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
+ <packaging>pom</packaging>
- <artifactId>camel-k-loader-js</artifactId>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core-engine</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.graalvm.js</groupId>
- <artifactId>js</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-apt</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-annotations</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <!-- ****************************** -->
- <!-- -->
- <!-- TESTS -->
- <!-- -->
- <!-- ****************************** -->
-
- <dependency>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-test</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-undertow</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-timer</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-seda</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-log</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-rest</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-direct</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-main</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-mock</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.gmavenplus</groupId>
- <artifactId>gmavenplus-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>addSources</goal>
- <goal>addTestSources</goal>
- <goal>compile</goal>
- <goal>compileTests</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <invokeDynamic>true</invokeDynamic>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.jboss.jandex</groupId>
- <artifactId>jandex-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>make-index</id>
- <goals>
- <goal>jandex</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <artifactId>camel-k-loader-js-parent</artifactId>
+ <modules>
+ <module>impl</module>
+ <module>runtime</module>
+ <module>deployment</module>
+ </modules>
</project>
diff --git a/camel-k-quarkus/camel-k-quarkus-loader-java/runtime/pom.xml b/camel-k-loader-js/runtime/pom.xml
similarity index 93%
rename from camel-k-quarkus/camel-k-quarkus-loader-java/runtime/pom.xml
rename to camel-k-loader-js/runtime/pom.xml
index 4975140..cefde59 100644
--- a/camel-k-quarkus/camel-k-quarkus-loader-java/runtime/pom.xml
+++ b/camel-k-loader-js/runtime/pom.xml
@@ -20,21 +20,21 @@
<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">
<parent>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus-loader-java-parent</artifactId>
+ <artifactId>camel-k-loader-js-parent</artifactId>
<version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>camel-k-quarkus-loader-java</artifactId>
+ <artifactId>camel-k-loader-js</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus-core</artifactId>
+ <artifactId>camel-k-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-loader-java</artifactId>
+ <artifactId>camel-k-loader-js-impl</artifactId>
</dependency>
</dependencies>
diff --git a/camel-k-loader-kotlin/camel-k-loader-kotlin-itests/src/test/java/org/apache/camel/k/loader/kotlin/itests/KotlinSourceLoaderTest.java b/camel-k-loader-kotlin/camel-k-loader-kotlin-itests/src/test/java/org/apache/camel/k/loader/kotlin/itests/KotlinSourceLoaderTest.java
deleted file mode 100644
index 994d87f..0000000
--- a/camel-k-loader-kotlin/camel-k-loader-kotlin-itests/src/test/java/org/apache/camel/k/loader/kotlin/itests/KotlinSourceLoaderTest.java
+++ /dev/null
@@ -1,48 +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.k.loader.kotlin.itests;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.k.Runtime;
-import org.apache.camel.k.Source;
-import org.apache.camel.k.Sources;
-import org.apache.camel.k.support.SourcesSupport;
-import org.junit.jupiter.api.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class KotlinSourceLoaderTest {
- @Test
- public void testLoad() throws Exception {
- final CamelContext context = new DefaultCamelContext();
- final Runtime runtime = Runtime.on(context);
- final Source source = Sources.fromURI("classpath:routes.kts");
-
- SourcesSupport.load(runtime, source);
-
- try {
- context.start();
-
- assertThat(context.getComponentNames()).isNotEmpty();
- assertThat(context.getRoutes()).isNotEmpty();
- assertThat(context.getEndpoints()).isNotEmpty();
- } finally {
- context.stop();
- }
- }
-}
diff --git a/camel-k-loader-kotlin/camel-k-loader-kotlin-itests/src/test/resources/log4j2-test.xml b/camel-k-loader-kotlin/camel-k-loader-kotlin-itests/src/test/resources/log4j2-test.xml
deleted file mode 100644
index aa3f788..0000000
--- a/camel-k-loader-kotlin/camel-k-loader-kotlin-itests/src/test/resources/log4j2-test.xml
+++ /dev/null
@@ -1,35 +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.
-
--->
-<Configuration status="INFO">
- <Appenders>
- <Console name="STDOUT" target="SYSTEM_OUT">
- <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS}|%-5level|%t|%c{1} - %msg%n"/>
- </Console>
- <Null name="NONE"/>
- </Appenders>
-
- <Loggers>
- <Root level="INFO">
- <!-- <AppenderRef ref="STDOUT"/> -->
- <AppenderRef ref="NONE"/>
- </Root>
- </Loggers>
-
-</Configuration>
\ No newline at end of file
diff --git a/camel-k-loader-kotlin/camel-k-loader-kotlin-itests/src/test/resources/routes.kts b/camel-k-loader-kotlin/camel-k-loader-kotlin-itests/src/test/resources/routes.kts
deleted file mode 100644
index 7d28bb5..0000000
--- a/camel-k-loader-kotlin/camel-k-loader-kotlin-itests/src/test/resources/routes.kts
+++ /dev/null
@@ -1,21 +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.
- */
-from("timer:tick")
- .process().message {
- m -> m.headers["MyHeader"] = "MyHeaderValue"
- }
- .to("log:info")
\ No newline at end of file
diff --git a/camel-k-quarkus/camel-k-quarkus-loader-yaml/deployment/pom.xml b/camel-k-loader-kotlin/deployment/pom.xml
similarity index 88%
rename from camel-k-quarkus/camel-k-quarkus-loader-yaml/deployment/pom.xml
rename to camel-k-loader-kotlin/deployment/pom.xml
index 4345187..e0fc32a 100644
--- a/camel-k-quarkus/camel-k-quarkus-loader-yaml/deployment/pom.xml
+++ b/camel-k-loader-kotlin/deployment/pom.xml
@@ -20,21 +20,21 @@
<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">
<parent>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus-loader-yaml-parent</artifactId>
+ <artifactId>camel-k-loader-kotlin-parent</artifactId>
<version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>camel-k-quarkus-loader-yaml-deployment</artifactId>
+ <artifactId>camel-k-loader-kotlin-deployment</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus-loader-yaml</artifactId>
+ <artifactId>camel-k-core-deployment</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus-core-deployment</artifactId>
+ <artifactId>camel-k-loader-kotlin</artifactId>
</dependency>
</dependencies>
diff --git a/camel-k-quarkus/camel-k-quarkus-loader-kotlin/deployment/src/main/java/org/apache/camel/k/loader/kotlin/quarkus/deployment/Feature.java b/camel-k-loader-kotlin/deployment/src/main/java/org/apache/camel/k/loader/kotlin/quarkus/deployment/Feature.java
similarity index 100%
rename from camel-k-quarkus/camel-k-quarkus-loader-kotlin/deployment/src/main/java/org/apache/camel/k/loader/kotlin/quarkus/deployment/Feature.java
rename to camel-k-loader-kotlin/deployment/src/main/java/org/apache/camel/k/loader/kotlin/quarkus/deployment/Feature.java
diff --git a/camel-k-loader-kotlin/camel-k-loader-kotlin/pom.xml b/camel-k-loader-kotlin/impl/pom.xml
similarity index 93%
rename from camel-k-loader-kotlin/camel-k-loader-kotlin/pom.xml
rename to camel-k-loader-kotlin/impl/pom.xml
index 119895e..59c59d9 100644
--- a/camel-k-loader-kotlin/camel-k-loader-kotlin/pom.xml
+++ b/camel-k-loader-kotlin/impl/pom.xml
@@ -25,24 +25,12 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>camel-k-loader-kotlin</artifactId>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.jetbrains.kotlin</groupId>
- <artifactId>kotlin-bom</artifactId>
- <version>${kotlin-version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
+ <artifactId>camel-k-loader-kotlin-impl</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-core</artifactId>
+ <artifactId>camel-k-core-support</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
diff --git a/camel-k-loader-kotlin/camel-k-loader-kotlin/src/main/kotlin/org/apache/camel/k/loader/kotlin/KotlinCompilationConfiguration.kt b/camel-k-loader-kotlin/impl/src/main/kotlin/org/apache/camel/k/loader/kotlin/KotlinCompilationConfiguration.kt
similarity index 100%
rename from camel-k-loader-kotlin/camel-k-loader-kotlin/src/main/kotlin/org/apache/camel/k/loader/kotlin/KotlinCompilationConfiguration.kt
rename to camel-k-loader-kotlin/impl/src/main/kotlin/org/apache/camel/k/loader/kotlin/KotlinCompilationConfiguration.kt
diff --git a/camel-k-loader-kotlin/camel-k-loader-kotlin/src/main/kotlin/org/apache/camel/k/loader/kotlin/KotlinSourceLoader.kt b/camel-k-loader-kotlin/impl/src/main/kotlin/org/apache/camel/k/loader/kotlin/KotlinSourceLoader.kt
similarity index 100%
rename from camel-k-loader-kotlin/camel-k-loader-kotlin/src/main/kotlin/org/apache/camel/k/loader/kotlin/KotlinSourceLoader.kt
rename to camel-k-loader-kotlin/impl/src/main/kotlin/org/apache/camel/k/loader/kotlin/KotlinSourceLoader.kt
diff --git a/camel-k-loader-kotlin/camel-k-loader-kotlin/src/main/kotlin/org/apache/camel/k/loader/kotlin/dsl/BeansConfiguration.kt b/camel-k-loader-kotlin/impl/src/main/kotlin/org/apache/camel/k/loader/kotlin/dsl/BeansConfiguration.kt
similarity index 100%
rename from camel-k-loader-kotlin/camel-k-loader-kotlin/src/main/kotlin/org/apache/camel/k/loader/kotlin/dsl/BeansConfiguration.kt
rename to camel-k-loader-kotlin/impl/src/main/kotlin/org/apache/camel/k/loader/kotlin/dsl/BeansConfiguration.kt
diff --git a/camel-k-loader-kotlin/camel-k-loader-kotlin/src/main/kotlin/org/apache/camel/k/loader/kotlin/dsl/CamelConfiguration.kt b/camel-k-loader-kotlin/impl/src/main/kotlin/org/apache/camel/k/loader/kotlin/dsl/CamelConfiguration.kt
similarity index 100%
rename from camel-k-loader-kotlin/camel-k-loader-kotlin/src/main/kotlin/org/apache/camel/k/loader/kotlin/dsl/CamelConfiguration.kt
rename to camel-k-loader-kotlin/impl/src/main/kotlin/org/apache/camel/k/loader/kotlin/dsl/CamelConfiguration.kt
diff --git a/camel-k-loader-kotlin/camel-k-loader-kotlin/src/main/kotlin/org/apache/camel/k/loader/kotlin/dsl/ComponentsConfiguration.kt b/camel-k-loader-kotlin/impl/src/main/kotlin/org/apache/camel/k/loader/kotlin/dsl/ComponentsConfiguration.kt
similarity index 100%
rename from camel-k-loader-kotlin/camel-k-loader-kotlin/src/main/kotlin/org/apache/camel/k/loader/kotlin/dsl/ComponentsConfiguration.kt
rename to camel-k-loader-kotlin/impl/src/main/kotlin/org/apache/camel/k/loader/kotlin/dsl/ComponentsConfiguration.kt
diff --git a/camel-k-loader-kotlin/camel-k-loader-kotlin/src/main/kotlin/org/apache/camel/k/loader/kotlin/dsl/DataFormatsConfiguration.kt b/camel-k-loader-kotlin/impl/src/main/kotlin/org/apache/camel/k/loader/kotlin/dsl/DataFormatsConfiguration.kt
similarity index 100%
rename from camel-k-loader-kotlin/camel-k-loader-kotlin/src/main/kotlin/org/apache/camel/k/loader/kotlin/dsl/DataFormatsConfiguration.kt
rename to camel-k-loader-kotlin/impl/src/main/kotlin/org/apache/camel/k/loader/kotlin/dsl/DataFormatsConfiguration.kt
diff --git a/camel-k-loader-kotlin/camel-k-loader-kotlin/src/main/kotlin/org/apache/camel/k/loader/kotlin/dsl/IntegrationConfiguration.kt b/camel-k-loader-kotlin/impl/src/main/kotlin/org/apache/camel/k/loader/kotlin/dsl/IntegrationConfiguration.kt
similarity index 100%
rename from camel-k-loader-kotlin/camel-k-loader-kotlin/src/main/kotlin/org/apache/camel/k/loader/kotlin/dsl/IntegrationConfiguration.kt
rename to camel-k-loader-kotlin/impl/src/main/kotlin/org/apache/camel/k/loader/kotlin/dsl/IntegrationConfiguration.kt
diff --git a/camel-k-loader-kotlin/camel-k-loader-kotlin/src/main/kotlin/org/apache/camel/k/loader/kotlin/dsl/LanguagesConfiguration.kt b/camel-k-loader-kotlin/impl/src/main/kotlin/org/apache/camel/k/loader/kotlin/dsl/LanguagesConfiguration.kt
similarity index 100%
rename from camel-k-loader-kotlin/camel-k-loader-kotlin/src/main/kotlin/org/apache/camel/k/loader/kotlin/dsl/LanguagesConfiguration.kt
rename to camel-k-loader-kotlin/impl/src/main/kotlin/org/apache/camel/k/loader/kotlin/dsl/LanguagesConfiguration.kt
diff --git a/camel-k-loader-kotlin/camel-k-loader-kotlin/src/main/kotlin/org/apache/camel/k/loader/kotlin/dsl/RegistryConfiguration.kt b/camel-k-loader-kotlin/impl/src/main/kotlin/org/apache/camel/k/loader/kotlin/dsl/RegistryConfiguration.kt
similarity index 100%
rename from camel-k-loader-kotlin/camel-k-loader-kotlin/src/main/kotlin/org/apache/camel/k/loader/kotlin/dsl/RegistryConfiguration.kt
rename to camel-k-loader-kotlin/impl/src/main/kotlin/org/apache/camel/k/loader/kotlin/dsl/RegistryConfiguration.kt
diff --git a/camel-k-loader-kotlin/camel-k-loader-kotlin/src/main/kotlin/org/apache/camel/k/loader/kotlin/dsl/RestConfiguration.kt b/camel-k-loader-kotlin/impl/src/main/kotlin/org/apache/camel/k/loader/kotlin/dsl/RestConfiguration.kt
similarity index 100%
rename from camel-k-loader-kotlin/camel-k-loader-kotlin/src/main/kotlin/org/apache/camel/k/loader/kotlin/dsl/RestConfiguration.kt
rename to camel-k-loader-kotlin/impl/src/main/kotlin/org/apache/camel/k/loader/kotlin/dsl/RestConfiguration.kt
diff --git a/camel-k-loader-kotlin/camel-k-loader-kotlin/src/main/kotlin/org/apache/camel/k/loader/kotlin/dsl/RestVerbConfiguration.kt b/camel-k-loader-kotlin/impl/src/main/kotlin/org/apache/camel/k/loader/kotlin/dsl/RestVerbConfiguration.kt
similarity index 100%
rename from camel-k-loader-kotlin/camel-k-loader-kotlin/src/main/kotlin/org/apache/camel/k/loader/kotlin/dsl/RestVerbConfiguration.kt
rename to camel-k-loader-kotlin/impl/src/main/kotlin/org/apache/camel/k/loader/kotlin/dsl/RestVerbConfiguration.kt
diff --git a/camel-k-loader-kotlin/camel-k-loader-kotlin/src/main/kotlin/org/apache/camel/k/loader/kotlin/dsl/Support.kt b/camel-k-loader-kotlin/impl/src/main/kotlin/org/apache/camel/k/loader/kotlin/dsl/Support.kt
similarity index 100%
rename from camel-k-loader-kotlin/camel-k-loader-kotlin/src/main/kotlin/org/apache/camel/k/loader/kotlin/dsl/Support.kt
rename to camel-k-loader-kotlin/impl/src/main/kotlin/org/apache/camel/k/loader/kotlin/dsl/Support.kt
diff --git a/camel-k-loader-kotlin/camel-k-loader-kotlin/src/main/kotlin/org/apache/camel/k/loader/kotlin/extension/LogComponentExtensions.kt b/camel-k-loader-kotlin/impl/src/main/kotlin/org/apache/camel/k/loader/kotlin/extension/LogComponentExtensions.kt
similarity index 100%
rename from camel-k-loader-kotlin/camel-k-loader-kotlin/src/main/kotlin/org/apache/camel/k/loader/kotlin/extension/LogComponentExtensions.kt
rename to camel-k-loader-kotlin/impl/src/main/kotlin/org/apache/camel/k/loader/kotlin/extension/LogComponentExtensions.kt
diff --git a/camel-k-loader-kotlin/camel-k-loader-kotlin/src/main/resources/META-INF/kotlin/script/templates/org.apache.camel.k.loader.kotlin.dsl.IntegrationConfiguration.classname b/camel-k-loader-kotlin/impl/src/main/resources/META-INF/kotlin/script/templates/org.apache.camel.k.loader.kotlin.dsl.IntegrationConfiguration.classname
similarity index 100%
rename from camel-k-loader-kotlin/camel-k-loader-kotlin/src/main/resources/META-INF/kotlin/script/templates/org.apache.camel.k.loader.kotlin.dsl.IntegrationConfiguration.classname
rename to camel-k-loader-kotlin/impl/src/main/resources/META-INF/kotlin/script/templates/org.apache.camel.k.loader.kotlin.dsl.IntegrationConfiguration.classname
diff --git a/camel-k-loader-kotlin/camel-k-loader-kotlin/src/main/resources/META-INF/services/org/apache/camel/k/loader/kts b/camel-k-loader-kotlin/impl/src/main/resources/META-INF/services/org/apache/camel/k/loader/kts
similarity index 100%
rename from camel-k-loader-kotlin/camel-k-loader-kotlin/src/main/resources/META-INF/services/org/apache/camel/k/loader/kts
rename to camel-k-loader-kotlin/impl/src/main/resources/META-INF/services/org/apache/camel/k/loader/kts
diff --git a/camel-k-loader-kotlin/camel-k-loader-kotlin/src/test/kotlin/org/apache/camel/k/loader/kotlin/KotlinSourceLoaderTest.kt b/camel-k-loader-kotlin/impl/src/test/kotlin/org/apache/camel/k/loader/kotlin/KotlinSourceLoaderTest.kt
similarity index 100%
rename from camel-k-loader-kotlin/camel-k-loader-kotlin/src/test/kotlin/org/apache/camel/k/loader/kotlin/KotlinSourceLoaderTest.kt
rename to camel-k-loader-kotlin/impl/src/test/kotlin/org/apache/camel/k/loader/kotlin/KotlinSourceLoaderTest.kt
diff --git a/camel-k-loader-kotlin/camel-k-loader-kotlin/src/test/kotlin/org/apache/camel/k/loader/kotlin/extension/LogExtensionTest.kt b/camel-k-loader-kotlin/impl/src/test/kotlin/org/apache/camel/k/loader/kotlin/extension/LogExtensionTest.kt
similarity index 100%
rename from camel-k-loader-kotlin/camel-k-loader-kotlin/src/test/kotlin/org/apache/camel/k/loader/kotlin/extension/LogExtensionTest.kt
rename to camel-k-loader-kotlin/impl/src/test/kotlin/org/apache/camel/k/loader/kotlin/extension/LogExtensionTest.kt
diff --git a/camel-k-loader-kotlin/camel-k-loader-kotlin/src/test/kotlin/org/apache/camel/k/loader/kotlin/support/MyBean.kt b/camel-k-loader-kotlin/impl/src/test/kotlin/org/apache/camel/k/loader/kotlin/support/MyBean.kt
similarity index 100%
rename from camel-k-loader-kotlin/camel-k-loader-kotlin/src/test/kotlin/org/apache/camel/k/loader/kotlin/support/MyBean.kt
rename to camel-k-loader-kotlin/impl/src/test/kotlin/org/apache/camel/k/loader/kotlin/support/MyBean.kt
diff --git a/camel-k-loader-kotlin/camel-k-loader-kotlin/src/test/kotlin/org/apache/camel/k/loader/kotlin/support/TestRuntime.kt b/camel-k-loader-kotlin/impl/src/test/kotlin/org/apache/camel/k/loader/kotlin/support/TestRuntime.kt
similarity index 100%
rename from camel-k-loader-kotlin/camel-k-loader-kotlin/src/test/kotlin/org/apache/camel/k/loader/kotlin/support/TestRuntime.kt
rename to camel-k-loader-kotlin/impl/src/test/kotlin/org/apache/camel/k/loader/kotlin/support/TestRuntime.kt
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/resources/log4j2-test.xml b/camel-k-loader-kotlin/impl/src/test/resources/log4j2-test.xml
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/resources/log4j2-test.xml
rename to camel-k-loader-kotlin/impl/src/test/resources/log4j2-test.xml
diff --git a/camel-k-loader-kotlin/camel-k-loader-kotlin/src/test/resources/routes-new.kts b/camel-k-loader-kotlin/impl/src/test/resources/routes-new.kts
similarity index 100%
rename from camel-k-loader-kotlin/camel-k-loader-kotlin/src/test/resources/routes-new.kts
rename to camel-k-loader-kotlin/impl/src/test/resources/routes-new.kts
diff --git a/camel-k-loader-kotlin/camel-k-loader-kotlin/src/test/resources/routes-with-beans.kts b/camel-k-loader-kotlin/impl/src/test/resources/routes-with-beans.kts
similarity index 100%
rename from camel-k-loader-kotlin/camel-k-loader-kotlin/src/test/resources/routes-with-beans.kts
rename to camel-k-loader-kotlin/impl/src/test/resources/routes-with-beans.kts
diff --git a/camel-k-loader-kotlin/camel-k-loader-kotlin/src/test/resources/routes-with-components-configuration-error.kts b/camel-k-loader-kotlin/impl/src/test/resources/routes-with-components-configuration-error.kts
similarity index 100%
rename from camel-k-loader-kotlin/camel-k-loader-kotlin/src/test/resources/routes-with-components-configuration-error.kts
rename to camel-k-loader-kotlin/impl/src/test/resources/routes-with-components-configuration-error.kts
diff --git a/camel-k-loader-kotlin/camel-k-loader-kotlin/src/test/resources/routes-with-components-configuration.kts b/camel-k-loader-kotlin/impl/src/test/resources/routes-with-components-configuration.kts
similarity index 100%
rename from camel-k-loader-kotlin/camel-k-loader-kotlin/src/test/resources/routes-with-components-configuration.kts
rename to camel-k-loader-kotlin/impl/src/test/resources/routes-with-components-configuration.kts
diff --git a/camel-k-loader-kotlin/camel-k-loader-kotlin/src/test/resources/routes-with-dataformats-configuration.kts b/camel-k-loader-kotlin/impl/src/test/resources/routes-with-dataformats-configuration.kts
similarity index 100%
rename from camel-k-loader-kotlin/camel-k-loader-kotlin/src/test/resources/routes-with-dataformats-configuration.kts
rename to camel-k-loader-kotlin/impl/src/test/resources/routes-with-dataformats-configuration.kts
diff --git a/camel-k-loader-kotlin/camel-k-loader-kotlin/src/test/resources/routes-with-endpoint-dsl.kts b/camel-k-loader-kotlin/impl/src/test/resources/routes-with-endpoint-dsl.kts
similarity index 100%
rename from camel-k-loader-kotlin/camel-k-loader-kotlin/src/test/resources/routes-with-endpoint-dsl.kts
rename to camel-k-loader-kotlin/impl/src/test/resources/routes-with-endpoint-dsl.kts
diff --git a/camel-k-loader-kotlin/camel-k-loader-kotlin/src/test/resources/routes-with-error-handler.kts b/camel-k-loader-kotlin/impl/src/test/resources/routes-with-error-handler.kts
similarity index 100%
rename from camel-k-loader-kotlin/camel-k-loader-kotlin/src/test/resources/routes-with-error-handler.kts
rename to camel-k-loader-kotlin/impl/src/test/resources/routes-with-error-handler.kts
diff --git a/camel-k-loader-kotlin/camel-k-loader-kotlin/src/test/resources/routes-with-languages-configuration.kts b/camel-k-loader-kotlin/impl/src/test/resources/routes-with-languages-configuration.kts
similarity index 100%
rename from camel-k-loader-kotlin/camel-k-loader-kotlin/src/test/resources/routes-with-languages-configuration.kts
rename to camel-k-loader-kotlin/impl/src/test/resources/routes-with-languages-configuration.kts
diff --git a/camel-k-loader-kotlin/camel-k-loader-kotlin/src/test/resources/routes-with-rest.kts b/camel-k-loader-kotlin/impl/src/test/resources/routes-with-rest.kts
similarity index 100%
rename from camel-k-loader-kotlin/camel-k-loader-kotlin/src/test/resources/routes-with-rest.kts
rename to camel-k-loader-kotlin/impl/src/test/resources/routes-with-rest.kts
diff --git a/camel-k-loader-kotlin/camel-k-loader-kotlin/src/test/resources/routes.kts b/camel-k-loader-kotlin/impl/src/test/resources/routes.kts
similarity index 100%
rename from camel-k-loader-kotlin/camel-k-loader-kotlin/src/test/resources/routes.kts
rename to camel-k-loader-kotlin/impl/src/test/resources/routes.kts
diff --git a/camel-k-loader-kotlin/pom.xml b/camel-k-loader-kotlin/pom.xml
index e1cbca7..e3d1605 100644
--- a/camel-k-loader-kotlin/pom.xml
+++ b/camel-k-loader-kotlin/pom.xml
@@ -20,7 +20,7 @@
<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">
<parent>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-parent</artifactId>
+ <artifactId>camel-k-runtime-project</artifactId>
<version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -29,8 +29,9 @@
<artifactId>camel-k-loader-kotlin-parent</artifactId>
<modules>
- <module>camel-k-loader-kotlin</module>
- <module>camel-k-loader-kotlin-itests</module>
+ <module>impl</module>
+ <module>runtime</module>
+ <module>deployment</module>
</modules>
</project>
diff --git a/camel-k-quarkus/camel-k-quarkus-wrap/runtime/pom.xml b/camel-k-loader-kotlin/runtime/pom.xml
similarity index 93%
copy from camel-k-quarkus/camel-k-quarkus-wrap/runtime/pom.xml
copy to camel-k-loader-kotlin/runtime/pom.xml
index 659d07d..ddecbdf 100644
--- a/camel-k-quarkus/camel-k-quarkus-wrap/runtime/pom.xml
+++ b/camel-k-loader-kotlin/runtime/pom.xml
@@ -20,21 +20,21 @@
<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">
<parent>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus-wrap-parent</artifactId>
+ <artifactId>camel-k-loader-kotlin-parent</artifactId>
<version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>camel-k-quarkus-wrap</artifactId>
+ <artifactId>camel-k-loader-kotlin</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus-core</artifactId>
+ <artifactId>camel-k-loader-kotlin-impl</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-wrap</artifactId>
+ <artifactId>camel-k-core</artifactId>
</dependency>
</dependencies>
diff --git a/camel-k-quarkus/camel-k-quarkus-loader-xml/deployment/pom.xml b/camel-k-loader-xml/deployment/pom.xml
similarity index 89%
copy from camel-k-quarkus/camel-k-quarkus-loader-xml/deployment/pom.xml
copy to camel-k-loader-xml/deployment/pom.xml
index ed89622..faa551e 100644
--- a/camel-k-quarkus/camel-k-quarkus-loader-xml/deployment/pom.xml
+++ b/camel-k-loader-xml/deployment/pom.xml
@@ -20,12 +20,12 @@
<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">
<parent>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus-loader-xml-parent</artifactId>
+ <artifactId>camel-k-loader-xml-parent</artifactId>
<version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>camel-k-quarkus-loader-xml-deployment</artifactId>
+ <artifactId>camel-k-loader-xml-deployment</artifactId>
<dependencies>
<dependency>
@@ -34,11 +34,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus-loader-xml</artifactId>
+ <artifactId>camel-k-loader-xml</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus-core-deployment</artifactId>
+ <artifactId>camel-k-core-deployment</artifactId>
</dependency>
</dependencies>
diff --git a/camel-k-quarkus/camel-k-quarkus-loader-xml/deployment/src/main/java/org/apache/camel/k/loader/xml/quarkus/deployment/Feature.java b/camel-k-loader-xml/deployment/src/main/java/org/apache/camel/k/loader/xml/quarkus/deployment/Feature.java
similarity index 100%
rename from camel-k-quarkus/camel-k-quarkus-loader-xml/deployment/src/main/java/org/apache/camel/k/loader/xml/quarkus/deployment/Feature.java
rename to camel-k-loader-xml/deployment/src/main/java/org/apache/camel/k/loader/xml/quarkus/deployment/Feature.java
diff --git a/camel-k-loader-xml/pom.xml b/camel-k-loader-xml/impl/pom.xml
similarity index 96%
copy from camel-k-loader-xml/pom.xml
copy to camel-k-loader-xml/impl/pom.xml
index c2f456a..fc06345 100644
--- a/camel-k-loader-xml/pom.xml
+++ b/camel-k-loader-xml/impl/pom.xml
@@ -20,12 +20,12 @@
<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">
<parent>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-parent</artifactId>
+ <artifactId>camel-k-loader-xml-parent</artifactId>
<version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>camel-k-loader-xml</artifactId>
+ <artifactId>camel-k-loader-xml-impl</artifactId>
<dependencies>
@@ -37,9 +37,8 @@
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-core</artifactId>
+ <artifactId>camel-k-core-support</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core-engine</artifactId>
diff --git a/camel-k-loader-xml/src/main/java/org/apache/camel/k/loader/xml/XmlSourceLoader.java b/camel-k-loader-xml/impl/src/main/java/org/apache/camel/k/loader/xml/XmlSourceLoader.java
similarity index 100%
rename from camel-k-loader-xml/src/main/java/org/apache/camel/k/loader/xml/XmlSourceLoader.java
rename to camel-k-loader-xml/impl/src/main/java/org/apache/camel/k/loader/xml/XmlSourceLoader.java
diff --git a/camel-k-loader-xml/src/test/groovy/org/apache/camel/k/loader/xml/XmlSourceLoaderTest.groovy b/camel-k-loader-xml/impl/src/test/groovy/org/apache/camel/k/loader/xml/XmlSourceLoaderTest.groovy
similarity index 100%
rename from camel-k-loader-xml/src/test/groovy/org/apache/camel/k/loader/xml/XmlSourceLoaderTest.groovy
rename to camel-k-loader-xml/impl/src/test/groovy/org/apache/camel/k/loader/xml/XmlSourceLoaderTest.groovy
diff --git a/camel-k-loader-xml/src/test/groovy/org/apache/camel/k/loader/xml/support/TestRuntime.groovy b/camel-k-loader-xml/impl/src/test/groovy/org/apache/camel/k/loader/xml/support/TestRuntime.groovy
similarity index 100%
rename from camel-k-loader-xml/src/test/groovy/org/apache/camel/k/loader/xml/support/TestRuntime.groovy
rename to camel-k-loader-xml/impl/src/test/groovy/org/apache/camel/k/loader/xml/support/TestRuntime.groovy
diff --git a/camel-k-loader-groovy/src/test/resources/log4j2-test.xml b/camel-k-loader-xml/impl/src/test/resources/log4j2-test.xml
similarity index 100%
rename from camel-k-loader-groovy/src/test/resources/log4j2-test.xml
rename to camel-k-loader-xml/impl/src/test/resources/log4j2-test.xml
diff --git a/camel-k-main/camel-k-runtime-main/src/test/resources/rests.xml b/camel-k-loader-xml/impl/src/test/resources/rests.xml
similarity index 100%
rename from camel-k-main/camel-k-runtime-main/src/test/resources/rests.xml
rename to camel-k-loader-xml/impl/src/test/resources/rests.xml
diff --git a/camel-k-main/camel-k-runtime-main/src/test/resources/routes.xml b/camel-k-loader-xml/impl/src/test/resources/routes.xml
similarity index 100%
copy from camel-k-main/camel-k-runtime-main/src/test/resources/routes.xml
copy to camel-k-loader-xml/impl/src/test/resources/routes.xml
diff --git a/camel-k-loader-xml/pom.xml b/camel-k-loader-xml/pom.xml
index c2f456a..ad82991 100644
--- a/camel-k-loader-xml/pom.xml
+++ b/camel-k-loader-xml/pom.xml
@@ -20,122 +20,18 @@
<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">
<parent>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-parent</artifactId>
+ <artifactId>camel-k-runtime-project</artifactId>
<version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
+ <packaging>pom</packaging>
- <artifactId>camel-k-loader-xml</artifactId>
+ <artifactId>camel-k-loader-xml-parent</artifactId>
- <dependencies>
-
- <!-- ****************************** -->
- <!-- -->
- <!-- RUNTIME -->
- <!-- -->
- <!-- ****************************** -->
-
- <dependency>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core-engine</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-xml-io</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-apt</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-annotations</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <!-- ****************************** -->
- <!-- -->
- <!-- TESTS -->
- <!-- -->
- <!-- ****************************** -->
-
- <dependency>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-test</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-undertow</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-timer</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-seda</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-log</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-rest</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-direct</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.gmavenplus</groupId>
- <artifactId>gmavenplus-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>addSources</goal>
- <goal>addTestSources</goal>
- <goal>compile</goal>
- <goal>compileTests</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <invokeDynamic>true</invokeDynamic>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.jboss.jandex</groupId>
- <artifactId>jandex-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>make-index</id>
- <goals>
- <goal>jandex</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <modules>
+ <module>impl</module>
+ <module>runtime</module>
+ <module>deployment</module>
+ </modules>
</project>
diff --git a/camel-k-quarkus/camel-k-quarkus-loader-xml/runtime/pom.xml b/camel-k-loader-xml/runtime/pom.xml
similarity index 93%
copy from camel-k-quarkus/camel-k-quarkus-loader-xml/runtime/pom.xml
copy to camel-k-loader-xml/runtime/pom.xml
index 3e7f860..02b7b5f 100644
--- a/camel-k-quarkus/camel-k-quarkus-loader-xml/runtime/pom.xml
+++ b/camel-k-loader-xml/runtime/pom.xml
@@ -20,12 +20,12 @@
<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">
<parent>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus-loader-xml-parent</artifactId>
+ <artifactId>camel-k-loader-xml-parent</artifactId>
<version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>camel-k-quarkus-loader-xml</artifactId>
+ <artifactId>camel-k-loader-xml</artifactId>
<dependencies>
<dependency>
@@ -34,11 +34,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus-core</artifactId>
+ <artifactId>camel-k-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-loader-xml</artifactId>
+ <artifactId>camel-k-loader-xml-impl</artifactId>
</dependency>
</dependencies>
diff --git a/camel-k-quarkus/camel-k-quarkus-wrap/deployment/pom.xml b/camel-k-loader-yaml/deployment/pom.xml
similarity index 89%
copy from camel-k-quarkus/camel-k-quarkus-wrap/deployment/pom.xml
copy to camel-k-loader-yaml/deployment/pom.xml
index 3082ed2..576a774 100644
--- a/camel-k-quarkus/camel-k-quarkus-wrap/deployment/pom.xml
+++ b/camel-k-loader-yaml/deployment/pom.xml
@@ -20,21 +20,21 @@
<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">
<parent>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus-wrap-parent</artifactId>
+ <artifactId>camel-k-loader-yaml-parent</artifactId>
<version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>camel-k-quarkus-wrap-deployment</artifactId>
+ <artifactId>camel-k-loader-yaml-deployment</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus-core-deployment</artifactId>
+ <artifactId>camel-k-loader-yaml</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus-wrap</artifactId>
+ <artifactId>camel-k-core-deployment</artifactId>
</dependency>
</dependencies>
diff --git a/camel-k-quarkus/camel-k-quarkus-loader-yaml/deployment/src/main/java/org/apache/camel/k/loader/yaml/quarkus/deployment/DeploymentProcessor.java b/camel-k-loader-yaml/deployment/src/main/java/org/apache/camel/k/loader/yaml/quarkus/deployment/DeploymentProcessor.java
similarity index 100%
rename from camel-k-quarkus/camel-k-quarkus-loader-yaml/deployment/src/main/java/org/apache/camel/k/loader/yaml/quarkus/deployment/DeploymentProcessor.java
rename to camel-k-loader-yaml/deployment/src/main/java/org/apache/camel/k/loader/yaml/quarkus/deployment/DeploymentProcessor.java
diff --git a/camel-k-quarkus/camel-k-quarkus-loader-yaml/deployment/src/main/java/org/apache/camel/k/loader/yaml/quarkus/deployment/Feature.java b/camel-k-loader-yaml/deployment/src/main/java/org/apache/camel/k/loader/yaml/quarkus/deployment/Feature.java
similarity index 100%
rename from camel-k-quarkus/camel-k-quarkus-loader-yaml/deployment/src/main/java/org/apache/camel/k/loader/yaml/quarkus/deployment/Feature.java
rename to camel-k-loader-yaml/deployment/src/main/java/org/apache/camel/k/loader/yaml/quarkus/deployment/Feature.java
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-common/pom.xml b/camel-k-loader-yaml/impl-common/pom.xml
similarity index 97%
rename from camel-k-loader-yaml/camel-k-loader-yaml-common/pom.xml
rename to camel-k-loader-yaml/impl-common/pom.xml
index d4a2a6c..0700dca 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml-common/pom.xml
+++ b/camel-k-loader-yaml/impl-common/pom.xml
@@ -25,7 +25,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>camel-k-loader-yaml-common</artifactId>
+ <artifactId>camel-k-loader-yaml-impl-common</artifactId>
<dependencies>
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-core</artifactId>
+ <artifactId>camel-k-core-api</artifactId>
</dependency>
<dependency>
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/model/Step.java b/camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/model/Step.java
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/model/Step.java
rename to camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/model/Step.java
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/AggregateStepParser.java b/camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/AggregateStepParser.java
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/AggregateStepParser.java
rename to camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/AggregateStepParser.java
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/BeansStepParser.java b/camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/BeansStepParser.java
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/BeansStepParser.java
rename to camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/BeansStepParser.java
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/ChoiceStepParser.java b/camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/ChoiceStepParser.java
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/ChoiceStepParser.java
rename to camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/ChoiceStepParser.java
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/CircuitBreakerStepParser.java b/camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/CircuitBreakerStepParser.java
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/CircuitBreakerStepParser.java
rename to camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/CircuitBreakerStepParser.java
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/DelayStepParser.java b/camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/DelayStepParser.java
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/DelayStepParser.java
rename to camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/DelayStepParser.java
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/DoTryStepParser.java b/camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/DoTryStepParser.java
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/DoTryStepParser.java
rename to camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/DoTryStepParser.java
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/DynamicRouterStepParser.java b/camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/DynamicRouterStepParser.java
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/DynamicRouterStepParser.java
rename to camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/DynamicRouterStepParser.java
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/EndpointStepParser.java b/camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/EndpointStepParser.java
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/EndpointStepParser.java
rename to camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/EndpointStepParser.java
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/EnrichStepParser.java b/camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/EnrichStepParser.java
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/EnrichStepParser.java
rename to camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/EnrichStepParser.java
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/ErrorHandlerStepParser.java b/camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/ErrorHandlerStepParser.java
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/ErrorHandlerStepParser.java
rename to camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/ErrorHandlerStepParser.java
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/FilterStepParser.java b/camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/FilterStepParser.java
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/FilterStepParser.java
rename to camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/FilterStepParser.java
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/FromStepParser.java b/camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/FromStepParser.java
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/FromStepParser.java
rename to camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/FromStepParser.java
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/IdempotentConsumerParser.java b/camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/IdempotentConsumerParser.java
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/IdempotentConsumerParser.java
rename to camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/IdempotentConsumerParser.java
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/LoadBalanceStepParser.java b/camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/LoadBalanceStepParser.java
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/LoadBalanceStepParser.java
rename to camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/LoadBalanceStepParser.java
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/LoopStepParser.java b/camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/LoopStepParser.java
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/LoopStepParser.java
rename to camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/LoopStepParser.java
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/MarshalStepParser.java b/camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/MarshalStepParser.java
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/MarshalStepParser.java
rename to camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/MarshalStepParser.java
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/MulticastStepParser.java b/camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/MulticastStepParser.java
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/MulticastStepParser.java
rename to camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/MulticastStepParser.java
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/OnExceptionStepParser.java b/camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/OnExceptionStepParser.java
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/OnExceptionStepParser.java
rename to camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/OnExceptionStepParser.java
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/PipelineStepParser.java b/camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/PipelineStepParser.java
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/PipelineStepParser.java
rename to camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/PipelineStepParser.java
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/PollEnrichStepParser.java b/camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/PollEnrichStepParser.java
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/PollEnrichStepParser.java
rename to camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/PollEnrichStepParser.java
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/ProcessStepParser.java b/camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/ProcessStepParser.java
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/ProcessStepParser.java
rename to camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/ProcessStepParser.java
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/RecipientListStepParser.java b/camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/RecipientListStepParser.java
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/RecipientListStepParser.java
rename to camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/RecipientListStepParser.java
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/ResequenceStepParser.java b/camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/ResequenceStepParser.java
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/ResequenceStepParser.java
rename to camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/ResequenceStepParser.java
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/RestStepParser.java b/camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/RestStepParser.java
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/RestStepParser.java
rename to camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/RestStepParser.java
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/RouteStepParser.java b/camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/RouteStepParser.java
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/RouteStepParser.java
rename to camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/RouteStepParser.java
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/RoutingSlipStepParser.java b/camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/RoutingSlipStepParser.java
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/RoutingSlipStepParser.java
rename to camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/RoutingSlipStepParser.java
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/SagaStepParser.java b/camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/SagaStepParser.java
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/SagaStepParser.java
rename to camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/SagaStepParser.java
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/SampleStepParser.java b/camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/SampleStepParser.java
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/SampleStepParser.java
rename to camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/SampleStepParser.java
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/ScriptStepParser.java b/camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/ScriptStepParser.java
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/ScriptStepParser.java
rename to camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/ScriptStepParser.java
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/ServiceCallStepParser.java b/camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/ServiceCallStepParser.java
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/ServiceCallStepParser.java
rename to camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/ServiceCallStepParser.java
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/SetBodyStepParser.java b/camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/SetBodyStepParser.java
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/SetBodyStepParser.java
rename to camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/SetBodyStepParser.java
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/SetExchangePatternStepParser.java b/camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/SetExchangePatternStepParser.java
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/SetExchangePatternStepParser.java
rename to camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/SetExchangePatternStepParser.java
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/SetHeaderStepParser.java b/camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/SetHeaderStepParser.java
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/SetHeaderStepParser.java
rename to camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/SetHeaderStepParser.java
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/SetPropertyStepParser.java b/camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/SetPropertyStepParser.java
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/SetPropertyStepParser.java
rename to camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/SetPropertyStepParser.java
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/SortStepParser.java b/camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/SortStepParser.java
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/SortStepParser.java
rename to camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/SortStepParser.java
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/SplitStepParser.java b/camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/SplitStepParser.java
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/SplitStepParser.java
rename to camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/SplitStepParser.java
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/StepStepParser.java b/camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/StepStepParser.java
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/StepStepParser.java
rename to camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/StepStepParser.java
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/ThrottleStepParser.java b/camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/ThrottleStepParser.java
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/ThrottleStepParser.java
rename to camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/ThrottleStepParser.java
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/ThrowExceptionStepParser.java b/camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/ThrowExceptionStepParser.java
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/ThrowExceptionStepParser.java
rename to camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/ThrowExceptionStepParser.java
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/ToDynamicStepParser.java b/camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/ToDynamicStepParser.java
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/ToDynamicStepParser.java
rename to camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/ToDynamicStepParser.java
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/ToStepParser.java b/camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/ToStepParser.java
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/ToStepParser.java
rename to camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/ToStepParser.java
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/TransactedStepParser.java b/camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/TransactedStepParser.java
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/TransactedStepParser.java
rename to camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/TransactedStepParser.java
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/TransformStepParser.java b/camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/TransformStepParser.java
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/TransformStepParser.java
rename to camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/TransformStepParser.java
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/TypedProcessorStepParser.java b/camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/TypedProcessorStepParser.java
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/TypedProcessorStepParser.java
rename to camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/TypedProcessorStepParser.java
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/UnmarshalStepParser.java b/camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/UnmarshalStepParser.java
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/UnmarshalStepParser.java
rename to camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/UnmarshalStepParser.java
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/ValidateStepParser.java b/camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/ValidateStepParser.java
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/ValidateStepParser.java
rename to camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/ValidateStepParser.java
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/WireTapStepParser.java b/camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/WireTapStepParser.java
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/parser/WireTapStepParser.java
rename to camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/parser/WireTapStepParser.java
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/spi/HasEndpoint.java b/camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/spi/HasEndpoint.java
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/spi/HasEndpoint.java
rename to camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/spi/HasEndpoint.java
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/spi/HasUri.java b/camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/spi/HasUri.java
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/spi/HasUri.java
rename to camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/spi/HasUri.java
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/spi/ProcessorStepParser.java b/camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/spi/ProcessorStepParser.java
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/spi/ProcessorStepParser.java
rename to camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/spi/ProcessorStepParser.java
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/spi/StartStepParser.java b/camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/spi/StartStepParser.java
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/spi/StartStepParser.java
rename to camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/spi/StartStepParser.java
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/spi/StepParser.java b/camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/spi/StepParser.java
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/spi/StepParser.java
rename to camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/spi/StepParser.java
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/spi/StepParserException.java b/camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/spi/StepParserException.java
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/spi/StepParserException.java
rename to camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/spi/StepParserException.java
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/support/Any23DataFormatMixIn.java b/camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/support/Any23DataFormatMixIn.java
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/support/Any23DataFormatMixIn.java
rename to camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/support/Any23DataFormatMixIn.java
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/support/ExpressionNodeMixIn.java b/camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/support/ExpressionNodeMixIn.java
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/support/ExpressionNodeMixIn.java
rename to camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/support/ExpressionNodeMixIn.java
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/support/ProcessorDefinitionMixIn.java b/camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/support/ProcessorDefinitionMixIn.java
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/support/ProcessorDefinitionMixIn.java
rename to camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/support/ProcessorDefinitionMixIn.java
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/support/RemoveHeaderDefinitionMixIn.java b/camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/support/RemoveHeaderDefinitionMixIn.java
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/support/RemoveHeaderDefinitionMixIn.java
rename to camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/support/RemoveHeaderDefinitionMixIn.java
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/support/RemovePropertyDefinitionMixIn.java b/camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/support/RemovePropertyDefinitionMixIn.java
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/support/RemovePropertyDefinitionMixIn.java
rename to camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/support/RemovePropertyDefinitionMixIn.java
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/support/StepParserSupport.java b/camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/support/StepParserSupport.java
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/support/StepParserSupport.java
rename to camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/support/StepParserSupport.java
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/support/XStreamDataFormatMixIn.java b/camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/support/XStreamDataFormatMixIn.java
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/support/XStreamDataFormatMixIn.java
rename to camel-k-loader-yaml/impl-common/src/main/java/org/apache/camel/k/loader/yaml/support/XStreamDataFormatMixIn.java
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-support/pom.xml b/camel-k-loader-yaml/impl-support/pom.xml
similarity index 96%
rename from camel-k-loader-yaml/camel-k-loader-yaml-support/pom.xml
rename to camel-k-loader-yaml/impl-support/pom.xml
index ffb6ced..e5e7cd3 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml-support/pom.xml
+++ b/camel-k-loader-yaml/impl-support/pom.xml
@@ -25,7 +25,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>camel-k-loader-yaml-support</artifactId>
+ <artifactId>camel-k-loader-yaml-impl-support</artifactId>
<dependencies>
@@ -37,11 +37,11 @@
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-core</artifactId>
+ <artifactId>camel-k-core-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-loader-yaml-common</artifactId>
+ <artifactId>camel-k-loader-yaml-impl-common</artifactId>
</dependency>
<dependency>
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/pom.xml b/camel-k-loader-yaml/impl/pom.xml
similarity index 96%
rename from camel-k-loader-yaml/camel-k-loader-yaml/pom.xml
rename to camel-k-loader-yaml/impl/pom.xml
index 0ff74d1..c0af1f4 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml/pom.xml
+++ b/camel-k-loader-yaml/impl/pom.xml
@@ -25,7 +25,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>camel-k-loader-yaml</artifactId>
+ <artifactId>camel-k-loader-yaml-impl</artifactId>
<dependencies>
@@ -37,15 +37,19 @@
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-core</artifactId>
+ <artifactId>camel-k-core-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-loader-yaml-common</artifactId>
+ <artifactId>camel-k-core-support</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-loader-yaml-support</artifactId>
+ <artifactId>camel-k-loader-yaml-impl-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.k</groupId>
+ <artifactId>camel-k-loader-yaml-impl-support</artifactId>
</dependency>
<dependency>
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/generated/resources/camel-yaml-dsl.json b/camel-k-loader-yaml/impl/src/generated/resources/camel-yaml-dsl.json
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/generated/resources/camel-yaml-dsl.json
rename to camel-k-loader-yaml/impl/src/generated/resources/camel-yaml-dsl.json
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/generated/resources/camel-yaml-endpoint.json b/camel-k-loader-yaml/impl/src/generated/resources/camel-yaml-endpoint.json
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/generated/resources/camel-yaml-endpoint.json
rename to camel-k-loader-yaml/impl/src/generated/resources/camel-yaml-endpoint.json
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/YamlSourceLoader.java b/camel-k-loader-yaml/impl/src/main/java/org/apache/camel/k/loader/yaml/YamlSourceLoader.java
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/YamlSourceLoader.java
rename to camel-k-loader-yaml/impl/src/main/java/org/apache/camel/k/loader/yaml/YamlSourceLoader.java
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/DefinitionsTest.groovy b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/DefinitionsTest.groovy
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/DefinitionsTest.groovy
rename to camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/DefinitionsTest.groovy
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/RoutesTest.groovy b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/RoutesTest.groovy
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/RoutesTest.groovy
rename to camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/RoutesTest.groovy
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/RoutesValidationTest.groovy b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/RoutesValidationTest.groovy
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/RoutesValidationTest.groovy
rename to camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/RoutesValidationTest.groovy
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/RoutesWithEndpointTest.groovy b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/RoutesWithEndpointTest.groovy
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/RoutesWithEndpointTest.groovy
rename to camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/RoutesWithEndpointTest.groovy
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/RoutesWithPlaceholdersTest.groovy b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/RoutesWithPlaceholdersTest.groovy
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/RoutesWithPlaceholdersTest.groovy
rename to camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/RoutesWithPlaceholdersTest.groovy
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/RoutesWithSecretsTest.groovy b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/RoutesWithSecretsTest.groovy
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/RoutesWithSecretsTest.groovy
rename to camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/RoutesWithSecretsTest.groovy
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/AggregateTest.groovy b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/AggregateTest.groovy
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/AggregateTest.groovy
rename to camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/AggregateTest.groovy
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/BeanTest.groovy b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/BeanTest.groovy
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/BeanTest.groovy
rename to camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/BeanTest.groovy
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ChoiceTest.groovy b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ChoiceTest.groovy
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ChoiceTest.groovy
rename to camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ChoiceTest.groovy
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/CircuitBreakerTest.groovy b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/CircuitBreakerTest.groovy
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/CircuitBreakerTest.groovy
rename to camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/CircuitBreakerTest.groovy
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ClaimCheckTest.groovy b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ClaimCheckTest.groovy
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ClaimCheckTest.groovy
rename to camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ClaimCheckTest.groovy
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ConvertBodyTest.groovy b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ConvertBodyTest.groovy
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ConvertBodyTest.groovy
rename to camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ConvertBodyTest.groovy
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/DelayTest.groovy b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/DelayTest.groovy
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/DelayTest.groovy
rename to camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/DelayTest.groovy
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/DoTryTest.groovy b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/DoTryTest.groovy
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/DoTryTest.groovy
rename to camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/DoTryTest.groovy
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/DynamicRouterTest.groovy b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/DynamicRouterTest.groovy
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/DynamicRouterTest.groovy
rename to camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/DynamicRouterTest.groovy
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/EnrichTest.groovy b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/EnrichTest.groovy
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/EnrichTest.groovy
rename to camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/EnrichTest.groovy
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ErrorHandlerTest.groovy b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ErrorHandlerTest.groovy
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ErrorHandlerTest.groovy
rename to camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ErrorHandlerTest.groovy
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/FilterTest.groovy b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/FilterTest.groovy
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/FilterTest.groovy
rename to camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/FilterTest.groovy
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/FromTest.groovy b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/FromTest.groovy
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/FromTest.groovy
rename to camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/FromTest.groovy
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/IdempotentConsumerTest.groovy b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/IdempotentConsumerTest.groovy
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/IdempotentConsumerTest.groovy
rename to camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/IdempotentConsumerTest.groovy
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/LoadBalanceTest.groovy b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/LoadBalanceTest.groovy
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/LoadBalanceTest.groovy
rename to camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/LoadBalanceTest.groovy
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/LogTest.groovy b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/LogTest.groovy
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/LogTest.groovy
rename to camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/LogTest.groovy
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/LoopTest.groovy b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/LoopTest.groovy
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/LoopTest.groovy
rename to camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/LoopTest.groovy
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/MarshalTest.groovy b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/MarshalTest.groovy
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/MarshalTest.groovy
rename to camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/MarshalTest.groovy
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/MulticastTest.groovy b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/MulticastTest.groovy
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/MulticastTest.groovy
rename to camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/MulticastTest.groovy
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/OnExceptionTest.groovy b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/OnExceptionTest.groovy
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/OnExceptionTest.groovy
rename to camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/OnExceptionTest.groovy
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/PipelineTest.groovy b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/PipelineTest.groovy
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/PipelineTest.groovy
rename to camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/PipelineTest.groovy
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/PollEnrichTest.groovy b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/PollEnrichTest.groovy
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/PollEnrichTest.groovy
rename to camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/PollEnrichTest.groovy
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ProcessTest.groovy b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ProcessTest.groovy
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ProcessTest.groovy
rename to camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ProcessTest.groovy
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RecipientListTest.groovy b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RecipientListTest.groovy
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RecipientListTest.groovy
rename to camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RecipientListTest.groovy
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RemoveHeaderTest.groovy b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RemoveHeaderTest.groovy
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RemoveHeaderTest.groovy
rename to camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RemoveHeaderTest.groovy
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RemoveHeadersTest.groovy b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RemoveHeadersTest.groovy
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RemoveHeadersTest.groovy
rename to camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RemoveHeadersTest.groovy
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RemovePropertiesTest.groovy b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RemovePropertiesTest.groovy
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RemovePropertiesTest.groovy
rename to camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RemovePropertiesTest.groovy
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RemovePropertyTest.groovy b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RemovePropertyTest.groovy
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RemovePropertyTest.groovy
rename to camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RemovePropertyTest.groovy
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ResequenceTest.groovy b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ResequenceTest.groovy
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ResequenceTest.groovy
rename to camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ResequenceTest.groovy
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RestTest.groovy b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RestTest.groovy
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RestTest.groovy
rename to camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RestTest.groovy
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RollbackTest.groovy b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RollbackTest.groovy
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RollbackTest.groovy
rename to camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RollbackTest.groovy
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RoutingSlipTest.groovy b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RoutingSlipTest.groovy
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RoutingSlipTest.groovy
rename to camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RoutingSlipTest.groovy
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SagaTest.groovy b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SagaTest.groovy
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SagaTest.groovy
rename to camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SagaTest.groovy
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SampleTest.groovy b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SampleTest.groovy
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SampleTest.groovy
rename to camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SampleTest.groovy
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ScriptTest.groovy b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ScriptTest.groovy
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ScriptTest.groovy
rename to camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ScriptTest.groovy
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ServiceCallTest.groovy b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ServiceCallTest.groovy
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ServiceCallTest.groovy
rename to camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ServiceCallTest.groovy
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SetBodyTest.groovy b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SetBodyTest.groovy
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SetBodyTest.groovy
rename to camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SetBodyTest.groovy
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SetExchangePatternTest.groovy b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SetExchangePatternTest.groovy
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SetExchangePatternTest.groovy
rename to camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SetExchangePatternTest.groovy
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SetHeaderTest.groovy b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SetHeaderTest.groovy
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SetHeaderTest.groovy
rename to camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SetHeaderTest.groovy
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SetPropertyTest.groovy b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SetPropertyTest.groovy
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SetPropertyTest.groovy
rename to camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SetPropertyTest.groovy
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SortTest.groovy b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SortTest.groovy
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SortTest.groovy
rename to camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SortTest.groovy
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SplitTest.groovy b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SplitTest.groovy
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SplitTest.groovy
rename to camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SplitTest.groovy
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/StepTest.groovy b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/StepTest.groovy
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/StepTest.groovy
rename to camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/StepTest.groovy
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/StopTest.groovy b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/StopTest.groovy
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/StopTest.groovy
rename to camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/StopTest.groovy
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ThreadsTest.groovy b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ThreadsTest.groovy
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ThreadsTest.groovy
rename to camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ThreadsTest.groovy
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ThrottleTest.groovy b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ThrottleTest.groovy
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ThrottleTest.groovy
rename to camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ThrottleTest.groovy
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ThrowExceptionTest.groovy b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ThrowExceptionTest.groovy
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ThrowExceptionTest.groovy
rename to camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ThrowExceptionTest.groovy
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ToDynamicTest.groovy b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ToDynamicTest.groovy
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ToDynamicTest.groovy
rename to camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ToDynamicTest.groovy
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ToTest.groovy b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ToTest.groovy
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ToTest.groovy
rename to camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ToTest.groovy
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/TransactedTest.groovy b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/TransactedTest.groovy
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/TransactedTest.groovy
rename to camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/TransactedTest.groovy
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/UnmarshalTest.groovy b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/UnmarshalTest.groovy
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/UnmarshalTest.groovy
rename to camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/UnmarshalTest.groovy
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ValidateTest.groovy b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ValidateTest.groovy
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ValidateTest.groovy
rename to camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ValidateTest.groovy
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/WireTapTest.groovy b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/WireTapTest.groovy
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/WireTapTest.groovy
rename to camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/parser/WireTapTest.groovy
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/support/MyBean.groovy b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/support/MyBean.groovy
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/support/MyBean.groovy
rename to camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/support/MyBean.groovy
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/support/MyException.groovy b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/support/MyException.groovy
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/support/MyException.groovy
rename to camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/support/MyException.groovy
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/support/MyFailingProcessor.groovy b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/support/MyFailingProcessor.groovy
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/support/MyFailingProcessor.groovy
rename to camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/support/MyFailingProcessor.groovy
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/support/MyUppercaseProcessor.groovy b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/support/MyUppercaseProcessor.groovy
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/support/MyUppercaseProcessor.groovy
rename to camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/support/MyUppercaseProcessor.groovy
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/support/TestSupport.groovy b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/support/TestSupport.groovy
similarity index 99%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/support/TestSupport.groovy
rename to camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/support/TestSupport.groovy
index 37ceae8..5612a6e 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/support/TestSupport.groovy
+++ b/camel-k-loader-yaml/impl/src/test/groovy/org/apache/camel/k/loader/yaml/support/TestSupport.groovy
@@ -25,12 +25,12 @@ import org.apache.camel.component.mock.MockEndpoint
import org.apache.camel.impl.DefaultCamelContext
import org.apache.camel.k.Runtime
import org.apache.camel.k.Source
-import org.apache.camel.k.Sources
import org.apache.camel.k.loader.yaml.YamlSourceLoader
import org.apache.camel.k.loader.yaml.YamlStepResolver
import org.apache.camel.k.loader.yaml.spi.ProcessorStepParser
import org.apache.camel.k.loader.yaml.spi.StartStepParser
import org.apache.camel.k.loader.yaml.spi.StepParser
+import org.apache.camel.k.support.Sources
import org.apache.camel.model.ProcessorDefinition
import org.apache.camel.model.RouteDefinition
import spock.lang.Specification
diff --git a/camel-k-loader-kotlin/camel-k-loader-kotlin/src/test/resources/log4j2-test.xml b/camel-k-loader-yaml/impl/src/test/resources/log4j2-test.xml
similarity index 100%
rename from camel-k-loader-kotlin/camel-k-loader-kotlin/src/test/resources/log4j2-test.xml
rename to camel-k-loader-yaml/impl/src/test/resources/log4j2-test.xml
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/resources/routes/RoutesTest_aggregator.yaml b/camel-k-loader-yaml/impl/src/test/resources/routes/RoutesTest_aggregator.yaml
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/resources/routes/RoutesTest_aggregator.yaml
rename to camel-k-loader-yaml/impl/src/test/resources/routes/RoutesTest_aggregator.yaml
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/resources/routes/RoutesTest_bean.yaml b/camel-k-loader-yaml/impl/src/test/resources/routes/RoutesTest_bean.yaml
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/resources/routes/RoutesTest_bean.yaml
rename to camel-k-loader-yaml/impl/src/test/resources/routes/RoutesTest_bean.yaml
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/resources/routes/RoutesTest_beans.yaml b/camel-k-loader-yaml/impl/src/test/resources/routes/RoutesTest_beans.yaml
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/resources/routes/RoutesTest_beans.yaml
rename to camel-k-loader-yaml/impl/src/test/resources/routes/RoutesTest_beans.yaml
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/resources/routes/RoutesTest_errorHandler.yaml b/camel-k-loader-yaml/impl/src/test/resources/routes/RoutesTest_errorHandler.yaml
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/resources/routes/RoutesTest_errorHandler.yaml
rename to camel-k-loader-yaml/impl/src/test/resources/routes/RoutesTest_errorHandler.yaml
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/resources/routes/RoutesTest_filter.yaml b/camel-k-loader-yaml/impl/src/test/resources/routes/RoutesTest_filter.yaml
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/resources/routes/RoutesTest_filter.yaml
rename to camel-k-loader-yaml/impl/src/test/resources/routes/RoutesTest_filter.yaml
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/resources/routes/RoutesTest_idempotentConsumer.yaml b/camel-k-loader-yaml/impl/src/test/resources/routes/RoutesTest_idempotentConsumer.yaml
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/resources/routes/RoutesTest_idempotentConsumer.yaml
rename to camel-k-loader-yaml/impl/src/test/resources/routes/RoutesTest_idempotentConsumer.yaml
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/resources/routes/RoutesTest_onExceptionHandled.yaml b/camel-k-loader-yaml/impl/src/test/resources/routes/RoutesTest_onExceptionHandled.yaml
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/resources/routes/RoutesTest_onExceptionHandled.yaml
rename to camel-k-loader-yaml/impl/src/test/resources/routes/RoutesTest_onExceptionHandled.yaml
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/resources/routes/RoutesTest_split.yaml b/camel-k-loader-yaml/impl/src/test/resources/routes/RoutesTest_split.yaml
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/resources/routes/RoutesTest_split.yaml
rename to camel-k-loader-yaml/impl/src/test/resources/routes/RoutesTest_split.yaml
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/resources/routes/RoutesWithEndpointTest_from.yaml b/camel-k-loader-yaml/impl/src/test/resources/routes/RoutesWithEndpointTest_from.yaml
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/resources/routes/RoutesWithEndpointTest_from.yaml
rename to camel-k-loader-yaml/impl/src/test/resources/routes/RoutesWithEndpointTest_from.yaml
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/resources/routes/RoutesWithEndpointTest_route.yaml b/camel-k-loader-yaml/impl/src/test/resources/routes/RoutesWithEndpointTest_route.yaml
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/resources/routes/RoutesWithEndpointTest_route.yaml
rename to camel-k-loader-yaml/impl/src/test/resources/routes/RoutesWithEndpointTest_route.yaml
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/resources/routes/RoutesWithPlaceholdersTest_from.yaml b/camel-k-loader-yaml/impl/src/test/resources/routes/RoutesWithPlaceholdersTest_from.yaml
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/resources/routes/RoutesWithPlaceholdersTest_from.yaml
rename to camel-k-loader-yaml/impl/src/test/resources/routes/RoutesWithPlaceholdersTest_from.yaml
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/resources/routes/RoutesWithPlaceholdersTest_route.yaml b/camel-k-loader-yaml/impl/src/test/resources/routes/RoutesWithPlaceholdersTest_route.yaml
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/resources/routes/RoutesWithPlaceholdersTest_route.yaml
rename to camel-k-loader-yaml/impl/src/test/resources/routes/RoutesWithPlaceholdersTest_route.yaml
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/resources/routes/RoutesWithPlaceholdersTest_to.yaml b/camel-k-loader-yaml/impl/src/test/resources/routes/RoutesWithPlaceholdersTest_to.yaml
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/resources/routes/RoutesWithPlaceholdersTest_to.yaml
rename to camel-k-loader-yaml/impl/src/test/resources/routes/RoutesWithPlaceholdersTest_to.yaml
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/resources/routes/RoutesWithPlaceholdersTest_tod.yaml b/camel-k-loader-yaml/impl/src/test/resources/routes/RoutesWithPlaceholdersTest_tod.yaml
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/resources/routes/RoutesWithPlaceholdersTest_tod.yaml
rename to camel-k-loader-yaml/impl/src/test/resources/routes/RoutesWithPlaceholdersTest_tod.yaml
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/resources/routes/RoutesWithSecretsTest_route.yaml b/camel-k-loader-yaml/impl/src/test/resources/routes/RoutesWithSecretsTest_route.yaml
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/resources/routes/RoutesWithSecretsTest_route.yaml
rename to camel-k-loader-yaml/impl/src/test/resources/routes/RoutesWithSecretsTest_route.yaml
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/resources/routes/RoutesWithSecretsTest_route_property.yaml b/camel-k-loader-yaml/impl/src/test/resources/routes/RoutesWithSecretsTest_route_property.yaml
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/resources/routes/RoutesWithSecretsTest_route_property.yaml
rename to camel-k-loader-yaml/impl/src/test/resources/routes/RoutesWithSecretsTest_route_property.yaml
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml/src/test/resources/routes/RoutesWithSecretsTest_route_raw.yaml b/camel-k-loader-yaml/impl/src/test/resources/routes/RoutesWithSecretsTest_route_raw.yaml
similarity index 100%
rename from camel-k-loader-yaml/camel-k-loader-yaml/src/test/resources/routes/RoutesWithSecretsTest_route_raw.yaml
rename to camel-k-loader-yaml/impl/src/test/resources/routes/RoutesWithSecretsTest_route_raw.yaml
diff --git a/camel-k-loader-yaml/pom.xml b/camel-k-loader-yaml/pom.xml
index a92f0d8..77e7048 100644
--- a/camel-k-loader-yaml/pom.xml
+++ b/camel-k-loader-yaml/pom.xml
@@ -20,7 +20,7 @@
<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">
<parent>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-parent</artifactId>
+ <artifactId>camel-k-runtime-project</artifactId>
<version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -29,9 +29,11 @@
<artifactId>camel-k-loader-yaml-parent</artifactId>
<modules>
- <module>camel-k-loader-yaml-common</module>
- <module>camel-k-loader-yaml-support</module>
- <module>camel-k-loader-yaml</module>
+ <module>impl-common</module>
+ <module>impl-support</module>
+ <module>impl</module>
+ <module>runtime</module>
+ <module>deployment</module>
</modules>
diff --git a/camel-k-quarkus/camel-k-quarkus-wrap/runtime/pom.xml b/camel-k-loader-yaml/runtime/pom.xml
similarity index 93%
copy from camel-k-quarkus/camel-k-quarkus-wrap/runtime/pom.xml
copy to camel-k-loader-yaml/runtime/pom.xml
index 659d07d..b76fb25 100644
--- a/camel-k-quarkus/camel-k-quarkus-wrap/runtime/pom.xml
+++ b/camel-k-loader-yaml/runtime/pom.xml
@@ -20,21 +20,21 @@
<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">
<parent>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus-wrap-parent</artifactId>
+ <artifactId>camel-k-loader-yaml-parent</artifactId>
<version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>camel-k-quarkus-wrap</artifactId>
+ <artifactId>camel-k-loader-yaml</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus-core</artifactId>
+ <artifactId>camel-k-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-wrap</artifactId>
+ <artifactId>camel-k-loader-yaml-impl</artifactId>
</dependency>
</dependencies>
diff --git a/camel-k-main/camel-k-runtime-health/src/generated/java/org/apache/camel/k/health/HealthContextCustomizerConfigurer.java b/camel-k-main/camel-k-runtime-health/src/generated/java/org/apache/camel/k/health/HealthContextCustomizerConfigurer.java
deleted file mode 100644
index 3f38b1b..0000000
--- a/camel-k-main/camel-k-runtime-health/src/generated/java/org/apache/camel/k/health/HealthContextCustomizerConfigurer.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.k.health;
-
-import java.util.Map;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
-import org.apache.camel.util.CaseInsensitiveMap;
-import org.apache.camel.k.health.HealthContextCustomizer;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-@SuppressWarnings("unchecked")
-public class HealthContextCustomizerConfigurer extends org.apache.camel.support.component.PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
-
- private static final Map<String, Object> ALL_OPTIONS;
- static {
- Map<String, Object> map = new CaseInsensitiveMap();
- map.put("HealthGroupFilterExclude", java.lang.String.class);
- map.put("IncludeContext", boolean.class);
- map.put("IncludeRoutes", boolean.class);
- map.put("Path", java.lang.String.class);
- ALL_OPTIONS = map;
- }
-
- @Override
- public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
- org.apache.camel.k.health.HealthContextCustomizer target = (org.apache.camel.k.health.HealthContextCustomizer) obj;
- switch (ignoreCase ? name.toLowerCase() : name) {
- case "healthgroupfilterexclude":
- case "HealthGroupFilterExclude": target.setHealthGroupFilterExclude(property(camelContext, java.lang.String.class, value)); return true;
- case "includecontext":
- case "IncludeContext": target.setIncludeContext(property(camelContext, boolean.class, value)); return true;
- case "includeroutes":
- case "IncludeRoutes": target.setIncludeRoutes(property(camelContext, boolean.class, value)); return true;
- case "path":
- case "Path": target.setPath(property(camelContext, java.lang.String.class, value)); return true;
- default: return false;
- }
- }
-
- @Override
- public Map<String, Object> getAllOptions(Object target) {
- return ALL_OPTIONS;
- }
-
- @Override
- public Object getOptionValue(Object obj, String name, boolean ignoreCase) {
- org.apache.camel.k.health.HealthContextCustomizer target = (org.apache.camel.k.health.HealthContextCustomizer) obj;
- switch (ignoreCase ? name.toLowerCase() : name) {
- case "healthgroupfilterexclude":
- case "HealthGroupFilterExclude": return target.getHealthGroupFilterExclude();
- case "includecontext":
- case "IncludeContext": return target.isIncludeContext();
- case "includeroutes":
- case "IncludeRoutes": return target.isIncludeRoutes();
- case "path":
- case "Path": return target.getPath();
- default: return null;
- }
- }
-}
-
diff --git a/camel-k-main/camel-k-runtime-health/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.k.health.HealthContextCustomizer b/camel-k-main/camel-k-runtime-health/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.k.health.HealthContextCustomizer
deleted file mode 100644
index 85a7a9a..0000000
--- a/camel-k-main/camel-k-runtime-health/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.k.health.HealthContextCustomizer
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.k.health.HealthContextCustomizerConfigurer
diff --git a/camel-k-main/camel-k-runtime-health/src/main/java/org/apache/camel/k/health/HealthContextCustomizer.java b/camel-k-main/camel-k-runtime-health/src/main/java/org/apache/camel/k/health/HealthContextCustomizer.java
deleted file mode 100644
index 7627bd8..0000000
--- a/camel-k-main/camel-k-runtime-health/src/main/java/org/apache/camel/k/health/HealthContextCustomizer.java
+++ /dev/null
@@ -1,173 +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.k.health;
-
-import java.util.Collection;
-import java.util.Map;
-
-import io.vertx.core.http.HttpMethod;
-import io.vertx.core.json.Json;
-import io.vertx.core.json.JsonArray;
-import io.vertx.core.json.JsonObject;
-import io.vertx.ext.web.Route;
-import org.apache.camel.CamelContext;
-import org.apache.camel.Ordered;
-import org.apache.camel.component.platform.http.vertx.VertxPlatformHttpRouter;
-import org.apache.camel.health.HealthCheck;
-import org.apache.camel.health.HealthCheckFilter;
-import org.apache.camel.health.HealthCheckHelper;
-import org.apache.camel.health.HealthCheckRegistry;
-import org.apache.camel.impl.health.AbstractHealthCheck;
-import org.apache.camel.impl.health.ContextHealthCheck;
-import org.apache.camel.impl.health.RoutesHealthCheckRepository;
-import org.apache.camel.k.ContextCustomizer;
-import org.apache.camel.k.annotation.Customizer;
-import org.apache.camel.spi.Configurer;
-
-@Configurer
-@Customizer("health")
-public class HealthContextCustomizer implements ContextCustomizer {
- public static final String DEFAULT_PATH = "/health";
-
- private String path;
- private String healthGroupFilterExclude;
- private boolean includeRoutes;
- private boolean includeContext;
-
- public HealthContextCustomizer() {
- this.path = DEFAULT_PATH;
- this.includeRoutes = true;
- this.includeContext = true;
- }
-
- public String getPath() {
- return path;
- }
-
- public void setPath(String path) {
- this.path = path;
- }
-
- public String getHealthGroupFilterExclude() {
- return healthGroupFilterExclude;
- }
-
- public void setHealthGroupFilterExclude(String healthGroupFilterExclude) {
- this.healthGroupFilterExclude = healthGroupFilterExclude;
- }
-
- public boolean isIncludeRoutes() {
- return includeRoutes;
- }
-
- public void setIncludeRoutes(boolean includeRoutes) {
- this.includeRoutes = includeRoutes;
- }
-
- public boolean isIncludeContext() {
- return includeContext;
- }
-
- public void setIncludeContext(boolean includeContext) {
- this.includeContext = includeContext;
- }
-
- @Override
- public int getOrder() {
- return Ordered.LOWEST;
- }
-
- @Override
- public void apply(CamelContext camelContext) {
- try {
- HealthCheckRegistry reg = HealthCheckRegistry.get(camelContext);
- if (includeRoutes) {
- reg.register(new RoutesHealthCheckRepository());
- }
- if (includeContext) {
- ContextHealthCheck contextHealthCheck = new ContextHealthCheck();
- contextHealthCheck.getConfiguration().setEnabled(true);
-
- reg.register(contextHealthCheck);
- }
-
- camelContext.addService(reg);
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
-
- // add health route
- addRoute(
- camelContext,
- VertxPlatformHttpRouter.lookup(camelContext)
- );
- }
-
- private Route addRoute(CamelContext camelContext, VertxPlatformHttpRouter router) {
- Route route = router.route(HttpMethod.GET, path);
-
- // add body handler
- route.handler(router.bodyHandler());
-
- // add health endpoint handler
- route.handler(routingContext -> {
- int code = 200;
-
- Collection<HealthCheck.Result> results = HealthCheckHelper.invoke(
- camelContext,
- (HealthCheckFilter) check -> check.getGroup() != null && check.getGroup().equals(getHealthGroupFilterExclude()));
-
- JsonObject response = new JsonObject();
- response.put("status", "UP");
-
- JsonArray checks = new JsonArray();
-
- for (HealthCheck.Result result: results) {
- Map<String, Object> details = result.getDetails();
- boolean enabled = true;
-
- if (details.containsKey(AbstractHealthCheck.CHECK_ENABLED)) {
- enabled = (boolean) details.get(AbstractHealthCheck.CHECK_ENABLED);
- }
-
- if (enabled) {
- JsonObject check = new JsonObject();
- check.put("name", result.getCheck().getId());
- check.put("status", result.getState().name());
-
- if (result.getState() == HealthCheck.State.DOWN) {
- response.put("status", "DOWN");
- code = 503;
- }
-
- checks.add(check);
- }
- }
-
- if (!checks.isEmpty()) {
- response.put("checks", checks);
- }
-
- routingContext.response()
- .putHeader("content-type", "application/json")
- .setStatusCode(code)
- .end(Json.encodePrettily(response));
- });
-
- return route;
- }
-}
diff --git a/camel-k-main/camel-k-runtime-health/src/test/java/org/apache/camel/k/health/HealthCustomizerTest.java b/camel-k-main/camel-k-runtime-health/src/test/java/org/apache/camel/k/health/HealthCustomizerTest.java
deleted file mode 100644
index a2fb9ab..0000000
--- a/camel-k-main/camel-k-runtime-health/src/test/java/org/apache/camel/k/health/HealthCustomizerTest.java
+++ /dev/null
@@ -1,82 +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.k.health;
-
-import java.net.URL;
-
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.k.Runtime;
-import org.apache.camel.k.http.PlatformHttpServiceContextCustomizer;
-import org.apache.camel.k.test.AvailablePortFinder;
-import org.apache.camel.util.ObjectHelper;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.ValueSource;
-
-import static io.restassured.RestAssured.when;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.hasItems;
-
-public class HealthCustomizerTest {
-
- @ParameterizedTest
- @ValueSource(strings = { "", "/test", "/test/nested" })
- public void testHealthConfigurer(String path) throws Exception {
- Runtime runtime = Runtime.on(new DefaultCamelContext());
- runtime.addRoutes(new RouteBuilder() {
- @Override
- public void configure() throws Exception {
- from("direct:start")
- .routeId("my-route")
- .to("mock:end");
- }
- });
-
- PlatformHttpServiceContextCustomizer phsc = new PlatformHttpServiceContextCustomizer();
- phsc.setBindPort(AvailablePortFinder.getNextAvailable());
-
- String url;
- if (ObjectHelper.isEmpty(path)) {
- url = "http://localhost:" + phsc.getBindPort() + HealthContextCustomizer.DEFAULT_PATH;
- } else {
- phsc.setPath(path);
-
- url = "http://localhost:" + phsc.getBindPort() + path + HealthContextCustomizer.DEFAULT_PATH;
- }
-
- phsc.apply(runtime.getCamelContext());
-
- HealthContextCustomizer healthCustomizer = new HealthContextCustomizer();
- healthCustomizer.apply(runtime.getCamelContext());
-
- try {
- runtime.getCamelContext().start();
-
- when()
- .get(new URL(url))
- .then()
- .statusCode(200)
- .body(
- "status", equalTo("UP"),
- "checks.name", hasItems("context", "route:my-route"),
- "checks.status", hasItems("UP", "UP")
- );
- } finally {
- runtime.stop();
- }
- }
-}
diff --git a/camel-k-main/camel-k-runtime-health/src/test/resources/log4j2-test.xml b/camel-k-main/camel-k-runtime-health/src/test/resources/log4j2-test.xml
deleted file mode 100644
index 0f393ea..0000000
--- a/camel-k-main/camel-k-runtime-health/src/test/resources/log4j2-test.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.
-
--->
-<Configuration status="INFO">
- <Appenders>
- <Console name="STDOUT" target="SYSTEM_OUT">
- <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS}|%-5level|%t|%c - %msg%n"/>
- </Console>
- <Null name="NONE"/>
- </Appenders>
-
- <Loggers>
- <Logger name="io.vertx" level="INFO"/>
- <Root level="INFO">
- <!-- <AppenderRef ref="STDOUT"/> -->
- <AppenderRef ref="NONE"/>
- </Root>
- </Loggers>
-
-</Configuration>
\ No newline at end of file
diff --git a/camel-k-main/camel-k-runtime-main/pom.xml b/camel-k-main/camel-k-runtime-main/pom.xml
deleted file mode 100644
index 729b025..0000000
--- a/camel-k-main/camel-k-runtime-main/pom.xml
+++ /dev/null
@@ -1,178 +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">
- <parent>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-main</artifactId>
- <version>1.6.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>camel-k-runtime-main</artifactId>
-
- <dependencies>
-
- <!-- ****************************** -->
- <!-- -->
- <!-- RUNTIME -->
- <!-- -->
- <!-- ****************************** -->
-
- <dependency>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core-engine</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-main</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-bean</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <version>${log4j2-version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- <version>${log4j2-version}</version>
- </dependency>
-
- <!-- ****************************** -->
- <!-- -->
- <!-- TESTS -->
- <!-- -->
- <!-- ****************************** -->
-
- <dependency>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-test</artifactId>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-undertow</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-timer</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-seda</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-log</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-rest</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-direct</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-loader-js</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-loader-xml</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-loader-java</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-loader-groovy</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-loader-kotlin</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-knative</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-knative-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-kamelet</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <environmentVariables>
- <CAMEL_K_RESOURCE_001>value from env</CAMEL_K_RESOURCE_001>
- <MY_OTHER_RESOURCE_TXT>env:CAMEL_K_RESOURCE_001</MY_OTHER_RESOURCE_TXT>
- </environmentVariables>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/camel-k-main/camel-k-runtime-main/src/main/java/org/apache/camel/k/main/Application.java b/camel-k-main/camel-k-runtime-main/src/main/java/org/apache/camel/k/main/Application.java
deleted file mode 100644
index 8d6aebe..0000000
--- a/camel-k-main/camel-k-runtime-main/src/main/java/org/apache/camel/k/main/Application.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 org.apache.camel.k.main;
-
-import java.util.ServiceLoader;
-
-import org.apache.camel.k.Runtime;
-
-public final class Application {
- static {
- //
- // Configure the logging subsystem log4j2 using a subset of spring boot
- // conventions:
- //
- // logging.level.${name} = OFF|FATAL|ERROR|WARN|INFO|DEBUG|TRACE|ALL
- //
- // We now support setting the logging level only
- //
- ApplicationSupport.configureLogging();
- }
-
- private Application() {
- }
-
- public static void main(String[] args) throws Exception {
- ApplicationRuntime runtime = new ApplicationRuntime();
- runtime.addListeners(ServiceLoader.load(Runtime.Listener.class));
- runtime.run();
- }
-}
diff --git a/camel-k-main/camel-k-runtime-main/src/main/java/org/apache/camel/k/main/ApplicationRuntime.java b/camel-k-main/camel-k-runtime-main/src/main/java/org/apache/camel/k/main/ApplicationRuntime.java
deleted file mode 100644
index f7a0938..0000000
--- a/camel-k-main/camel-k-runtime-main/src/main/java/org/apache/camel/k/main/ApplicationRuntime.java
+++ /dev/null
@@ -1,240 +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.k.main;
-
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Properties;
-import java.util.Set;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.ProducerTemplate;
-import org.apache.camel.RoutesBuilder;
-import org.apache.camel.RuntimeCamelException;
-import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.k.CompositeClassloader;
-import org.apache.camel.k.Runtime;
-import org.apache.camel.k.support.RuntimeSupport;
-import org.apache.camel.main.BaseMainSupport;
-import org.apache.camel.main.MainSupport;
-import org.apache.camel.main.RoutesCollector;
-import org.apache.camel.model.RouteTemplatesDefinition;
-import org.apache.camel.model.RoutesDefinition;
-import org.apache.camel.model.rest.RestsDefinition;
-import org.apache.camel.util.function.ThrowingConsumer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public final class ApplicationRuntime implements Runtime {
- private static final Logger LOGGER = LoggerFactory.getLogger(ApplicationRuntime.class);
-
- private final MainSupport main;
- private final DefaultCamelContext context;
- private final Set<Runtime.Listener> listeners;
-
- public ApplicationRuntime() {
- this.listeners = new LinkedHashSet<>();
-
- this.context = new DefaultCamelContext();
- this.context.setName("camel-k");
- this.context.setApplicationContextClassLoader(new CompositeClassloader());
-
- this.main = new MainAdapter();
- this.main.configure().setXmlRoutes("false");
- this.main.configure().setXmlRests("false");
- this.main.configure().setXmlRouteTemplates("false");
- this.main.setDefaultPropertyPlaceholderLocation("false");
- this.main.setRoutesCollector(new NoRoutesCollector());
- this.main.addMainListener(new MainListenerAdapter());
- }
-
- @Override
- public CamelContext getCamelContext() {
- return this.context;
- }
-
- public void run() throws Exception {
- LOGGER.info("Apache Camel K Runtime {}", RuntimeSupport.getRuntimeVersion());
- this.main.run();
- }
-
- @Override
- public void stop() throws Exception {
- this.main.stop();
- }
-
- @Override
- public void addRoutes(RoutesBuilder builder) {
- this.main.configure().addRoutesBuilder(builder);
- }
-
- @Override
- public void setInitialProperties(Properties properties) {
- this.main.getCamelContext().getPropertiesComponent().setInitialProperties(properties);
- }
-
- @Override
- public void setProperties(Properties properties) {
- this.main.getCamelContext().getPropertiesComponent().setOverrideProperties(properties);
- }
-
- public void addListeners(Iterable<Runtime.Listener> listeners) {
- listeners.forEach(this::addListener);
- }
-
- public void addListener(Runtime.Listener listener) {
- LOGGER.debug("Add listener: {}", listener);
-
- this.listeners.add(listener);
- }
-
- public void addListener(Phase phase, ThrowingConsumer<Runtime, Exception> consumer) {
- addListener((p, runtime) -> {
- if (p == phase) {
- try {
- consumer.accept(runtime);
- return true;
- } catch (Exception e) {
- throw RuntimeCamelException.wrapRuntimeCamelException(e);
- }
- }
-
- return false;
- });
- }
-
- private final class MainListenerAdapter implements org.apache.camel.main.MainListener {
- @Override
- public void beforeInitialize(BaseMainSupport main) {
- invokeListeners(Phase.Initializing);
- invokeListeners(Phase.ConfigureProperties);
- }
-
- @Override
- public void beforeConfigure(BaseMainSupport main) {
- invokeListeners(Phase.ConfigureRoutes);
- }
-
- @Override
- public void afterConfigure(BaseMainSupport main) {
- invokeListeners(Phase.ConfigureContext);
- }
-
- @Override
- public void configure(CamelContext context) {
- // no-op
- }
-
- @Override
- public void beforeStart(BaseMainSupport main) {
- invokeListeners(Phase.Starting);
- }
-
- @Override
- public void afterStart(BaseMainSupport main) {
- invokeListeners(Phase.Started);
- }
-
- @Override
- public void beforeStop(BaseMainSupport main) {
- invokeListeners(Phase.Stopping);
- }
-
- @Override
- public void afterStop(BaseMainSupport main) {
- invokeListeners(Phase.Stopped);
- }
-
- private void invokeListeners(Phase phase) {
- listeners.stream()
- .sorted(Comparator.comparingInt(Listener::getOrder))
- .forEach(l -> {
- if (l.accept(phase, ApplicationRuntime.this)) {
- LOGGER.debug("Listener {} executed in phase {}", l, phase);
- }
- });
- }
- }
-
- private final class MainAdapter extends MainSupport {
- @Override
- public CamelContext getCamelContext() {
- return ApplicationRuntime.this.context;
- }
-
- @Override
- protected CamelContext createCamelContext() {
- return ApplicationRuntime.this.context;
- }
-
- @Override
- protected void doInit() throws Exception {
- super.doInit();
- initCamelContext();
- }
-
- @Override
- protected void doStart() throws Exception {
- super.doStart();
-
- try {
- // if we were veto started then mark as completed
- getCamelContext().start();
- } finally {
- if (getCamelContext().isVetoStarted()) {
- completed();
- }
- }
- }
-
- @Override
- protected void doStop() throws Exception {
- super.doStop();
- getCamelContext().stop();
- }
-
- @Override
- protected ProducerTemplate findOrCreateCamelTemplate() {
- return getCamelContext().createProducerTemplate();
- }
- }
-
- private static final class NoRoutesCollector implements RoutesCollector {
- @Override
- public List<RoutesBuilder> collectRoutesFromRegistry(CamelContext camelContext, String excludePattern, String includePattern) {
- return Collections.emptyList();
- }
-
- @Override
- public List<RoutesDefinition> collectXmlRoutesFromDirectory(CamelContext camelContext, String directory) throws Exception {
- return Collections.emptyList();
- }
-
- @Override
- public List<RouteTemplatesDefinition> collectXmlRouteTemplatesFromDirectory(CamelContext camelContext, String directory) throws Exception {
- return Collections.emptyList();
- }
-
- @Override
- public List<RestsDefinition> collectXmlRestsFromDirectory(CamelContext camelContext, String directory) throws Exception {
- return Collections.emptyList();
- }
- }
-}
-
diff --git a/camel-k-main/camel-k-runtime-main/src/main/java/org/apache/camel/k/main/ApplicationSupport.java b/camel-k-main/camel-k-runtime-main/src/main/java/org/apache/camel/k/main/ApplicationSupport.java
deleted file mode 100644
index 288521f..0000000
--- a/camel-k-main/camel-k-runtime-main/src/main/java/org/apache/camel/k/main/ApplicationSupport.java
+++ /dev/null
@@ -1,55 +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.k.main;
-
-import java.util.Properties;
-
-import org.apache.camel.k.Constants;
-import org.apache.camel.k.support.PropertiesSupport;
-import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.core.LoggerContext;
-import org.apache.logging.log4j.core.config.LoggerConfig;
-
-
-public final class ApplicationSupport {
- private ApplicationSupport() {
- }
-
- public static void configureLogging() {
- final LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
- final Properties properties = PropertiesSupport.loadProperties();
-
- properties.entrySet().stream()
- .filter(entry -> entry.getKey() instanceof String)
- .filter(entry -> entry.getValue() instanceof String)
- .filter(entry -> ((String)entry.getKey()).startsWith(Constants.LOGGING_LEVEL_PREFIX))
- .forEach(entry -> {
- String key = (String)entry.getKey();
- String val = (String)entry.getValue();
-
- String logger = key.substring(Constants.LOGGING_LEVEL_PREFIX.length());
- Level level = Level.getLevel(val);
- LoggerConfig config = new LoggerConfig(logger, level, true);
-
- ctx.getConfiguration().addLogger(logger, config);
- }
- );
-
- ctx.updateLoggers();
- }
-}
diff --git a/camel-k-main/camel-k-runtime-main/src/main/resources/log4j2.properties b/camel-k-main/camel-k-runtime-main/src/main/resources/log4j2.properties
deleted file mode 100644
index 69cb2f2..0000000
--- a/camel-k-main/camel-k-runtime-main/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.console.type = Console
-appender.console.name = console
-appender.console.layout.type = PatternLayout
-appender.console.layout.pattern = %d{yyyy-MM-dd HH:mm:ss.SSS} %highlight{%-5level} [%t] %c{1} - %msg%n
-
-rootLogger.level = INFO
-rootLogger.appenderRef.stdout.ref = console
\ No newline at end of file
diff --git a/camel-k-main/camel-k-runtime-main/src/test/java/org/apache/camel/k/main/ApplicationSupportTest.java b/camel-k-main/camel-k-runtime-main/src/test/java/org/apache/camel/k/main/ApplicationSupportTest.java
deleted file mode 100644
index 25c5aa0..0000000
--- a/camel-k-main/camel-k-runtime-main/src/test/java/org/apache/camel/k/main/ApplicationSupportTest.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.k.main;
-
-import org.apache.camel.k.Constants;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-import org.slf4j.LoggerFactory;
-
-class ApplicationSupportTest {
-
- @Test
- void configureLogging() {
- System.setProperty(Constants.PROPERTY_CAMEL_K_CONF, "src/test/resources/logger.properties");
-
- try {
- Assertions.assertFalse(LoggerFactory.getLogger("org.foo").isDebugEnabled());
- Assertions.assertTrue(LoggerFactory.getLogger("org.bar").isInfoEnabled());
-
- ApplicationSupport.configureLogging();
-
- Assertions.assertTrue(LoggerFactory.getLogger("org.foo").isDebugEnabled());
- Assertions.assertFalse(LoggerFactory.getLogger("org.bar").isInfoEnabled());
- } finally {
- System.getProperties().remove(Constants.PROPERTY_CAMEL_K_CONF);
- }
- }
-}
diff --git a/camel-k-main/camel-k-runtime-main/src/test/java/org/apache/camel/k/main/PropertiesTest.java b/camel-k-main/camel-k-runtime-main/src/test/java/org/apache/camel/k/main/PropertiesTest.java
deleted file mode 100644
index 7349b84..0000000
--- a/camel-k-main/camel-k-runtime-main/src/test/java/org/apache/camel/k/main/PropertiesTest.java
+++ /dev/null
@@ -1,206 +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.k.main;
-
-import java.util.Properties;
-import java.util.concurrent.ThreadLocalRandom;
-import java.util.stream.Collectors;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.component.properties.PropertiesComponent;
-import org.apache.camel.component.seda.SedaComponent;
-import org.apache.camel.k.Constants;
-import org.apache.camel.k.ContextCustomizer;
-import org.apache.camel.k.Runtime;
-import org.apache.camel.k.listener.ContextConfigurer;
-import org.apache.camel.k.support.PropertiesSupport;
-import org.junit.jupiter.api.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class PropertiesTest {
-
- @Test
- public void testLoadProperties() throws Exception {
- System.setProperty(Constants.PROPERTY_CAMEL_K_CONF, "src/test/resources/conf.properties");
- System.setProperty(Constants.PROPERTY_CAMEL_K_CONF_D, "src/test/resources/conf.d");
-
- try {
- ApplicationRuntime runtime = new ApplicationRuntime();
- runtime.setInitialProperties(PropertiesSupport.loadApplicationProperties());
- runtime.setPropertiesLocations(PropertiesSupport.resolveUserPropertiesLocations());
- runtime.addListener(new ContextConfigurer());
- runtime.addListener(Runtime.Phase.Started, r -> {
- final CamelContext context = r.getCamelContext();
- final PropertiesComponent pc = (PropertiesComponent)context.getPropertiesComponent();
-
- assertThat(pc.getInitialProperties()).containsExactlyEntriesOf(PropertiesSupport.loadApplicationProperties());
- assertThat(pc.getInitialProperties().getProperty("root.key")).isEqualTo("root.value");
- assertThat(pc.getInitialProperties().getProperty("a.key")).isEqualTo("a.root");
-
- assertThat(pc.getLocations()).hasSameElementsAs(
- PropertiesSupport.resolveUserPropertiesLocations().stream()
- .map(location -> "file:" + location)
- .distinct()
- .sorted()
- .collect(Collectors.toList())
- );
-
- assertThat(pc.resolveProperty("root.key")).get().isEqualTo("root.value");
- assertThat(pc.resolveProperty("001.key")).get().isEqualTo("001.value");
- assertThat(pc.resolveProperty("002.key")).get().isEqualTo("002.value");
- assertThat(pc.resolveProperty("a.key")).get().isEqualTo("a.002");
- runtime.stop();
- });
-
- runtime.run();
- } finally {
- System.getProperties().remove(Constants.PROPERTY_CAMEL_K_CONF);
- System.getProperties().remove(Constants.PROPERTY_CAMEL_K_CONF_D);
- }
- }
-
- @Test
- public void testSystemProperties() throws Exception {
- System.setProperty("my.property", "my.value");
-
- try {
- ApplicationRuntime runtime = new ApplicationRuntime();
- runtime.setProperties(System.getProperties());
- runtime.addListener(new ContextConfigurer());
- runtime.addListener(Runtime.Phase.Started, r -> {
- CamelContext context = r.getCamelContext();
- String value = context.resolvePropertyPlaceholders("{{my.property}}");
-
- assertThat(value).isEqualTo("my.value");
- runtime.stop();
- });
-
- runtime.run();
- } finally {
- System.getProperties().remove("my.property");
- }
- }
-
- @Test
- public void testComponentConfiguration() throws Exception {
- int queueSize1 = ThreadLocalRandom.current().nextInt(10, 100);
- int queueSize2 = ThreadLocalRandom.current().nextInt(10, 100);
-
- Properties properties = new Properties();
- properties.setProperty("camel.component.seda.queueSize", Integer.toString(queueSize1));
- properties.setProperty("camel.component.my-seda.queueSize", Integer.toString(queueSize2));
-
- ApplicationRuntime runtime = new ApplicationRuntime();
- runtime.setProperties(properties);
- runtime.getRegistry().bind("my-seda", new SedaComponent());
- runtime.addListener(new ContextConfigurer());
- runtime.addListener(Runtime.Phase.Started, r -> {
- CamelContext context = r.getCamelContext();
- assertThat(context.getComponent("seda", true)).hasFieldOrPropertyWithValue("queueSize", queueSize1);
- assertThat(context.getComponent("my-seda", true)).hasFieldOrPropertyWithValue("queueSize", queueSize2);
- runtime.stop();
- });
-
- runtime.run();
- }
-
- @Test
- public void testContextConfiguration() throws Exception {
- Properties properties = new Properties();
- properties.setProperty("camel.main.message-history", "false");
- properties.setProperty("camel.main.load-type-converters", "false");
- properties.setProperty("camel.main.stream-caching-spool-threshold", "100");
- properties.setProperty("camel.rest.component", "servlet");
- properties.setProperty("camel.rest.context-path", "/my/path");
-
- ApplicationRuntime runtime = new ApplicationRuntime();
- runtime.setProperties(properties);
- runtime.addListener(new ContextConfigurer());
- runtime.addListener(Runtime.Phase.Started, r -> {
- CamelContext context = r.getCamelContext();
- assertThat(context.isMessageHistory()).isFalse();
- assertThat(context.isLoadTypeConverters()).isFalse();
- assertThat(context.getStreamCachingStrategy().getSpoolThreshold()).isEqualTo(100);
- assertThat(context.getRestConfiguration().getComponent()).isEqualTo("servlet");
- assertThat(context.getRestConfiguration().getContextPath()).isEqualTo("/my/path");
- runtime.stop();
- });
-
- runtime.run();
- }
-
- @Test
- public void testContextCustomizerFromProperties() throws Exception {
- Properties properties = new Properties();
- properties.setProperty("camel.k.customizer.test.enabled", "true");
- properties.setProperty("camel.k.customizer.test.message-history", "false");
-
- ApplicationRuntime runtime = new ApplicationRuntime();
- runtime.setProperties(properties);
- runtime.addListener(new ContextConfigurer());
- runtime.addListener(Runtime.Phase.Started, r -> {
- CamelContext context = r.getCamelContext();
- assertThat(context.isMessageHistory()).isFalse();
- assertThat(context.isLoadTypeConverters()).isFalse();
- runtime.stop();
- });
-
- runtime.run();
- }
-
- @Test
- public void testContextCustomizerFromPropertiesFallback() throws Exception {
- Properties properties = new Properties();
- properties.setProperty("customizer.test.enabled", "true");
- properties.setProperty("customizer.test.message-history", "false");
-
- ApplicationRuntime runtime = new ApplicationRuntime();
- runtime.setProperties(properties);
- runtime.addListener(new ContextConfigurer());
- runtime.addListener(Runtime.Phase.Started, r -> {
- CamelContext context = r.getCamelContext();
- assertThat(context.isMessageHistory()).isFalse();
- assertThat(context.isLoadTypeConverters()).isFalse();
- runtime.stop();
- });
-
- runtime.run();
- }
-
- @Test
- public void testContextCustomizerFromRegistry() throws Exception {
- Properties properties = new Properties();
- properties.setProperty("camel.k.customizer.c1.enabled", "true");
-
- ApplicationRuntime runtime = new ApplicationRuntime();
- runtime.setProperties(properties);
- runtime.addListener(new ContextConfigurer());
- runtime.getRegistry().bind("c1", (ContextCustomizer) camelContext -> {
- camelContext.setMessageHistory(false);
- camelContext.setLoadTypeConverters(false);
- });
- runtime.addListener(Runtime.Phase.Started, r -> {
- CamelContext context = r.getCamelContext();
- assertThat(context.isMessageHistory()).isFalse();
- assertThat(context.isLoadTypeConverters()).isFalse();
- runtime.stop();
- });
-
- runtime.run();
- }
-}
diff --git a/camel-k-main/camel-k-runtime-main/src/test/java/org/apache/camel/k/main/RuntimeTest.java b/camel-k-main/camel-k-runtime-main/src/test/java/org/apache/camel/k/main/RuntimeTest.java
deleted file mode 100644
index 4e275c3..0000000
--- a/camel-k-main/camel-k-runtime-main/src/test/java/org/apache/camel/k/main/RuntimeTest.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.k.main;
-
-import java.util.List;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.Route;
-import org.apache.camel.component.knative.KnativeComponent;
-import org.apache.camel.component.knative.spi.Knative;
-import org.apache.camel.component.knative.spi.KnativeEnvironment;
-import org.apache.camel.component.knative.test.KnativeEnvironmentSupport;
-import org.apache.camel.k.Runtime;
-import org.apache.camel.k.http.PlatformHttpServiceContextCustomizer;
-import org.apache.camel.k.listener.ContextConfigurer;
-import org.apache.camel.k.listener.SourcesConfigurer;
-import org.apache.camel.k.main.support.MyBean;
-import org.apache.camel.k.main.support.MyProcessor;
-import org.apache.camel.k.support.SourcesSupport;
-import org.apache.camel.k.test.AvailablePortFinder;
-import org.apache.camel.model.ModelCamelContext;
-import org.apache.camel.model.ToDefinition;
-import org.apache.camel.util.ObjectHelper;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import static org.apache.camel.util.CollectionHelper.mapOf;
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class RuntimeTest {
- private ApplicationRuntime runtime;
-
- @BeforeEach
- public void setUp() {
- runtime = new ApplicationRuntime();
- }
-
- @AfterEach
- public void cleanUp() throws Exception {
- if (runtime != null) {
- runtime.stop();
- }
- }
-
- @Test
- void testLoadMultipleRoutes() throws Exception {
- runtime.addListener(new ContextConfigurer());
- runtime.addListener(SourcesSupport.forRoutes("classpath:r1.js", "classpath:r2.mytype?language=js"));
- runtime.addListener(Runtime.Phase.Started, r -> {
- CamelContext context = r.getCamelContext();
- List<Route> routes = context.getRoutes();
-
- assertThat(routes).hasSize(2);
- assertThat(routes).anyMatch(p -> ObjectHelper.equal("r1", p.getId()));
- assertThat(routes).anyMatch(p -> ObjectHelper.equal("r2", p.getId()));
-
- runtime.stop();
- });
-
- runtime.run();
- }
-
- @Test
- void testLoadRouteAndRest() throws Exception {
- runtime.addListener(new ContextConfigurer());
- runtime.addListener(SourcesSupport.forRoutes("classpath:routes.xml", "classpath:rests.xml"));
- runtime.addListener(Runtime.Phase.Started, r -> {
- ModelCamelContext context = r.getCamelContext(ModelCamelContext.class);
-
- assertThat(context.getRouteDefinitions()).isNotEmpty();
- assertThat(context.getRestDefinitions()).isNotEmpty();
-
- runtime.stop();
- });
-
- runtime.run();
- }
-
- @Test
- void testLoadRouteWithExpression() throws Exception {
- runtime.setProperties(mapOf(
- "the.body", "10"
- ));
-
- runtime.addListener(new ContextConfigurer());
- runtime.addListener(SourcesSupport.forRoutes("classpath:routes-with-expression.xml"));
- runtime.addListener(Runtime.Phase.Started, Runtime::stop);
- runtime.run();
- }
-
- @Test
- public void testLoadJavaSource() throws Exception {
- runtime.setProperties(mapOf(
- "camel.beans.myProcessor", "#class:" + MyProcessor.class.getName()
- ));
-
- runtime.addListener(SourcesSupport.forRoutes("classpath:MyRoutesWithBeans.java"));
- runtime.addListener(Runtime.Phase.Started, r -> {
- assertThat(runtime.getCamelContext().getRoutes()).hasSize(1);
- assertThat(runtime.getRegistry().lookupByName("myProcessor")).isNotNull();
- assertThat(runtime.getRegistry().lookupByName("my-bean")).isInstanceOfSatisfying(MyBean.class, b -> {
- assertThat(b).hasFieldOrPropertyWithValue("name", "my-bean-name");
- });
- r.stop();
- });
- runtime.run();
- }
-
- @Test
- public void testLoadJavaSourceFromProperties() throws Exception {
- runtime.setInitialProperties(
- "camel.k.sources[0].name", "MyRoutesWithBeans",
- "camel.k.sources[0].location", "classpath:MyRoutesWithBeans.java",
- "camel.k.sources[0].language", "java"
- );
- runtime.setProperties(mapOf(
- "camel.beans.myProcessor", "#class:" + MyProcessor.class.getName()
- ));
-
- runtime.addListener(new SourcesConfigurer());
- runtime.addListener(Runtime.Phase.Started, r -> {
- assertThat(runtime.getCamelContext().getRoutes()).hasSize(1);
- assertThat(runtime.getRegistry().lookupByName("myProcessor")).isNotNull();
- assertThat(runtime.getRegistry().lookupByName("my-bean")).isInstanceOfSatisfying(MyBean.class, b -> {
- assertThat(b).hasFieldOrPropertyWithValue("name", "my-bean-name");
- });
- r.stop();
- });
- runtime.run();
- }
-
- @Test
- public void testLoadJavaSourceFromSimpleProperties() throws Exception {
- runtime.setInitialProperties(
- "camel.k.sources[0].location", "classpath:MyRoutesWithBeans.java"
- );
- runtime.setProperties(mapOf(
- "camel.beans.myProcessor", "#class:" + MyProcessor.class.getName()
- ));
-
- runtime.addListener(new SourcesConfigurer());
- runtime.addListener(Runtime.Phase.Started, Runtime::stop);
- runtime.run();
-
- assertThat(runtime.getRegistry().lookupByName("myProcessor")).isNotNull();
- assertThat(runtime.getRegistry().lookupByName("my-bean")).isInstanceOfSatisfying(MyBean.class, b -> {
- assertThat(b).hasFieldOrPropertyWithValue("name", "my-bean-name");
- });
- }
-
- @Test
- public void testLoadJavaSourceWrap() throws Exception {
- KnativeComponent component = new KnativeComponent();
- component.setEnvironment(KnativeEnvironment.on(
- KnativeEnvironmentSupport.endpoint(Knative.EndpointKind.sink, "sink", "http://localhost:" + AvailablePortFinder.getNextAvailable())
- ));
-
- PlatformHttpServiceContextCustomizer phsc = new PlatformHttpServiceContextCustomizer();
- phsc.setBindPort(AvailablePortFinder.getNextAvailable());
- phsc.apply(runtime.getCamelContext());
-
- runtime.getCamelContext().addComponent("knative", component);
- runtime.addListener(SourcesSupport.forRoutes("classpath:MyRoutesWithBeans.java?interceptors=knative-source"));
- runtime.addListener(Runtime.Phase.Started, Runtime::stop);
- runtime.run();
-
- assertThat(runtime.getRegistry().lookupByName("my-bean")).isInstanceOfSatisfying(MyBean.class, b -> {
- assertThat(b).hasFieldOrPropertyWithValue("name", "my-bean-name");
- });
- assertThat(runtime.getCamelContext(ModelCamelContext.class).getRouteDefinition("my-route")).satisfies(definition -> {
- assertThat(definition.getOutputs()).last().isInstanceOfSatisfying(ToDefinition.class, to -> {
- assertThat(to.getEndpointUri()).isEqualTo("knative://endpoint/sink");
- });
- });
- }
-
-}
diff --git a/camel-k-main/camel-k-runtime-main/src/test/java/org/apache/camel/k/main/TemplatesTest.java b/camel-k-main/camel-k-runtime-main/src/test/java/org/apache/camel/k/main/TemplatesTest.java
deleted file mode 100644
index c7215a4..0000000
--- a/camel-k-main/camel-k-runtime-main/src/test/java/org/apache/camel/k/main/TemplatesTest.java
+++ /dev/null
@@ -1,89 +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.k.main;
-
-import java.util.Map;
-
-import org.apache.camel.Route;
-import org.apache.camel.k.SourceType;
-import org.apache.camel.k.main.support.RuntimeTestSupport;
-import org.apache.camel.model.ModelCamelContext;
-import org.junit.jupiter.api.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class TemplatesTest {
- @Test
- public void templatesCanBeLoadedAndMaterialized() throws Exception {
- RuntimeTestSupport.run(
- Map.of(
- "camel.k.sources[0].id", "my-template",
- "camel.k.sources[0].location", "classpath:MyRouteTemplate.java",
- "camel.k.sources[0].type", SourceType.template.name(),
- "camel.k.sources[0].property-names[0]", "message"
- ),
- runtime -> {
- var context = runtime.getCamelContext(ModelCamelContext.class);
-
- assertThat(context.getRouteTemplateDefinitions()).hasSize(1);
- assertThat(context.getRouteDefinitions()).isEmpty();
-
- context.addRouteFromTemplate("myRoute", "my-template", Map.of("message", "test"));
-
- assertThat(context.getRoutes())
- .hasSize(1)
- .first().hasFieldOrPropertyWithValue("id", "myRoute");
- }
- );
- }
-
- @Test
- public void templatesCanBeLoadedAndMaterializedByKamelets() throws Exception {
- RuntimeTestSupport.run(
- Map.of(
- // template
- "camel.k.sources[0].id", "my-template",
- "camel.k.sources[0].location", "classpath:MyRouteTemplate.java",
- "camel.k.sources[0].type", SourceType.template.name(),
- "camel.k.sources[0].property-names[0]", "message",
- // route
- "camel.k.sources[1].location", "classpath:MyRoutesWithKamelets.java",
- "camel.k.sources[1].type", SourceType.source.name(),
- // props
- "camel.kamelet.my-template.message", "default-message"
- ),
- runtime -> {
- var context = runtime.getCamelContext(ModelCamelContext.class);
-
- // templates
- assertThat(context.getRouteTemplateDefinitions()).hasSize(1);
-
- // 2 routes defined in MyRoutesWithKamelets
- // 2 routes materialized from templates by camel-kamelet
- assertThat(context.getRouteDefinitions()).hasSize(4);
-
- assertThat(context.getRoutes())
- .hasSize(4)
- .extracting(Route::getId)
- .containsExactlyInAnyOrder(
- "k1", "k2", // routes from MyRoutesWithKamelets
- "myKamelet1", "myKamelet2" // routes from templates
- );
- }
- );
- }
-}
diff --git a/camel-k-main/camel-k-runtime-main/src/test/java/org/apache/camel/k/main/support/RuntimeTestSupport.java b/camel-k-main/camel-k-runtime-main/src/test/java/org/apache/camel/k/main/support/RuntimeTestSupport.java
deleted file mode 100644
index 03d0a28..0000000
--- a/camel-k-main/camel-k-runtime-main/src/test/java/org/apache/camel/k/main/support/RuntimeTestSupport.java
+++ /dev/null
@@ -1,48 +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.k.main.support;
-
-import java.util.Map;
-
-import org.apache.camel.k.Runtime;
-import org.apache.camel.k.listener.SourcesConfigurer;
-import org.apache.camel.k.main.ApplicationRuntime;
-import org.junit.jupiter.api.function.ThrowingConsumer;
-
-public final class RuntimeTestSupport {
- private RuntimeTestSupport() {
- }
-
- public static void run(Map<String, String> properties, ThrowingConsumer<Runtime> consumer) throws Exception {
- ApplicationRuntime runtime = new ApplicationRuntime();
- try {
- runtime.setInitialProperties(properties);
- runtime.addListener(new SourcesConfigurer());
- runtime.addListener(Runtime.Phase.Started, r -> {
- try {
- consumer.accept(r);
- } catch (Throwable e) {
- throw new RuntimeException(e);
- } finally {
- r.stop();
- }
- });
- } finally {
- runtime.stop();
- }
- }
-}
diff --git a/camel-k-main/camel-k-runtime-main/src/test/resources/MyRouteTemplate.java b/camel-k-main/camel-k-runtime-main/src/test/resources/MyRouteTemplate.java
deleted file mode 100644
index b70f309..0000000
--- a/camel-k-main/camel-k-runtime-main/src/test/resources/MyRouteTemplate.java
+++ /dev/null
@@ -1,29 +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.
- */
-
-import org.apache.camel.BindToRegistry;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.k.main.support.MyBean;
-
-public class MyRouteTemplate extends RouteBuilder {
- @Override
- public void configure() throws Exception {
- from("direct:{{routeId}}")
- .setBody().constant("{{message}}")
- .to("log:{{routeId}}");
- }
-}
\ No newline at end of file
diff --git a/camel-k-main/camel-k-runtime-main/src/test/resources/MyRoutesWithBeans.java b/camel-k-main/camel-k-runtime-main/src/test/resources/MyRoutesWithBeans.java
deleted file mode 100644
index 003e97c..0000000
--- a/camel-k-main/camel-k-runtime-main/src/test/resources/MyRoutesWithBeans.java
+++ /dev/null
@@ -1,35 +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.
- */
-
-import org.apache.camel.BindToRegistry;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.k.main.support.MyBean;
-
-public class MyRoutesWithBeans extends RouteBuilder {
- @Override
- public void configure() throws Exception {
- from("direct:start")
- .routeId("my-route")
- .bean("my-bean", "getName")
- .to("log:info");
- }
-
- @BindToRegistry("my-bean")
- public MyBean createMyBean() {
- return new MyBean("my-bean-name");
- }
-}
\ No newline at end of file
diff --git a/camel-k-main/camel-k-runtime-main/src/test/resources/MyRoutesWithKamelets.java b/camel-k-main/camel-k-runtime-main/src/test/resources/MyRoutesWithKamelets.java
deleted file mode 100644
index 7e1f4b1..0000000
--- a/camel-k-main/camel-k-runtime-main/src/test/resources/MyRoutesWithKamelets.java
+++ /dev/null
@@ -1,32 +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.
- */
-
-import org.apache.camel.BindToRegistry;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.k.main.support.MyBean;
-
-public class MyRoutesWithKamelets extends RouteBuilder {
- @Override
- public void configure() throws Exception {
- from("direct:k1")
- .routeId("k1")
- .to("kamelet:my-template/myKamelet1?message=my-message");
- from("direct:k2")
- .routeId("k2")
- .to("kamelet:my-template/myKamelet2");
- }
-}
\ No newline at end of file
diff --git a/camel-k-main/camel-k-runtime-main/src/test/resources/log4j2-test.xml b/camel-k-main/camel-k-runtime-main/src/test/resources/log4j2-test.xml
deleted file mode 100644
index e2e9f42..0000000
--- a/camel-k-main/camel-k-runtime-main/src/test/resources/log4j2-test.xml
+++ /dev/null
@@ -1,35 +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.
-
--->
-<Configuration status="INFO">
- <Appenders>
- <Console name="STDOUT" target="SYSTEM_OUT">
- <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS}|%-5level|%t|%c{1} - %msg%n"/>
- </Console>
- <Null name="NONE"/>
- </Appenders>
-
- <Loggers>
- <Root level="INFO">
- <!--<AppenderRef ref="STDOUT"/>-->
- <AppenderRef ref="NONE"/>
- </Root>
- </Loggers>
-
-</Configuration>
\ No newline at end of file
diff --git a/camel-k-main/camel-k-runtime-main/src/test/resources/logger.properties b/camel-k-main/camel-k-runtime-main/src/test/resources/logger.properties
deleted file mode 100644
index acb9346..0000000
--- a/camel-k-main/camel-k-runtime-main/src/test/resources/logger.properties
+++ /dev/null
@@ -1,18 +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.
-## ---------------------------------------------------------------------------
-logging.level.org.foo=DEBUG
-logging.level.org.bar=WARN
diff --git a/camel-k-main/camel-k-runtime-main/src/test/resources/my-resource.txt b/camel-k-main/camel-k-runtime-main/src/test/resources/my-resource.txt
deleted file mode 100644
index 817b31f..0000000
--- a/camel-k-main/camel-k-runtime-main/src/test/resources/my-resource.txt
+++ /dev/null
@@ -1 +0,0 @@
-value from file resource
\ No newline at end of file
diff --git a/camel-k-main/camel-k-runtime-main/src/test/resources/r1.js b/camel-k-main/camel-k-runtime-main/src/test/resources/r1.js
deleted file mode 100644
index ef96193..0000000
--- a/camel-k-main/camel-k-runtime-main/src/test/resources/r1.js
+++ /dev/null
@@ -1,20 +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.
- */
-
-from('timer:tick1')
- .id('r1')
- .to('log:info1')
\ No newline at end of file
diff --git a/camel-k-main/camel-k-runtime-main/src/test/resources/r2.mytype b/camel-k-main/camel-k-runtime-main/src/test/resources/r2.mytype
deleted file mode 100644
index a0b33cc..0000000
--- a/camel-k-main/camel-k-runtime-main/src/test/resources/r2.mytype
+++ /dev/null
@@ -1,4 +0,0 @@
-
-from('timer:tick2')
- .id('r2')
- .to('log:info2')
\ No newline at end of file
diff --git a/camel-k-main/camel-k-runtime-tracing/src/generated/java/org/apache/camel/k/tracing/TracingContextCustomizerConfigurer.java b/camel-k-main/camel-k-runtime-tracing/src/generated/java/org/apache/camel/k/tracing/TracingContextCustomizerConfigurer.java
deleted file mode 100644
index 6879ede..0000000
--- a/camel-k-main/camel-k-runtime-tracing/src/generated/java/org/apache/camel/k/tracing/TracingContextCustomizerConfigurer.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.k.tracing;
-
-import java.util.Map;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
-import org.apache.camel.util.CaseInsensitiveMap;
-import org.apache.camel.k.tracing.TracingContextCustomizer;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-@SuppressWarnings("unchecked")
-public class TracingContextCustomizerConfigurer extends org.apache.camel.support.component.PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
-
- private static final Map<String, Object> ALL_OPTIONS;
- static {
- Map<String, Object> map = new CaseInsensitiveMap();
- map.put("Reporter", io.jaegertracing.Configuration.ReporterConfiguration.class);
- map.put("Sampler", io.jaegertracing.Configuration.SamplerConfiguration.class);
- map.put("ServiceName", java.lang.String.class);
- map.put("Tags", java.util.Map.class);
- ALL_OPTIONS = map;
- }
-
- @Override
- public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
- org.apache.camel.k.tracing.TracingContextCustomizer target = (org.apache.camel.k.tracing.TracingContextCustomizer) obj;
- switch (ignoreCase ? name.toLowerCase() : name) {
- case "reporter":
- case "Reporter": target.setReporter(property(camelContext, io.jaegertracing.Configuration.ReporterConfiguration.class, value)); return true;
- case "sampler":
- case "Sampler": target.setSampler(property(camelContext, io.jaegertracing.Configuration.SamplerConfiguration.class, value)); return true;
- case "servicename":
- case "ServiceName": target.setServiceName(property(camelContext, java.lang.String.class, value)); return true;
- case "tags":
- case "Tags": target.setTags(property(camelContext, java.util.Map.class, value)); return true;
- default: return false;
- }
- }
-
- @Override
- public Map<String, Object> getAllOptions(Object target) {
- return ALL_OPTIONS;
- }
-
- @Override
- public Object getOptionValue(Object obj, String name, boolean ignoreCase) {
- org.apache.camel.k.tracing.TracingContextCustomizer target = (org.apache.camel.k.tracing.TracingContextCustomizer) obj;
- switch (ignoreCase ? name.toLowerCase() : name) {
- case "reporter":
- case "Reporter": return target.getReporter();
- case "sampler":
- case "Sampler": return target.getSampler();
- case "servicename":
- case "ServiceName": return target.getServiceName();
- case "tags":
- case "Tags": return target.getTags();
- default: return null;
- }
- }
-
- @Override
- public Object getCollectionValueType(Object target, String name, boolean ignoreCase) {
- switch (ignoreCase ? name.toLowerCase() : name) {
- case "tags":
- case "Tags": return java.lang.String.class;
- default: return null;
- }
- }
-}
-
diff --git a/camel-k-main/camel-k-runtime-tracing/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.k.tracing.TracingContextCustomizer b/camel-k-main/camel-k-runtime-tracing/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.k.tracing.TracingContextCustomizer
deleted file mode 100644
index 43519db..0000000
--- a/camel-k-main/camel-k-runtime-tracing/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.k.tracing.TracingContextCustomizer
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.k.tracing.TracingContextCustomizerConfigurer
diff --git a/camel-k-main/camel-k-runtime-tracing/src/main/java/org/apache/camel/k/tracing/TracingContextCustomizer.java b/camel-k-main/camel-k-runtime-tracing/src/main/java/org/apache/camel/k/tracing/TracingContextCustomizer.java
deleted file mode 100644
index 56ae0db..0000000
--- a/camel-k-main/camel-k-runtime-tracing/src/main/java/org/apache/camel/k/tracing/TracingContextCustomizer.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.k.tracing;
-
-import java.util.Collections;
-import java.util.Map;
-
-import io.jaegertracing.Configuration;
-import io.opentracing.Tracer;
-import org.apache.camel.CamelContext;
-import org.apache.camel.k.ContextCustomizer;
-import org.apache.camel.k.annotation.Customizer;
-import org.apache.camel.opentracing.OpenTracingTracer;
-import org.apache.camel.spi.Configurer;
-import org.apache.camel.util.ObjectHelper;
-
-@Configurer
-@Customizer("tracing")
-public class TracingContextCustomizer implements ContextCustomizer {
- private String serviceName;
- private Map<String, String> tags;
- private Configuration.ReporterConfiguration reporter = new Configuration.ReporterConfiguration();
- private Configuration.SamplerConfiguration sampler = new Configuration.SamplerConfiguration();
-
- public String getServiceName() {
- return serviceName;
- }
-
- public void setServiceName(String serviceName) {
- this.serviceName = serviceName;
- }
-
- public Map<String, String> getTags() {
- return tags;
- }
-
- public void setTags(Map<String, String> tags) {
- this.tags = tags;
- }
-
- public Configuration.ReporterConfiguration getReporter() {
- return reporter;
- }
-
- public void setReporter(Configuration.ReporterConfiguration reporter) {
- this.reporter = reporter;
- }
-
- public Configuration.SamplerConfiguration getSampler() {
- return sampler;
- }
-
- public void setSampler(Configuration.SamplerConfiguration sampler) {
- this.sampler = sampler;
- }
-
- @Override
- public void apply(CamelContext camelContext) {
- ObjectHelper.notNull(serviceName, "service-name");
-
- Tracer tracer = new Configuration(camelContext.getName())
- .withServiceName(serviceName)
- .withTracerTags(tags != null ? tags : Collections.emptyMap())
- .withReporter(reporter)
- .withSampler(sampler)
- .getTracer();
-
- OpenTracingTracer openTracingTracer = new OpenTracingTracer();
- openTracingTracer.setTracer(tracer);
- openTracingTracer.init(camelContext);
- }
-}
diff --git a/camel-k-main/camel-k-runtime-tracing/src/test/java/org/apache/camel/k/tracing/TracingContextCustomizerTest.java b/camel-k-main/camel-k-runtime-tracing/src/test/java/org/apache/camel/k/tracing/TracingContextCustomizerTest.java
deleted file mode 100644
index 7e41d2d..0000000
--- a/camel-k-main/camel-k-runtime-tracing/src/test/java/org/apache/camel/k/tracing/TracingContextCustomizerTest.java
+++ /dev/null
@@ -1,56 +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.k.tracing;
-
-import java.util.Random;
-
-import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.k.Runtime;
-import org.apache.camel.k.support.RuntimeSupport;
-import org.junit.jupiter.api.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class TracingContextCustomizerTest {
- @Test
- public void testTracingConfiguration() {
- final String serviceName = "my-service";
- final String endpoint = "http://jaeger:14268/api/traces";
- final String type = "const";
- final int param = new Random().nextInt(10);
-
- Runtime runtime = Runtime.on(new DefaultCamelContext());
- runtime.setProperties(
- "service-name", serviceName,
- "camel.k.customizer.tracing.enabled", "true",
- "camel.k.customizer.tracing.service-name", "{{service-name}}",
- "camel.k.customizer.tracing.reporter.sender.endpoint", endpoint,
- "camel.k.customizer.tracing.sampler.type", type,
- "camel.k.customizer.tracing.sampler.param", Integer.toString(param));
-
- assertThat(RuntimeSupport.configureContextCustomizers(runtime))
- .hasOnlyOneElementSatisfying(customizer -> {
- assertThat(customizer)
- .isInstanceOfSatisfying(TracingContextCustomizer.class, tracing -> {
- assertThat(tracing.getServiceName()).isEqualTo(serviceName);
- assertThat(tracing.getReporter().getSenderConfiguration().getEndpoint()).isEqualTo(endpoint);
- assertThat(tracing.getSampler().getType()).isEqualTo(type);
- assertThat(tracing.getSampler().getParam().intValue()).isEqualTo(param);
- });
- });
- }
-}
diff --git a/camel-k-main/camel-k-runtime-tracing/src/test/resources/log4j2-test.xml b/camel-k-main/camel-k-runtime-tracing/src/test/resources/log4j2-test.xml
deleted file mode 100644
index 5023b85..0000000
--- a/camel-k-main/camel-k-runtime-tracing/src/test/resources/log4j2-test.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.
-
--->
-<Configuration status="INFO">
- <Appenders>
- <Console name="STDOUT" target="SYSTEM_OUT">
- <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS}|%-5level|%t|%c - %msg%n"/>
- </Console>
- <Null name="NONE"/>
- </Appenders>
-
- <Loggers>
- <Logger name="io.vertx" level="INFO"/>
- <Root level="INFO">
- <!-- <AppenderRef ref="STDOUT"/> -->
- <AppenderRef ref="STDOUT"/>
- </Root>
- </Loggers>
-
-</Configuration>
\ No newline at end of file
diff --git a/camel-k-quarkus/camel-k-quarkus-master/deployment/pom.xml b/camel-k-master/deployment/pom.xml
similarity index 90%
rename from camel-k-quarkus/camel-k-quarkus-master/deployment/pom.xml
rename to camel-k-master/deployment/pom.xml
index feb7e33..a88bee3 100644
--- a/camel-k-quarkus/camel-k-quarkus-master/deployment/pom.xml
+++ b/camel-k-master/deployment/pom.xml
@@ -20,21 +20,21 @@
<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">
<parent>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus-master-parent</artifactId>
+ <artifactId>camel-k-master-parent</artifactId>
<version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>camel-k-quarkus-master-deployment</artifactId>
+ <artifactId>camel-k-master-deployment</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus-core-deployment</artifactId>
+ <artifactId>camel-k-core-deployment</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus-master</artifactId>
+ <artifactId>camel-k-master</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
diff --git a/camel-k-quarkus/camel-k-quarkus-master/deployment/src/main/java/org/apache/camel/k/quarkus/master/deployment/Feature.java b/camel-k-master/deployment/src/main/java/org/apache/camel/k/quarkus/master/deployment/Feature.java
similarity index 100%
rename from camel-k-quarkus/camel-k-quarkus-master/deployment/src/main/java/org/apache/camel/k/quarkus/master/deployment/Feature.java
rename to camel-k-master/deployment/src/main/java/org/apache/camel/k/quarkus/master/deployment/Feature.java
diff --git a/camel-k-runtime-master/pom.xml b/camel-k-master/impl/pom.xml
similarity index 71%
rename from camel-k-runtime-master/pom.xml
rename to camel-k-master/impl/pom.xml
index f33cb82..5b5152a 100644
--- a/camel-k-runtime-master/pom.xml
+++ b/camel-k-master/impl/pom.xml
@@ -20,12 +20,12 @@
<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">
<parent>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-parent</artifactId>
+ <artifactId>camel-k-master-parent</artifactId>
<version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>camel-k-runtime-master</artifactId>
+ <artifactId>camel-k-master-impl</artifactId>
<dependencies>
@@ -45,7 +45,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-core</artifactId>
+ <artifactId>camel-k-core-support</artifactId>
</dependency>
<dependency>
@@ -58,33 +58,6 @@
<artifactId>camel-k-annotations</artifactId>
<scope>provided</scope>
</dependency>
-
- <!-- ****************************** -->
- <!-- -->
- <!-- TESTS -->
- <!-- -->
- <!-- ****************************** -->
-
- <dependency>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-main</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-master</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-main</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
diff --git a/camel-k-runtime-master/src/main/java/org/apache/camel/k/master/MasterContextCustomizer.java b/camel-k-master/impl/src/main/java/org/apache/camel/k/master/MasterContextCustomizer.java
similarity index 100%
rename from camel-k-runtime-master/src/main/java/org/apache/camel/k/master/MasterContextCustomizer.java
rename to camel-k-master/impl/src/main/java/org/apache/camel/k/master/MasterContextCustomizer.java
diff --git a/camel-k-quarkus/camel-k-quarkus-knative/pom.xml b/camel-k-master/pom.xml
similarity index 90%
rename from camel-k-quarkus/camel-k-quarkus-knative/pom.xml
rename to camel-k-master/pom.xml
index 756e006..9fa9961 100644
--- a/camel-k-quarkus/camel-k-quarkus-knative/pom.xml
+++ b/camel-k-master/pom.xml
@@ -20,17 +20,17 @@
<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">
<parent>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus</artifactId>
+ <artifactId>camel-k-runtime-project</artifactId>
<version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
- <artifactId>camel-k-quarkus-knative-parent</artifactId>
+ <artifactId>camel-k-master-parent</artifactId>
<modules>
+ <module>impl</module>
<module>runtime</module>
<module>deployment</module>
</modules>
-
</project>
diff --git a/camel-k-quarkus/camel-k-quarkus-master/runtime/pom.xml b/camel-k-master/runtime/pom.xml
similarity index 93%
rename from camel-k-quarkus/camel-k-quarkus-master/runtime/pom.xml
rename to camel-k-master/runtime/pom.xml
index c3fe67b..78730a4 100644
--- a/camel-k-quarkus/camel-k-quarkus-master/runtime/pom.xml
+++ b/camel-k-master/runtime/pom.xml
@@ -20,21 +20,21 @@
<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">
<parent>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus-master-parent</artifactId>
+ <artifactId>camel-k-master-parent</artifactId>
<version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>camel-k-quarkus-master</artifactId>
+ <artifactId>camel-k-master</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus-core</artifactId>
+ <artifactId>camel-k-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-master</artifactId>
+ <artifactId>camel-k-master-impl</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
diff --git a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-runtime/src/main/java/org/apache/camel/k/quarkus/it/Application.java b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-runtime/src/main/java/org/apache/camel/k/quarkus/it/Application.java
deleted file mode 100644
index d0d308a..0000000
--- a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-runtime/src/main/java/org/apache/camel/k/quarkus/it/Application.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.k.quarkus.it;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.json.Json;
-import javax.json.JsonObject;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.k.Runtime;
-import org.apache.camel.main.BaseMainSupport;
-import org.apache.camel.quarkus.main.CamelMain;
-import org.eclipse.microprofile.config.Config;
-
-import static org.apache.camel.k.quarkus.Application.instance;
-
-@Path("/test")
-@ApplicationScoped
-public class Application {
- @Inject
- Config config;
-
- @GET
- @Path("/inspect")
- @Produces(MediaType.APPLICATION_JSON)
- public JsonObject inspect() {
- return Json.createObjectBuilder()
- .add("camel-context", instance(CamelContext.class).map(Object::getClass).map(Class::getName).orElse(""))
- .add("camel-k-runtime", instance(Runtime.class).map(Object::getClass).map(Class::getName).orElse(""))
- .add("routes-collector", instance(CamelMain.class).map(BaseMainSupport::getRoutesCollector).map(Object::getClass).map(Class::getName).orElse(""))
- .build();
- }
-
- @GET
- @Path("/property/{name}")
- @Produces(MediaType.TEXT_PLAIN)
- public String property(@PathParam("name") String name) {
- return config.getValue(name, String.class);
- }
-}
diff --git a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-runtime/src/test/resources/test.properties b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-runtime/src/test/resources/test.properties
deleted file mode 100644
index eb73887..0000000
--- a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-runtime/src/test/resources/test.properties
+++ /dev/null
@@ -1,18 +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.
-## ---------------------------------------------------------------------------
-
-quarkus.my-property = my-test-value
\ No newline at end of file
diff --git a/camel-k-quarkus/camel-k-quarkus-itests/pom.xml b/camel-k-quarkus/camel-k-quarkus-itests/pom.xml
deleted file mode 100644
index 3af6f87..0000000
--- a/camel-k-quarkus/camel-k-quarkus-itests/pom.xml
+++ /dev/null
@@ -1,49 +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">
- <parent>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus</artifactId>
- <version>1.6.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <packaging>pom</packaging>
-
- <artifactId>camel-k-quarkus-itests</artifactId>
-
- <modules>
- <module>camel-k-quarkus-itests-core</module>
- <module>camel-k-quarkus-itests-loader-support</module>
- <module>camel-k-quarkus-itests-loader-groovy</module>
- <module>camel-k-quarkus-itests-loader-kotlin</module>
- <module>camel-k-quarkus-itests-loader-java</module>
- <module>camel-k-quarkus-itests-loader-js</module>
- <module>camel-k-quarkus-itests-loader-xml</module>
- <module>camel-k-quarkus-itests-loader-yaml</module>
- <module>camel-k-quarkus-itests-polyglot</module>
- <module>camel-k-quarkus-itests-runtime</module>
- <module>camel-k-quarkus-itests-cron</module>
- <module>camel-k-quarkus-itests-master</module>
- <module>camel-k-quarkus-itests-knative</module>
- <module>camel-k-quarkus-itests-kamelet</module>
- <module>camel-k-quarkus-itests-wrap</module>
- </modules>
-
-</project>
diff --git a/camel-k-quarkus/camel-k-quarkus-loader-groovy/pom.xml b/camel-k-quarkus/camel-k-quarkus-loader-groovy/pom.xml
deleted file mode 100644
index 6d1fc0d..0000000
--- a/camel-k-quarkus/camel-k-quarkus-loader-groovy/pom.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.
-
--->
-<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">
- <parent>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus</artifactId>
- <version>1.6.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <packaging>pom</packaging>
-
- <artifactId>camel-k-quarkus-loader-groovy-parent</artifactId>
-
- <modules>
- <module>runtime</module>
- <module>deployment</module>
- </modules>
-
-</project>
diff --git a/camel-k-quarkus/camel-k-quarkus-loader-java/pom.xml b/camel-k-quarkus/camel-k-quarkus-loader-java/pom.xml
deleted file mode 100644
index ce98c8a..0000000
--- a/camel-k-quarkus/camel-k-quarkus-loader-java/pom.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.
-
--->
-<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">
- <parent>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus</artifactId>
- <version>1.6.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <packaging>pom</packaging>
-
- <artifactId>camel-k-quarkus-loader-java-parent</artifactId>
-
- <modules>
- <module>runtime</module>
- <module>deployment</module>
- </modules>
-
-</project>
diff --git a/camel-k-quarkus/camel-k-quarkus-loader-js/pom.xml b/camel-k-quarkus/camel-k-quarkus-loader-js/pom.xml
deleted file mode 100644
index 45b1a0c..0000000
--- a/camel-k-quarkus/camel-k-quarkus-loader-js/pom.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.
-
--->
-<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">
- <parent>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus</artifactId>
- <version>1.6.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <packaging>pom</packaging>
-
- <artifactId>camel-k-quarkus-loader-js-parent</artifactId>
-
- <modules>
- <module>runtime</module>
- <module>deployment</module>
- </modules>
-
-</project>
diff --git a/camel-k-quarkus/camel-k-quarkus-loader-kotlin/deployment/pom.xml b/camel-k-quarkus/camel-k-quarkus-loader-kotlin/deployment/pom.xml
deleted file mode 100644
index 916690c..0000000
--- a/camel-k-quarkus/camel-k-quarkus-loader-kotlin/deployment/pom.xml
+++ /dev/null
@@ -1,59 +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">
- <parent>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus-loader-kotlin-parent</artifactId>
- <version>1.6.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>camel-k-quarkus-loader-kotlin-deployment</artifactId>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus-core-deployment</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus-loader-kotlin</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <annotationProcessorPaths>
- <path>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-extension-processor</artifactId>
- <version>${quarkus-version}</version>
- </path>
- </annotationProcessorPaths>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/camel-k-quarkus/camel-k-quarkus-loader-kotlin/pom.xml b/camel-k-quarkus/camel-k-quarkus-loader-kotlin/pom.xml
deleted file mode 100644
index e2c96f4..0000000
--- a/camel-k-quarkus/camel-k-quarkus-loader-kotlin/pom.xml
+++ /dev/null
@@ -1,48 +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">
- <parent>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus</artifactId>
- <version>1.6.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <packaging>pom</packaging>
-
- <artifactId>camel-k-quarkus-loader-kotlin-parent</artifactId>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.jetbrains.kotlin</groupId>
- <artifactId>kotlin-bom</artifactId>
- <version>${kotlin-version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <modules>
- <module>runtime</module>
- <module>deployment</module>
- </modules>
-
-</project>
diff --git a/camel-k-quarkus/camel-k-quarkus-loader-kotlin/runtime/pom.xml b/camel-k-quarkus/camel-k-quarkus-loader-kotlin/runtime/pom.xml
deleted file mode 100644
index d7a84c0..0000000
--- a/camel-k-quarkus/camel-k-quarkus-loader-kotlin/runtime/pom.xml
+++ /dev/null
@@ -1,86 +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">
- <parent>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus-loader-kotlin-parent</artifactId>
- <version>1.6.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>camel-k-quarkus-loader-kotlin</artifactId>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-loader-kotlin</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus-core</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
- <version>${quarkus-version}</version>
- <executions>
- <execution>
- <goals>
- <goal>extension-descriptor</goal>
- </goals>
- <configuration>
- <deployment>${project.groupId}:${project.artifactId}-deployment:${project.version}</deployment>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <annotationProcessorPaths>
- <path>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-extension-processor</artifactId>
- <version>${quarkus-version}</version>
- </path>
- </annotationProcessorPaths>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.jboss.jandex</groupId>
- <artifactId>jandex-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>make-index</id>
- <goals>
- <goal>jandex</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/camel-k-quarkus/camel-k-quarkus-loader-xml/pom.xml b/camel-k-quarkus/camel-k-quarkus-loader-xml/pom.xml
deleted file mode 100644
index 8ac1fc4..0000000
--- a/camel-k-quarkus/camel-k-quarkus-loader-xml/pom.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.
-
--->
-<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">
- <parent>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus</artifactId>
- <version>1.6.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <packaging>pom</packaging>
-
- <artifactId>camel-k-quarkus-loader-xml-parent</artifactId>
-
- <modules>
- <module>runtime</module>
- <module>deployment</module>
- </modules>
-
-</project>
diff --git a/camel-k-quarkus/camel-k-quarkus-loader-yaml/pom.xml b/camel-k-quarkus/camel-k-quarkus-loader-yaml/pom.xml
deleted file mode 100644
index 91ceaed..0000000
--- a/camel-k-quarkus/camel-k-quarkus-loader-yaml/pom.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.
-
--->
-<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">
- <parent>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus</artifactId>
- <version>1.6.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <packaging>pom</packaging>
-
- <artifactId>camel-k-quarkus-loader-yaml-parent</artifactId>
-
- <modules>
- <module>runtime</module>
- <module>deployment</module>
- </modules>
-
-</project>
diff --git a/camel-k-quarkus/camel-k-quarkus-loader-yaml/runtime/pom.xml b/camel-k-quarkus/camel-k-quarkus-loader-yaml/runtime/pom.xml
deleted file mode 100644
index abdd08a..0000000
--- a/camel-k-quarkus/camel-k-quarkus-loader-yaml/runtime/pom.xml
+++ /dev/null
@@ -1,86 +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">
- <parent>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus-loader-yaml-parent</artifactId>
- <version>1.6.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>camel-k-quarkus-loader-yaml</artifactId>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-loader-yaml</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
- <version>${quarkus-version}</version>
- <executions>
- <execution>
- <goals>
- <goal>extension-descriptor</goal>
- </goals>
- <configuration>
- <deployment>${project.groupId}:${project.artifactId}-deployment:${project.version}</deployment>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <annotationProcessorPaths>
- <path>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-extension-processor</artifactId>
- <version>${quarkus-version}</version>
- </path>
- </annotationProcessorPaths>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.jboss.jandex</groupId>
- <artifactId>jandex-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>make-index</id>
- <goals>
- <goal>jandex</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/camel-k-quarkus/camel-k-quarkus-master/pom.xml b/camel-k-quarkus/camel-k-quarkus-master/pom.xml
deleted file mode 100644
index fdf8d37..0000000
--- a/camel-k-quarkus/camel-k-quarkus-master/pom.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.
-
--->
-<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">
- <parent>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus</artifactId>
- <version>1.6.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <packaging>pom</packaging>
-
- <artifactId>camel-k-quarkus-master-parent</artifactId>
-
- <modules>
- <module>runtime</module>
- <module>deployment</module>
- </modules>
-
-</project>
diff --git a/camel-k-quarkus/camel-k-quarkus-wrap/pom.xml b/camel-k-quarkus/camel-k-quarkus-wrap/pom.xml
deleted file mode 100644
index 7dc0096..0000000
--- a/camel-k-quarkus/camel-k-quarkus-wrap/pom.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.
-
--->
-<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">
- <parent>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus</artifactId>
- <version>1.6.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <packaging>pom</packaging>
-
- <artifactId>camel-k-quarkus-wrap-parent</artifactId>
-
- <modules>
- <module>runtime</module>
- <module>deployment</module>
- </modules>
-
-</project>
diff --git a/camel-k-quarkus/camel-k-runtime-quarkus/pom.xml b/camel-k-quarkus/camel-k-runtime-quarkus/pom.xml
deleted file mode 100644
index 49047f9..0000000
--- a/camel-k-quarkus/camel-k-runtime-quarkus/pom.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.
-
--->
-<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">
- <parent>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus</artifactId>
- <version>1.6.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <packaging>pom</packaging>
-
- <artifactId>camel-k-runtime-quarkus-parent</artifactId>
-
- <modules>
- <module>runtime</module>
- <module>deployment</module>
- </modules>
-
-</project>
diff --git a/camel-k-quarkus/pom.xml b/camel-k-quarkus/pom.xml
deleted file mode 100644
index 4ac6244..0000000
--- a/camel-k-quarkus/pom.xml
+++ /dev/null
@@ -1,70 +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">
- <parent>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-parent</artifactId>
- <version>1.6.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <packaging>pom</packaging>
-
- <artifactId>camel-k-quarkus</artifactId>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.jetbrains.kotlin</groupId>
- <artifactId>kotlin-bom</artifactId>
- <version>${kotlin-version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-bom</artifactId>
- <version>${camel-quarkus-version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <modules>
- <module>camel-k-quarkus-loader-xml</module>
- <module>camel-k-quarkus-loader-js</module>
- <module>camel-k-quarkus-loader-yaml</module>
- <module>camel-k-quarkus-loader-java</module>
- <module>camel-k-quarkus-loader-groovy</module>
- <module>camel-k-quarkus-loader-kotlin</module>
-
- <module>camel-k-quarkus-core</module>
- <module>camel-k-quarkus-kamelet</module>
- <module>camel-k-quarkus-knative</module>
- <module>camel-k-quarkus-cron</module>
- <module>camel-k-quarkus-master</module>
- <module>camel-k-quarkus-wrap</module>
-
- <module>camel-k-runtime-quarkus</module>
-
- <module>camel-k-quarkus-itests</module>
- </modules>
-
-</project>
diff --git a/camel-k-runtime-cron/src/test/resources/log4j2-test.xml b/camel-k-runtime-cron/src/test/resources/log4j2-test.xml
deleted file mode 100644
index 3784c66..0000000
--- a/camel-k-runtime-cron/src/test/resources/log4j2-test.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.
-
--->
-<Configuration status="INFO">
- <Appenders>
- <Console name="STDOUT" target="SYSTEM_OUT">
- <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS}|%-5level|%t|%c - %msg%n"/>
- </Console>
- <Null name="NONE"/>
- </Appenders>
-
- <Loggers>
- <Logger name="io.netty" level="INFO"/>
- <Logger name="io.netty.handler.logging" level="DEBUG"/>
- <Root level="INFO">
- <!--<AppenderRef ref="STDOUT"/>-->
- <AppenderRef ref="NONE"/>
- </Root>
- </Loggers>
-
-</Configuration>
diff --git a/camel-k-runtime-cron/src/test/resources/routes-quartz.js b/camel-k-runtime-cron/src/test/resources/routes-quartz.js
deleted file mode 100644
index 995296a..0000000
--- a/camel-k-runtime-cron/src/test/resources/routes-quartz.js
+++ /dev/null
@@ -1,19 +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.
- */
-from('quartz:tick?cron=0 0 0 * * ? 2099')
- .setBody().simple('x')
- .to('mock:result')
diff --git a/camel-k-runtime-cron/src/test/resources/routes-timer.js b/camel-k-runtime-cron/src/test/resources/routes-timer.js
deleted file mode 100644
index 29c26e1..0000000
--- a/camel-k-runtime-cron/src/test/resources/routes-timer.js
+++ /dev/null
@@ -1,19 +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.
- */
-from('timer:tick?period=1&delay=600000')
- .setBody().simple('x')
- .to('mock:result')
diff --git a/camel-k-runtime-http/src/generated/java/org/apache/camel/k/http/PlatformHttpServiceContextCustomizerConfigurer.java b/camel-k-runtime-http/src/generated/java/org/apache/camel/k/http/PlatformHttpServiceContextCustomizerConfigurer.java
deleted file mode 100644
index e90e61f..0000000
--- a/camel-k-runtime-http/src/generated/java/org/apache/camel/k/http/PlatformHttpServiceContextCustomizerConfigurer.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.k.http;
-
-import java.util.Map;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
-import org.apache.camel.util.CaseInsensitiveMap;
-import org.apache.camel.k.http.PlatformHttpServiceContextCustomizer;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-@SuppressWarnings("unchecked")
-public class PlatformHttpServiceContextCustomizerConfigurer extends org.apache.camel.support.component.PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
-
- private static final Map<String, Object> ALL_OPTIONS;
- static {
- Map<String, Object> map = new CaseInsensitiveMap();
- map.put("BindHost", java.lang.String.class);
- map.put("BindPort", int.class);
- map.put("BodyHandler", org.apache.camel.component.platform.http.vertx.VertxPlatformHttpServerConfiguration.BodyHandler.class);
- map.put("Cors", org.apache.camel.component.platform.http.vertx.VertxPlatformHttpServerConfiguration.Cors.class);
- map.put("MaxBodySize", java.math.BigInteger.class);
- map.put("Path", java.lang.String.class);
- map.put("SslContextParameters", org.apache.camel.support.jsse.SSLContextParameters.class);
- map.put("UseGlobalSslContextParameters", boolean.class);
- ALL_OPTIONS = map;
- }
-
- @Override
- public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
- org.apache.camel.k.http.PlatformHttpServiceContextCustomizer target = (org.apache.camel.k.http.PlatformHttpServiceContextCustomizer) obj;
- switch (ignoreCase ? name.toLowerCase() : name) {
- case "bindhost":
- case "BindHost": target.setBindHost(property(camelContext, java.lang.String.class, value)); return true;
- case "bindport":
- case "BindPort": target.setBindPort(property(camelContext, int.class, value)); return true;
- case "bodyhandler":
- case "BodyHandler": target.setBodyHandler(property(camelContext, org.apache.camel.component.platform.http.vertx.VertxPlatformHttpServerConfiguration.BodyHandler.class, value)); return true;
- case "cors":
- case "Cors": target.setCors(property(camelContext, org.apache.camel.component.platform.http.vertx.VertxPlatformHttpServerConfiguration.Cors.class, value)); return true;
- case "maxbodysize":
- case "MaxBodySize": target.setMaxBodySize(property(camelContext, java.math.BigInteger.class, value)); return true;
- case "path":
- case "Path": target.setPath(property(camelContext, java.lang.String.class, value)); return true;
- case "sslcontextparameters":
- case "SslContextParameters": target.setSslContextParameters(property(camelContext, org.apache.camel.support.jsse.SSLContextParameters.class, value)); return true;
- case "useglobalsslcontextparameters":
- case "UseGlobalSslContextParameters": target.setUseGlobalSslContextParameters(property(camelContext, boolean.class, value)); return true;
- default: return false;
- }
- }
-
- @Override
- public Map<String, Object> getAllOptions(Object target) {
- return ALL_OPTIONS;
- }
-
- @Override
- public Object getOptionValue(Object obj, String name, boolean ignoreCase) {
- org.apache.camel.k.http.PlatformHttpServiceContextCustomizer target = (org.apache.camel.k.http.PlatformHttpServiceContextCustomizer) obj;
- switch (ignoreCase ? name.toLowerCase() : name) {
- case "bindhost":
- case "BindHost": return target.getBindHost();
- case "bindport":
- case "BindPort": return target.getBindPort();
- case "bodyhandler":
- case "BodyHandler": return target.getBodyHandler();
- case "cors":
- case "Cors": return target.getCors();
- case "maxbodysize":
- case "MaxBodySize": return target.getMaxBodySize();
- case "path":
- case "Path": return target.getPath();
- case "sslcontextparameters":
- case "SslContextParameters": return target.getSslContextParameters();
- case "useglobalsslcontextparameters":
- case "UseGlobalSslContextParameters": return target.isUseGlobalSslContextParameters();
- default: return null;
- }
- }
-}
-
diff --git a/camel-k-runtime-http/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.k.http.PlatformHttpServiceContextCustomizer b/camel-k-runtime-http/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.k.http.PlatformHttpServiceContextCustomizer
deleted file mode 100644
index 0df1953..0000000
--- a/camel-k-runtime-http/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.k.http.PlatformHttpServiceContextCustomizer
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.k.http.PlatformHttpServiceContextCustomizerConfigurer
diff --git a/camel-k-runtime-http/src/main/java/org/apache/camel/k/http/PlatformHttpServiceContextCustomizer.java b/camel-k-runtime-http/src/main/java/org/apache/camel/k/http/PlatformHttpServiceContextCustomizer.java
deleted file mode 100644
index 00ff2aa..0000000
--- a/camel-k-runtime-http/src/main/java/org/apache/camel/k/http/PlatformHttpServiceContextCustomizer.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.k.http;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.Ordered;
-import org.apache.camel.component.platform.http.PlatformHttpComponent;
-import org.apache.camel.component.platform.http.PlatformHttpConstants;
-import org.apache.camel.component.platform.http.vertx.VertxPlatformHttpEngine;
-import org.apache.camel.component.platform.http.vertx.VertxPlatformHttpServer;
-import org.apache.camel.component.platform.http.vertx.VertxPlatformHttpServerConfiguration;
-import org.apache.camel.k.ContextCustomizer;
-import org.apache.camel.k.annotation.Customizer;
-import org.apache.camel.spi.Configurer;
-
-@Configurer
-@Customizer("platform-http")
-public class PlatformHttpServiceContextCustomizer extends VertxPlatformHttpServerConfiguration implements ContextCustomizer {
- @Override
- public int getOrder() {
- return Ordered.HIGHEST;
- }
-
- @Override
- public void apply(CamelContext camelContext) {
- try {
- camelContext.addService(new VertxPlatformHttpServer(this) {
- @Override
- protected void doInit() throws Exception {
- initializeServer();
- }
- @Override
- protected void doStart() throws Exception {
- startServer();
- }
- });
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
-
- PlatformHttpComponent component = new PlatformHttpComponent(camelContext);
- component.setEngine(new VertxPlatformHttpEngine());
-
- camelContext.getRegistry().bind(PlatformHttpConstants.PLATFORM_HTTP_COMPONENT_NAME, component);
- }
-}
diff --git a/camel-k-runtime-http/src/test/java/org/apache/camel/k/http/PlatformHttpServiceCustomizerTest.java b/camel-k-runtime-http/src/test/java/org/apache/camel/k/http/PlatformHttpServiceCustomizerTest.java
deleted file mode 100644
index d8afd69..0000000
--- a/camel-k-runtime-http/src/test/java/org/apache/camel/k/http/PlatformHttpServiceCustomizerTest.java
+++ /dev/null
@@ -1,353 +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.k.http;
-
-import java.net.ConnectException;
-import java.util.Arrays;
-
-import io.vertx.core.http.HttpMethod;
-import io.vertx.core.json.Json;
-import io.vertx.core.json.JsonObject;
-import org.apache.camel.CamelContext;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.platform.http.PlatformHttpComponent;
-import org.apache.camel.component.platform.http.PlatformHttpConstants;
-import org.apache.camel.component.platform.http.vertx.VertxPlatformHttpEngine;
-import org.apache.camel.component.platform.http.vertx.VertxPlatformHttpRouter;
-import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.k.Runtime;
-import org.apache.camel.k.test.AvailablePortFinder;
-import org.apache.camel.support.jsse.KeyManagersParameters;
-import org.apache.camel.support.jsse.KeyStoreParameters;
-import org.apache.camel.support.jsse.SSLContextParameters;
-import org.apache.camel.support.jsse.SSLContextServerParameters;
-import org.apache.camel.support.jsse.TrustManagersParameters;
-import org.apache.camel.util.ObjectHelper;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.ValueSource;
-
-import static io.restassured.RestAssured.given;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.hamcrest.Matchers.equalTo;
-
-public class PlatformHttpServiceCustomizerTest {
-
- @ParameterizedTest
- @ValueSource(strings = { "", "/test", "/test/nested" })
- public void testPlatformHttpServiceCustomizer(String path) throws Exception {
- Runtime runtime = Runtime.on(new DefaultCamelContext());
-
- PlatformHttpServiceContextCustomizer httpService = new PlatformHttpServiceContextCustomizer();
- httpService.setBindPort(AvailablePortFinder.getNextAvailable());
-
- if (ObjectHelper.isNotEmpty(path)) {
- httpService.setPath(path);
- }
-
- httpService.apply(runtime.getCamelContext());
-
- try {
- runtime.getCamelContext().start();
-
- VertxPlatformHttpRouter.lookup(runtime.getCamelContext()).route(HttpMethod.GET, "/my/path")
- .handler(routingContext -> {
- JsonObject response = new JsonObject();
- response.put("status", "UP");
-
- routingContext.response()
- .putHeader("content-type", "application/json")
- .setStatusCode(200)
- .end(Json.encodePrettily(response));
- });
-
- given()
- .port(httpService.getBindPort())
- .when()
- .get(path + "/my/path")
- .then()
- .statusCode(200)
- .body("status", equalTo("UP"));
- } finally {
- runtime.getCamelContext().stop();
- }
- }
-
- @ParameterizedTest
- @ValueSource(strings = { "/", "/test", "/test/nested" })
- public void testPlatformHttpComponent(String path) throws Exception {
- Runtime runtime = Runtime.on(new DefaultCamelContext());
- runtime.addRoutes(new RouteBuilder() {
- @Override
- public void configure() throws Exception {
- fromF("platform-http:%s", path)
- .setBody().constant(PlatformHttpConstants.PLATFORM_HTTP_COMPONENT_NAME);
- }
- });
-
- PlatformHttpServiceContextCustomizer httpService = new PlatformHttpServiceContextCustomizer();
- httpService.setBindPort(AvailablePortFinder.getNextAvailable());
- httpService.apply(runtime.getCamelContext());
-
- PlatformHttpComponent c = runtime.getCamelContext().getComponent(PlatformHttpConstants.PLATFORM_HTTP_COMPONENT_NAME, PlatformHttpComponent.class);
-
- assertThat(c).isNotNull();
- assertThat(c.getEngine()).isInstanceOf(VertxPlatformHttpEngine.class);
-
- try {
- runtime.getCamelContext().start();
-
- given()
- .port(httpService.getBindPort())
- .when()
- .get(path)
- .then()
- .statusCode(200)
- .body(equalTo(PlatformHttpConstants.PLATFORM_HTTP_COMPONENT_NAME));
- } finally {
- runtime.getCamelContext().stop();
- }
- }
-
- @ParameterizedTest
- @ValueSource(strings = { "/", "/test", "/test/nested" })
- public void testPlatformHttpComponentPost(String path) throws Exception {
- Runtime runtime = Runtime.on(new DefaultCamelContext());
- runtime.addRoutes(new RouteBuilder() {
- @Override
- public void configure() throws Exception {
- fromF("platform-http:%s", path)
- .transform().body(String.class, b -> b.toUpperCase());
- }
- });
-
- PlatformHttpServiceContextCustomizer httpService = new PlatformHttpServiceContextCustomizer();
- httpService.setBindPort(AvailablePortFinder.getNextAvailable());
- httpService.apply(runtime.getCamelContext());
-
- PlatformHttpComponent c = runtime.getCamelContext().getComponent(PlatformHttpConstants.PLATFORM_HTTP_COMPONENT_NAME, PlatformHttpComponent.class);
-
- assertThat(c).isNotNull();
- assertThat(c.getEngine()).isInstanceOf(VertxPlatformHttpEngine.class);
-
- try {
- runtime.getCamelContext().start();
-
- given()
- .port(httpService.getBindPort())
- .body("test")
- .when()
- .post(path)
- .then()
- .statusCode(200)
- .body(equalTo("TEST"));
- } finally {
- runtime.getCamelContext().stop();
- }
- }
-
- @Test
- public void testPlatformHttpServiceNotAvailableBeforeCamelContextStarts() throws Exception {
- Runtime runtime = Runtime.on(new DefaultCamelContext());
-
- var httpService = new PlatformHttpServiceContextCustomizer();
- httpService.setBindPort(AvailablePortFinder.getNextAvailable());
- httpService.apply(runtime.getCamelContext());
-
- //VertxPlatformHttpRouter.lookup(runtime.getCamelContext())
- // .route(HttpMethod.GET, "/my/path")
- // .handler(routingContext -> routingContext.response().setStatusCode(200).end());
-
- assertThatExceptionOfType(ConnectException.class).isThrownBy(
- () -> {
- given()
- .port(httpService.getBindPort())
- .when()
- .get("/")
- .then()
- .extract();
- }
- );
- }
-
- @Test
- public void testPlatformHttpComponentSSL() throws Exception {
- KeyStoreParameters keystoreParameters = new KeyStoreParameters();
- keystoreParameters.setResource("jsse/service.jks");
- keystoreParameters.setPassword("security");
-
- SSLContextParameters serviceSSLContextParameters = new SSLContextParameters();
- KeyManagersParameters serviceSSLKeyManagers = new KeyManagersParameters();
- serviceSSLKeyManagers.setKeyPassword("security");
- serviceSSLKeyManagers.setKeyStore(keystoreParameters);
- serviceSSLContextParameters.setKeyManagers(serviceSSLKeyManagers);
-
- KeyStoreParameters truststoreParameters = new KeyStoreParameters();
- truststoreParameters.setResource("jsse/truststore.jks");
- truststoreParameters.setPassword("storepass");
-
- TrustManagersParameters clientAuthServiceSSLTrustManagers = new TrustManagersParameters();
- clientAuthServiceSSLTrustManagers.setKeyStore(truststoreParameters);
- serviceSSLContextParameters.setTrustManagers(clientAuthServiceSSLTrustManagers);
- SSLContextServerParameters clientAuthSSLContextServerParameters = new SSLContextServerParameters();
- clientAuthSSLContextServerParameters.setClientAuthentication("REQUIRE");
- serviceSSLContextParameters.setServerParameters(clientAuthSSLContextServerParameters);
-
- SSLContextParameters clientSSLContextParameters = new SSLContextParameters();
- TrustManagersParameters clientSSLTrustManagers = new TrustManagersParameters();
- clientSSLTrustManagers.setKeyStore(truststoreParameters);
- clientSSLContextParameters.setTrustManagers(clientSSLTrustManagers);
-
- KeyManagersParameters clientAuthClientSSLKeyManagers = new KeyManagersParameters();
- clientAuthClientSSLKeyManagers.setKeyPassword("security");
- clientAuthClientSSLKeyManagers.setKeyStore(keystoreParameters);
- clientSSLContextParameters.setKeyManagers(clientAuthClientSSLKeyManagers);
-
- CamelContext context = new DefaultCamelContext();
- context.addRoutes(new RouteBuilder() {
- @Override
- public void configure() throws Exception {
- fromF("platform-http:/")
- .transform().body(String.class, b -> b.toUpperCase());
- }
- });
-
- PlatformHttpServiceContextCustomizer httpService = new PlatformHttpServiceContextCustomizer();
- httpService.setBindPort(AvailablePortFinder.getNextAvailable());
- httpService.setSslContextParameters(serviceSSLContextParameters);
- httpService.apply(context);
-
- try {
- context.getRegistry().bind("clientSSLContextParameters", clientSSLContextParameters);
- context.start();
-
- String result = context.createFluentProducerTemplate()
- .toF("https://localhost:%d?sslContextParameters=#clientSSLContextParameters", httpService.getBindPort())
- .withBody("test")
- .request(String.class);
-
- assertThat(result).isEqualTo("TEST");
- } finally {
- context.stop();
- }
- }
-
- @Test
- public void testPlatformHttpComponentGlobalSSL() throws Exception {
- KeyStoreParameters keystoreParameters = new KeyStoreParameters();
- keystoreParameters.setResource("jsse/service.jks");
- keystoreParameters.setPassword("security");
-
- SSLContextParameters serviceSSLContextParameters = new SSLContextParameters();
- KeyManagersParameters serviceSSLKeyManagers = new KeyManagersParameters();
- serviceSSLKeyManagers.setKeyPassword("security");
- serviceSSLKeyManagers.setKeyStore(keystoreParameters);
- serviceSSLContextParameters.setKeyManagers(serviceSSLKeyManagers);
-
- KeyStoreParameters truststoreParameters = new KeyStoreParameters();
- truststoreParameters.setResource("jsse/truststore.jks");
- truststoreParameters.setPassword("storepass");
-
- TrustManagersParameters clientAuthServiceSSLTrustManagers = new TrustManagersParameters();
- clientAuthServiceSSLTrustManagers.setKeyStore(truststoreParameters);
- serviceSSLContextParameters.setTrustManagers(clientAuthServiceSSLTrustManagers);
- SSLContextServerParameters clientAuthSSLContextServerParameters = new SSLContextServerParameters();
- clientAuthSSLContextServerParameters.setClientAuthentication("REQUIRE");
- serviceSSLContextParameters.setServerParameters(clientAuthSSLContextServerParameters);
-
- SSLContextParameters clientSSLContextParameters = new SSLContextParameters();
- TrustManagersParameters clientSSLTrustManagers = new TrustManagersParameters();
- clientSSLTrustManagers.setKeyStore(truststoreParameters);
- clientSSLContextParameters.setTrustManagers(clientSSLTrustManagers);
-
- KeyManagersParameters clientAuthClientSSLKeyManagers = new KeyManagersParameters();
- clientAuthClientSSLKeyManagers.setKeyPassword("security");
- clientAuthClientSSLKeyManagers.setKeyStore(keystoreParameters);
- clientSSLContextParameters.setKeyManagers(clientAuthClientSSLKeyManagers);
-
- CamelContext context = new DefaultCamelContext();
- context.setSSLContextParameters(serviceSSLContextParameters);
- context.addRoutes(new RouteBuilder() {
- @Override
- public void configure() throws Exception {
- fromF("platform-http:/")
- .transform().body(String.class, b -> b.toUpperCase());
- }
- });
-
- PlatformHttpServiceContextCustomizer httpService = new PlatformHttpServiceContextCustomizer();
- httpService.setBindPort(AvailablePortFinder.getNextAvailable());
- httpService.setUseGlobalSslContextParameters(true);
- httpService.apply(context);
-
- try {
- context.getRegistry().bind("clientSSLContextParameters", clientSSLContextParameters);
- context.start();
-
- String result = context.createFluentProducerTemplate()
- .toF("https://localhost:%d?sslContextParameters=#clientSSLContextParameters", httpService.getBindPort())
- .withBody("test")
- .request(String.class);
-
- assertThat(result).isEqualTo("TEST");
- } finally {
- context.stop();
- }
- }
-
- @Test
- public void testPlatformHttpComponentCORS() throws Exception {
- CamelContext context = new DefaultCamelContext();
- context.addRoutes(new RouteBuilder() {
- @Override
- public void configure() throws Exception {
- fromF("platform-http:/")
- .transform().constant("cors");
- }
- });
-
- PlatformHttpServiceContextCustomizer httpService = new PlatformHttpServiceContextCustomizer();
- httpService.setBindPort(AvailablePortFinder.getNextAvailable());
- httpService.getCors().setEnabled(true);
- httpService.getCors().setMethods(Arrays.asList("GET", "POST"));
- httpService.apply(context);
-
- try {
- context.start();
-
- String origin = "http://custom.origin.quarkus";
- String methods = "GET,POST";
- String headers = "X-Custom";
-
- given()
- .port(httpService.getBindPort())
- .header("Origin", origin)
- .header("Access-Control-Request-Method", methods)
- .header("Access-Control-Request-Headers", headers)
- .when()
- .get("/")
- .then()
- .statusCode(200)
- .header("Access-Control-Allow-Origin", origin)
- .header("Access-Control-Allow-Methods", methods)
- .header("Access-Control-Allow-Headers", headers);
- } finally {
- context.stop();
- }
- }
-}
diff --git a/camel-k-runtime-http/src/test/resources/jsse/service.jks b/camel-k-runtime-http/src/test/resources/jsse/service.jks
deleted file mode 100644
index 52321ad..0000000
Binary files a/camel-k-runtime-http/src/test/resources/jsse/service.jks and /dev/null differ
diff --git a/camel-k-runtime-http/src/test/resources/jsse/truststore.jks b/camel-k-runtime-http/src/test/resources/jsse/truststore.jks
deleted file mode 100644
index 44d82a8..0000000
Binary files a/camel-k-runtime-http/src/test/resources/jsse/truststore.jks and /dev/null differ
diff --git a/camel-k-runtime-http/src/test/resources/log4j2-test.xml b/camel-k-runtime-http/src/test/resources/log4j2-test.xml
deleted file mode 100644
index d0ac3a4..0000000
--- a/camel-k-runtime-http/src/test/resources/log4j2-test.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.
-
--->
-<Configuration status="INFO">
- <Appenders>
- <Console name="STDOUT" target="SYSTEM_OUT">
- <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS}|%-5level|%t|%c - %msg%n"/>
- </Console>
- <Null name="NONE"/>
- </Appenders>
-
- <Loggers>
- <Logger name="io.vertx" level="INFO"/>
- <Root level="INFO">
- <!--<AppenderRef ref="STDOUT"/>-->
- <AppenderRef ref="NONE"/>
- </Root>
- </Loggers>
-
-</Configuration>
\ No newline at end of file
diff --git a/camel-k-runtime-knative/pom.xml b/camel-k-runtime-knative/pom.xml
deleted file mode 100644
index 12c93c3..0000000
--- a/camel-k-runtime-knative/pom.xml
+++ /dev/null
@@ -1,180 +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">
- <parent>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-parent</artifactId>
- <version>1.6.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>camel-k-runtime-knative</artifactId>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-knative</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-knative-http</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-loader-yaml</artifactId>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-apt</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-annotations</artifactId>
- <optional>true</optional>
- </dependency>
-
- <!-- ****************************** -->
- <!-- -->
- <!-- TESTS -->
- <!-- -->
- <!-- ****************************** -->
-
- <dependency>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-knative-test</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-loader-xml</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-loader-groovy</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-loader-kotlin</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-loader-js</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-loader-java</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-direct</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-log</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-mock</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.jboss.jandex</groupId>
- <artifactId>jandex-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>make-index</id>
- <goals>
- <goal>jandex</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-package-maven-plugin</artifactId>
- <version>${camel-version}</version>
- <executions>
- <execution>
- <id>generate-configurer</id>
- <phase>process-classes</phase>
- <goals>
- <goal>generate-configurer</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- <goal>add-resource</goal>
- </goals>
- <configuration>
- <sources>
- <source>src/generated/java</source>
- </sources>
- <resources>
- <resource>
- <directory>src/generated/resources</directory>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <useSystemClassLoader>false</useSystemClassLoader>
- <forkCount>1</forkCount>
- <resueForks>false</resueForks>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/camel-k-runtime-knative/src/main/java/org/apache/camel/k/knative/yaml/parser/KnativeStepParser.java b/camel-k-runtime-knative/src/main/java/org/apache/camel/k/knative/yaml/parser/KnativeStepParser.java
deleted file mode 100644
index 0027a61..0000000
--- a/camel-k-runtime-knative/src/main/java/org/apache/camel/k/knative/yaml/parser/KnativeStepParser.java
+++ /dev/null
@@ -1,78 +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.k.knative.yaml.parser;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URISyntaxException;
-import java.util.List;
-import java.util.Map;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import org.apache.camel.component.knative.spi.Knative;
-import org.apache.camel.k.loader.yaml.spi.ProcessorStepParser;
-import org.apache.camel.k.loader.yaml.spi.StartStepParser;
-import org.apache.camel.k.loader.yaml.support.StepParserSupport;
-import org.apache.camel.model.ProcessorDefinition;
-import org.apache.camel.model.RouteDefinition;
-import org.apache.camel.model.ToDefinition;
-import org.apache.camel.util.ObjectHelper;
-import org.apache.camel.util.URISupport;
-
-public class KnativeStepParser implements ProcessorStepParser, StartStepParser {
- @Override
- public Object process(Context context) {
- final Definition definition = context.node(Definition.class);
- final String uri = definition.getEndpointUri();
- final RouteDefinition route = context.builder().from(uri);
-
- // steps are mandatory
- ObjectHelper.notNull(definition.steps, "from steps");
-
- return StepParserSupport.convertSteps(
- context,
- route,
- definition.steps
- );
- }
-
- @Override
- public ProcessorDefinition<?> toProcessor(Context context) {
- return new ToDefinition(context.node(Definition.class).getEndpointUri());
- }
-
- public static final class Definition {
- public Knative.Type type;
- public String name;
- public Map<String, Object> parameters;
- public List<org.apache.camel.k.loader.yaml.model.Step> steps;
-
- @JsonIgnore
- public String getEndpointUri() {
- String answer = String.format("knative:%s/%s", type.name(), name);
-
- if (parameters != null) {
- try {
- answer = URISupport.appendParametersToURI(answer, parameters);
- } catch (URISyntaxException | UnsupportedEncodingException e) {
- throw new RuntimeException(e);
- }
- }
-
- return answer;
- }
- }
-}
diff --git a/camel-k-runtime-knative/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/knative b/camel-k-runtime-knative/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/knative
deleted file mode 100644
index e2e3d21..0000000
--- a/camel-k-runtime-knative/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/knative
+++ /dev/null
@@ -1,18 +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.
-#
-
-class=org.apache.camel.k.knative.yaml.parser.KnativeStepParser
\ No newline at end of file
diff --git a/camel-k-runtime-knative/src/test/java/org/apache/camel/k/knative/customizer/KnativeSinkBindingCustomizerTest.java b/camel-k-runtime-knative/src/test/java/org/apache/camel/k/knative/customizer/KnativeSinkBindingCustomizerTest.java
deleted file mode 100644
index fc870be..0000000
--- a/camel-k-runtime-knative/src/test/java/org/apache/camel/k/knative/customizer/KnativeSinkBindingCustomizerTest.java
+++ /dev/null
@@ -1,185 +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.k.knative.customizer;
-
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.UUID;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.RoutesBuilder;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.knative.KnativeComponent;
-import org.apache.camel.component.knative.KnativeConstants;
-import org.apache.camel.component.knative.spi.CloudEvent;
-import org.apache.camel.component.knative.spi.CloudEvents;
-import org.apache.camel.component.knative.spi.Knative;
-import org.apache.camel.component.knative.spi.KnativeEnvironment;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.k.Runtime;
-import org.apache.camel.k.Source;
-import org.apache.camel.k.SourceLoader;
-import org.apache.camel.k.Sources;
-import org.apache.camel.k.http.PlatformHttpServiceContextCustomizer;
-import org.apache.camel.k.support.RuntimeSupport;
-import org.apache.camel.k.support.SourcesSupport;
-import org.apache.camel.k.test.AvailablePortFinder;
-import org.junit.jupiter.api.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class KnativeSinkBindingCustomizerTest {
-
- @Test
- public void testSinkBindingRegistration() throws Exception {
- Runtime runtime = Runtime.on(new DefaultCamelContext());
- runtime.setProperties(
- "k.sink", "http://theurl",
- "camel.k.customizer.sinkbinding.enabled", "true",
- "camel.k.customizer.sinkbinding.name", "mychannel",
- "camel.k.customizer.sinkbinding.type", "channel",
- "camel.k.customizer.sinkbinding.kind", "InMemoryChannel",
- "camel.k.customizer.sinkbinding.api-version", "messaging.knative.dev/v1beta1");
-
-
- assertThat(RuntimeSupport.configureContextCustomizers(runtime)).hasOnlyOneElementSatisfying(customizer -> {
- assertThat(customizer).isInstanceOfSatisfying(KnativeSinkBindingContextCustomizer.class, sc -> {
- assertThat(sc.getName()).isEqualTo("mychannel");
- assertThat(sc.getType()).isEqualTo(Knative.Type.channel);
- assertThat(sc.getApiVersion()).isEqualTo("messaging.knative.dev/v1beta1");
- assertThat(sc.getKind()).isEqualTo("InMemoryChannel");
- });
-
- var svc = runtime.getRegistry().lookupByNameAndType("mychannel", KnativeEnvironment.KnativeResource.class);
- assertThat(svc).isNotNull();
- assertThat(svc.getUrl()).isEqualTo("http://theurl");
- assertThat(svc.getName()).isEqualTo("mychannel");
- assertThat(svc.getType()).isEqualTo(Knative.Type.channel);
- assertThat(svc.getMetadata(Knative.KNATIVE_API_VERSION)).isEqualTo("messaging.knative.dev/v1beta1");
- assertThat(svc.getMetadata(Knative.KNATIVE_KIND)).isEqualTo("InMemoryChannel");
- });
- }
-
- @Test
- public void testWrapLoaderWithSyntheticServiceDefinition() throws Exception {
-
- final String data = UUID.randomUUID().toString();
- final TestRuntime runtime = new TestRuntime();
- final String typeHeaderKey = CloudEvents.v1_0.mandatoryAttribute(CloudEvent.CAMEL_CLOUD_EVENT_TYPE).http();
- final String typeHeaderVal = UUID.randomUUID().toString();
- final String url = String.format("http://localhost:%d", runtime.port);
-
- KnativeComponent component = new KnativeComponent();
- component.setEnvironment(new KnativeEnvironment(Collections.emptyList()));
-
- Properties properties = new Properties();
- properties.put("camel.k.customizer.sinkbinding.enabled", "true");
- properties.put("camel.k.customizer.sinkbinding.name", "mySynk");
- properties.put("camel.k.customizer.sinkbinding.type", "endpoint");
- properties.put("k.sink", String.format("http://localhost:%d", runtime.port));
- properties.put("k.ce.overrides", Knative.MAPPER.writeValueAsString(Map.of(typeHeaderKey, typeHeaderVal)));
-
- CamelContext context = runtime.getCamelContext();
- context.getPropertiesComponent().setInitialProperties(properties);
- context.addComponent(KnativeConstants.SCHEME, component);
-
- RuntimeSupport.configureContextCustomizers(runtime);
-
- Source source = Sources.fromBytes("groovy", "from('direct:start').setBody().header('MyHeader').to('knative://endpoint/mySynk')".getBytes(StandardCharsets.UTF_8));
- SourceLoader loader = SourcesSupport.load(runtime, source);
-
- assertThat(loader.getSupportedLanguages()).contains(source.getLanguage());
- assertThat(runtime.builders).hasSize(1);
-
- try {
- context.addRoutes(runtime.builders.get(0));
- context.addRoutes(new RouteBuilder() {
- @Override
- public void configure() throws Exception {
- fromF("platform-http:/")
- .routeId("http")
- .to("mock:result");
- }
- });
- context.start();
-
- var services = context.getRegistry().findByType(KnativeEnvironment.KnativeResource.class);
-
- assertThat(services).hasSize(1);
- assertThat(services).first().hasFieldOrPropertyWithValue("name", "mySynk");
- assertThat(services).first().hasFieldOrPropertyWithValue("url", url);
-
- MockEndpoint mock = context.getEndpoint("mock:result", MockEndpoint.class);
- mock.expectedMessageCount(1);
- mock.expectedBodiesReceived(data);
- mock.expectedHeaderReceived(typeHeaderKey, typeHeaderVal);
-
- context.createFluentProducerTemplate()
- .to("direct:start")
- .withHeader("MyHeader", data)
- .send();
-
- mock.assertIsSatisfied();
- } finally {
- context.stop();
- }
- }
-
- static class TestRuntime implements Runtime {
- private final CamelContext camelContext;
- private final List<RoutesBuilder> builders;
- private final int port;
-
- public TestRuntime() {
- this.camelContext = new DefaultCamelContext();
- this.camelContext.disableJMX();
- this.camelContext.setStreamCaching(true);
-
- this.builders = new ArrayList<>();
- this.port = AvailablePortFinder.getNextAvailable();
-
- PlatformHttpServiceContextCustomizer httpService = new PlatformHttpServiceContextCustomizer();
- httpService.setBindPort(this.port);
- httpService.apply(this.camelContext);
- }
-
- public int getPort() {
- return port;
- }
-
- @Override
- public CamelContext getCamelContext() {
- return this.camelContext;
- }
-
- @Override
- public void addRoutes(RoutesBuilder builder) {
- this.builders.add(builder);
- }
-
- @Override
- public void setPropertiesLocations(Collection<String> locations) {
- }
- }
-
-}
diff --git a/camel-k-runtime-knative/src/test/java/org/apache/camel/k/knative/yaml/parser/KnativeConverterTest.java b/camel-k-runtime-knative/src/test/java/org/apache/camel/k/knative/yaml/parser/KnativeConverterTest.java
deleted file mode 100644
index 88a265b..0000000
--- a/camel-k-runtime-knative/src/test/java/org/apache/camel/k/knative/yaml/parser/KnativeConverterTest.java
+++ /dev/null
@@ -1,110 +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.k.knative.yaml.parser;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.RoutesBuilder;
-import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.k.Runtime;
-import org.apache.camel.k.Source;
-import org.apache.camel.k.SourceLoader;
-import org.apache.camel.k.Sources;
-import org.apache.camel.k.loader.yaml.YamlSourceLoader;
-import org.apache.camel.k.support.SourcesSupport;
-import org.apache.camel.model.FromDefinition;
-import org.apache.camel.model.ProcessorDefinition;
-import org.apache.camel.model.RouteDefinition;
-import org.apache.camel.model.ToDefinition;
-import org.junit.jupiter.api.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class KnativeConverterTest {
-
- @Test
- public void testLoadRoutes() throws Exception {
- TestRuntime runtime = new TestRuntime();
- Source source = Sources.fromURI("classpath:route.yaml");
- SourceLoader loader = SourcesSupport.load(runtime, source);
-
- assertThat(loader).isInstanceOf(YamlSourceLoader.class);
- assertThat(runtime.builders).hasSize(1);
-
- runtime.camelContext.addRoutes(runtime.builders.get(0));
-
- List<RouteDefinition> routes = runtime.camelContext.getRouteDefinitions();
- assertThat(routes).hasSize(1);
-
- // input
- assertThat(routes)
- .first()
- .extracting(RouteDefinition::getInput)
- .isInstanceOfSatisfying(FromDefinition.class, t-> {
- assertThat(t.getEndpointUri()).isEqualTo("knative:endpoint/from");
- });
-
- // outputs
- assertThat(routes)
- .first()
- .satisfies(KnativeConverterTest::validateSteps);
- }
-
- private static void validateSteps(RouteDefinition definition) {
- List<ProcessorDefinition<?>> outputs = definition.getOutputs();
-
- assertThat(outputs).hasSize(2);
-
- assertThat(outputs)
- .element(0)
- .isInstanceOfSatisfying(ToDefinition.class, t-> {
- assertThat(t.getEndpointUri()).isEqualTo("log:info");
- });
- assertThat(outputs)
- .element(1)
- .isInstanceOfSatisfying(ToDefinition.class, t-> {
- assertThat(t.getEndpointUri()).isEqualTo("knative:endpoint/to");
- });
- }
-
- static class TestRuntime implements Runtime {
- private final DefaultCamelContext camelContext;
- private final List<RoutesBuilder> builders;
-
- public TestRuntime() {
- this.camelContext = new DefaultCamelContext();
- this.builders = new ArrayList<>();
- }
-
- @Override
- public CamelContext getCamelContext() {
- return this.camelContext;
- }
-
- @Override
- public void addRoutes(RoutesBuilder builder) {
- this.builders.add(builder);
- }
-
- @Override
- public void setPropertiesLocations(Collection<String> locations) {
- }
- }
-}
diff --git a/camel-k-runtime-knative/src/test/java/org/apache/camel/k/loader/knative/KnativeSourceRoutesLoaderTest.java b/camel-k-runtime-knative/src/test/java/org/apache/camel/k/loader/knative/KnativeSourceRoutesLoaderTest.java
deleted file mode 100644
index ceda4f6..0000000
--- a/camel-k-runtime-knative/src/test/java/org/apache/camel/k/loader/knative/KnativeSourceRoutesLoaderTest.java
+++ /dev/null
@@ -1,161 +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.k.loader.knative;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.UUID;
-import java.util.stream.Stream;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.RoutesBuilder;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.knative.KnativeComponent;
-import org.apache.camel.component.knative.KnativeConstants;
-import org.apache.camel.component.knative.spi.Knative;
-import org.apache.camel.component.knative.spi.KnativeEnvironment;
-import org.apache.camel.component.knative.test.KnativeEnvironmentSupport;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.k.Runtime;
-import org.apache.camel.k.Source;
-import org.apache.camel.k.SourceLoader;
-import org.apache.camel.k.Sources;
-import org.apache.camel.k.http.PlatformHttpServiceContextCustomizer;
-import org.apache.camel.k.support.SourcesSupport;
-import org.apache.camel.k.test.AvailablePortFinder;
-import org.apache.camel.model.ModelCamelContext;
-import org.apache.camel.model.RouteDefinition;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.MethodSource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class KnativeSourceRoutesLoaderTest {
- private static final Logger LOGGER = LoggerFactory.getLogger(KnativeSourceRoutesLoaderTest.class);
-
- static Stream<Arguments> parameters() {
- return Stream.of(
- Arguments.arguments("classpath:sources/routes.yaml?interceptors=knative-source"),
- Arguments.arguments("classpath:sources/routes.xml?interceptors=knative-source"),
- Arguments.arguments("classpath:sources/routes.groovy?interceptors=knative-source"),
- Arguments.arguments("classpath:sources/routes.kts?interceptors=knative-source"),
- Arguments.arguments("classpath:sources/routes.js?interceptors=knative-source"),
- Arguments.arguments("classpath:sources/routes.java?name=MyRoutes.java&interceptors=knative-source")
- ).sequential();
- }
-
- @ParameterizedTest
- @MethodSource("parameters")
- public void testWrapLoader(String uri) throws Exception {
- LOGGER.info("uri: {}", uri);
-
- final String data = UUID.randomUUID().toString();
- final TestRuntime runtime = new TestRuntime();
-
- KnativeComponent component = new KnativeComponent();
- component.setEnvironment(KnativeEnvironment.on(
- KnativeEnvironmentSupport.endpoint(Knative.EndpointKind.sink, "sink", "http://localhost:" + runtime.port)
- ));
-
- CamelContext context = runtime.getCamelContext();
- context.addComponent(KnativeConstants.SCHEME, component);
-
- Source source = Sources.fromURI(uri);
- SourceLoader loader = SourcesSupport.load(runtime, source);
-
- assertThat(loader.getSupportedLanguages()).contains(source.getLanguage());
- assertThat(runtime.builders).hasSize(1);
-
- try {
- context.addRoutes(runtime.builders.get(0));
- context.addRoutes(new RouteBuilder() {
- @Override
- public void configure() throws Exception {
- fromF("platform-http:/")
- .routeId("http")
- .to("mock:result");
- }
- });
- context.start();
-
- List<RouteDefinition> definitions = context.adapt(ModelCamelContext.class).getRouteDefinitions();
-
- assertThat(definitions).hasSize(2);
- assertThat(definitions).first().satisfies(d -> {
- assertThat(d.getOutputs()).last().hasFieldOrPropertyWithValue(
- "endpointUri",
- "knative://endpoint/sink"
- );
- });
-
- MockEndpoint mock = context.getEndpoint("mock:result", MockEndpoint.class);
- mock.expectedMessageCount(1);
- mock.expectedBodiesReceived(data);
-
- context.createFluentProducerTemplate()
- .to("direct:start")
- .withHeader("MyHeader", data)
- .send();
-
- mock.assertIsSatisfied();
- } finally {
- context.stop();
- }
- }
-
- static class TestRuntime implements Runtime {
- private final CamelContext camelContext;
- private final List<RoutesBuilder> builders;
- private final int port;
-
- public TestRuntime() {
- this.camelContext = new DefaultCamelContext();
- this.camelContext.disableJMX();
- this.camelContext.setStreamCaching(true);
-
- this.builders = new ArrayList<>();
- this.port = AvailablePortFinder.getNextAvailable();
-
- PlatformHttpServiceContextCustomizer httpService = new PlatformHttpServiceContextCustomizer();
- httpService.setBindPort(this.port);
- httpService.apply(this.camelContext);
- }
-
- public int getPort() {
- return port;
- }
-
- @Override
- public CamelContext getCamelContext() {
- return this.camelContext;
- }
-
- @Override
- public void addRoutes(RoutesBuilder builder) {
- this.builders.add(builder);
- }
-
- @Override
- public void setPropertiesLocations(Collection<String> locations) {
- }
- }
-}
diff --git a/camel-k-runtime-knative/src/test/resources/route.yaml b/camel-k-runtime-knative/src/test/resources/route.yaml
deleted file mode 100644
index 62c978f..0000000
--- a/camel-k-runtime-knative/src/test/resources/route.yaml
+++ /dev/null
@@ -1,26 +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.
-#
-
-- knative:
- type: "endpoint"
- name: "from"
- steps:
- - to:
- uri: "log:info"
- - knative:
- type: "endpoint"
- name: "to"
\ No newline at end of file
diff --git a/camel-k-runtime-knative/src/test/resources/sources/routes.kts b/camel-k-runtime-knative/src/test/resources/sources/routes.kts
deleted file mode 100644
index 54cc88c..0000000
--- a/camel-k-runtime-knative/src/test/resources/sources/routes.kts
+++ /dev/null
@@ -1,20 +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.
- */
-from("direct:start")
- .setBody().header("MyHeader")
- .to("log:knative")
-
diff --git a/camel-k-runtime-master/src/test/java/org/apache/camel/k/master/MasterCustomizerTest.java b/camel-k-runtime-master/src/test/java/org/apache/camel/k/master/MasterCustomizerTest.java
deleted file mode 100644
index 066c655..0000000
--- a/camel-k-runtime-master/src/test/java/org/apache/camel/k/master/MasterCustomizerTest.java
+++ /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 org.apache.camel.k.master;
-
-import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.k.Runtime;
-import org.apache.camel.support.cluster.ClusterServiceHelper;
-import org.junit.jupiter.api.Test;
-
-import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
-
-public class MasterCustomizerTest {
-
- @Test
- public void testMasterCustomizer() {
- Runtime runtime = Runtime.on(new DefaultCamelContext());
-
- MasterContextCustomizer masterCustomizer = new MasterContextCustomizer();
- masterCustomizer.apply(runtime.getCamelContext());
-
- assertThat(ClusterServiceHelper.lookupService(runtime.getCamelContext())).isNotEmpty();
- }
-}
diff --git a/camel-k-runtime-webhook/pom.xml b/camel-k-runtime-webhook/pom.xml
deleted file mode 100644
index 403939a..0000000
--- a/camel-k-runtime-webhook/pom.xml
+++ /dev/null
@@ -1,160 +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">
- <parent>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-parent</artifactId>
- <version>1.6.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>camel-k-runtime-webhook</artifactId>
-
- <dependencies>
-
- <!-- ****************************** -->
- <!-- -->
- <!-- RUNTIME -->
- <!-- -->
- <!-- ****************************** -->
-
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core-engine</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-webhook</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-apt</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-annotations</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <!-- ****************************** -->
- <!-- -->
- <!-- TESTS -->
- <!-- -->
- <!-- ****************************** -->
-
- <dependency>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-loader-js</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-main</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-rest</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-undertow</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-log</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-timer</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.jboss.jandex</groupId>
- <artifactId>jandex-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>make-index</id>
- <goals>
- <goal>jandex</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-package-maven-plugin</artifactId>
- <version>${camel-version}</version>
- <executions>
- <execution>
- <id>generate-configurer</id>
- <phase>process-classes</phase>
- <goals>
- <goal>generate-configurer</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- <goal>add-resource</goal>
- </goals>
- <configuration>
- <sources>
- <source>src/generated/java</source>
- </sources>
- <resources>
- <resource>
- <directory>src/generated/resources</directory>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/camel-k-runtime-webhook/src/test/java/org/apache/camel/k/webhook/WebhookTest.java b/camel-k-runtime-webhook/src/test/java/org/apache/camel/k/webhook/WebhookTest.java
deleted file mode 100644
index 010e85a..0000000
--- a/camel-k-runtime-webhook/src/test/java/org/apache/camel/k/webhook/WebhookTest.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.k.webhook;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.Consumer;
-import org.apache.camel.FailedToCreateRouteException;
-import org.apache.camel.NamedNode;
-import org.apache.camel.Route;
-import org.apache.camel.k.listener.ContextConfigurer;
-import org.apache.camel.k.main.ApplicationRuntime;
-import org.apache.camel.k.support.SourcesSupport;
-import org.apache.camel.spi.RoutePolicy;
-import org.apache.camel.spi.RoutePolicyFactory;
-import org.apache.camel.support.RoutePolicySupport;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.EnumSource;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class WebhookTest {
- @ParameterizedTest
- @EnumSource(WebhookAction.class)
- public void testWebhookRegistration(WebhookAction action) throws Exception {
- ApplicationRuntime runtime = new ApplicationRuntime();
- runtime.setProperties(
- "camel.component.webhook.configuration.webhook-auto-register", "false",
- "camel.k.customizer.webhook.enabled", "true",
- "camel.k.customizer.webhook.action", action.name().toLowerCase());
-
- CountDownLatch operation = new CountDownLatch(1);
- Map<WebhookAction, AtomicInteger> registerCounters = new HashMap<>();
- Arrays.stream(WebhookAction.values()).forEach(v -> registerCounters.put(v, new AtomicInteger()));
-
- runtime.getCamelContext().addComponent(
- "dummy",
- new DummyWebhookComponent(
- () -> {
- registerCounters.get(WebhookAction.REGISTER).incrementAndGet();
- operation.countDown();
- },
- () -> {
- registerCounters.get(WebhookAction.UNREGISTER).incrementAndGet();
- operation.countDown();
- })
- );
-
- AtomicBoolean routeStarted = new AtomicBoolean();
- runtime.addListener(new ContextConfigurer());
- runtime.addListener(SourcesSupport.forRoutes("classpath:webhook.js"));
- runtime.getCamelContext().addRoutePolicyFactory(new RoutePolicyFactory() {
- @Override
- public RoutePolicy createRoutePolicy(CamelContext camelContext, String routeId, NamedNode route) {
- return new RoutePolicySupport() {
- @Override
- public void onStart(Route route) {
- routeStarted.set(true);
- super.onStart(route);
- }
-
- @Override
- public void startRoute(Route route) throws Exception {
- routeStarted.set(true);
- super.startRoute(route);
- }
-
- @Override
- public void startConsumer(Consumer consumer) throws Exception {
- routeStarted.set(true);
- super.startConsumer(consumer);
- }
- };
- }
- });
-
- runtime.run();
-
- operation.await(15, TimeUnit.SECONDS);
- for (WebhookAction a : WebhookAction.values()) {
- if (a == action) {
- assertThat(registerCounters.get(a)).hasValue(1);
- } else {
- assertThat(registerCounters.get(a)).hasValue(0);
- }
- }
-
- assertThat(routeStarted).isFalse();
- }
-
- @ParameterizedTest()
- @EnumSource(WebhookAction.class)
- public void testRegistrationFailure(WebhookAction action) throws Exception {
- ApplicationRuntime runtime = new ApplicationRuntime();
- runtime.setProperties(
- "camel.component.webhook.configuration.webhook-auto-register", "false",
- "camel.k.customizer.webhook.enabled", "true",
- "camel.k.customizer.webhook.action", action.name());
-
- runtime.getCamelContext().addComponent(
- "dummy",
- new DummyWebhookComponent(
- () -> {
- throw new RuntimeException("dummy error");
- },
- () -> {
- throw new RuntimeException("dummy error");
- })
- );
-
- runtime.addListener(new ContextConfigurer());
- runtime.addListener(SourcesSupport.forRoutes("classpath:webhook.js"));
-
- Assertions.assertThrows(FailedToCreateRouteException.class, runtime::run);
- }
-
- @Test
- public void testAutoRegistrationNotDisabled() throws Exception {
- ApplicationRuntime runtime = new ApplicationRuntime();
- runtime.setProperties(
- "camel.k.customizer.webhook.enabled", "true",
- "camel.k.customizer.webhook.action", WebhookAction.REGISTER.name());
-
- runtime.getCamelContext().addComponent("dummy", new DummyWebhookComponent());
- runtime.addListener(new ContextConfigurer());
- runtime.addListener(SourcesSupport.forRoutes("classpath:webhook.js"));
-
- Assertions.assertThrows(FailedToCreateRouteException.class, runtime::run);
- }
-
-}
diff --git a/camel-k-runtime-webhook/src/test/resources/log4j2-test.xml b/camel-k-runtime-webhook/src/test/resources/log4j2-test.xml
deleted file mode 100644
index 48bdd0c..0000000
--- a/camel-k-runtime-webhook/src/test/resources/log4j2-test.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.
-
--->
-<Configuration status="INFO">
- <Appenders>
- <Console name="STDOUT" target="SYSTEM_OUT">
- <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS}|%-5level|%t|%c - %msg%n"/>
- </Console>
- <Null name="NONE"/>
- </Appenders>
-
- <Loggers>
- <Logger name="io.netty" level="INFO"/>
- <Logger name="io.netty.handler.logging" level="DEBUG"/>
- <Root level="INFO">
- <!--<AppenderRef ref="STDOUT"/>-->
- <AppenderRef ref="NONE"/>
- </Root>
- </Loggers>
-
-</Configuration>
\ No newline at end of file
diff --git a/camel-k-runtime-webhook/src/test/resources/webhook.js b/camel-k-runtime-webhook/src/test/resources/webhook.js
deleted file mode 100644
index 150113a..0000000
--- a/camel-k-runtime-webhook/src/test/resources/webhook.js
+++ /dev/null
@@ -1,21 +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.
- */
-
-from('webhook:dummy:test?foo=bar')
- .to('log:info')
-from('timer:tick')
- .to('log:info')
diff --git a/camel-k-quarkus/camel-k-runtime-quarkus/deployment/pom.xml b/camel-k-runtime/deployment/pom.xml
similarity index 90%
rename from camel-k-quarkus/camel-k-runtime-quarkus/deployment/pom.xml
rename to camel-k-runtime/deployment/pom.xml
index fbf1aab..1ea1f8a 100644
--- a/camel-k-quarkus/camel-k-runtime-quarkus/deployment/pom.xml
+++ b/camel-k-runtime/deployment/pom.xml
@@ -20,21 +20,21 @@
<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">
<parent>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-quarkus-parent</artifactId>
+ <artifactId>camel-k-runtime-parent</artifactId>
<version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>camel-k-runtime-quarkus-deployment</artifactId>
+ <artifactId>camel-k-runtime-deployment</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-quarkus</artifactId>
+ <artifactId>camel-k-runtime</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus-core-deployment</artifactId>
+ <artifactId>camel-k-core-deployment</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
diff --git a/camel-k-quarkus/camel-k-runtime-quarkus/deployment/src/main/java/org/apache/camel/k/quarkus/deployment/DeploymentProcessor.java b/camel-k-runtime/deployment/src/main/java/org/apache/camel/k/quarkus/deployment/DeploymentProcessor.java
similarity index 100%
rename from camel-k-quarkus/camel-k-runtime-quarkus/deployment/src/main/java/org/apache/camel/k/quarkus/deployment/DeploymentProcessor.java
rename to camel-k-runtime/deployment/src/main/java/org/apache/camel/k/quarkus/deployment/DeploymentProcessor.java
diff --git a/camel-k-quarkus/camel-k-runtime-quarkus/deployment/src/main/java/org/apache/camel/k/quarkus/deployment/Feature.java b/camel-k-runtime/deployment/src/main/java/org/apache/camel/k/quarkus/deployment/Feature.java
similarity index 100%
rename from camel-k-quarkus/camel-k-runtime-quarkus/deployment/src/main/java/org/apache/camel/k/quarkus/deployment/Feature.java
rename to camel-k-runtime/deployment/src/main/java/org/apache/camel/k/quarkus/deployment/Feature.java
diff --git a/camel-k-quarkus/camel-k-quarkus-kamelet/pom.xml b/camel-k-runtime/pom.xml
similarity index 92%
rename from camel-k-quarkus/camel-k-quarkus-kamelet/pom.xml
rename to camel-k-runtime/pom.xml
index 2e253cd..4ae8129 100644
--- a/camel-k-quarkus/camel-k-quarkus-kamelet/pom.xml
+++ b/camel-k-runtime/pom.xml
@@ -20,13 +20,13 @@
<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">
<parent>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus</artifactId>
+ <artifactId>camel-k-runtime-project</artifactId>
<version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
- <artifactId>camel-k-quarkus-kamelet-parent</artifactId>
+ <artifactId>camel-k-runtime-parent</artifactId>
<modules>
<module>runtime</module>
diff --git a/camel-k-quarkus/camel-k-runtime-quarkus/runtime/pom.xml b/camel-k-runtime/runtime/pom.xml
similarity index 95%
rename from camel-k-quarkus/camel-k-runtime-quarkus/runtime/pom.xml
rename to camel-k-runtime/runtime/pom.xml
index 8c1c09e..19ce655 100644
--- a/camel-k-quarkus/camel-k-runtime-quarkus/runtime/pom.xml
+++ b/camel-k-runtime/runtime/pom.xml
@@ -20,17 +20,17 @@
<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">
<parent>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-quarkus-parent</artifactId>
+ <artifactId>camel-k-runtime-parent</artifactId>
<version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>camel-k-runtime-quarkus</artifactId>
+ <artifactId>camel-k-runtime</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus-core</artifactId>
+ <artifactId>camel-k-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
diff --git a/camel-k-quarkus/camel-k-runtime-quarkus/runtime/src/main/java/org/apache/camel/k/quarkus/Application.java b/camel-k-runtime/runtime/src/main/java/org/apache/camel/k/quarkus/Application.java
similarity index 98%
rename from camel-k-quarkus/camel-k-runtime-quarkus/runtime/src/main/java/org/apache/camel/k/quarkus/Application.java
rename to camel-k-runtime/runtime/src/main/java/org/apache/camel/k/quarkus/Application.java
index 20690a4..91c89b8 100644
--- a/camel-k-quarkus/camel-k-runtime-quarkus/runtime/src/main/java/org/apache/camel/k/quarkus/Application.java
+++ b/camel-k-runtime/runtime/src/main/java/org/apache/camel/k/quarkus/Application.java
@@ -49,6 +49,7 @@ public final class Application {
public Runtime(BaseMainSupport main) {
this.main = main;
+ this.main.configure().setAutoConfigurationLogSummary(false);
this.stopped = new AtomicBoolean();
}
diff --git a/camel-k-quarkus/camel-k-runtime-quarkus/runtime/src/main/java/org/apache/camel/k/quarkus/ApplicationConfigSourceProvider.java b/camel-k-runtime/runtime/src/main/java/org/apache/camel/k/quarkus/ApplicationConfigSourceProvider.java
similarity index 100%
rename from camel-k-quarkus/camel-k-runtime-quarkus/runtime/src/main/java/org/apache/camel/k/quarkus/ApplicationConfigSourceProvider.java
rename to camel-k-runtime/runtime/src/main/java/org/apache/camel/k/quarkus/ApplicationConfigSourceProvider.java
diff --git a/camel-k-quarkus/camel-k-runtime-quarkus/runtime/src/main/java/org/apache/camel/k/quarkus/ApplicationProducers.java b/camel-k-runtime/runtime/src/main/java/org/apache/camel/k/quarkus/ApplicationProducers.java
similarity index 100%
copy from camel-k-quarkus/camel-k-runtime-quarkus/runtime/src/main/java/org/apache/camel/k/quarkus/ApplicationProducers.java
copy to camel-k-runtime/runtime/src/main/java/org/apache/camel/k/quarkus/ApplicationProducers.java
diff --git a/camel-k-quarkus/camel-k-runtime-quarkus/runtime/src/main/java/org/apache/camel/k/quarkus/ApplicationRecorder.java b/camel-k-runtime/runtime/src/main/java/org/apache/camel/k/quarkus/ApplicationRecorder.java
similarity index 100%
rename from camel-k-quarkus/camel-k-runtime-quarkus/runtime/src/main/java/org/apache/camel/k/quarkus/ApplicationRecorder.java
rename to camel-k-runtime/runtime/src/main/java/org/apache/camel/k/quarkus/ApplicationRecorder.java
diff --git a/camel-k-quarkus/camel-k-runtime-quarkus/runtime/src/main/resources/META-INF/services/org.eclipse.microprofile.config.spi.ConfigSourceProvider b/camel-k-runtime/runtime/src/main/resources/META-INF/services/org.eclipse.microprofile.config.spi.ConfigSourceProvider
similarity index 100%
rename from camel-k-quarkus/camel-k-runtime-quarkus/runtime/src/main/resources/META-INF/services/org.eclipse.microprofile.config.spi.ConfigSourceProvider
rename to camel-k-runtime/runtime/src/main/resources/META-INF/services/org.eclipse.microprofile.config.spi.ConfigSourceProvider
diff --git a/camel-k-quarkus/camel-k-quarkus-loader-xml/deployment/pom.xml b/camel-k-webhook/deployment/pom.xml
similarity index 86%
rename from camel-k-quarkus/camel-k-quarkus-loader-xml/deployment/pom.xml
rename to camel-k-webhook/deployment/pom.xml
index ed89622..8e9db1c 100644
--- a/camel-k-quarkus/camel-k-quarkus-loader-xml/deployment/pom.xml
+++ b/camel-k-webhook/deployment/pom.xml
@@ -20,25 +20,25 @@
<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">
<parent>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus-loader-xml-parent</artifactId>
+ <artifactId>camel-k-webhook-parent</artifactId>
<version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>camel-k-quarkus-loader-xml-deployment</artifactId>
+ <artifactId>camel-k-webhook-deployment</artifactId>
<dependencies>
<dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-xml-io-deployment</artifactId>
+ <groupId>org.apache.camel.k</groupId>
+ <artifactId>camel-k-core-deployment</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus-loader-xml</artifactId>
+ <artifactId>camel-k-webhook</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus-core-deployment</artifactId>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-support-webhook-deployment</artifactId>
</dependency>
</dependencies>
diff --git a/camel-k-quarkus/camel-k-quarkus-loader-java/deployment/src/main/java/org/apache/camel/k/loader/java/quarkus/deployment/Feature.java b/camel-k-webhook/deployment/src/main/java/org/apache/camel/k/quarkus/webhook/deployment/WebhookFeature.java
similarity index 66%
rename from camel-k-quarkus/camel-k-quarkus-loader-java/deployment/src/main/java/org/apache/camel/k/loader/java/quarkus/deployment/Feature.java
rename to camel-k-webhook/deployment/src/main/java/org/apache/camel/k/quarkus/webhook/deployment/WebhookFeature.java
index a5b0d0f..2da9161 100644
--- a/camel-k-quarkus/camel-k-quarkus-loader-java/deployment/src/main/java/org/apache/camel/k/loader/java/quarkus/deployment/Feature.java
+++ b/camel-k-webhook/deployment/src/main/java/org/apache/camel/k/quarkus/webhook/deployment/WebhookFeature.java
@@ -14,16 +14,27 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.loader.java.quarkus.deployment;
+package org.apache.camel.k.quarkus.webhook.deployment;
+
+import java.util.List;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.FeatureBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
+import org.apache.camel.component.webhook.WebhookConfiguration;
-public class Feature {
- private static final String FEATURE = "camel-k-loader-java";
+public class WebhookFeature {
+ private static final String FEATURE = "camel-k-runtime-webhook";
@BuildStep
FeatureBuildItem feature() {
return new FeatureBuildItem(FEATURE);
}
+
+ @BuildStep
+ List<ReflectiveClassBuildItem> reflectiveClasses() {
+ return List.of(
+ new ReflectiveClassBuildItem(true, false, WebhookConfiguration.class)
+ );
+ }
}
diff --git a/camel-k-main/camel-k-runtime-tracing/pom.xml b/camel-k-webhook/impl/pom.xml
similarity index 83%
rename from camel-k-main/camel-k-runtime-tracing/pom.xml
rename to camel-k-webhook/impl/pom.xml
index e33dcdf..4a64755 100644
--- a/camel-k-main/camel-k-runtime-tracing/pom.xml
+++ b/camel-k-webhook/impl/pom.xml
@@ -20,12 +20,12 @@
<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">
<parent>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-main</artifactId>
+ <artifactId>camel-k-webhook-parent</artifactId>
<version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>camel-k-runtime-tracing</artifactId>
+ <artifactId>camel-k-webhook-impl</artifactId>
<dependencies>
@@ -41,17 +41,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-opentracing</artifactId>
+ <artifactId>camel-webhook</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>io.jaegertracing</groupId>
- <artifactId>jaeger-client</artifactId>
- <version>${jaeger-version}</version>
+ <artifactId>camel-k-core-support</artifactId>
</dependency>
<dependency>
@@ -64,19 +58,6 @@
<artifactId>camel-k-annotations</artifactId>
<scope>provided</scope>
</dependency>
-
- <!-- ****************************** -->
- <!-- -->
- <!-- TESTS -->
- <!-- -->
- <!-- ****************************** -->
-
- <dependency>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-test</artifactId>
- <scope>test</scope>
- </dependency>
-
</dependencies>
<build>
diff --git a/camel-k-runtime-webhook/src/generated/java/org/apache/camel/k/webhook/WebhookContextCustomizerConfigurer.java b/camel-k-webhook/impl/src/generated/java/org/apache/camel/k/webhook/WebhookContextCustomizerConfigurer.java
similarity index 100%
rename from camel-k-runtime-webhook/src/generated/java/org/apache/camel/k/webhook/WebhookContextCustomizerConfigurer.java
rename to camel-k-webhook/impl/src/generated/java/org/apache/camel/k/webhook/WebhookContextCustomizerConfigurer.java
diff --git a/camel-k-runtime-webhook/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.k.webhook.WebhookContextCustomizer b/camel-k-webhook/impl/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.k.webhook.WebhookContextCustomizer
similarity index 100%
rename from camel-k-runtime-webhook/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.k.webhook.WebhookContextCustomizer
rename to camel-k-webhook/impl/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.k.webhook.WebhookContextCustomizer
diff --git a/camel-k-runtime-webhook/src/main/java/org/apache/camel/k/webhook/WebhookAction.java b/camel-k-webhook/impl/src/main/java/org/apache/camel/k/webhook/WebhookAction.java
similarity index 100%
rename from camel-k-runtime-webhook/src/main/java/org/apache/camel/k/webhook/WebhookAction.java
rename to camel-k-webhook/impl/src/main/java/org/apache/camel/k/webhook/WebhookAction.java
... 11282 lines suppressed ...