apache · lburgazzoli · Jul 16, 2019 · Jul 16, 2019 · Jul 16, 2019 · Jul 16, 2019
diff --git a/camel-k-runtime-groovy/pom.xml → camel-k-loader-groovy/pom.xml b/camel-k-runtime-groovy/pom.xml → 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/groovy/GroovyRoutesLoader.groovy → ...k/loader/groovy/GroovyRoutesLoader.groovy b/.../camel/k/groovy/GroovyRoutesLoader.groovy → ...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/.../groovy/dsl/ComponentConfiguration.groovy → .../groovy/dsl/ComponentConfiguration.groovy b/.../groovy/dsl/ComponentConfiguration.groovy → .../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-loader-groovy/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/Components.java b/camel-k-loader-groovy/src/main/groovy/org/apache/camel/k/loader/groovy/dsl/Components.java
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.k.loader.groovy.dsl;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.Component;
+
+public class Components {
+    private CamelContext context;
+
+    public Components(CamelContext context) {
+        this.context = context;
+    }
+
+    public Component get(String scheme) {
+        return context.getComponent(scheme, true);
+    }
+
+    public Component put(String scheme, Component instance) {
+        context.addComponent(scheme, instance);
+
+        return instance;
+    }
+
+    public Component make(String scheme, String type) {
+        final Class<?> clazz = context.getClassResolver().resolveClass(type);
+        final Component instance = (Component)context.getInjector().newInstance(clazz);
+
+        context.addComponent(scheme, instance);
+
+        return instance;
+    }
+}
diff --git a/...groovy/dsl/ComponentsConfiguration.groovy → ...groovy/dsl/ComponentsConfiguration.groovy b/...groovy/dsl/ComponentsConfiguration.groovy → ...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/.../k/groovy/dsl/ContextConfiguration.groovy → ...er/groovy/dsl/ContextConfiguration.groovy b/.../k/groovy/dsl/ContextConfiguration.groovy → ...er/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/...roovy/dsl/IntegrationConfiguration.groovy → ...roovy/dsl/IntegrationConfiguration.groovy b/...roovy/dsl/IntegrationConfiguration.groovy → ...roovy/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/...k/groovy/dsl/RegistryConfiguration.groovy → ...r/groovy/dsl/RegistryConfiguration.groovy b/...k/groovy/dsl/RegistryConfiguration.groovy → ...r/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/...mel/k/groovy/dsl/RestConfiguration.groovy → ...oader/groovy/dsl/RestConfiguration.groovy b/...mel/k/groovy/dsl/RestConfiguration.groovy → ...oader/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/...vy/extension/LogComponentExtension.groovy → ...vy/extension/LogComponentExtension.groovy b/...vy/extension/LogComponentExtension.groovy → ...vy/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/...g.codehaus.groovy.runtime.ExtensionModule → ...g.codehaus.groovy.runtime.ExtensionModule b/...g.codehaus.groovy.runtime.ExtensionModule → ...g.codehaus.groovy.runtime.ExtensionModule
@@ -1,4 +1,4 @@
 moduleName=camel-k-runtime-groovy
 moduleVersion=0.0.3-SNAPSHOT
-extensionClasses=org.apache.camel.k.groovy.extension.LogComponentExtension
+extensionClasses=org.apache.camel.k.loader.groovy.extension.LogComponentExtension
 #staticExtensionClasses=support.StaticStringExtension
diff --git a/...services/org/apache/camel/k/loader/groovy → ...services/org/apache/camel/k/loader/groovy b/...services/org/apache/camel/k/loader/groovy → ...services/org/apache/camel/k/loader/groovy
@@ -15,4 +15,4 @@
 # limitations under the License.
 #
 
-class=org.apache.camel.k.groovy.GroovyRoutesLoader
+class=org.apache.camel.k.loader.groovy.GroovyRoutesLoader
diff --git a/...roovy/src/main/resources/integration.gdsl → ...roovy/src/main/resources/integration.gdsl b/...roovy/src/main/resources/integration.gdsl → ...roovy/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'))
 }
