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 2019/07/16 12:21:47 UTC
[camel-k-runtime] 01/05: Modularize loaders #100
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
commit 97779bb0fa428ff38dbdfe708dc0882ff8831c66
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Tue Jul 16 09:30:42 2019 +0200
Modularize loaders #100
---
.../pom.xml | 2 +-
.../k/loader}/groovy/GroovyRoutesLoader.groovy | 4 +-
.../groovy/dsl/ComponentConfiguration.groovy | 2 +-
.../camel/k/loader/groovy}/dsl/Components.java | 2 +-
.../groovy/dsl/ComponentsConfiguration.groovy | 2 +-
.../loader}/groovy/dsl/ContextConfiguration.groovy | 2 +-
.../groovy/dsl/IntegrationConfiguration.groovy | 3 +-
.../groovy/dsl/RegistryConfiguration.groovy | 2 +-
.../k/loader}/groovy/dsl/RestConfiguration.groovy | 2 +-
.../groovy/extension/LogComponentExtension.groovy | 2 +-
.../org.codehaus.groovy.runtime.ExtensionModule | 4 ++
.../services/org/apache/camel/k/loader/groovy | 2 +-
.../src/main/resources/integration.gdsl | 2 +-
.../camel/k/loader}/groovy/LoaderTest.groovy | 2 +-
.../k/loader}/groovy/dsl/IntegrationTest.groovy | 2 +-
.../groovy/dsl/extension/LogExtensionTest.groovy | 2 +-
.../src/test/resources/log4j2-test.xml | 0
.../src/test/resources/routes-with-bindings.groovy | 0
.../routes-with-component-configuration.groovy | 0
.../resources/routes-with-error-handler.groovy | 0
.../src/test/resources/routes-with-rest.groovy | 0
.../src/test/resources/routes.groovy | 0
.../pom.xml | 43 +---------------
.../camel/k/loader/java/JavaClassRoutesLoader.java | 4 +-
.../k/loader/java/JavaSourceRoutesLoader.java | 4 +-
.../services/org/apache/camel/k/loader/class | 2 +-
.../services/org/apache/camel/k/loader/java | 2 +-
.../org/apache/camel/k/loader/java}/MyRoutes.java | 2 +-
.../camel/k/loader/java/RoutesLoaderTest.java | 59 +++++++++++----------
.../src/test/resources/MyRoutes.java | 0
.../test/resources/MyRoutesWithNameOverride.java | 0
.../test/resources/MyRoutesWithNestedClass.java | 0
.../src/test/resources/MyRoutesWithPackage.java | 0
.../resources/MyRoutesWithRestConfiguration.java | 0
.../src/test/resources/log4j2-test.xml | 1 -
{camel-k-runtime-jvm => camel-k-loader-js}/pom.xml | 43 +---------------
.../camel/k/loader/js/JavaScriptRoutesLoader.java | 6 +--
.../apache/camel/k/loader/js}/dsl/Components.java | 2 +-
.../META-INF/services/org/apache/camel/k/loader/js | 2 +-
.../apache/camel/k/loader/js/RoutesLoaderTest.java | 19 ++-----
.../src/test/resources/log4j2-test.xml | 0
.../src/test/resources/routes-compressed.js.gz.b64 | 0
.../src/test/resources/routes.js | 0
.../src/test/resources/routes.mytype | 0
.../pom.xml | 2 +-
.../camel/k/loader}/kotlin/KotlinRoutesLoader.kt | 4 +-
.../kotlin/KotlinScriptCompilationConfiguration.kt | 0
.../loader}/kotlin/dsl/ComponentsConfiguration.kt | 2 +-
.../k/loader}/kotlin/dsl/ContextConfiguration.kt | 2 +-
.../loader}/kotlin/dsl/IntegrationConfiguration.kt | 8 +--
.../k/loader}/kotlin/dsl/RegistryConfiguration.kt | 2 +-
.../k/loader}/kotlin/dsl/RestConfiguration.kt | 2 +-
.../kotlin/extension/LogComponentExtensions.kt | 2 +-
...r.kotlin.dsl.IntegrationConfiguration.classname | 0
.../services/org/apache/camel/k/loader/kts | 2 +-
.../apache/camel/k/loader}/kotlin/LoaderTest.kt | 2 +-
.../camel/k/loader}/kotlin/dsl/IntegrationTest.kt | 2 +-
.../k/loader}/kotlin/extension/LogExtensionTest.kt | 2 +-
.../src/test/resources/log4j2-test.xml | 0
.../src/test/resources/routes-new.kts | 0
.../src/test/resources/routes-with-bindings.kts | 0
.../routes-with-component-configuration.kts | 0
.../test/resources/routes-with-error-handler.kts | 0
.../src/test/resources/routes-with-rest.kts | 0
.../src/test/resources/routes.kts | 0
.../pom.xml | 49 +-----------------
.../apache/camel/k/loader/xml/XmlRoutesLoader.java | 6 +--
.../services/org/apache/camel/k/loader/xml | 2 +-
.../camel/k/loader/xml/RoutesLoaderTest.java | 17 ++----
.../src/test/resources/log4j2-test.xml | 0
.../src/test/resources/rests.xml | 0
.../src/test/resources/routes.xml | 0
.../README.adoc | 6 +--
.../pom.xml | 2 +-
.../java/org/apache/camel/k/loader}/yaml/Yaml.java | 4 +-
.../camel/k/loader}/yaml/YamlRoutesLoader.java | 8 +--
.../camel/k/loader}/yaml/model/Definitions.java | 2 +-
.../apache/camel/k/loader}/yaml/model/Route.java | 2 +-
.../apache/camel/k/loader}/yaml/model/Step.java | 2 +-
.../k/loader}/yaml/parser/ChoiceStepParser.java | 7 +--
.../loader}/yaml/parser/ClaimCheckStepParser.java | 2 +-
.../loader}/yaml/parser/ConvertBodyStepParser.java | 2 +-
.../k/loader}/yaml/parser/DelayStepParser.java | 2 +-
.../yaml/parser/DynamicRouterStepParser.java | 2 +-
.../k/loader}/yaml/parser/FilterStepParser.java | 5 +-
.../k/loader}/yaml/parser/FromStepParser.java | 4 +-
.../camel/k/loader}/yaml/parser/HasDataFormat.java | 6 +--
.../camel/k/loader}/yaml/parser/HasExpression.java | 6 +--
.../camel/k/loader}/yaml/parser/LogStepParser.java | 2 +-
.../k/loader}/yaml/parser/MarshalStepParser.java | 2 +-
.../k/loader}/yaml/parser/PipelineStepParser.java | 5 +-
.../k/loader}/yaml/parser/ProcessStepParser.java | 2 +-
.../k/loader}/yaml/parser/ProcessorStepParser.java | 2 +-
.../yaml/parser/RemoveHeaderStepParser.java | 2 +-
.../yaml/parser/RemoveHeadersStepParser.java | 2 +-
.../yaml/parser/RemovePropertiesStepParser.java | 2 +-
.../yaml/parser/RemovePropertyStepParser.java | 2 +-
.../k/loader}/yaml/parser/RestStepParser.java | 5 +-
.../k/loader}/yaml/parser/SetBodyStepParser.java | 2 +-
.../k/loader}/yaml/parser/SetHeaderStepParser.java | 2 +-
.../loader}/yaml/parser/SetPropertyStepParser.java | 2 +-
.../k/loader}/yaml/parser/SplitStepParser.java | 5 +-
.../k/loader}/yaml/parser/StartStepParser.java | 2 +-
.../camel/k/loader}/yaml/parser/StepParser.java | 6 +--
.../k/loader}/yaml/parser/StepParserException.java | 2 +-
.../k/loader}/yaml/parser/StepParserSupport.java | 4 +-
.../k/loader}/yaml/parser/ToDynamicStepParser.java | 2 +-
.../camel/k/loader}/yaml/parser/ToStepParser.java | 2 +-
.../k/loader}/yaml/parser/TransformStepParser.java | 2 +-
.../k/loader}/yaml/parser/UnmarshalStepParser.java | 2 +-
.../services/org/apache/camel/k/loader/yaml | 2 +-
.../org/apache/camel/k/loader/yaml-parser}/choice | 2 +-
.../apache/camel/k/loader/yaml-parser}/claim-check | 2 +-
.../camel/k/loader/yaml-parser}/convert-body | 2 +-
.../org/apache/camel/k/loader/yaml-parser}/delay | 2 +-
.../camel/k/loader/yaml-parser}/dynamic-router | 2 +-
.../apache/camel/k/loader/yaml-parser}/endpoint | 2 +-
.../org/apache/camel/k/loader/yaml-parser}/filter | 2 +-
.../org/apache/camel/k/loader/yaml-parser}/from | 2 +-
.../org/apache/camel/k/loader/yaml-parser}/log | 2 +-
.../org/apache/camel/k/loader/yaml-parser}/marshal | 2 +-
.../apache/camel/k/loader/yaml-parser}/pipeline | 2 +-
.../org/apache/camel/k/loader/yaml-parser}/process | 2 +-
.../camel/k/loader/yaml-parser}/remove-header | 2 +-
.../camel/k/loader/yaml-parser}/remove-headers | 2 +-
.../camel/k/loader/yaml-parser}/remove-properties | 2 +-
.../camel/k/loader/yaml-parser}/remove-property | 2 +-
.../org/apache/camel/k/loader/yaml-parser}/rest | 2 +-
.../apache/camel/k/loader/yaml-parser}/set-body | 2 +-
.../apache/camel/k/loader/yaml-parser}/set-header | 2 +-
.../camel/k/loader/yaml-parser}/set-property | 2 +-
.../org/apache/camel/k/loader/yaml-parser}/split | 2 +-
.../org/apache/camel/k/loader/yaml-parser}/to | 2 +-
.../org/apache/camel/k/loader/yaml-parser}/tod | 2 +-
.../apache/camel/k/loader/yaml-parser}/transform | 2 +-
.../apache/camel/k/loader/yaml-parser}/unmarshal | 2 +-
.../k/loader}/yaml/RouteDefinitionTest.groovy | 2 +-
.../apache/camel/k/loader}/yaml/RouteTest.groovy | 2 +-
.../apache/camel/k/loader}/yaml/TestSupport.groovy | 4 +-
.../camel/k/loader}/yaml/parser/ChoiceTest.groovy | 4 +-
.../k/loader}/yaml/parser/ClaimCheckTest.groovy | 6 +--
.../k/loader}/yaml/parser/ConvertBodyTest.groovy | 4 +-
.../camel/k/loader}/yaml/parser/DelayTest.groovy | 4 +-
.../k/loader}/yaml/parser/DynamicRouterTest.groovy | 4 +-
.../camel/k/loader}/yaml/parser/FilterTest.groovy | 4 +-
.../camel/k/loader}/yaml/parser/FromTest.groovy | 4 +-
.../camel/k/loader}/yaml/parser/LogTest.groovy | 4 +-
.../camel/k/loader}/yaml/parser/MarshalTest.groovy | 4 +-
.../k/loader}/yaml/parser/PipelineTest.groovy | 8 +--
.../camel/k/loader}/yaml/parser/ProcessTest.groovy | 4 +-
.../k/loader}/yaml/parser/RemoveHeaderTest.groovy | 4 +-
.../k/loader}/yaml/parser/RemoveHeadersTest.groovy | 6 +--
.../yaml/parser/RemovePropertiesTest.groovy | 6 +--
.../loader}/yaml/parser/RemovePropertyTest.groovy | 4 +-
.../camel/k/loader}/yaml/parser/RestTest.groovy | 4 +-
.../camel/k/loader}/yaml/parser/SetBodyTest.groovy | 4 +-
.../k/loader}/yaml/parser/SetHeaderTest.groovy | 4 +-
.../k/loader}/yaml/parser/SetPropertyTest.groovy | 4 +-
.../camel/k/loader}/yaml/parser/SplitTest.groovy | 4 +-
.../k/loader}/yaml/parser/ToDynamicTest.groovy | 4 +-
.../camel/k/loader}/yaml/parser/ToTest.groovy | 4 +-
.../k/loader}/yaml/parser/UnmarshalTest.groovy | 4 +-
.../src/test/resources/log4j2-test.xml | 0
camel-k-runtime-bom/pom.xml | 47 ++++++++++++++---
.../test/java/org/apache/camel/k/SourceTest.java | 38 +++++++-------
.../camel-k-runtime-example-health/pom.xml | 2 +-
.../camel-k-runtime-example-servlet/pom.xml | 2 +-
.../camel-k-runtime-example-yaml/pom.xml | 6 +--
.../org.codehaus.groovy.runtime.ExtensionModule | 4 --
camel-k-runtime-jvm/pom.xml | 6 +--
.../java/org/apache/camel/k/jvm/RuntimeTest.java | 5 +-
camel-k-runtime-knative/pom.xml | 2 +-
.../k/knative/yaml/parser/KnativeStepParser.java | 8 +--
.../camel/k/{yaml => loader/yaml-parser}/knative | 0
.../knative/yaml/parser/KnativeConverterTest.java | 2 +-
.../camel-k-runtime-groovy/pom.xml | 30 ++++++-----
.../camel-k-runtime-kotlin/pom.xml | 30 ++++++-----
.../camel-k-runtime-yaml/pom.xml | 30 ++++++-----
.../pom.xml | 36 +++++++------
pom.xml | 60 ++++++++++++++++++----
180 files changed, 432 insertions(+), 491 deletions(-)
diff --git a/camel-k-runtime-groovy/pom.xml b/camel-k-loader-groovy/pom.xml
similarity index 99%
rename from camel-k-runtime-groovy/pom.xml
rename to camel-k-loader-groovy/pom.xml
index 7b41825..64300db 100644
--- a/camel-k-runtime-groovy/pom.xml
+++ b/camel-k-loader-groovy/pom.xml
@@ -25,7 +25,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>camel-k-runtime-groovy</artifactId>
+ <artifactId>camel-k-loader-groovy</artifactId>
<dependencies>
<dependency>
diff --git a/camel-k-runtime-groovy/src/main/groovy/org/apache/camel/k/groovy/GroovyRoutesLoader.groovy b/camel-k-loader-groovy/src/main/groovy/org/apache/camel/k/loader/groovy/GroovyRoutesLoader.groovy
similarity index 95%
rename from camel-k-runtime-groovy/src/main/groovy/org/apache/camel/k/groovy/GroovyRoutesLoader.groovy
rename to camel-k-loader-groovy/src/main/groovy/org/apache/camel/k/loader/groovy/GroovyRoutesLoader.groovy
index 129fea7..666cddd 100644
--- a/camel-k-runtime-groovy/src/main/groovy/org/apache/camel/k/groovy/GroovyRoutesLoader.groovy
+++ b/camel-k-loader-groovy/src/main/groovy/org/apache/camel/k/loader/groovy/GroovyRoutesLoader.groovy
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.groovy
+package org.apache.camel.k.loader.groovy
import org.apache.camel.CamelContext
import org.apache.camel.builder.RouteBuilder
import org.apache.camel.k.RoutesLoader
import org.apache.camel.k.Source
-import org.apache.camel.k.groovy.dsl.IntegrationConfiguration
+import org.apache.camel.k.loader.groovy.dsl.IntegrationConfiguration
import org.apache.camel.k.support.URIResolver
import org.codehaus.groovy.control.CompilerConfiguration
diff --git a/camel-k-runtime-groovy/src/main/groovy/org/apache/camel/k/groovy/dsl/ComponentConfiguration.groovy b/camel-k-loader-groovy/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/ComponentConfiguration.groovy
similarity index 98%
rename from camel-k-runtime-groovy/src/main/groovy/org/apache/camel/k/groovy/dsl/ComponentConfiguration.groovy
rename to camel-k-loader-groovy/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/ComponentConfiguration.groovy
index 19a3b4b..d81d914 100644
--- a/camel-k-runtime-groovy/src/main/groovy/org/apache/camel/k/groovy/dsl/ComponentConfiguration.groovy
+++ b/camel-k-loader-groovy/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/ComponentConfiguration.groovy
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.groovy.dsl
+package org.apache.camel.k.loader.groovy.dsl
import org.apache.camel.support.IntrospectionSupport
diff --git a/camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/dsl/Components.java b/camel-k-loader-groovy/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/Components.java
similarity index 97%
copy from camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/dsl/Components.java
copy to camel-k-loader-groovy/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/Components.java
index a3286b2..90c73cf 100644
--- a/camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/dsl/Components.java
+++ b/camel-k-loader-groovy/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/Components.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.jvm.dsl;
+package org.apache.camel.k.loader.groovy.dsl;
import org.apache.camel.CamelContext;
import org.apache.camel.Component;
diff --git a/camel-k-runtime-groovy/src/main/groovy/org/apache/camel/k/groovy/dsl/ComponentsConfiguration.groovy b/camel-k-loader-groovy/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/ComponentsConfiguration.groovy
similarity index 98%
rename from camel-k-runtime-groovy/src/main/groovy/org/apache/camel/k/groovy/dsl/ComponentsConfiguration.groovy
rename to camel-k-loader-groovy/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/ComponentsConfiguration.groovy
index 6287100..65698ea 100644
--- a/camel-k-runtime-groovy/src/main/groovy/org/apache/camel/k/groovy/dsl/ComponentsConfiguration.groovy
+++ b/camel-k-loader-groovy/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/ComponentsConfiguration.groovy
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.groovy.dsl
+package org.apache.camel.k.loader.groovy.dsl
import org.apache.camel.CamelContext
import org.apache.camel.Component
diff --git a/camel-k-runtime-groovy/src/main/groovy/org/apache/camel/k/groovy/dsl/ContextConfiguration.groovy b/camel-k-loader-groovy/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/ContextConfiguration.groovy
similarity index 97%
rename from camel-k-runtime-groovy/src/main/groovy/org/apache/camel/k/groovy/dsl/ContextConfiguration.groovy
rename to camel-k-loader-groovy/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/ContextConfiguration.groovy
index 3b1c373..8cba11b 100644
--- a/camel-k-runtime-groovy/src/main/groovy/org/apache/camel/k/groovy/dsl/ContextConfiguration.groovy
+++ b/camel-k-loader-groovy/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/ContextConfiguration.groovy
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.groovy.dsl
+package org.apache.camel.k.loader.groovy.dsl
import org.apache.camel.CamelContext
diff --git a/camel-k-runtime-groovy/src/main/groovy/org/apache/camel/k/groovy/dsl/IntegrationConfiguration.groovy b/camel-k-loader-groovy/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/IntegrationConfiguration.groovy
similarity index 97%
rename from camel-k-runtime-groovy/src/main/groovy/org/apache/camel/k/groovy/dsl/IntegrationConfiguration.groovy
rename to camel-k-loader-groovy/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/IntegrationConfiguration.groovy
index 9544874..2408fea 100644
--- a/camel-k-runtime-groovy/src/main/groovy/org/apache/camel/k/groovy/dsl/IntegrationConfiguration.groovy
+++ b/camel-k-loader-groovy/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/IntegrationConfiguration.groovy
@@ -14,13 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.groovy.dsl
+package org.apache.camel.k.loader.groovy.dsl
import org.apache.camel.Exchange
import org.apache.camel.Predicate
import org.apache.camel.Processor
import org.apache.camel.builder.RouteBuilder
-import org.apache.camel.k.jvm.dsl.Components
import org.apache.camel.model.*
import org.apache.camel.spi.Registry
diff --git a/camel-k-runtime-groovy/src/main/groovy/org/apache/camel/k/groovy/dsl/RegistryConfiguration.groovy b/camel-k-loader-groovy/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/RegistryConfiguration.groovy
similarity index 96%
rename from camel-k-runtime-groovy/src/main/groovy/org/apache/camel/k/groovy/dsl/RegistryConfiguration.groovy
rename to camel-k-loader-groovy/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/RegistryConfiguration.groovy
index d444392..248c567 100644
--- a/camel-k-runtime-groovy/src/main/groovy/org/apache/camel/k/groovy/dsl/RegistryConfiguration.groovy
+++ b/camel-k-loader-groovy/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/RegistryConfiguration.groovy
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.groovy.dsl
+package org.apache.camel.k.loader.groovy.dsl
import org.apache.camel.spi.Registry
diff --git a/camel-k-runtime-groovy/src/main/groovy/org/apache/camel/k/groovy/dsl/RestConfiguration.groovy b/camel-k-loader-groovy/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/RestConfiguration.groovy
similarity index 97%
rename from camel-k-runtime-groovy/src/main/groovy/org/apache/camel/k/groovy/dsl/RestConfiguration.groovy
rename to camel-k-loader-groovy/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/RestConfiguration.groovy
index a082f68..1d7fe12 100644
--- a/camel-k-runtime-groovy/src/main/groovy/org/apache/camel/k/groovy/dsl/RestConfiguration.groovy
+++ b/camel-k-loader-groovy/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/RestConfiguration.groovy
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.groovy.dsl
+package org.apache.camel.k.loader.groovy.dsl
import org.apache.camel.builder.RouteBuilder
import org.apache.camel.model.rest.RestConfigurationDefinition
diff --git a/camel-k-runtime-groovy/src/main/groovy/org/apache/camel/k/groovy/extension/LogComponentExtension.groovy b/camel-k-loader-groovy/src/main/groovy/org/apache/camel/k/loader/groovy/extension/LogComponentExtension.groovy
similarity index 96%
rename from camel-k-runtime-groovy/src/main/groovy/org/apache/camel/k/groovy/extension/LogComponentExtension.groovy
rename to camel-k-loader-groovy/src/main/groovy/org/apache/camel/k/loader/groovy/extension/LogComponentExtension.groovy
index 05b1458..386b463 100644
--- a/camel-k-runtime-groovy/src/main/groovy/org/apache/camel/k/groovy/extension/LogComponentExtension.groovy
+++ b/camel-k-loader-groovy/src/main/groovy/org/apache/camel/k/loader/groovy/extension/LogComponentExtension.groovy
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.groovy.extension
+package org.apache.camel.k.loader.groovy.extension
import org.apache.camel.Exchange
import org.apache.camel.component.log.LogComponent
diff --git a/camel-k-loader-groovy/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule b/camel-k-loader-groovy/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule
new file mode 100644
index 0000000..435a95c
--- /dev/null
+++ b/camel-k-loader-groovy/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule
@@ -0,0 +1,4 @@
+moduleName=camel-k-runtime-groovy
+moduleVersion=0.0.3-SNAPSHOT
+extensionClasses=org.apache.camel.k.loader.groovy.extension.LogComponentExtension
+#staticExtensionClasses=support.StaticStringExtension
\ No newline at end of file
diff --git a/camel-k-runtime-groovy/src/main/resources/META-INF/services/org/apache/camel/k/loader/groovy b/camel-k-loader-groovy/src/main/resources/META-INF/services/org/apache/camel/k/loader/groovy
similarity index 93%
rename from camel-k-runtime-groovy/src/main/resources/META-INF/services/org/apache/camel/k/loader/groovy
rename to camel-k-loader-groovy/src/main/resources/META-INF/services/org/apache/camel/k/loader/groovy
index ba7720a..006db95 100644
--- a/camel-k-runtime-groovy/src/main/resources/META-INF/services/org/apache/camel/k/loader/groovy
+++ b/camel-k-loader-groovy/src/main/resources/META-INF/services/org/apache/camel/k/loader/groovy
@@ -15,4 +15,4 @@
# limitations under the License.
#
-class=org.apache.camel.k.groovy.GroovyRoutesLoader
\ No newline at end of file
+class=org.apache.camel.k.loader.groovy.GroovyRoutesLoader
\ No newline at end of file
diff --git a/camel-k-runtime-groovy/src/main/resources/integration.gdsl b/camel-k-loader-groovy/src/main/resources/integration.gdsl
similarity index 90%
rename from camel-k-runtime-groovy/src/main/resources/integration.gdsl
rename to camel-k-loader-groovy/src/main/resources/integration.gdsl
index 75ddf1f..db0e3cf 100644
--- a/camel-k-runtime-groovy/src/main/resources/integration.gdsl
+++ b/camel-k-loader-groovy/src/main/resources/integration.gdsl
@@ -17,5 +17,5 @@
def ctx = context(scope: scriptScope())
contributor(ctx) {
- delegatesTo(findClass('org.apache.camel.k.groovy.dsl.IntegrationConfiguration'))
+ delegatesTo(findClass('org.apache.camel.k.loader.groovy.dsl.IntegrationConfiguration'))
}
\ No newline at end of file
diff --git a/camel-k-runtime-groovy/src/test/groovy/org/apache/camel/k/groovy/LoaderTest.groovy b/camel-k-loader-groovy/src/test/groovy/org/apache/camel/k/loader/groovy/LoaderTest.groovy
similarity index 97%
rename from camel-k-runtime-groovy/src/test/groovy/org/apache/camel/k/groovy/LoaderTest.groovy
rename to camel-k-loader-groovy/src/test/groovy/org/apache/camel/k/loader/groovy/LoaderTest.groovy
index 5a36700..e019b03 100644
--- a/camel-k-runtime-groovy/src/test/groovy/org/apache/camel/k/groovy/LoaderTest.groovy
+++ b/camel-k-loader-groovy/src/test/groovy/org/apache/camel/k/loader/groovy/LoaderTest.groovy
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.groovy
+package org.apache.camel.k.loader.groovy
import org.apache.camel.impl.DefaultCamelContext
import org.apache.camel.k.Source
diff --git a/camel-k-runtime-groovy/src/test/groovy/org/apache/camel/k/groovy/dsl/IntegrationTest.groovy b/camel-k-loader-groovy/src/test/groovy/org/apache/camel/k/loader/groovy/dsl/IntegrationTest.groovy
similarity index 99%
rename from camel-k-runtime-groovy/src/test/groovy/org/apache/camel/k/groovy/dsl/IntegrationTest.groovy
rename to camel-k-loader-groovy/src/test/groovy/org/apache/camel/k/loader/groovy/dsl/IntegrationTest.groovy
index e85a4ae..3c241ad 100644
--- a/camel-k-runtime-groovy/src/test/groovy/org/apache/camel/k/groovy/dsl/IntegrationTest.groovy
+++ b/camel-k-loader-groovy/src/test/groovy/org/apache/camel/k/loader/groovy/dsl/IntegrationTest.groovy
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.groovy.dsl
+package org.apache.camel.k.loader.groovy.dsl
import org.apache.camel.Processor
import org.apache.camel.component.log.LogComponent
diff --git a/camel-k-runtime-groovy/src/test/groovy/org/apache/camel/k/groovy/dsl/extension/LogExtensionTest.groovy b/camel-k-loader-groovy/src/test/groovy/org/apache/camel/k/loader/groovy/dsl/extension/LogExtensionTest.groovy
similarity index 96%
rename from camel-k-runtime-groovy/src/test/groovy/org/apache/camel/k/groovy/dsl/extension/LogExtensionTest.groovy
rename to camel-k-loader-groovy/src/test/groovy/org/apache/camel/k/loader/groovy/dsl/extension/LogExtensionTest.groovy
index 2465647..be463a0 100644
--- a/camel-k-runtime-groovy/src/test/groovy/org/apache/camel/k/groovy/dsl/extension/LogExtensionTest.groovy
+++ b/camel-k-loader-groovy/src/test/groovy/org/apache/camel/k/loader/groovy/dsl/extension/LogExtensionTest.groovy
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.groovy.dsl.extension
+package org.apache.camel.k.loader.groovy.dsl.extension
import org.apache.camel.component.log.LogComponent
import org.apache.camel.impl.DefaultCamelContext
diff --git a/camel-k-runtime-groovy/src/test/resources/log4j2-test.xml b/camel-k-loader-groovy/src/test/resources/log4j2-test.xml
similarity index 100%
copy from camel-k-runtime-groovy/src/test/resources/log4j2-test.xml
copy to camel-k-loader-groovy/src/test/resources/log4j2-test.xml
diff --git a/camel-k-runtime-groovy/src/test/resources/routes-with-bindings.groovy b/camel-k-loader-groovy/src/test/resources/routes-with-bindings.groovy
similarity index 100%
rename from camel-k-runtime-groovy/src/test/resources/routes-with-bindings.groovy
rename to camel-k-loader-groovy/src/test/resources/routes-with-bindings.groovy
diff --git a/camel-k-runtime-groovy/src/test/resources/routes-with-component-configuration.groovy b/camel-k-loader-groovy/src/test/resources/routes-with-component-configuration.groovy
similarity index 100%
rename from camel-k-runtime-groovy/src/test/resources/routes-with-component-configuration.groovy
rename to camel-k-loader-groovy/src/test/resources/routes-with-component-configuration.groovy
diff --git a/camel-k-runtime-groovy/src/test/resources/routes-with-error-handler.groovy b/camel-k-loader-groovy/src/test/resources/routes-with-error-handler.groovy
similarity index 100%
rename from camel-k-runtime-groovy/src/test/resources/routes-with-error-handler.groovy
rename to camel-k-loader-groovy/src/test/resources/routes-with-error-handler.groovy
diff --git a/camel-k-runtime-groovy/src/test/resources/routes-with-rest.groovy b/camel-k-loader-groovy/src/test/resources/routes-with-rest.groovy
similarity index 100%
rename from camel-k-runtime-groovy/src/test/resources/routes-with-rest.groovy
rename to camel-k-loader-groovy/src/test/resources/routes-with-rest.groovy
diff --git a/camel-k-runtime-groovy/src/test/resources/routes.groovy b/camel-k-loader-groovy/src/test/resources/routes.groovy
similarity index 100%
rename from camel-k-runtime-groovy/src/test/resources/routes.groovy
rename to camel-k-loader-groovy/src/test/resources/routes.groovy
diff --git a/camel-k-runtime-jvm/pom.xml b/camel-k-loader-java/pom.xml
similarity index 74%
copy from camel-k-runtime-jvm/pom.xml
copy to camel-k-loader-java/pom.xml
index 48bcb2e..23d09e7 100644
--- a/camel-k-runtime-jvm/pom.xml
+++ b/camel-k-loader-java/pom.xml
@@ -25,7 +25,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>camel-k-runtime-jvm</artifactId>
+ <artifactId>camel-k-loader-java</artifactId>
<dependencies>
@@ -45,38 +45,12 @@
<artifactId>camel-core-engine</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-main</artifactId>
- <scope>provided</scope>
- </dependency>
<dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <version>${log4j2.version}</version>
- </dependency>
- <dependency>
<groupId>org.jooq</groupId>
<artifactId>joor-java-8</artifactId>
<version>${joor.version}</version>
</dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${commons-io.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>${commons-lang.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.graalvm.js</groupId>
- <artifactId>js</artifactId>
- <version>${graalvm.version}</version>
- </dependency>
<!-- ****************************** -->
<!-- -->
@@ -147,19 +121,4 @@
</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-runtime-jvm/src/main/java/org/apache/camel/k/jvm/loader/JavaClassLoader.java b/camel-k-loader-java/src/main/java/org/apache/camel/k/loader/java/JavaClassRoutesLoader.java
similarity index 94%
rename from camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/loader/JavaClassLoader.java
rename to camel-k-loader-java/src/main/java/org/apache/camel/k/loader/java/JavaClassRoutesLoader.java
index d03ba93..4ff060c 100644
--- a/camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/loader/JavaClassLoader.java
+++ b/camel-k-loader-java/src/main/java/org/apache/camel/k/loader/java/JavaClassRoutesLoader.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.jvm.loader;
+package org.apache.camel.k.loader.java;
import java.util.Collections;
import java.util.List;
@@ -25,7 +25,7 @@ import org.apache.camel.k.RoutesLoader;
import org.apache.camel.k.Source;
import org.apache.commons.lang3.StringUtils;
-public class JavaClassLoader implements RoutesLoader {
+public class JavaClassRoutesLoader implements RoutesLoader {
@Override
public List<String> getSupportedLanguages() {
return Collections.singletonList("class");
diff --git a/camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/loader/JavaSourceLoader.java b/camel-k-loader-java/src/main/java/org/apache/camel/k/loader/java/JavaSourceRoutesLoader.java
similarity index 97%
rename from camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/loader/JavaSourceLoader.java
rename to camel-k-loader-java/src/main/java/org/apache/camel/k/loader/java/JavaSourceRoutesLoader.java
index d040257..d41ab7c 100644
--- a/camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/loader/JavaSourceLoader.java
+++ b/camel-k-loader-java/src/main/java/org/apache/camel/k/loader/java/JavaSourceRoutesLoader.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.jvm.loader;
+package org.apache.camel.k.loader.java;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
@@ -36,7 +36,7 @@ import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.joor.Reflect;
-public class JavaSourceLoader implements RoutesLoader {
+public class JavaSourceRoutesLoader implements RoutesLoader {
@Override
public List<String> getSupportedLanguages() {
return Collections.singletonList("java");
diff --git a/camel-k-runtime-jvm/src/main/resources/META-INF/services/org/apache/camel/k/loader/class b/camel-k-loader-java/src/main/resources/META-INF/services/org/apache/camel/k/loader/class
similarity index 93%
rename from camel-k-runtime-jvm/src/main/resources/META-INF/services/org/apache/camel/k/loader/class
rename to camel-k-loader-java/src/main/resources/META-INF/services/org/apache/camel/k/loader/class
index 2d85f95..ca7a231 100644
--- a/camel-k-runtime-jvm/src/main/resources/META-INF/services/org/apache/camel/k/loader/class
+++ b/camel-k-loader-java/src/main/resources/META-INF/services/org/apache/camel/k/loader/class
@@ -15,4 +15,4 @@
# limitations under the License.
#
-class=org.apache.camel.k.jvm.loader.JavaClassLoader
\ No newline at end of file
+class=org.apache.camel.k.loader.java.JavaClassRoutesLoader
\ No newline at end of file
diff --git a/camel-k-runtime-jvm/src/main/resources/META-INF/services/org/apache/camel/k/loader/java b/camel-k-loader-java/src/main/resources/META-INF/services/org/apache/camel/k/loader/java
similarity index 92%
rename from camel-k-runtime-jvm/src/main/resources/META-INF/services/org/apache/camel/k/loader/java
rename to camel-k-loader-java/src/main/resources/META-INF/services/org/apache/camel/k/loader/java
index 3bf8297..2118cbc 100644
--- a/camel-k-runtime-jvm/src/main/resources/META-INF/services/org/apache/camel/k/loader/java
+++ b/camel-k-loader-java/src/main/resources/META-INF/services/org/apache/camel/k/loader/java
@@ -15,4 +15,4 @@
# limitations under the License.
#
-class=org.apache.camel.k.jvm.loader.JavaSourceLoader
\ No newline at end of file
+class=org.apache.camel.k.loader.java.JavaSourceRoutesLoader
\ No newline at end of file
diff --git a/camel-k-runtime-jvm/src/test/java/org/apache/camel/k/jvm/MyRoutes.java b/camel-k-loader-java/src/test/java/org/apache/camel/k/loader/java/MyRoutes.java
similarity index 96%
rename from camel-k-runtime-jvm/src/test/java/org/apache/camel/k/jvm/MyRoutes.java
rename to camel-k-loader-java/src/test/java/org/apache/camel/k/loader/java/MyRoutes.java
index 8a0c558..8b2f4e9 100644
--- a/camel-k-runtime-jvm/src/test/java/org/apache/camel/k/jvm/MyRoutes.java
+++ b/camel-k-loader-java/src/test/java/org/apache/camel/k/loader/java/MyRoutes.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.jvm;
+package org.apache.camel.k.loader.java;
import org.apache.camel.builder.RouteBuilder;
diff --git a/camel-k-runtime-jvm/src/test/java/org/apache/camel/k/jvm/RoutesLoadersTest.java b/camel-k-loader-java/src/test/java/org/apache/camel/k/loader/java/RoutesLoaderTest.java
similarity index 64%
rename from camel-k-runtime-jvm/src/test/java/org/apache/camel/k/jvm/RoutesLoadersTest.java
rename to camel-k-loader-java/src/test/java/org/apache/camel/k/loader/java/RoutesLoaderTest.java
index 49a23ed..45ac859 100644
--- a/camel-k-runtime-jvm/src/test/java/org/apache/camel/k/jvm/RoutesLoadersTest.java
+++ b/camel-k-loader-java/src/test/java/org/apache/camel/k/loader/java/RoutesLoaderTest.java
@@ -14,39 +14,39 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.jvm;
+package org.apache.camel.k.loader.java;
import java.util.List;
+import java.util.stream.Stream;
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.k.RoutesLoader;
import org.apache.camel.k.Source;
-import org.apache.camel.k.jvm.loader.JavaClassLoader;
-import org.apache.camel.k.jvm.loader.JavaSourceLoader;
import org.apache.camel.k.support.RuntimeSupport;
import org.apache.camel.model.ProcessDefinition;
import org.apache.camel.model.RouteDefinition;
import org.apache.camel.model.SetBodyDefinition;
import org.apache.camel.model.ToDefinition;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.AssertionsForClassTypes.assertThatExceptionOfType;
-
-public class RoutesLoadersTest {
+public class RoutesLoaderTest {
@Test
public void testLoaderFromRegistry() throws Exception {
- RoutesLoader myLoader = new JavaClassLoader();
+ RoutesLoader myLoader = new JavaClassRoutesLoader();
CamelContext camelContext = new DefaultCamelContext();
camelContext.getRegistry().bind("my-loader", myLoader);
Source source = Source.create("classpath:" + MyRoutes.class.getName() + ".class");
RoutesLoader loader = RuntimeSupport.loaderFor(camelContext, source);
- assertThat(loader).isInstanceOf(JavaClassLoader.class);
+ assertThat(loader).isInstanceOf(JavaClassRoutesLoader.class);
assertThat(loader).isSameAs(myLoader);
}
@@ -58,7 +58,7 @@ public class RoutesLoadersTest {
RoutesLoader loader = RuntimeSupport.loaderFor(new DefaultCamelContext(), source);
RouteBuilder builder = loader.load(context, source);
- assertThat(loader).isInstanceOf(JavaSourceLoader.class);
+ assertThat(loader).isInstanceOf(JavaSourceRoutesLoader.class);
assertThat(builder).isNotNull();
builder.setContext(context);
@@ -80,7 +80,7 @@ public class RoutesLoadersTest {
RoutesLoader loader = RuntimeSupport.loaderFor(new DefaultCamelContext(), source);
RouteBuilder builder = loader.load(context, source);
- assertThat(loader).isInstanceOf(JavaSourceLoader.class);
+ assertThat(loader).isInstanceOf(JavaSourceRoutesLoader.class);
assertThat(builder).isNotNull();
builder.setContext(context);
@@ -90,25 +90,32 @@ public class RoutesLoadersTest {
assertThat(context.getRestConfigurations().iterator().next()).hasFieldOrPropertyWithValue("component", "restlet");
}
- @Test
- public void testResourceWithoutScheme() {
- assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(
- () -> Source.create("routes.js")
- );
- }
- @Test
- public void testResourceWithIllegalScheme() {
- assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(
- () -> Source.create("http:routes.js")
- );
+ @ParameterizedTest
+ @MethodSource("parameters")
+ public void testLoaders(String location, Class<? extends RoutesLoader> type) throws Exception {
+ Source source = Source.create(location);
+ RoutesLoader loader = RuntimeSupport.loaderFor(new DefaultCamelContext(), source);
+ RouteBuilder builder = loader.load(new DefaultCamelContext(), source);
+
+ assertThat(loader).isInstanceOf(type);
+ assertThat(builder).isNotNull();
+
+ builder.setContext(new DefaultCamelContext());
+ builder.configure();
+
+ List<RouteDefinition> routes = builder.getRouteCollection().getRoutes();
+ assertThat(routes).hasSize(1);
+ assertThat(routes.get(0).getInput().getEndpointUri()).isEqualTo("timer:tick");
+ assertThat(routes.get(0).getOutputs().get(0)).isInstanceOf(ToDefinition.class);
}
- @Test
- public void testUnsupportedLanguage() {
- assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(
- () -> Source.create(" test")
+ static Stream<Arguments> parameters() {
+ return Stream.of(
+ Arguments.arguments("classpath:" + MyRoutes.class.getName() + ".class", JavaClassRoutesLoader.class),
+ Arguments.arguments("classpath:MyRoutes.java", JavaSourceRoutesLoader.class),
+ Arguments.arguments("classpath:MyRoutesWithNameOverride.java?name=MyRoutes.java", JavaSourceRoutesLoader.class),
+ Arguments.arguments("classpath:MyRoutesWithPackage.java", JavaSourceRoutesLoader.class)
);
}
-
}
diff --git a/camel-k-runtime-jvm/src/test/resources/MyRoutes.java b/camel-k-loader-java/src/test/resources/MyRoutes.java
similarity index 100%
rename from camel-k-runtime-jvm/src/test/resources/MyRoutes.java
rename to camel-k-loader-java/src/test/resources/MyRoutes.java
diff --git a/camel-k-runtime-jvm/src/test/resources/MyRoutesWithNameOverride.java b/camel-k-loader-java/src/test/resources/MyRoutesWithNameOverride.java
similarity index 100%
rename from camel-k-runtime-jvm/src/test/resources/MyRoutesWithNameOverride.java
rename to camel-k-loader-java/src/test/resources/MyRoutesWithNameOverride.java
diff --git a/camel-k-runtime-jvm/src/test/resources/MyRoutesWithNestedClass.java b/camel-k-loader-java/src/test/resources/MyRoutesWithNestedClass.java
similarity index 100%
rename from camel-k-runtime-jvm/src/test/resources/MyRoutesWithNestedClass.java
rename to camel-k-loader-java/src/test/resources/MyRoutesWithNestedClass.java
diff --git a/camel-k-runtime-jvm/src/test/resources/MyRoutesWithPackage.java b/camel-k-loader-java/src/test/resources/MyRoutesWithPackage.java
similarity index 100%
rename from camel-k-runtime-jvm/src/test/resources/MyRoutesWithPackage.java
rename to camel-k-loader-java/src/test/resources/MyRoutesWithPackage.java
diff --git a/camel-k-runtime-jvm/src/test/resources/MyRoutesWithRestConfiguration.java b/camel-k-loader-java/src/test/resources/MyRoutesWithRestConfiguration.java
similarity index 100%
rename from camel-k-runtime-jvm/src/test/resources/MyRoutesWithRestConfiguration.java
rename to camel-k-loader-java/src/test/resources/MyRoutesWithRestConfiguration.java
diff --git a/camel-k-runtime-groovy/src/test/resources/log4j2-test.xml b/camel-k-loader-java/src/test/resources/log4j2-test.xml
similarity index 98%
copy from camel-k-runtime-groovy/src/test/resources/log4j2-test.xml
copy to camel-k-loader-java/src/test/resources/log4j2-test.xml
index 42e5526..e2e9f42 100644
--- a/camel-k-runtime-groovy/src/test/resources/log4j2-test.xml
+++ b/camel-k-loader-java/src/test/resources/log4j2-test.xml
@@ -25,7 +25,6 @@
<Null name="NONE"/>
</Appenders>
-
<Loggers>
<Root level="INFO">
<!--<AppenderRef ref="STDOUT"/>-->
diff --git a/camel-k-runtime-jvm/pom.xml b/camel-k-loader-js/pom.xml
similarity index 74%
copy from camel-k-runtime-jvm/pom.xml
copy to camel-k-loader-js/pom.xml
index 48bcb2e..7a7a2dd 100644
--- a/camel-k-runtime-jvm/pom.xml
+++ b/camel-k-loader-js/pom.xml
@@ -25,7 +25,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>camel-k-runtime-jvm</artifactId>
+ <artifactId>camel-k-loader-js</artifactId>
<dependencies>
@@ -45,32 +45,6 @@
<artifactId>camel-core-engine</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-main</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <version>${log4j2.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jooq</groupId>
- <artifactId>joor-java-8</artifactId>
- <version>${joor.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${commons-io.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>${commons-lang.version}</version>
- </dependency>
<dependency>
<groupId>org.graalvm.js</groupId>
@@ -147,19 +121,4 @@
</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-runtime-jvm/src/main/java/org/apache/camel/k/jvm/loader/JavaScriptLoader.java b/camel-k-loader-js/src/main/java/org/apache/camel/k/loader/js/JavaScriptRoutesLoader.java
similarity index 94%
rename from camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/loader/JavaScriptLoader.java
rename to camel-k-loader-js/src/main/java/org/apache/camel/k/loader/js/JavaScriptRoutesLoader.java
index 5b519ab..850ad15 100644
--- a/camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/loader/JavaScriptLoader.java
+++ b/camel-k-loader-js/src/main/java/org/apache/camel/k/loader/js/JavaScriptRoutesLoader.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.jvm.loader;
+package org.apache.camel.k.loader.js;
import java.io.InputStream;
import java.io.InputStreamReader;
@@ -25,13 +25,13 @@ import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.k.RoutesLoader;
import org.apache.camel.k.Source;
-import org.apache.camel.k.jvm.dsl.Components;
+import org.apache.camel.k.loader.js.dsl.Components;
import org.apache.camel.k.support.URIResolver;
import org.graalvm.polyglot.Context;
import org.graalvm.polyglot.Value;
import org.graalvm.polyglot.proxy.ProxyExecutable;
-public class JavaScriptLoader implements RoutesLoader {
+public class JavaScriptRoutesLoader implements RoutesLoader {
@Override
public List<String> getSupportedLanguages() {
return Collections.singletonList("js");
diff --git a/camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/dsl/Components.java b/camel-k-loader-js/src/main/java/org/apache/camel/k/loader/js/dsl/Components.java
similarity index 97%
rename from camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/dsl/Components.java
rename to camel-k-loader-js/src/main/java/org/apache/camel/k/loader/js/dsl/Components.java
index a3286b2..c6a462b 100644
--- a/camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/dsl/Components.java
+++ b/camel-k-loader-js/src/main/java/org/apache/camel/k/loader/js/dsl/Components.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.jvm.dsl;
+package org.apache.camel.k.loader.js.dsl;
import org.apache.camel.CamelContext;
import org.apache.camel.Component;
diff --git a/camel-k-runtime-jvm/src/main/resources/META-INF/services/org/apache/camel/k/loader/js b/camel-k-loader-js/src/main/resources/META-INF/services/org/apache/camel/k/loader/js
similarity index 93%
rename from camel-k-runtime-jvm/src/main/resources/META-INF/services/org/apache/camel/k/loader/js
rename to camel-k-loader-js/src/main/resources/META-INF/services/org/apache/camel/k/loader/js
index 45227e8..dc6af3b 100644
--- a/camel-k-runtime-jvm/src/main/resources/META-INF/services/org/apache/camel/k/loader/js
+++ b/camel-k-loader-js/src/main/resources/META-INF/services/org/apache/camel/k/loader/js
@@ -15,4 +15,4 @@
# limitations under the License.
#
-class=org.apache.camel.k.jvm.loader.JavaScriptLoader
\ No newline at end of file
+class=org.apache.camel.k.loader.js.JavaScriptRoutesLoader
\ No newline at end of file
diff --git a/camel-k-runtime-jvm/src/test/java/org/apache/camel/k/jvm/RoutesLoadersCommonTest.java b/camel-k-loader-js/src/test/java/org/apache/camel/k/loader/js/RoutesLoaderTest.java
similarity index 74%
copy from camel-k-runtime-jvm/src/test/java/org/apache/camel/k/jvm/RoutesLoadersCommonTest.java
copy to camel-k-loader-js/src/test/java/org/apache/camel/k/loader/js/RoutesLoaderTest.java
index 443f096..05e417f 100644
--- a/camel-k-runtime-jvm/src/test/java/org/apache/camel/k/jvm/RoutesLoadersCommonTest.java
+++ b/camel-k-loader-js/src/test/java/org/apache/camel/k/loader/js/RoutesLoaderTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.jvm;
+package org.apache.camel.k.loader.js;
import java.util.List;
import java.util.stream.Stream;
@@ -23,10 +23,6 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.k.RoutesLoader;
import org.apache.camel.k.Source;
-import org.apache.camel.k.jvm.loader.JavaClassLoader;
-import org.apache.camel.k.jvm.loader.JavaScriptLoader;
-import org.apache.camel.k.jvm.loader.JavaSourceLoader;
-import org.apache.camel.k.jvm.loader.XmlLoader;
import org.apache.camel.k.support.RuntimeSupport;
import org.apache.camel.model.RouteDefinition;
import org.apache.camel.model.ToDefinition;
@@ -36,7 +32,7 @@ import org.junit.jupiter.params.provider.MethodSource;
import static org.assertj.core.api.Assertions.assertThat;
-public class RoutesLoadersCommonTest {
+public class RoutesLoaderTest {
@ParameterizedTest
@MethodSource("parameters")
public void testLoaders(String location, Class<? extends RoutesLoader> type) throws Exception {
@@ -58,14 +54,9 @@ public class RoutesLoadersCommonTest {
static Stream<Arguments> parameters() {
return Stream.of(
- Arguments.arguments("classpath:" + MyRoutes.class.getName() + ".class", JavaClassLoader.class),
- Arguments.arguments("classpath:MyRoutes.java", JavaSourceLoader.class),
- Arguments.arguments("classpath:MyRoutesWithNameOverride.java?name=MyRoutes.java", JavaSourceLoader.class),
- Arguments.arguments("classpath:MyRoutesWithPackage.java", JavaSourceLoader.class),
- Arguments.arguments("classpath:routes.js", JavaScriptLoader.class),
- Arguments.arguments("classpath:routes-compressed.js.gz.b64?language=js&compression=true", JavaScriptLoader.class),
- Arguments.arguments("classpath:routes.mytype?language=js", JavaScriptLoader.class),
- Arguments.arguments("classpath:routes.xml", XmlLoader.class)
+ Arguments.arguments("classpath:routes.js", JavaScriptRoutesLoader.class),
+ Arguments.arguments("classpath:routes-compressed.js.gz.b64?language=js&compression=true", JavaScriptRoutesLoader.class),
+ Arguments.arguments("classpath:routes.mytype?language=js", JavaScriptRoutesLoader.class)
);
}
}
diff --git a/camel-k-runtime-groovy/src/test/resources/log4j2-test.xml b/camel-k-loader-js/src/test/resources/log4j2-test.xml
similarity index 100%
copy from camel-k-runtime-groovy/src/test/resources/log4j2-test.xml
copy to camel-k-loader-js/src/test/resources/log4j2-test.xml
diff --git a/camel-k-runtime-jvm/src/test/resources/routes-compressed.js.gz.b64 b/camel-k-loader-js/src/test/resources/routes-compressed.js.gz.b64
similarity index 100%
rename from camel-k-runtime-jvm/src/test/resources/routes-compressed.js.gz.b64
rename to camel-k-loader-js/src/test/resources/routes-compressed.js.gz.b64
diff --git a/camel-k-runtime-jvm/src/test/resources/routes.js b/camel-k-loader-js/src/test/resources/routes.js
similarity index 100%
rename from camel-k-runtime-jvm/src/test/resources/routes.js
rename to camel-k-loader-js/src/test/resources/routes.js
diff --git a/camel-k-runtime-jvm/src/test/resources/routes.mytype b/camel-k-loader-js/src/test/resources/routes.mytype
similarity index 100%
rename from camel-k-runtime-jvm/src/test/resources/routes.mytype
rename to camel-k-loader-js/src/test/resources/routes.mytype
diff --git a/camel-k-runtime-kotlin/pom.xml b/camel-k-loader-kotlin/pom.xml
similarity index 99%
rename from camel-k-runtime-kotlin/pom.xml
rename to camel-k-loader-kotlin/pom.xml
index 63bd714..91f4d5a 100644
--- a/camel-k-runtime-kotlin/pom.xml
+++ b/camel-k-loader-kotlin/pom.xml
@@ -25,7 +25,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>camel-k-runtime-kotlin</artifactId>
+ <artifactId>camel-k-loader-kotlin</artifactId>
<dependencies>
<dependency>
diff --git a/camel-k-runtime-kotlin/src/main/kotlin/org/apache/camel/k/kotlin/KotlinRoutesLoader.kt b/camel-k-loader-kotlin/src/main/kotlin/org/apache/camel/k/loader/kotlin/KotlinRoutesLoader.kt
similarity index 97%
rename from camel-k-runtime-kotlin/src/main/kotlin/org/apache/camel/k/kotlin/KotlinRoutesLoader.kt
rename to camel-k-loader-kotlin/src/main/kotlin/org/apache/camel/k/loader/kotlin/KotlinRoutesLoader.kt
index e01d18b..a6105f9 100644
--- a/camel-k-runtime-kotlin/src/main/kotlin/org/apache/camel/k/kotlin/KotlinRoutesLoader.kt
+++ b/camel-k-loader-kotlin/src/main/kotlin/org/apache/camel/k/loader/kotlin/KotlinRoutesLoader.kt
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.kotlin
+package org.apache.camel.k.loader.kotlin
import org.apache.camel.CamelContext
import org.apache.camel.builder.RouteBuilder
import org.apache.camel.k.RoutesLoader
import org.apache.camel.k.Source
-import org.apache.camel.k.kotlin.dsl.IntegrationConfiguration
+import org.apache.camel.k.loader.kotlin.dsl.IntegrationConfiguration
import org.apache.camel.k.support.URIResolver
import org.slf4j.Logger
import org.slf4j.LoggerFactory
diff --git a/camel-k-runtime-kotlin/src/main/kotlin/org/apache/camel/k/kotlin/KotlinScriptCompilationConfiguration.kt b/camel-k-loader-kotlin/src/main/kotlin/org/apache/camel/k/loader/kotlin/KotlinScriptCompilationConfiguration.kt
similarity index 100%
rename from camel-k-runtime-kotlin/src/main/kotlin/org/apache/camel/k/kotlin/KotlinScriptCompilationConfiguration.kt
rename to camel-k-loader-kotlin/src/main/kotlin/org/apache/camel/k/loader/kotlin/KotlinScriptCompilationConfiguration.kt
diff --git a/camel-k-runtime-kotlin/src/main/kotlin/org/apache/camel/k/kotlin/dsl/ComponentsConfiguration.kt b/camel-k-loader-kotlin/src/main/kotlin/org/apache/camel/k/loader/kotlin/dsl/ComponentsConfiguration.kt
similarity index 97%
rename from camel-k-runtime-kotlin/src/main/kotlin/org/apache/camel/k/kotlin/dsl/ComponentsConfiguration.kt
rename to camel-k-loader-kotlin/src/main/kotlin/org/apache/camel/k/loader/kotlin/dsl/ComponentsConfiguration.kt
index 8512a3e..ea00781 100644
--- a/camel-k-runtime-kotlin/src/main/kotlin/org/apache/camel/k/kotlin/dsl/ComponentsConfiguration.kt
+++ b/camel-k-loader-kotlin/src/main/kotlin/org/apache/camel/k/loader/kotlin/dsl/ComponentsConfiguration.kt
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.kotlin.dsl
+package org.apache.camel.k.loader.kotlin.dsl
import org.apache.camel.CamelContext
import org.apache.camel.Component
diff --git a/camel-k-runtime-kotlin/src/main/kotlin/org/apache/camel/k/kotlin/dsl/ContextConfiguration.kt b/camel-k-loader-kotlin/src/main/kotlin/org/apache/camel/k/loader/kotlin/dsl/ContextConfiguration.kt
similarity index 96%
rename from camel-k-runtime-kotlin/src/main/kotlin/org/apache/camel/k/kotlin/dsl/ContextConfiguration.kt
rename to camel-k-loader-kotlin/src/main/kotlin/org/apache/camel/k/loader/kotlin/dsl/ContextConfiguration.kt
index af0f053..e701ad4 100644
--- a/camel-k-runtime-kotlin/src/main/kotlin/org/apache/camel/k/kotlin/dsl/ContextConfiguration.kt
+++ b/camel-k-loader-kotlin/src/main/kotlin/org/apache/camel/k/loader/kotlin/dsl/ContextConfiguration.kt
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.kotlin.dsl
+package org.apache.camel.k.loader.kotlin.dsl
import org.apache.camel.CamelContext
import org.apache.camel.spi.Registry
diff --git a/camel-k-runtime-kotlin/src/main/kotlin/org/apache/camel/k/kotlin/dsl/IntegrationConfiguration.kt b/camel-k-loader-kotlin/src/main/kotlin/org/apache/camel/k/loader/kotlin/dsl/IntegrationConfiguration.kt
similarity index 93%
rename from camel-k-runtime-kotlin/src/main/kotlin/org/apache/camel/k/kotlin/dsl/IntegrationConfiguration.kt
rename to camel-k-loader-kotlin/src/main/kotlin/org/apache/camel/k/loader/kotlin/dsl/IntegrationConfiguration.kt
index 775fdbf..e5029df 100644
--- a/camel-k-runtime-kotlin/src/main/kotlin/org/apache/camel/k/kotlin/dsl/IntegrationConfiguration.kt
+++ b/camel-k-loader-kotlin/src/main/kotlin/org/apache/camel/k/loader/kotlin/dsl/IntegrationConfiguration.kt
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.kotlin.dsl
+package org.apache.camel.k.loader.kotlin.dsl
import org.apache.camel.Exchange
import org.apache.camel.Predicate
import org.apache.camel.Processor
import org.apache.camel.builder.RouteBuilder
-import org.apache.camel.k.kotlin.KamelKtsConfigurator
+import org.apache.camel.k.loader.kotlin.KamelKtsConfigurator
import org.apache.camel.model.*
import org.apache.camel.spi.Registry
import kotlin.script.experimental.annotations.KotlinScript
@@ -37,8 +37,8 @@ abstract class IntegrationConfiguration(
fun context(block: ContextConfiguration.() -> Unit) {
val delegate = ContextConfiguration(
- context = context,
- registry = registry
+ context = context,
+ registry = registry
)
delegate.block()
diff --git a/camel-k-runtime-kotlin/src/main/kotlin/org/apache/camel/k/kotlin/dsl/RegistryConfiguration.kt b/camel-k-loader-kotlin/src/main/kotlin/org/apache/camel/k/loader/kotlin/dsl/RegistryConfiguration.kt
similarity index 95%
rename from camel-k-runtime-kotlin/src/main/kotlin/org/apache/camel/k/kotlin/dsl/RegistryConfiguration.kt
rename to camel-k-loader-kotlin/src/main/kotlin/org/apache/camel/k/loader/kotlin/dsl/RegistryConfiguration.kt
index d7a9e9d..facc9d1 100644
--- a/camel-k-runtime-kotlin/src/main/kotlin/org/apache/camel/k/kotlin/dsl/RegistryConfiguration.kt
+++ b/camel-k-loader-kotlin/src/main/kotlin/org/apache/camel/k/loader/kotlin/dsl/RegistryConfiguration.kt
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.kotlin.dsl
+package org.apache.camel.k.loader.kotlin.dsl
import org.apache.camel.spi.Registry
diff --git a/camel-k-runtime-kotlin/src/main/kotlin/org/apache/camel/k/kotlin/dsl/RestConfiguration.kt b/camel-k-loader-kotlin/src/main/kotlin/org/apache/camel/k/loader/kotlin/dsl/RestConfiguration.kt
similarity index 97%
rename from camel-k-runtime-kotlin/src/main/kotlin/org/apache/camel/k/kotlin/dsl/RestConfiguration.kt
rename to camel-k-loader-kotlin/src/main/kotlin/org/apache/camel/k/loader/kotlin/dsl/RestConfiguration.kt
index 4ac6f7a..d70aa0c 100644
--- a/camel-k-runtime-kotlin/src/main/kotlin/org/apache/camel/k/kotlin/dsl/RestConfiguration.kt
+++ b/camel-k-loader-kotlin/src/main/kotlin/org/apache/camel/k/loader/kotlin/dsl/RestConfiguration.kt
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.kotlin.dsl
+package org.apache.camel.k.loader.kotlin.dsl
import org.apache.camel.builder.RouteBuilder
import org.apache.camel.model.rest.RestConfigurationDefinition
diff --git a/camel-k-runtime-kotlin/src/main/kotlin/org/apache/camel/k/kotlin/extension/LogComponentExtensions.kt b/camel-k-loader-kotlin/src/main/kotlin/org/apache/camel/k/loader/kotlin/extension/LogComponentExtensions.kt
similarity index 94%
rename from camel-k-runtime-kotlin/src/main/kotlin/org/apache/camel/k/kotlin/extension/LogComponentExtensions.kt
rename to camel-k-loader-kotlin/src/main/kotlin/org/apache/camel/k/loader/kotlin/extension/LogComponentExtensions.kt
index 87bcac2..ebd8574 100644
--- a/camel-k-runtime-kotlin/src/main/kotlin/org/apache/camel/k/kotlin/extension/LogComponentExtensions.kt
+++ b/camel-k-loader-kotlin/src/main/kotlin/org/apache/camel/k/loader/kotlin/extension/LogComponentExtensions.kt
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.kotlin.extension
+package org.apache.camel.k.loader.kotlin.extension
import org.apache.camel.Exchange
import org.apache.camel.component.log.LogComponent
diff --git a/camel-k-runtime-kotlin/src/main/resources/META-INF/kotlin/script/templates/org.apache.camel.k.kotlin.dsl.IntegrationConfiguration.classname b/camel-k-loader-kotlin/src/main/resources/META-INF/kotlin/script/templates/org.apache.camel.k.loader.kotlin.dsl.IntegrationConfiguration.classname
similarity index 100%
rename from camel-k-runtime-kotlin/src/main/resources/META-INF/kotlin/script/templates/org.apache.camel.k.kotlin.dsl.IntegrationConfiguration.classname
rename to camel-k-loader-kotlin/src/main/resources/META-INF/kotlin/script/templates/org.apache.camel.k.loader.kotlin.dsl.IntegrationConfiguration.classname
diff --git a/camel-k-runtime-kotlin/src/main/resources/META-INF/services/org/apache/camel/k/loader/kts b/camel-k-loader-kotlin/src/main/resources/META-INF/services/org/apache/camel/k/loader/kts
similarity index 93%
rename from camel-k-runtime-kotlin/src/main/resources/META-INF/services/org/apache/camel/k/loader/kts
rename to camel-k-loader-kotlin/src/main/resources/META-INF/services/org/apache/camel/k/loader/kts
index d4bcde1..48b587d 100644
--- a/camel-k-runtime-kotlin/src/main/resources/META-INF/services/org/apache/camel/k/loader/kts
+++ b/camel-k-loader-kotlin/src/main/resources/META-INF/services/org/apache/camel/k/loader/kts
@@ -15,4 +15,4 @@
# limitations under the License.
#
-class=org.apache.camel.k.kotlin.KotlinRoutesLoader
\ No newline at end of file
+class=org.apache.camel.k.loader.kotlin.KotlinRoutesLoader
\ No newline at end of file
diff --git a/camel-k-runtime-kotlin/src/test/kotlin/org/apache/camel/k/kotlin/LoaderTest.kt b/camel-k-loader-kotlin/src/test/kotlin/org/apache/camel/k/loader/kotlin/LoaderTest.kt
similarity index 97%
rename from camel-k-runtime-kotlin/src/test/kotlin/org/apache/camel/k/kotlin/LoaderTest.kt
rename to camel-k-loader-kotlin/src/test/kotlin/org/apache/camel/k/loader/kotlin/LoaderTest.kt
index 5006d69..9567b0a 100644
--- a/camel-k-runtime-kotlin/src/test/kotlin/org/apache/camel/k/kotlin/LoaderTest.kt
+++ b/camel-k-loader-kotlin/src/test/kotlin/org/apache/camel/k/loader/kotlin/LoaderTest.kt
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.kotlin
+package org.apache.camel.k.loader.kotlin
import org.apache.camel.impl.DefaultCamelContext
import org.apache.camel.k.Source
diff --git a/camel-k-runtime-kotlin/src/test/kotlin/org/apache/camel/k/kotlin/dsl/IntegrationTest.kt b/camel-k-loader-kotlin/src/test/kotlin/org/apache/camel/k/loader/kotlin/dsl/IntegrationTest.kt
similarity index 99%
rename from camel-k-runtime-kotlin/src/test/kotlin/org/apache/camel/k/kotlin/dsl/IntegrationTest.kt
rename to camel-k-loader-kotlin/src/test/kotlin/org/apache/camel/k/loader/kotlin/dsl/IntegrationTest.kt
index 5fea625..991d909 100644
--- a/camel-k-runtime-kotlin/src/test/kotlin/org/apache/camel/k/kotlin/dsl/IntegrationTest.kt
+++ b/camel-k-loader-kotlin/src/test/kotlin/org/apache/camel/k/loader/kotlin/dsl/IntegrationTest.kt
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.kotlin.dsl
+package org.apache.camel.k.loader.kotlin.dsl
import org.apache.camel.Processor
import org.apache.camel.component.log.LogComponent
diff --git a/camel-k-runtime-kotlin/src/test/kotlin/org/apache/camel/k/kotlin/extension/LogExtensionTest.kt b/camel-k-loader-kotlin/src/test/kotlin/org/apache/camel/k/loader/kotlin/extension/LogExtensionTest.kt
similarity index 96%
rename from camel-k-runtime-kotlin/src/test/kotlin/org/apache/camel/k/kotlin/extension/LogExtensionTest.kt
rename to camel-k-loader-kotlin/src/test/kotlin/org/apache/camel/k/loader/kotlin/extension/LogExtensionTest.kt
index 296aded..5987b3b 100644
--- a/camel-k-runtime-kotlin/src/test/kotlin/org/apache/camel/k/kotlin/extension/LogExtensionTest.kt
+++ b/camel-k-loader-kotlin/src/test/kotlin/org/apache/camel/k/loader/kotlin/extension/LogExtensionTest.kt
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.kotlin.extension
+package org.apache.camel.k.loader.kotlin.extension
import org.apache.camel.component.log.LogComponent
import org.apache.camel.impl.DefaultCamelContext
diff --git a/camel-k-runtime-yaml/src/test/resources/log4j2-test.xml b/camel-k-loader-kotlin/src/test/resources/log4j2-test.xml
similarity index 100%
rename from camel-k-runtime-yaml/src/test/resources/log4j2-test.xml
rename to camel-k-loader-kotlin/src/test/resources/log4j2-test.xml
diff --git a/camel-k-runtime-kotlin/src/test/resources/routes-new.kts b/camel-k-loader-kotlin/src/test/resources/routes-new.kts
similarity index 100%
rename from camel-k-runtime-kotlin/src/test/resources/routes-new.kts
rename to camel-k-loader-kotlin/src/test/resources/routes-new.kts
diff --git a/camel-k-runtime-kotlin/src/test/resources/routes-with-bindings.kts b/camel-k-loader-kotlin/src/test/resources/routes-with-bindings.kts
similarity index 100%
rename from camel-k-runtime-kotlin/src/test/resources/routes-with-bindings.kts
rename to camel-k-loader-kotlin/src/test/resources/routes-with-bindings.kts
diff --git a/camel-k-runtime-kotlin/src/test/resources/routes-with-component-configuration.kts b/camel-k-loader-kotlin/src/test/resources/routes-with-component-configuration.kts
similarity index 100%
rename from camel-k-runtime-kotlin/src/test/resources/routes-with-component-configuration.kts
rename to camel-k-loader-kotlin/src/test/resources/routes-with-component-configuration.kts
diff --git a/camel-k-runtime-kotlin/src/test/resources/routes-with-error-handler.kts b/camel-k-loader-kotlin/src/test/resources/routes-with-error-handler.kts
similarity index 100%
rename from camel-k-runtime-kotlin/src/test/resources/routes-with-error-handler.kts
rename to camel-k-loader-kotlin/src/test/resources/routes-with-error-handler.kts
diff --git a/camel-k-runtime-kotlin/src/test/resources/routes-with-rest.kts b/camel-k-loader-kotlin/src/test/resources/routes-with-rest.kts
similarity index 100%
rename from camel-k-runtime-kotlin/src/test/resources/routes-with-rest.kts
rename to camel-k-loader-kotlin/src/test/resources/routes-with-rest.kts
diff --git a/camel-k-runtime-kotlin/src/test/resources/routes.kts b/camel-k-loader-kotlin/src/test/resources/routes.kts
similarity index 100%
rename from camel-k-runtime-kotlin/src/test/resources/routes.kts
rename to camel-k-loader-kotlin/src/test/resources/routes.kts
diff --git a/camel-k-runtime-jvm/pom.xml b/camel-k-loader-xml/pom.xml
similarity index 71%
copy from camel-k-runtime-jvm/pom.xml
copy to camel-k-loader-xml/pom.xml
index 48bcb2e..a6c69ee 100644
--- a/camel-k-runtime-jvm/pom.xml
+++ b/camel-k-loader-xml/pom.xml
@@ -25,7 +25,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>camel-k-runtime-jvm</artifactId>
+ <artifactId>camel-k-loader-xml</artifactId>
<dependencies>
@@ -45,38 +45,6 @@
<artifactId>camel-core-engine</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-main</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <version>${log4j2.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jooq</groupId>
- <artifactId>joor-java-8</artifactId>
- <version>${joor.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${commons-io.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>${commons-lang.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.graalvm.js</groupId>
- <artifactId>js</artifactId>
- <version>${graalvm.version}</version>
- </dependency>
<!-- ****************************** -->
<!-- -->
@@ -147,19 +115,4 @@
</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-runtime-jvm/src/main/java/org/apache/camel/k/jvm/loader/XmlLoader.java b/camel-k-loader-xml/src/main/java/org/apache/camel/k/loader/xml/XmlRoutesLoader.java
similarity index 96%
rename from camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/loader/XmlLoader.java
rename to camel-k-loader-xml/src/main/java/org/apache/camel/k/loader/xml/XmlRoutesLoader.java
index e6be1a8..fb6678b 100644
--- a/camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/loader/XmlLoader.java
+++ b/camel-k-loader-xml/src/main/java/org/apache/camel/k/loader/xml/XmlRoutesLoader.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.jvm.loader;
+package org.apache.camel.k.loader.xml;
import java.io.InputStream;
import java.util.Collections;
@@ -32,8 +32,8 @@ import org.apache.camel.model.rest.RestsDefinition;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class XmlLoader implements RoutesLoader {
- private static final Logger LOGGER = LoggerFactory.getLogger(XmlLoader.class);
+public class XmlRoutesLoader implements RoutesLoader {
+ private static final Logger LOGGER = LoggerFactory.getLogger(XmlRoutesLoader.class);
@Override
public List<String> getSupportedLanguages() {
diff --git a/camel-k-runtime-jvm/src/main/resources/META-INF/services/org/apache/camel/k/loader/xml b/camel-k-loader-xml/src/main/resources/META-INF/services/org/apache/camel/k/loader/xml
similarity index 93%
rename from camel-k-runtime-jvm/src/main/resources/META-INF/services/org/apache/camel/k/loader/xml
rename to camel-k-loader-xml/src/main/resources/META-INF/services/org/apache/camel/k/loader/xml
index e30ce1e..5670bf1 100644
--- a/camel-k-runtime-jvm/src/main/resources/META-INF/services/org/apache/camel/k/loader/xml
+++ b/camel-k-loader-xml/src/main/resources/META-INF/services/org/apache/camel/k/loader/xml
@@ -15,4 +15,4 @@
# limitations under the License.
#
-class=org.apache.camel.k.jvm.loader.XmlLoader
\ No newline at end of file
+class=org.apache.camel.k.loader.xml.XmlRoutesLoader
\ No newline at end of file
diff --git a/camel-k-runtime-jvm/src/test/java/org/apache/camel/k/jvm/RoutesLoadersCommonTest.java b/camel-k-loader-xml/src/test/java/org/apache/camel/k/loader/xml/RoutesLoaderTest.java
similarity index 68%
rename from camel-k-runtime-jvm/src/test/java/org/apache/camel/k/jvm/RoutesLoadersCommonTest.java
rename to camel-k-loader-xml/src/test/java/org/apache/camel/k/loader/xml/RoutesLoaderTest.java
index 443f096..aaa9262 100644
--- a/camel-k-runtime-jvm/src/test/java/org/apache/camel/k/jvm/RoutesLoadersCommonTest.java
+++ b/camel-k-loader-xml/src/test/java/org/apache/camel/k/loader/xml/RoutesLoaderTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.jvm;
+package org.apache.camel.k.loader.xml;
import java.util.List;
import java.util.stream.Stream;
@@ -23,10 +23,6 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.k.RoutesLoader;
import org.apache.camel.k.Source;
-import org.apache.camel.k.jvm.loader.JavaClassLoader;
-import org.apache.camel.k.jvm.loader.JavaScriptLoader;
-import org.apache.camel.k.jvm.loader.JavaSourceLoader;
-import org.apache.camel.k.jvm.loader.XmlLoader;
import org.apache.camel.k.support.RuntimeSupport;
import org.apache.camel.model.RouteDefinition;
import org.apache.camel.model.ToDefinition;
@@ -36,7 +32,7 @@ import org.junit.jupiter.params.provider.MethodSource;
import static org.assertj.core.api.Assertions.assertThat;
-public class RoutesLoadersCommonTest {
+public class RoutesLoaderTest {
@ParameterizedTest
@MethodSource("parameters")
public void testLoaders(String location, Class<? extends RoutesLoader> type) throws Exception {
@@ -58,14 +54,7 @@ public class RoutesLoadersCommonTest {
static Stream<Arguments> parameters() {
return Stream.of(
- Arguments.arguments("classpath:" + MyRoutes.class.getName() + ".class", JavaClassLoader.class),
- Arguments.arguments("classpath:MyRoutes.java", JavaSourceLoader.class),
- Arguments.arguments("classpath:MyRoutesWithNameOverride.java?name=MyRoutes.java", JavaSourceLoader.class),
- Arguments.arguments("classpath:MyRoutesWithPackage.java", JavaSourceLoader.class),
- Arguments.arguments("classpath:routes.js", JavaScriptLoader.class),
- Arguments.arguments("classpath:routes-compressed.js.gz.b64?language=js&compression=true", JavaScriptLoader.class),
- Arguments.arguments("classpath:routes.mytype?language=js", JavaScriptLoader.class),
- Arguments.arguments("classpath:routes.xml", XmlLoader.class)
+ Arguments.arguments("classpath:routes.xml", XmlRoutesLoader.class)
);
}
}
diff --git a/camel-k-runtime-groovy/src/test/resources/log4j2-test.xml b/camel-k-loader-xml/src/test/resources/log4j2-test.xml
similarity index 100%
copy from camel-k-runtime-groovy/src/test/resources/log4j2-test.xml
copy to camel-k-loader-xml/src/test/resources/log4j2-test.xml
diff --git a/camel-k-runtime-jvm/src/test/resources/rests.xml b/camel-k-loader-xml/src/test/resources/rests.xml
similarity index 100%
rename from camel-k-runtime-jvm/src/test/resources/rests.xml
rename to camel-k-loader-xml/src/test/resources/rests.xml
diff --git a/camel-k-runtime-jvm/src/test/resources/routes.xml b/camel-k-loader-xml/src/test/resources/routes.xml
similarity index 100%
rename from camel-k-runtime-jvm/src/test/resources/routes.xml
rename to camel-k-loader-xml/src/test/resources/routes.xml
diff --git a/camel-k-runtime-yaml/README.adoc b/camel-k-loader-yaml/README.adoc
similarity index 95%
rename from camel-k-runtime-yaml/README.adoc
rename to camel-k-loader-yaml/README.adoc
index 9487821..587dcda 100644
--- a/camel-k-runtime-yaml/README.adoc
+++ b/camel-k-loader-yaml/README.adoc
@@ -153,15 +153,15 @@ Assuming you want to create a step to simplify the creation of a certain type of
class=com.acme.converter.MyConverter
----
-- create the step handler extending `org.apache.camel.k.yaml.parser.ProcessorStepParser`
+- create the step handler extending `org.apache.camel.k.loader.yaml.parser.ProcessorStepParser`
+
[source, java]
----
package com.acme.converter.AcmeConverter
-public class AcmeConverter
- implements org.apache.camel.k.yaml.parser.ProcessorStepParser {
+import org.apache.camel.k.loader.yaml.parser.ProcessorStepParser;public class AcmeConverter
+ implements ProcessorStepParser {
/**
* @param context contains a references to the camel context and the current node as raw JsonNode
*/
diff --git a/camel-k-runtime-yaml/pom.xml b/camel-k-loader-yaml/pom.xml
similarity index 99%
rename from camel-k-runtime-yaml/pom.xml
rename to camel-k-loader-yaml/pom.xml
index 9f05f32..fe6a510 100644
--- a/camel-k-runtime-yaml/pom.xml
+++ b/camel-k-loader-yaml/pom.xml
@@ -25,7 +25,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>camel-k-runtime-yaml</artifactId>
+ <artifactId>camel-k-loader-yaml</artifactId>
<dependencies>
diff --git a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/Yaml.java b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/Yaml.java
similarity index 97%
rename from camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/Yaml.java
rename to camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/Yaml.java
index b4e1d8c..712fff5 100644
--- a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/Yaml.java
+++ b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/Yaml.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.yaml;
+package org.apache.camel.k.loader.yaml;
import java.util.function.Function;
import java.util.function.Supplier;
@@ -31,7 +31,7 @@ import com.fasterxml.jackson.databind.jsontype.NamedType;
import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
import com.fasterxml.jackson.dataformat.yaml.YAMLGenerator;
import org.apache.camel.Exchange;
-import org.apache.camel.k.yaml.model.Definitions;
+import org.apache.camel.k.loader.yaml.model.Definitions;
import org.apache.camel.model.Block;
import org.apache.camel.model.OptionalIdentifiedDefinition;
import org.apache.camel.model.OtherAttributesAware;
diff --git a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/YamlRoutesLoader.java b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/YamlRoutesLoader.java
similarity index 95%
rename from camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/YamlRoutesLoader.java
rename to camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/YamlRoutesLoader.java
index e67d1df..2512a89 100644
--- a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/YamlRoutesLoader.java
+++ b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/YamlRoutesLoader.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.yaml;
+package org.apache.camel.k.loader.yaml;
import java.io.InputStream;
import java.util.ArrayList;
@@ -26,9 +26,9 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.k.RoutesLoader;
import org.apache.camel.k.Source;
import org.apache.camel.k.support.URIResolver;
-import org.apache.camel.k.yaml.model.Route;
-import org.apache.camel.k.yaml.parser.StartStepParser;
-import org.apache.camel.k.yaml.parser.StepParser;
+import org.apache.camel.k.loader.yaml.model.Route;
+import org.apache.camel.k.loader.yaml.parser.StartStepParser;
+import org.apache.camel.k.loader.yaml.parser.StepParser;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.model.RouteDefinition;
import org.apache.camel.model.RoutesDefinition;
diff --git a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/model/Definitions.java b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/model/Definitions.java
similarity index 98%
rename from camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/model/Definitions.java
rename to camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/model/Definitions.java
index af9c701..d1420f2 100644
--- a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/model/Definitions.java
+++ b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/model/Definitions.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.yaml.model;
+package org.apache.camel.k.loader.yaml.model;
import java.io.IOException;
import java.io.InputStream;
diff --git a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/model/Route.java b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/model/Route.java
similarity index 98%
rename from camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/model/Route.java
rename to camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/model/Route.java
index 2fbc51f..dfdb583 100644
--- a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/model/Route.java
+++ b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/model/Route.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.yaml.model;
+package org.apache.camel.k.loader.yaml.model;
import java.util.Optional;
diff --git a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/model/Step.java b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/model/Step.java
similarity index 97%
rename from camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/model/Step.java
rename to camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/model/Step.java
index 2a6b438..2092cd1 100644
--- a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/model/Step.java
+++ b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/model/Step.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.yaml.model;
+package org.apache.camel.k.loader.yaml.model;
import java.io.IOException;
import java.util.Map;
diff --git a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/ChoiceStepParser.java b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/ChoiceStepParser.java
similarity index 93%
rename from camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/ChoiceStepParser.java
rename to camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/ChoiceStepParser.java
index e5759bd..5c5847c 100644
--- a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/ChoiceStepParser.java
+++ b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/ChoiceStepParser.java
@@ -14,10 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.yaml.parser;
+package org.apache.camel.k.loader.yaml.parser;
import java.util.List;
+import org.apache.camel.k.loader.yaml.model.Step;
import org.apache.camel.model.ChoiceDefinition;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.model.WhenDefinition;
@@ -59,11 +60,11 @@ public class ChoiceStepParser implements ProcessorStepParser {
public Otherwise otherwise;
public static final class When extends WhenDefinition implements HasExpression {
- public List<org.apache.camel.k.yaml.model.Step> steps;
+ public List<Step> steps;
}
public static final class Otherwise {
- public List<org.apache.camel.k.yaml.model.Step> steps;
+ public List<Step> steps;
}
}
}
diff --git a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/ClaimCheckStepParser.java b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/ClaimCheckStepParser.java
similarity index 95%
rename from camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/ClaimCheckStepParser.java
rename to camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/ClaimCheckStepParser.java
index dd7e896..de7af02 100644
--- a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/ClaimCheckStepParser.java
+++ b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/ClaimCheckStepParser.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.yaml.parser;
+package org.apache.camel.k.loader.yaml.parser;
import org.apache.camel.model.ClaimCheckDefinition;
import org.apache.camel.model.ProcessorDefinition;
diff --git a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/ConvertBodyStepParser.java b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/ConvertBodyStepParser.java
similarity index 95%
rename from camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/ConvertBodyStepParser.java
rename to camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/ConvertBodyStepParser.java
index 8374fd5..e467427 100644
--- a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/ConvertBodyStepParser.java
+++ b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/ConvertBodyStepParser.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.yaml.parser;
+package org.apache.camel.k.loader.yaml.parser;
import org.apache.camel.model.ConvertBodyDefinition;
import org.apache.camel.model.ProcessorDefinition;
diff --git a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/DelayStepParser.java b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/DelayStepParser.java
similarity index 96%
rename from camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/DelayStepParser.java
rename to camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/DelayStepParser.java
index b73a230..9300214 100644
--- a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/DelayStepParser.java
+++ b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/DelayStepParser.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.yaml.parser;
+package org.apache.camel.k.loader.yaml.parser;
import org.apache.camel.model.DelayDefinition;
import org.apache.camel.model.ProcessorDefinition;
diff --git a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/DynamicRouterStepParser.java b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/DynamicRouterStepParser.java
similarity index 96%
rename from camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/DynamicRouterStepParser.java
rename to camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/DynamicRouterStepParser.java
index aefbcf9..70e74f2 100644
--- a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/DynamicRouterStepParser.java
+++ b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/DynamicRouterStepParser.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.yaml.parser;
+package org.apache.camel.k.loader.yaml.parser;
import org.apache.camel.model.DynamicRouterDefinition;
import org.apache.camel.model.ProcessorDefinition;
diff --git a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/FilterStepParser.java b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/FilterStepParser.java
similarity index 92%
rename from camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/FilterStepParser.java
rename to camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/FilterStepParser.java
index 4e64678..165093a 100644
--- a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/FilterStepParser.java
+++ b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/FilterStepParser.java
@@ -14,10 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.yaml.parser;
+package org.apache.camel.k.loader.yaml.parser;
import java.util.List;
+import org.apache.camel.k.loader.yaml.model.Step;
import org.apache.camel.model.FilterDefinition;
import org.apache.camel.model.ProcessorDefinition;
@@ -36,7 +37,7 @@ public class FilterStepParser implements ProcessorStepParser {
}
public static final class Definition extends FilterDefinition implements HasExpression {
- public List<org.apache.camel.k.yaml.model.Step> steps;
+ public List<Step> steps;
}
}
diff --git a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/FromStepParser.java b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/FromStepParser.java
similarity index 95%
rename from camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/FromStepParser.java
rename to camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/FromStepParser.java
index 062320a..1f12a1e 100644
--- a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/FromStepParser.java
+++ b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/FromStepParser.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.yaml.parser;
+package org.apache.camel.k.loader.yaml.parser;
import java.io.UnsupportedEncodingException;
import java.net.URISyntaxException;
@@ -22,7 +22,7 @@ import java.util.List;
import java.util.Map;
import com.fasterxml.jackson.annotation.JsonIgnore;
-import org.apache.camel.k.yaml.model.Step;
+import org.apache.camel.k.loader.yaml.model.Step;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.model.RouteDefinition;
import org.apache.camel.util.URISupport;
diff --git a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/HasDataFormat.java b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/HasDataFormat.java
similarity index 93%
rename from camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/HasDataFormat.java
rename to camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/HasDataFormat.java
index e95ae93..0227021 100644
--- a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/HasDataFormat.java
+++ b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/HasDataFormat.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.yaml.parser;
+package org.apache.camel.k.loader.yaml.parser;
import java.io.IOException;
@@ -22,8 +22,8 @@ import com.fasterxml.jackson.annotation.JsonAlias;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
import com.fasterxml.jackson.databind.JsonNode;
-import org.apache.camel.k.yaml.Yaml;
-import org.apache.camel.k.yaml.model.Definitions;
+import org.apache.camel.k.loader.yaml.Yaml;
+import org.apache.camel.k.loader.yaml.model.Definitions;
import org.apache.camel.model.DataFormatDefinition;
public interface HasDataFormat {
diff --git a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/HasExpression.java b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/HasExpression.java
similarity index 93%
rename from camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/HasExpression.java
rename to camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/HasExpression.java
index e31a525..35b5971 100644
--- a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/HasExpression.java
+++ b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/HasExpression.java
@@ -14,15 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.yaml.parser;
+package org.apache.camel.k.loader.yaml.parser;
import java.io.IOException;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
import com.fasterxml.jackson.databind.JsonNode;
-import org.apache.camel.k.yaml.Yaml;
-import org.apache.camel.k.yaml.model.Definitions;
+import org.apache.camel.k.loader.yaml.Yaml;
+import org.apache.camel.k.loader.yaml.model.Definitions;
import org.apache.camel.model.language.ExpressionDefinition;
public interface HasExpression {
diff --git a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/LogStepParser.java b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/LogStepParser.java
similarity index 95%
rename from camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/LogStepParser.java
rename to camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/LogStepParser.java
index 2692424..4aa467c 100644
--- a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/LogStepParser.java
+++ b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/LogStepParser.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.yaml.parser;
+package org.apache.camel.k.loader.yaml.parser;
import org.apache.camel.model.LogDefinition;
import org.apache.camel.model.ProcessorDefinition;
diff --git a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/MarshalStepParser.java b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/MarshalStepParser.java
similarity index 96%
rename from camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/MarshalStepParser.java
rename to camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/MarshalStepParser.java
index b9105de..e6ce23b 100644
--- a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/MarshalStepParser.java
+++ b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/MarshalStepParser.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.yaml.parser;
+package org.apache.camel.k.loader.yaml.parser;
import org.apache.camel.model.MarshalDefinition;
import org.apache.camel.model.ProcessorDefinition;
diff --git a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/PipelineStepParser.java b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/PipelineStepParser.java
similarity index 91%
copy from camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/PipelineStepParser.java
copy to camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/PipelineStepParser.java
index 27ea234..28d09b2 100644
--- a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/PipelineStepParser.java
+++ b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/PipelineStepParser.java
@@ -14,10 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.yaml.parser;
+package org.apache.camel.k.loader.yaml.parser;
import java.util.List;
+import org.apache.camel.k.loader.yaml.model.Step;
import org.apache.camel.model.PipelineDefinition;
import org.apache.camel.model.ProcessorDefinition;
@@ -37,7 +38,7 @@ public class PipelineStepParser implements ProcessorStepParser {
}
public static final class Definition {
- public List<org.apache.camel.k.yaml.model.Step> steps;
+ public List<Step> steps;
}
}
diff --git a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/ProcessStepParser.java b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/ProcessStepParser.java
similarity index 95%
rename from camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/ProcessStepParser.java
rename to camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/ProcessStepParser.java
index bb25c31..d1c1b90 100644
--- a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/ProcessStepParser.java
+++ b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/ProcessStepParser.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.yaml.parser;
+package org.apache.camel.k.loader.yaml.parser;
import org.apache.camel.model.ProcessDefinition;
import org.apache.camel.model.ProcessorDefinition;
diff --git a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/ProcessorStepParser.java b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/ProcessorStepParser.java
similarity index 96%
rename from camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/ProcessorStepParser.java
rename to camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/ProcessorStepParser.java
index e8de8ec..5c34347 100644
--- a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/ProcessorStepParser.java
+++ b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/ProcessorStepParser.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.yaml.parser;
+package org.apache.camel.k.loader.yaml.parser;
import org.apache.camel.NoFactoryAvailableException;
import org.apache.camel.model.ProcessorDefinition;
diff --git a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/RemoveHeaderStepParser.java b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/RemoveHeaderStepParser.java
similarity index 96%
rename from camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/RemoveHeaderStepParser.java
rename to camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/RemoveHeaderStepParser.java
index 694a7d0..912a7d9 100644
--- a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/RemoveHeaderStepParser.java
+++ b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/RemoveHeaderStepParser.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.yaml.parser;
+package org.apache.camel.k.loader.yaml.parser;
import com.fasterxml.jackson.annotation.JsonAlias;
import org.apache.camel.model.ProcessorDefinition;
diff --git a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/RemoveHeadersStepParser.java b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/RemoveHeadersStepParser.java
similarity index 96%
rename from camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/RemoveHeadersStepParser.java
rename to camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/RemoveHeadersStepParser.java
index 3fc29a5..ffd991b 100644
--- a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/RemoveHeadersStepParser.java
+++ b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/RemoveHeadersStepParser.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.yaml.parser;
+package org.apache.camel.k.loader.yaml.parser;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.model.RemoveHeadersDefinition;
diff --git a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/RemovePropertiesStepParser.java b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/RemovePropertiesStepParser.java
similarity index 96%
rename from camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/RemovePropertiesStepParser.java
rename to camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/RemovePropertiesStepParser.java
index 4f51b37..dc056de 100644
--- a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/RemovePropertiesStepParser.java
+++ b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/RemovePropertiesStepParser.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.yaml.parser;
+package org.apache.camel.k.loader.yaml.parser;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.model.RemovePropertiesDefinition;
diff --git a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/RemovePropertyStepParser.java b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/RemovePropertyStepParser.java
similarity index 96%
rename from camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/RemovePropertyStepParser.java
rename to camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/RemovePropertyStepParser.java
index 9129a6b..41dfb31 100644
--- a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/RemovePropertyStepParser.java
+++ b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/RemovePropertyStepParser.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.yaml.parser;
+package org.apache.camel.k.loader.yaml.parser;
import com.fasterxml.jackson.annotation.JsonAlias;
import org.apache.camel.model.ProcessorDefinition;
diff --git a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/RestStepParser.java b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/RestStepParser.java
similarity index 96%
rename from camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/RestStepParser.java
rename to camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/RestStepParser.java
index 1f3a7ce..e7bf9dc 100644
--- a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/RestStepParser.java
+++ b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/RestStepParser.java
@@ -14,13 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.yaml.parser;
+package org.apache.camel.k.loader.yaml.parser;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonSetter;
import com.fasterxml.jackson.annotation.Nulls;
+import org.apache.camel.k.loader.yaml.model.Step;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.model.rest.RestBindingMode;
import org.apache.camel.model.rest.RestDefinition;
@@ -84,7 +85,7 @@ public class RestStepParser implements StartStepParser {
public Boolean apiDocs;
@JsonProperty
- public List<org.apache.camel.k.yaml.model.Step> steps;
+ public List<Step> steps;
@JsonProperty
public Class<?> type;
diff --git a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/SetBodyStepParser.java b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/SetBodyStepParser.java
similarity index 96%
rename from camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/SetBodyStepParser.java
rename to camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/SetBodyStepParser.java
index 2f7762b..828cb8d 100644
--- a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/SetBodyStepParser.java
+++ b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/SetBodyStepParser.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.yaml.parser;
+package org.apache.camel.k.loader.yaml.parser;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.model.SetBodyDefinition;
diff --git a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/SetHeaderStepParser.java b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/SetHeaderStepParser.java
similarity index 96%
rename from camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/SetHeaderStepParser.java
rename to camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/SetHeaderStepParser.java
index cf769b3..6259b4d 100644
--- a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/SetHeaderStepParser.java
+++ b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/SetHeaderStepParser.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.yaml.parser;
+package org.apache.camel.k.loader.yaml.parser;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.model.SetHeaderDefinition;
diff --git a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/SetPropertyStepParser.java b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/SetPropertyStepParser.java
similarity index 96%
rename from camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/SetPropertyStepParser.java
rename to camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/SetPropertyStepParser.java
index 484a280..0bde312 100644
--- a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/SetPropertyStepParser.java
+++ b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/SetPropertyStepParser.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.yaml.parser;
+package org.apache.camel.k.loader.yaml.parser;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.model.SetPropertyDefinition;
diff --git a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/SplitStepParser.java b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/SplitStepParser.java
similarity index 92%
rename from camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/SplitStepParser.java
rename to camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/SplitStepParser.java
index 1604ef6..282feb3 100644
--- a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/SplitStepParser.java
+++ b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/SplitStepParser.java
@@ -14,10 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.yaml.parser;
+package org.apache.camel.k.loader.yaml.parser;
import java.util.List;
+import org.apache.camel.k.loader.yaml.model.Step;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.model.SplitDefinition;
@@ -35,7 +36,7 @@ public class SplitStepParser implements ProcessorStepParser {
}
public static final class Definition extends SplitDefinition implements HasExpression {
- public List<org.apache.camel.k.yaml.model.Step> steps;
+ public List<Step> steps;
}
}
diff --git a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/StartStepParser.java b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/StartStepParser.java
similarity index 96%
rename from camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/StartStepParser.java
rename to camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/StartStepParser.java
index 1301288..2fb2333 100644
--- a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/StartStepParser.java
+++ b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/StartStepParser.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.yaml.parser;
+package org.apache.camel.k.loader.yaml.parser;
import org.apache.camel.NoFactoryAvailableException;
import org.apache.camel.model.ProcessorDefinition;
diff --git a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/StepParser.java b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/StepParser.java
similarity index 96%
rename from camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/StepParser.java
rename to camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/StepParser.java
index f84fa58..8988805 100644
--- a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/StepParser.java
+++ b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/StepParser.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.yaml.parser;
+package org.apache.camel.k.loader.yaml.parser;
import java.io.IOException;
@@ -22,11 +22,11 @@ import com.fasterxml.jackson.databind.JsonNode;
import org.apache.camel.CamelContext;
import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.NoFactoryAvailableException;
-import org.apache.camel.k.yaml.Yaml;
+import org.apache.camel.k.loader.yaml.Yaml;
import org.apache.camel.util.ObjectHelper;
public interface StepParser {
- String RESOURCE_PATH = "META-INF/services/org/apache/camel/k/yaml/";
+ String RESOURCE_PATH = "META-INF/services/org/apache/camel/k/loader/yaml-parser/";
@SuppressWarnings("unchecked")
static <T extends StepParser> T lookup(CamelContext camelContext, Class<T> type, String stepId) throws NoFactoryAvailableException {
diff --git a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/StepParserException.java b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/StepParserException.java
similarity index 97%
rename from camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/StepParserException.java
rename to camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/StepParserException.java
index aa1388e..0694138 100644
--- a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/StepParserException.java
+++ b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/StepParserException.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.yaml.parser;
+package org.apache.camel.k.loader.yaml.parser;
import java.util.Arrays;
import java.util.List;
diff --git a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/StepParserSupport.java b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/StepParserSupport.java
similarity index 97%
rename from camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/StepParserSupport.java
rename to camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/StepParserSupport.java
index 3a0bf67..7f5387a 100644
--- a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/StepParserSupport.java
+++ b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/StepParserSupport.java
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.yaml.parser;
+package org.apache.camel.k.loader.yaml.parser;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import org.apache.camel.CamelContext;
-import org.apache.camel.k.yaml.model.Step;
+import org.apache.camel.k.loader.yaml.model.Step;
import org.apache.camel.model.OutputNode;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.support.IntrospectionSupport;
diff --git a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/ToDynamicStepParser.java b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/ToDynamicStepParser.java
similarity index 97%
rename from camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/ToDynamicStepParser.java
rename to camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/ToDynamicStepParser.java
index 4c0ba2e..2adc099 100644
--- a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/ToDynamicStepParser.java
+++ b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/ToDynamicStepParser.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.yaml.parser;
+package org.apache.camel.k.loader.yaml.parser;
import java.io.UnsupportedEncodingException;
import java.net.URISyntaxException;
diff --git a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/ToStepParser.java b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/ToStepParser.java
similarity index 97%
rename from camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/ToStepParser.java
rename to camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/ToStepParser.java
index 48b6982..211a6e0 100644
--- a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/ToStepParser.java
+++ b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/ToStepParser.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.yaml.parser;
+package org.apache.camel.k.loader.yaml.parser;
import java.io.UnsupportedEncodingException;
import java.net.URISyntaxException;
diff --git a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/TransformStepParser.java b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/TransformStepParser.java
similarity index 96%
rename from camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/TransformStepParser.java
rename to camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/TransformStepParser.java
index fd15a92..872dbe7 100644
--- a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/TransformStepParser.java
+++ b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/TransformStepParser.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.yaml.parser;
+package org.apache.camel.k.loader.yaml.parser;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.model.TransformDefinition;
diff --git a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/UnmarshalStepParser.java b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/UnmarshalStepParser.java
similarity index 96%
rename from camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/UnmarshalStepParser.java
rename to camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/UnmarshalStepParser.java
index b890312..d48bd21 100644
--- a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/UnmarshalStepParser.java
+++ b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/parser/UnmarshalStepParser.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.yaml.parser;
+package org.apache.camel.k.loader.yaml.parser;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.model.UnmarshalDefinition;
diff --git a/camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml b/camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml
similarity index 93%
rename from camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml
rename to camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml
index 54724f9..d02fd5e 100644
--- a/camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml
+++ b/camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml
@@ -15,4 +15,4 @@
# limitations under the License.
#
-class=org.apache.camel.k.yaml.YamlRoutesLoader
\ No newline at end of file
+class=org.apache.camel.k.loader.yaml.YamlRoutesLoader
\ No newline at end of file
diff --git a/camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/choice b/camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/choice
similarity index 92%
rename from camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/choice
rename to camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/choice
index 64a8e13..5317fbd 100644
--- a/camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/choice
+++ b/camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/choice
@@ -15,4 +15,4 @@
# limitations under the License.
#
-class=org.apache.camel.k.yaml.parser.ChoiceStepParser
\ No newline at end of file
+class=org.apache.camel.k.loader.yaml.parser.ChoiceStepParser
\ No newline at end of file
diff --git a/camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/claim-check b/camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/claim-check
similarity index 92%
rename from camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/claim-check
rename to camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/claim-check
index 97d3621..6561f1a 100644
--- a/camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/claim-check
+++ b/camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/claim-check
@@ -15,4 +15,4 @@
# limitations under the License.
#
-class=org.apache.camel.k.yaml.parser.ClaimCheckStepParser
\ No newline at end of file
+class=org.apache.camel.k.loader.yaml.parser.ClaimCheckStepParser
\ No newline at end of file
diff --git a/camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/convert-body b/camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/convert-body
similarity index 92%
rename from camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/convert-body
rename to camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/convert-body
index 0306716..4418801 100644
--- a/camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/convert-body
+++ b/camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/convert-body
@@ -15,4 +15,4 @@
# limitations under the License.
#
-class=org.apache.camel.k.yaml.parser.ConvertBodyStepParser
\ No newline at end of file
+class=org.apache.camel.k.loader.yaml.parser.ConvertBodyStepParser
\ No newline at end of file
diff --git a/camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/delay b/camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/delay
similarity index 92%
rename from camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/delay
rename to camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/delay
index 5537a85..75694a6 100644
--- a/camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/delay
+++ b/camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/delay
@@ -15,4 +15,4 @@
# limitations under the License.
#
-class=org.apache.camel.k.yaml.parser.DelayStepParser
\ No newline at end of file
+class=org.apache.camel.k.loader.yaml.parser.DelayStepParser
\ No newline at end of file
diff --git a/camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/dynamic-router b/camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/dynamic-router
similarity index 92%
rename from camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/dynamic-router
rename to camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/dynamic-router
index 0a52d9f..ee6522f 100644
--- a/camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/dynamic-router
+++ b/camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/dynamic-router
@@ -15,4 +15,4 @@
# limitations under the License.
#
-class=org.apache.camel.k.yaml.parser.DynamicRouterStepParser
\ No newline at end of file
+class=org.apache.camel.k.loader.yaml.parser.DynamicRouterStepParser
\ No newline at end of file
diff --git a/camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/endpoint b/camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/endpoint
similarity index 93%
rename from camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/endpoint
rename to camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/endpoint
index c9bdf52..2d998f9 100644
--- a/camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/endpoint
+++ b/camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/endpoint
@@ -15,4 +15,4 @@
# limitations under the License.
#
-class=org.apache.camel.k.yaml.parser.ToStepParser
\ No newline at end of file
+class=org.apache.camel.k.loader.yaml.parser.ToStepParser
\ No newline at end of file
diff --git a/camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/filter b/camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/filter
similarity index 92%
rename from camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/filter
rename to camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/filter
index c7d7fdd..b855a06 100644
--- a/camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/filter
+++ b/camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/filter
@@ -15,4 +15,4 @@
# limitations under the License.
#
-class=org.apache.camel.k.yaml.parser.FilterStepParser
\ No newline at end of file
+class=org.apache.camel.k.loader.yaml.parser.FilterStepParser
\ No newline at end of file
diff --git a/camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/from b/camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/from
similarity index 93%
rename from camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/from
rename to camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/from
index 4e1b851..fd2c47d 100644
--- a/camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/from
+++ b/camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/from
@@ -15,4 +15,4 @@
# limitations under the License.
#
-class=org.apache.camel.k.yaml.parser.FromStepParser
\ No newline at end of file
+class=org.apache.camel.k.loader.yaml.parser.FromStepParser
\ No newline at end of file
diff --git a/camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/log b/camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/log
similarity index 93%
rename from camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/log
rename to camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/log
index 1b8d1cb..be817d4 100644
--- a/camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/log
+++ b/camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/log
@@ -15,4 +15,4 @@
# limitations under the License.
#
-class=org.apache.camel.k.yaml.parser.LogStepParser
\ No newline at end of file
+class=org.apache.camel.k.loader.yaml.parser.LogStepParser
\ No newline at end of file
diff --git a/camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/marshal b/camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/marshal
similarity index 92%
rename from camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/marshal
rename to camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/marshal
index 65ba8ec..c950e5b 100644
--- a/camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/marshal
+++ b/camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/marshal
@@ -15,4 +15,4 @@
# limitations under the License.
#
-class=org.apache.camel.k.yaml.parser.MarshalStepParser
\ No newline at end of file
+class=org.apache.camel.k.loader.yaml.parser.MarshalStepParser
\ No newline at end of file
diff --git a/camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/pipeline b/camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/pipeline
similarity index 92%
rename from camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/pipeline
rename to camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/pipeline
index 13de498..f1a5a64 100644
--- a/camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/pipeline
+++ b/camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/pipeline
@@ -15,4 +15,4 @@
# limitations under the License.
#
-class=org.apache.camel.k.yaml.parser.PipelineStepParser
\ No newline at end of file
+class=org.apache.camel.k.loader.yaml.parser.PipelineStepParser
\ No newline at end of file
diff --git a/camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/process b/camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/process
similarity index 92%
rename from camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/process
rename to camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/process
index ddd6162..b56dc45 100644
--- a/camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/process
+++ b/camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/process
@@ -15,4 +15,4 @@
# limitations under the License.
#
-class=org.apache.camel.k.yaml.parser.ProcessStepParser
\ No newline at end of file
+class=org.apache.camel.k.loader.yaml.parser.ProcessStepParser
\ No newline at end of file
diff --git a/camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/remove-header b/camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/remove-header
similarity index 92%
rename from camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/remove-header
rename to camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/remove-header
index 80976d7..9417853 100644
--- a/camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/remove-header
+++ b/camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/remove-header
@@ -15,4 +15,4 @@
# limitations under the License.
#
-class=org.apache.camel.k.yaml.parser.RemoveHeaderStepParser
\ No newline at end of file
+class=org.apache.camel.k.loader.yaml.parser.RemoveHeaderStepParser
\ No newline at end of file
diff --git a/camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/remove-headers b/camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/remove-headers
similarity index 92%
rename from camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/remove-headers
rename to camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/remove-headers
index cc28571..aef8b1d 100644
--- a/camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/remove-headers
+++ b/camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/remove-headers
@@ -15,4 +15,4 @@
# limitations under the License.
#
-class=org.apache.camel.k.yaml.parser.RemoveHeaderStepParsers
\ No newline at end of file
+class=org.apache.camel.k.loader.yaml.parser.RemoveHeaderStepParsers
\ No newline at end of file
diff --git a/camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/remove-properties b/camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/remove-properties
similarity index 91%
rename from camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/remove-properties
rename to camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/remove-properties
index a0b558e..a2f6b11 100644
--- a/camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/remove-properties
+++ b/camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/remove-properties
@@ -15,4 +15,4 @@
# limitations under the License.
#
-class=org.apache.camel.k.yaml.parser.RemovePropertiesStepParser
\ No newline at end of file
+class=org.apache.camel.k.loader.yaml.parser.RemovePropertiesStepParser
\ No newline at end of file
diff --git a/camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/remove-property b/camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/remove-property
similarity index 92%
rename from camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/remove-property
rename to camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/remove-property
index 09ff2cf..a10f127 100644
--- a/camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/remove-property
+++ b/camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/remove-property
@@ -15,4 +15,4 @@
# limitations under the License.
#
-class=org.apache.camel.k.yaml.parser.RemovePropertyStepParser
\ No newline at end of file
+class=org.apache.camel.k.loader.yaml.parser.RemovePropertyStepParser
\ No newline at end of file
diff --git a/camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/rest b/camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/rest
similarity index 93%
rename from camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/rest
rename to camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/rest
index f03eebd..3bca165 100644
--- a/camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/rest
+++ b/camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/rest
@@ -15,4 +15,4 @@
# limitations under the License.
#
-class=org.apache.camel.k.yaml.parser.RestStepParser
\ No newline at end of file
+class=org.apache.camel.k.loader.yaml.parser.RestStepParser
\ No newline at end of file
diff --git a/camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/set-body b/camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/set-body
similarity index 92%
rename from camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/set-body
rename to camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/set-body
index 1f7313d..a61863c 100644
--- a/camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/set-body
+++ b/camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/set-body
@@ -15,4 +15,4 @@
# limitations under the License.
#
-class=org.apache.camel.k.yaml.parser.SetBodyStepParser
\ No newline at end of file
+class=org.apache.camel.k.loader.yaml.parser.SetBodyStepParser
\ No newline at end of file
diff --git a/camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/set-header b/camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/set-header
similarity index 92%
rename from camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/set-header
rename to camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/set-header
index 9e11066..ea35f00 100644
--- a/camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/set-header
+++ b/camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/set-header
@@ -15,4 +15,4 @@
# limitations under the License.
#
-class=org.apache.camel.k.yaml.parser.SetHeaderStepParser
\ No newline at end of file
+class=org.apache.camel.k.loader.yaml.parser.SetHeaderStepParser
\ No newline at end of file
diff --git a/camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/set-property b/camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/set-property
similarity index 92%
rename from camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/set-property
rename to camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/set-property
index 4d9fd41..205e7e5 100644
--- a/camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/set-property
+++ b/camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/set-property
@@ -15,4 +15,4 @@
# limitations under the License.
#
-class=org.apache.camel.k.yaml.parser.SetPropertyStepParser
\ No newline at end of file
+class=org.apache.camel.k.loader.yaml.parser.SetPropertyStepParser
\ No newline at end of file
diff --git a/camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/split b/camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/split
similarity index 92%
rename from camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/split
rename to camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/split
index 8fc451d..6be711d 100644
--- a/camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/split
+++ b/camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/split
@@ -15,4 +15,4 @@
# limitations under the License.
#
-class=org.apache.camel.k.yaml.parser.SplitStepParser
\ No newline at end of file
+class=org.apache.camel.k.loader.yaml.parser.SplitStepParser
\ No newline at end of file
diff --git a/camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/to b/camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/to
similarity index 93%
rename from camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/to
rename to camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/to
index c9bdf52..2d998f9 100644
--- a/camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/to
+++ b/camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/to
@@ -15,4 +15,4 @@
# limitations under the License.
#
-class=org.apache.camel.k.yaml.parser.ToStepParser
\ No newline at end of file
+class=org.apache.camel.k.loader.yaml.parser.ToStepParser
\ No newline at end of file
diff --git a/camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/tod b/camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/tod
similarity index 93%
rename from camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/tod
rename to camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/tod
index c689ad6..9aacca2 100644
--- a/camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/tod
+++ b/camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/tod
@@ -15,4 +15,4 @@
# limitations under the License.
#
-class=org.apache.camel.k.yaml.parser.ToDynamic
\ No newline at end of file
+class=org.apache.camel.k.loader.yaml.parser.ToDynamic
\ No newline at end of file
diff --git a/camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/transform b/camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/transform
similarity index 92%
rename from camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/transform
rename to camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/transform
index 91d8368..019c815 100644
--- a/camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/transform
+++ b/camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/transform
@@ -15,4 +15,4 @@
# limitations under the License.
#
-class=org.apache.camel.k.yaml.parser.TransformStepParser
\ No newline at end of file
+class=org.apache.camel.k.loader.yaml.parser.TransformStepParser
\ No newline at end of file
diff --git a/camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/unmarshal b/camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/unmarshal
similarity index 92%
rename from camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/unmarshal
rename to camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/unmarshal
index aeeb170..5ef1e11 100644
--- a/camel-k-runtime-yaml/src/main/resources/META-INF/services/org/apache/camel/k/yaml/unmarshal
+++ b/camel-k-loader-yaml/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/unmarshal
@@ -15,4 +15,4 @@
# limitations under the License.
#
-class=org.apache.camel.k.yaml.parser.UnmarshalStepParser
\ No newline at end of file
+class=org.apache.camel.k.loader.yaml.parser.UnmarshalStepParser
\ No newline at end of file
diff --git a/camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/RouteDefinitionTest.groovy b/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/RouteDefinitionTest.groovy
similarity index 99%
rename from camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/RouteDefinitionTest.groovy
rename to camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/RouteDefinitionTest.groovy
index d0eb55f..5365d2d 100644
--- a/camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/RouteDefinitionTest.groovy
+++ b/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/RouteDefinitionTest.groovy
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.yaml
+package org.apache.camel.k.loader.yaml
import org.apache.camel.impl.DefaultCamelContext
import org.apache.camel.model.ChoiceDefinition
diff --git a/camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/RouteTest.groovy b/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/RouteTest.groovy
similarity index 98%
rename from camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/RouteTest.groovy
rename to camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/RouteTest.groovy
index dbf8564..8337653 100644
--- a/camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/RouteTest.groovy
+++ b/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/RouteTest.groovy
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.yaml
+package org.apache.camel.k.loader.yaml
import org.apache.camel.component.mock.MockEndpoint
diff --git a/camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/TestSupport.groovy b/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/TestSupport.groovy
similarity index 96%
rename from camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/TestSupport.groovy
rename to camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/TestSupport.groovy
index 543d124..bc44871 100644
--- a/camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/TestSupport.groovy
+++ b/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/TestSupport.groovy
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.yaml
+package org.apache.camel.k.loader.yaml
import com.fasterxml.jackson.databind.JsonNode
import groovy.util.logging.Slf4j
import org.apache.camel.CamelContext
import org.apache.camel.component.mock.MockEndpoint
import org.apache.camel.impl.DefaultCamelContext
-import org.apache.camel.k.yaml.parser.StepParser
+import org.apache.camel.k.loader.yaml.parser.StepParser
import org.apache.commons.io.IOUtils
import spock.lang.Specification
diff --git a/camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/ChoiceTest.groovy b/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ChoiceTest.groovy
similarity index 97%
rename from camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/ChoiceTest.groovy
rename to camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ChoiceTest.groovy
index e06acdc..08d1a24 100644
--- a/camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/ChoiceTest.groovy
+++ b/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ChoiceTest.groovy
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.yaml.parser
+package org.apache.camel.k.loader.yaml.parser
-import org.apache.camel.k.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.TestSupport
import org.apache.camel.model.ChoiceDefinition
class ChoiceTest extends TestSupport {
diff --git a/camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/ClaimCheckTest.groovy b/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ClaimCheckTest.groovy
similarity index 91%
rename from camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/ClaimCheckTest.groovy
rename to camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ClaimCheckTest.groovy
index 2c163a0..6c06521 100644
--- a/camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/ClaimCheckTest.groovy
+++ b/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ClaimCheckTest.groovy
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.yaml.parser
+package org.apache.camel.k.loader.yaml.parser
+
-import org.apache.camel.k.yaml.TestSupport
import org.apache.camel.model.ClaimCheckDefinition
import org.apache.camel.model.ClaimCheckOperation
-class ClaimCheckTest extends TestSupport {
+class ClaimCheckTest extends org.apache.camel.k.loader.yaml.TestSupport {
def "definition"() {
given:
def stepContext = stepContext('''
diff --git a/camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/ConvertBodyTest.groovy b/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ConvertBodyTest.groovy
similarity index 93%
rename from camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/ConvertBodyTest.groovy
rename to camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ConvertBodyTest.groovy
index 35bd454..5c1daa9 100644
--- a/camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/ConvertBodyTest.groovy
+++ b/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ConvertBodyTest.groovy
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.yaml.parser
+package org.apache.camel.k.loader.yaml.parser
-import org.apache.camel.k.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.TestSupport
import org.apache.camel.model.ConvertBodyDefinition
class ConvertBodyTest extends TestSupport {
diff --git a/camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/DelayTest.groovy b/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/DelayTest.groovy
similarity index 95%
rename from camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/DelayTest.groovy
rename to camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/DelayTest.groovy
index d116c0d..e7f2837 100644
--- a/camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/DelayTest.groovy
+++ b/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/DelayTest.groovy
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.yaml.parser
+package org.apache.camel.k.loader.yaml.parser
-import org.apache.camel.k.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.TestSupport
import org.apache.camel.model.DelayDefinition
class DelayTest extends TestSupport {
diff --git a/camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/DynamicRouterTest.groovy b/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/DynamicRouterTest.groovy
similarity index 94%
rename from camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/DynamicRouterTest.groovy
rename to camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/DynamicRouterTest.groovy
index fe8b79f..623e809 100644
--- a/camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/DynamicRouterTest.groovy
+++ b/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/DynamicRouterTest.groovy
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.yaml.parser
+package org.apache.camel.k.loader.yaml.parser
-import org.apache.camel.k.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.TestSupport
import org.apache.camel.model.DynamicRouterDefinition
class DynamicRouterTest extends TestSupport {
diff --git a/camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/FilterTest.groovy b/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/FilterTest.groovy
similarity index 94%
rename from camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/FilterTest.groovy
rename to camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/FilterTest.groovy
index 91a4d5c..9249a3b 100644
--- a/camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/FilterTest.groovy
+++ b/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/FilterTest.groovy
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.yaml.parser
+package org.apache.camel.k.loader.yaml.parser
-import org.apache.camel.k.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.TestSupport
import org.apache.camel.model.FilterDefinition
class FilterTest extends TestSupport {
diff --git a/camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/FromTest.groovy b/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/FromTest.groovy
similarity index 95%
rename from camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/FromTest.groovy
rename to camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/FromTest.groovy
index 72fda32..14b4a5b 100644
--- a/camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/FromTest.groovy
+++ b/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/FromTest.groovy
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.yaml.parser
+package org.apache.camel.k.loader.yaml.parser
-import org.apache.camel.k.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.TestSupport
import org.apache.camel.model.FromDefinition
import org.apache.camel.model.RouteDefinition
diff --git a/camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/LogTest.groovy b/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/LogTest.groovy
similarity index 93%
rename from camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/LogTest.groovy
rename to camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/LogTest.groovy
index bfae9f9..6a1025f 100644
--- a/camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/LogTest.groovy
+++ b/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/LogTest.groovy
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.yaml.parser
+package org.apache.camel.k.loader.yaml.parser
import org.apache.camel.LoggingLevel
-import org.apache.camel.k.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.TestSupport
import org.apache.camel.model.LogDefinition
class LogTest extends TestSupport {
diff --git a/camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/MarshalTest.groovy b/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/MarshalTest.groovy
similarity index 96%
rename from camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/MarshalTest.groovy
rename to camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/MarshalTest.groovy
index e65e0ae..fa2a160 100644
--- a/camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/MarshalTest.groovy
+++ b/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/MarshalTest.groovy
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.yaml.parser
+package org.apache.camel.k.loader.yaml.parser
-import org.apache.camel.k.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.TestSupport
import org.apache.camel.model.MarshalDefinition
class MarshalTest extends TestSupport {
diff --git a/camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/PipelineTest.groovy b/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/PipelineTest.groovy
similarity index 88%
rename from camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/PipelineTest.groovy
rename to camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/PipelineTest.groovy
index c58ff9b..6c13f1c 100644
--- a/camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/PipelineTest.groovy
+++ b/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/PipelineTest.groovy
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.yaml.parser
+package org.apache.camel.k.loader.yaml.parser
-import org.apache.camel.k.yaml.TestSupport
-import org.apache.camel.k.yaml.Yaml
+
+import org.apache.camel.k.loader.yaml.TestSupport
import org.apache.camel.model.PipelineDefinition
class PipelineTest extends TestSupport {
@@ -39,7 +39,7 @@ class PipelineTest extends TestSupport {
def "should fail without steps"() {
given:
- def stepContext = stepContext(Yaml.MAPPER.createObjectNode());
+ def stepContext = stepContext(org.apache.camel.k.loader.yaml.Yaml.MAPPER.createObjectNode());
when:
new PipelineStepParser().toProcessor(stepContext)
then:
diff --git a/camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/ProcessTest.groovy b/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ProcessTest.groovy
similarity index 92%
rename from camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/ProcessTest.groovy
rename to camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ProcessTest.groovy
index f5da18f..ad8b3f9 100644
--- a/camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/ProcessTest.groovy
+++ b/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ProcessTest.groovy
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.yaml.parser
+package org.apache.camel.k.loader.yaml.parser
-import org.apache.camel.k.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.TestSupport
import org.apache.camel.model.ProcessDefinition
class ProcessTest extends TestSupport {
diff --git a/camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/RemoveHeaderTest.groovy b/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RemoveHeaderTest.groovy
similarity index 92%
rename from camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/RemoveHeaderTest.groovy
rename to camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RemoveHeaderTest.groovy
index f2f700e..39ac88a 100644
--- a/camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/RemoveHeaderTest.groovy
+++ b/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RemoveHeaderTest.groovy
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.yaml.parser
+package org.apache.camel.k.loader.yaml.parser
-import org.apache.camel.k.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.TestSupport
import org.apache.camel.model.RemoveHeaderDefinition
class RemoveHeaderTest extends TestSupport {
diff --git a/camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/RemoveHeadersTest.groovy b/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RemoveHeadersTest.groovy
similarity index 92%
rename from camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/RemoveHeadersTest.groovy
rename to camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RemoveHeadersTest.groovy
index 4a164a3..4fd49ce 100644
--- a/camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/RemoveHeadersTest.groovy
+++ b/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RemoveHeadersTest.groovy
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.yaml.parser
+package org.apache.camel.k.loader.yaml.parser
+
-import org.apache.camel.k.yaml.TestSupport
import org.apache.camel.model.RemoveHeadersDefinition
-class RemoveHeadersTest extends TestSupport {
+class RemoveHeadersTest extends org.apache.camel.k.loader.yaml.TestSupport {
def "definition"() {
given:
diff --git a/camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/RemovePropertiesTest.groovy b/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RemovePropertiesTest.groovy
similarity index 92%
rename from camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/RemovePropertiesTest.groovy
rename to camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RemovePropertiesTest.groovy
index add30aa..90a151e 100644
--- a/camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/RemovePropertiesTest.groovy
+++ b/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RemovePropertiesTest.groovy
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.yaml.parser
+package org.apache.camel.k.loader.yaml.parser
+
-import org.apache.camel.k.yaml.TestSupport
import org.apache.camel.model.RemovePropertiesDefinition
-class RemovePropertiesTest extends TestSupport {
+class RemovePropertiesTest extends org.apache.camel.k.loader.yaml.TestSupport {
def "definition"() {
given:
diff --git a/camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/RemovePropertyTest.groovy b/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RemovePropertyTest.groovy
similarity index 92%
rename from camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/RemovePropertyTest.groovy
rename to camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RemovePropertyTest.groovy
index 2e0684b..edd0412 100644
--- a/camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/RemovePropertyTest.groovy
+++ b/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RemovePropertyTest.groovy
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.yaml.parser
+package org.apache.camel.k.loader.yaml.parser
-import org.apache.camel.k.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.TestSupport
import org.apache.camel.model.RemovePropertyDefinition
class RemovePropertyTest extends TestSupport {
diff --git a/camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/RestTest.groovy b/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RestTest.groovy
similarity index 96%
rename from camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/RestTest.groovy
rename to camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RestTest.groovy
index 5c18da3..9fe806a 100644
--- a/camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/RestTest.groovy
+++ b/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/RestTest.groovy
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.yaml.parser
+package org.apache.camel.k.loader.yaml.parser
-import org.apache.camel.k.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.TestSupport
import org.apache.camel.model.RouteDefinition
import org.apache.camel.model.rest.GetVerbDefinition
diff --git a/camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/SetBodyTest.groovy b/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SetBodyTest.groovy
similarity index 94%
rename from camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/SetBodyTest.groovy
rename to camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SetBodyTest.groovy
index 8a8e34c..a8bcb1f 100644
--- a/camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/SetBodyTest.groovy
+++ b/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SetBodyTest.groovy
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.yaml.parser
+package org.apache.camel.k.loader.yaml.parser
-import org.apache.camel.k.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.TestSupport
import org.apache.camel.model.SetBodyDefinition
class SetBodyTest extends TestSupport {
diff --git a/camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/SetHeaderTest.groovy b/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SetHeaderTest.groovy
similarity index 95%
rename from camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/SetHeaderTest.groovy
rename to camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SetHeaderTest.groovy
index 5d4e597..689e1e2 100644
--- a/camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/SetHeaderTest.groovy
+++ b/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SetHeaderTest.groovy
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.yaml.parser
+package org.apache.camel.k.loader.yaml.parser
-import org.apache.camel.k.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.TestSupport
import org.apache.camel.model.SetHeaderDefinition
class SetHeaderTest extends TestSupport {
diff --git a/camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/SetPropertyTest.groovy b/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SetPropertyTest.groovy
similarity index 95%
rename from camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/SetPropertyTest.groovy
rename to camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SetPropertyTest.groovy
index 31a5286..66851e3 100644
--- a/camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/SetPropertyTest.groovy
+++ b/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SetPropertyTest.groovy
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.yaml.parser
+package org.apache.camel.k.loader.yaml.parser
-import org.apache.camel.k.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.TestSupport
import org.apache.camel.model.SetPropertyDefinition
class SetPropertyTest extends TestSupport {
diff --git a/camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/SplitTest.groovy b/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SplitTest.groovy
similarity index 94%
rename from camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/SplitTest.groovy
rename to camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SplitTest.groovy
index c798ab6..2e12fd4 100644
--- a/camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/SplitTest.groovy
+++ b/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/SplitTest.groovy
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.yaml.parser
+package org.apache.camel.k.loader.yaml.parser
-import org.apache.camel.k.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.TestSupport
import org.apache.camel.model.SplitDefinition
class SplitTest extends TestSupport {
diff --git a/camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/ToDynamicTest.groovy b/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ToDynamicTest.groovy
similarity index 94%
rename from camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/ToDynamicTest.groovy
rename to camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ToDynamicTest.groovy
index 65cda84..a7ec5d4 100644
--- a/camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/ToDynamicTest.groovy
+++ b/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ToDynamicTest.groovy
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.yaml.parser
+package org.apache.camel.k.loader.yaml.parser
import com.fasterxml.jackson.databind.node.TextNode
import org.apache.camel.impl.DefaultCamelContext
-import org.apache.camel.k.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.TestSupport
import org.apache.camel.model.ToDynamicDefinition
class ToDynamicTest extends TestSupport {
diff --git a/camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/ToTest.groovy b/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ToTest.groovy
similarity index 94%
rename from camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/ToTest.groovy
rename to camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ToTest.groovy
index fbdcd6c..bfd54ae 100644
--- a/camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/ToTest.groovy
+++ b/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/ToTest.groovy
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.yaml.parser
+package org.apache.camel.k.loader.yaml.parser
import com.fasterxml.jackson.databind.node.TextNode
-import org.apache.camel.k.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.TestSupport
import org.apache.camel.model.ToDefinition
class ToTest extends TestSupport {
diff --git a/camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/UnmarshalTest.groovy b/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/UnmarshalTest.groovy
similarity index 96%
rename from camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/UnmarshalTest.groovy
rename to camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/UnmarshalTest.groovy
index 95834ed..b815931 100644
--- a/camel-k-runtime-yaml/src/test/groovy/org/apache/camel/k/yaml/parser/UnmarshalTest.groovy
+++ b/camel-k-loader-yaml/src/test/groovy/org/apache/camel/k/loader/yaml/parser/UnmarshalTest.groovy
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.yaml.parser
+package org.apache.camel.k.loader.yaml.parser
-import org.apache.camel.k.yaml.TestSupport
+import org.apache.camel.k.loader.yaml.TestSupport
import org.apache.camel.model.UnmarshalDefinition
class UnmarshalTest extends TestSupport {
diff --git a/camel-k-runtime-kotlin/src/test/resources/log4j2-test.xml b/camel-k-loader-yaml/src/test/resources/log4j2-test.xml
similarity index 100%
rename from camel-k-runtime-kotlin/src/test/resources/log4j2-test.xml
rename to camel-k-loader-yaml/src/test/resources/log4j2-test.xml
diff --git a/camel-k-runtime-bom/pom.xml b/camel-k-runtime-bom/pom.xml
index 26be2dc..c337d8d 100644
--- a/camel-k-runtime-bom/pom.xml
+++ b/camel-k-runtime-bom/pom.xml
@@ -117,32 +117,67 @@
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-groovy</artifactId>
+ <artifactId>camel-k-runtime-health</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-kotlin</artifactId>
+ <artifactId>camel-k-runtime-servlet</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-yaml</artifactId>
+ <artifactId>camel-k-runtime-knative</artifactId>
<version>${project.version}</version>
</dependency>
+
+
+ <!-- loaders -->
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-health</artifactId>
+ <artifactId>camel-k-loader-kotlin</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-servlet</artifactId>
+ <artifactId>camel-k-loader-groovy</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-knative</artifactId>
+ <artifactId>camel-k-loader-yaml</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.k</groupId>
+ <artifactId>camel-k-loader-js</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.k</groupId>
+ <artifactId>camel-k-loader-xml</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.k</groupId>
+ <artifactId>camel-k-loader-java</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <!-- legacy -->
+ <dependency>
+ <groupId>org.apache.camel.k</groupId>
+ <artifactId>camel-k-runtime-groovy</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.k</groupId>
+ <artifactId>camel-k-runtime-kotlin</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.k</groupId>
+ <artifactId>camel-k-runtime-yaml</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/PipelineStepParser.java b/camel-k-runtime-core/src/test/java/org/apache/camel/k/SourceTest.java
similarity index 52%
rename from camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/PipelineStepParser.java
rename to camel-k-runtime-core/src/test/java/org/apache/camel/k/SourceTest.java
index 27ea234..cba9496 100644
--- a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/PipelineStepParser.java
+++ b/camel-k-runtime-core/src/test/java/org/apache/camel/k/SourceTest.java
@@ -14,30 +14,32 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.yaml.parser;
+package org.apache.camel.k;
-import java.util.List;
+import org.junit.jupiter.api.Test;
-import org.apache.camel.model.PipelineDefinition;
-import org.apache.camel.model.ProcessorDefinition;
+import static org.assertj.core.api.AssertionsForClassTypes.assertThatExceptionOfType;
-public class PipelineStepParser implements ProcessorStepParser {
- @Override
- public ProcessorDefinition<?> toProcessor(Context context) {
- final Definition definition = context.node(Definition.class);
- final PipelineDefinition answer = new PipelineDefinition();
-
- StepParserSupport.notNull(definition.steps, "steps");
+public class SourceTest {
+ @Test
+ public void testResourceWithoutScheme() {
+ assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(
+ () -> Source.create("routes.js")
+ );
+ }
- return StepParserSupport.convertSteps(
- context,
- answer,
- definition.steps
+ @Test
+ public void testResourceWithIllegalScheme() {
+ assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(
+ () -> Source.create("http:routes.js")
);
}
- public static final class Definition {
- public List<org.apache.camel.k.yaml.model.Step> steps;
+ @Test
+ public void testUnsupportedLanguage() {
+ assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(
+ () -> Source.create(" test")
+ );
}
-}
+}
diff --git a/camel-k-runtime-examples/camel-k-runtime-example-health/pom.xml b/camel-k-runtime-examples/camel-k-runtime-example-health/pom.xml
index ab15e19..2cbf640 100644
--- a/camel-k-runtime-examples/camel-k-runtime-example-health/pom.xml
+++ b/camel-k-runtime-examples/camel-k-runtime-example-health/pom.xml
@@ -49,7 +49,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-groovy</artifactId>
+ <artifactId>camel-k-loader-groovy</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
diff --git a/camel-k-runtime-examples/camel-k-runtime-example-servlet/pom.xml b/camel-k-runtime-examples/camel-k-runtime-example-servlet/pom.xml
index 07a8050..af95005 100644
--- a/camel-k-runtime-examples/camel-k-runtime-example-servlet/pom.xml
+++ b/camel-k-runtime-examples/camel-k-runtime-example-servlet/pom.xml
@@ -49,7 +49,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-groovy</artifactId>
+ <artifactId>camel-k-loader-groovy</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
diff --git a/camel-k-runtime-examples/camel-k-runtime-example-yaml/pom.xml b/camel-k-runtime-examples/camel-k-runtime-example-yaml/pom.xml
index 398a978..b7b8b1e 100644
--- a/camel-k-runtime-examples/camel-k-runtime-example-yaml/pom.xml
+++ b/camel-k-runtime-examples/camel-k-runtime-example-yaml/pom.xml
@@ -53,15 +53,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-groovy</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.k</groupId>
<artifactId>camel-k-runtime-servlet</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-yaml</artifactId>
+ <artifactId>camel-k-loader-yaml</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
diff --git a/camel-k-runtime-groovy/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule b/camel-k-runtime-groovy/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule
deleted file mode 100644
index 217436e..0000000
--- a/camel-k-runtime-groovy/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule
+++ /dev/null
@@ -1,4 +0,0 @@
-moduleName=camel-k-runtime-groovy
-moduleVersion=0.0.3-SNAPSHOT
-extensionClasses=org.apache.camel.k.groovy.extension.LogComponentExtension
-#staticExtensionClasses=support.StaticStringExtension
\ No newline at end of file
diff --git a/camel-k-runtime-jvm/pom.xml b/camel-k-runtime-jvm/pom.xml
index 48bcb2e..1390ffb 100644
--- a/camel-k-runtime-jvm/pom.xml
+++ b/camel-k-runtime-jvm/pom.xml
@@ -56,11 +56,7 @@
<artifactId>log4j-core</artifactId>
<version>${log4j2.version}</version>
</dependency>
- <dependency>
- <groupId>org.jooq</groupId>
- <artifactId>joor-java-8</artifactId>
- <version>${joor.version}</version>
- </dependency>
+
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
diff --git a/camel-k-runtime-jvm/src/test/java/org/apache/camel/k/jvm/RuntimeTest.java b/camel-k-runtime-jvm/src/test/java/org/apache/camel/k/jvm/RuntimeTest.java
index 671f3ad..824e2d3 100644
--- a/camel-k-runtime-jvm/src/test/java/org/apache/camel/k/jvm/RuntimeTest.java
+++ b/camel-k-runtime-jvm/src/test/java/org/apache/camel/k/jvm/RuntimeTest.java
@@ -25,12 +25,13 @@ import org.apache.camel.k.listener.ContextConfigurer;
import org.apache.camel.k.listener.RoutesConfigurer;
import org.apache.camel.model.ModelCamelContext;
import org.apache.camel.util.ObjectHelper;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Java6Assertions.assertThat;
public class RuntimeTest {
-
+ @Disabled
@Test
void testLoadMultipleRoutes() throws Exception {
ApplicationRuntime runtime = new ApplicationRuntime();
@@ -55,7 +56,7 @@ public class RuntimeTest {
}
}
-
+ @Disabled
@Test
void testLoadRouteAndRest() throws Exception {
ApplicationRuntime runtime = new ApplicationRuntime();
diff --git a/camel-k-runtime-knative/pom.xml b/camel-k-runtime-knative/pom.xml
index febd934..9a6fb97 100644
--- a/camel-k-runtime-knative/pom.xml
+++ b/camel-k-runtime-knative/pom.xml
@@ -38,7 +38,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-yaml</artifactId>
+ <artifactId>camel-k-loader-yaml</artifactId>
<optional>true</optional>
</dependency>
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
index ed92f24..f778ccf 100644
--- 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
@@ -23,9 +23,9 @@ import java.util.Map;
import com.fasterxml.jackson.annotation.JsonIgnore;
import org.apache.camel.component.knative.Knative;
-import org.apache.camel.k.yaml.parser.ProcessorStepParser;
-import org.apache.camel.k.yaml.parser.StartStepParser;
-import org.apache.camel.k.yaml.parser.StepParserSupport;
+import org.apache.camel.k.loader.yaml.parser.ProcessorStepParser;
+import org.apache.camel.k.loader.yaml.parser.StartStepParser;
+import org.apache.camel.k.loader.yaml.parser.StepParserSupport;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.model.RouteDefinition;
import org.apache.camel.model.ToDefinition;
@@ -58,7 +58,7 @@ public class KnativeStepParser implements ProcessorStepParser, StartStepParser {
public Knative.Type type;
public String name;
public Map<String, Object> parameters;
- public List<org.apache.camel.k.yaml.model.Step> steps;
+ public List<org.apache.camel.k.loader.yaml.model.Step> steps;
@JsonIgnore
public String getEndpointUri() {
diff --git a/camel-k-runtime-knative/src/main/resources/META-INF/services/org/apache/camel/k/yaml/knative b/camel-k-runtime-knative/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/knative
similarity index 100%
rename from camel-k-runtime-knative/src/main/resources/META-INF/services/org/apache/camel/k/yaml/knative
rename to camel-k-runtime-knative/src/main/resources/META-INF/services/org/apache/camel/k/loader/yaml-parser/knative
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
index a053062..ba605c0 100644
--- 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
@@ -22,8 +22,8 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.k.RoutesLoader;
import org.apache.camel.k.Source;
+import org.apache.camel.k.loader.yaml.YamlRoutesLoader;
import org.apache.camel.k.support.RuntimeSupport;
-import org.apache.camel.k.yaml.YamlRoutesLoader;
import org.apache.camel.model.FromDefinition;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.model.RouteDefinition;
diff --git a/camel-k-runtime-groovy/src/test/resources/log4j2-test.xml b/camel-k-runtime-legacy/camel-k-runtime-groovy/pom.xml
similarity index 55%
copy from camel-k-runtime-groovy/src/test/resources/log4j2-test.xml
copy to camel-k-runtime-legacy/camel-k-runtime-groovy/pom.xml
index 42e5526..673ddac 100644
--- a/camel-k-runtime-groovy/src/test/resources/log4j2-test.xml
+++ b/camel-k-runtime-legacy/camel-k-runtime-groovy/pom.xml
@@ -17,20 +17,22 @@
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>
+<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-legacy</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <packaging>pom</packaging>
+ <artifactId>camel-k-runtime-groovy</artifactId>
- <Loggers>
- <Root level="INFO">
- <!--<AppenderRef ref="STDOUT"/>-->
- <AppenderRef ref="NONE"/>
- </Root>
- </Loggers>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.camel.k</groupId>
+ <artifactId>camel-k-loader-groovy</artifactId>
+ </dependency>
+ </dependencies>
-</Configuration>
\ No newline at end of file
+</project>
diff --git a/camel-k-runtime-groovy/src/test/resources/log4j2-test.xml b/camel-k-runtime-legacy/camel-k-runtime-kotlin/pom.xml
similarity index 55%
copy from camel-k-runtime-groovy/src/test/resources/log4j2-test.xml
copy to camel-k-runtime-legacy/camel-k-runtime-kotlin/pom.xml
index 42e5526..297cd0d 100644
--- a/camel-k-runtime-groovy/src/test/resources/log4j2-test.xml
+++ b/camel-k-runtime-legacy/camel-k-runtime-kotlin/pom.xml
@@ -17,20 +17,22 @@
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>
+<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-legacy</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <packaging>pom</packaging>
+ <artifactId>camel-k-runtime-kotlin</artifactId>
- <Loggers>
- <Root level="INFO">
- <!--<AppenderRef ref="STDOUT"/>-->
- <AppenderRef ref="NONE"/>
- </Root>
- </Loggers>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.camel.k</groupId>
+ <artifactId>camel-k-loader-kotlin</artifactId>
+ </dependency>
+ </dependencies>
-</Configuration>
\ No newline at end of file
+</project>
diff --git a/camel-k-runtime-groovy/src/test/resources/log4j2-test.xml b/camel-k-runtime-legacy/camel-k-runtime-yaml/pom.xml
similarity index 55%
copy from camel-k-runtime-groovy/src/test/resources/log4j2-test.xml
copy to camel-k-runtime-legacy/camel-k-runtime-yaml/pom.xml
index 42e5526..b014507 100644
--- a/camel-k-runtime-groovy/src/test/resources/log4j2-test.xml
+++ b/camel-k-runtime-legacy/camel-k-runtime-yaml/pom.xml
@@ -17,20 +17,22 @@
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>
+<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-legacy</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <packaging>pom</packaging>
+ <artifactId>camel-k-runtime-yaml</artifactId>
- <Loggers>
- <Root level="INFO">
- <!--<AppenderRef ref="STDOUT"/>-->
- <AppenderRef ref="NONE"/>
- </Root>
- </Loggers>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.camel.k</groupId>
+ <artifactId>camel-k-loader-yaml</artifactId>
+ </dependency>
+ </dependencies>
-</Configuration>
\ No newline at end of file
+</project>
diff --git a/camel-k-runtime-groovy/src/test/resources/log4j2-test.xml b/camel-k-runtime-legacy/pom.xml
similarity index 55%
rename from camel-k-runtime-groovy/src/test/resources/log4j2-test.xml
rename to camel-k-runtime-legacy/pom.xml
index 42e5526..dc41242 100644
--- a/camel-k-runtime-groovy/src/test/resources/log4j2-test.xml
+++ b/camel-k-runtime-legacy/pom.xml
@@ -17,20 +17,22 @@
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
+<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.0.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <packaging>pom</packaging>
+ <artifactId>camel-k-runtime-legacy</artifactId>
+
+
+ <modules>
+ <module>camel-k-runtime-kotlin</module>
+ <module>camel-k-runtime-groovy</module>
+ <module>camel-k-runtime-yaml</module>
+ </modules>
+
+</project>
diff --git a/pom.xml b/pom.xml
index a92cbc8..7c58b02 100644
--- a/pom.xml
+++ b/pom.xml
@@ -188,14 +188,20 @@
<module>camel-k-maven-plugin</module>
<module>camel-k-runtime-core</module>
<module>camel-k-runtime-jvm</module>
- <module>camel-k-runtime-groovy</module>
- <module>camel-k-runtime-kotlin</module>
- <module>camel-k-runtime-yaml</module>
+
+ <module>camel-k-loader-groovy</module>
+ <module>camel-k-loader-kotlin</module>
+ <module>camel-k-loader-yaml</module>
+ <module>camel-k-loader-js</module>
+ <module>camel-k-loader-xml</module>
+ <module>camel-k-loader-java</module>
+
<module>camel-k-runtime-health</module>
<module>camel-k-runtime-servlet</module>
<module>camel-k-runtime-examples</module>
<module>camel-k-runtime-knative</module>
<module>camel-k-runtime-bom</module>
+ <module>camel-k-runtime-legacy</module>
<module>distribution</module>
</modules>
@@ -246,11 +252,13 @@
<artifactId>camel-knative-http</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.camel.k</groupId>
<artifactId>camel-k-runtime-core</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.camel.k</groupId>
<artifactId>camel-k-runtime-jvm</artifactId>
@@ -258,32 +266,66 @@
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-groovy</artifactId>
+ <artifactId>camel-k-runtime-health</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-kotlin</artifactId>
+ <artifactId>camel-k-runtime-servlet</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-yaml</artifactId>
+ <artifactId>camel-k-runtime-knative</artifactId>
<version>${project.version}</version>
</dependency>
+
+ <!-- loaders -->
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-health</artifactId>
+ <artifactId>camel-k-loader-kotlin</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-servlet</artifactId>
+ <artifactId>camel-k-loader-groovy</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-knative</artifactId>
+ <artifactId>camel-k-loader-yaml</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.k</groupId>
+ <artifactId>camel-k-loader-js</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.k</groupId>
+ <artifactId>camel-k-loader-xml</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.k</groupId>
+ <artifactId>camel-k-loader-java</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <!-- legacy -->
+ <dependency>
+ <groupId>org.apache.camel.k</groupId>
+ <artifactId>camel-k-runtime-groovy</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.k</groupId>
+ <artifactId>camel-k-runtime-kotlin</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.k</groupId>
+ <artifactId>camel-k-runtime-yaml</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>