diff --git a/...g/apache/camel/k/groovy/LoaderTest.groovy → ...e/camel/k/loader/groovy/LoaderTest.groovy b/...g/apache/camel/k/groovy/LoaderTest.groovy → ...e/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/groovy/dsl/IntegrationTest.groovy → .../loader/groovy/dsl/IntegrationTest.groovy b/...camel/k/groovy/dsl/IntegrationTest.groovy → .../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/...ovy/dsl/extension/LogExtensionTest.groovy → ...ovy/dsl/extension/LogExtensionTest.groovy b/...ovy/dsl/extension/LogExtensionTest.groovy → ...ovy/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/...groovy/src/test/resources/log4j2-test.xml → ...groovy/src/test/resources/log4j2-test.xml b/...groovy/src/test/resources/log4j2-test.xml → ...groovy/src/test/resources/log4j2-test.xml
diff --git a/...est/resources/routes-with-bindings.groovy → ...est/resources/routes-with-bindings.groovy b/...est/resources/routes-with-bindings.groovy → ...est/resources/routes-with-bindings.groovy
diff --git a/...outes-with-component-configuration.groovy → ...outes-with-component-configuration.groovy b/...outes-with-component-configuration.groovy → ...outes-with-component-configuration.groovy
diff --git a/...esources/routes-with-error-handler.groovy → ...esources/routes-with-error-handler.groovy b/...esources/routes-with-error-handler.groovy → ...esources/routes-with-error-handler.groovy
diff --git a/...rc/test/resources/routes-with-rest.groovy → ...rc/test/resources/routes-with-rest.groovy b/...rc/test/resources/routes-with-rest.groovy → ...rc/test/resources/routes-with-rest.groovy
diff --git a/...e-groovy/src/test/resources/routes.groovy → ...r-groovy/src/test/resources/routes.groovy b/...e-groovy/src/test/resources/routes.groovy → ...r-groovy/src/test/resources/routes.groovy
diff --git a/camel-k-loader-java/pom.xml b/camel-k-loader-java/pom.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>org.apache.camel.k</groupId>
+        <artifactId>camel-k-runtime-parent</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>camel-k-loader-java</artifactId>
+
+    <dependencies>
+
+        <!-- ****************************** -->
+        <!--                                -->
+        <!-- RUNTIME                        -->
+        <!--                                -->
+        <!-- ****************************** -->
+
+        <dependency>
+            <groupId>org.apache.camel.k</groupId>
+            <artifactId>camel-k-runtime-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-core-engine</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jooq</groupId>
+            <artifactId>joor-java-8</artifactId>
+            <version>${joor.version}</version>
+        </dependency>
+
+        <!-- ****************************** -->
+        <!--                                -->
+        <!-- TESTS                          -->
+        <!--                                -->
+        <!-- ****************************** -->
+
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-undertow</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-timer</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-seda</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-log</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-rest</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-direct</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-properties</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-slf4j-impl</artifactId>
+            <version>${log4j2.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/...e/camel/k/jvm/loader/JavaClassLoader.java → .../k/loader/java/JavaClassRoutesLoader.java b/...e/camel/k/jvm/loader/JavaClassLoader.java → .../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.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/jvm/loader/JavaSourceLoader.java → ...k/loader/java/JavaSourceRoutesLoader.java b/.../camel/k/jvm/loader/JavaSourceLoader.java → ...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.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/.../services/org/apache/camel/k/loader/class → .../services/org/apache/camel/k/loader/class b/.../services/org/apache/camel/k/loader/class → .../services/org/apache/camel/k/loader/class
@@ -15,4 +15,4 @@
 # limitations under the License.
 #
 
-class=org.apache.camel.k.jvm.loader.JavaClassLoader
+class=org.apache.camel.k.loader.java.JavaClassRoutesLoader
diff --git a/...F/services/org/apache/camel/k/loader/java → ...F/services/org/apache/camel/k/loader/java b/...F/services/org/apache/camel/k/loader/java → ...F/services/org/apache/camel/k/loader/java
@@ -15,4 +15,4 @@
 # limitations under the License.
 #
 
-class=org.apache.camel.k.jvm.loader.JavaSourceLoader
+class=org.apache.camel.k.loader.java.JavaSourceRoutesLoader
diff --git a/...java/org/apache/camel/k/jvm/MyRoutes.java → .../apache/camel/k/loader/java/MyRoutes.java b/...java/org/apache/camel/k/jvm/MyRoutes.java → .../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;