This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git.
from be365ed Inject camel-k version as environment variable #285
new aa2890f runtime: initial support for traits #287
new 4a14f8c runtime: use camel built-in service loader to find routes
loaders
new 1331a29 runtime: refactor project layout
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
runtime/{jvm => camel-k-runtime-core}/pom.xml | 27 +---
.../main/java/org/apache/camel/k}/Constants.java | 5 +-
.../main/java/org/apache/camel/k}/Language.java | 18 ++-
.../java/org/apache/camel/k}/RoutesLoader.java | 2 +-
.../java/org/apache/camel/k}/RuntimeRegistry.java | 6 +-
.../java/org/apache/camel/k/RuntimeTrait.java} | 14 +-
.../src/main/java/org/apache/camel/k}/Source.java | 2 +-
runtime/{groovy => camel-k-runtime-groovy}/pom.xml | 0
.../camel/k/groovy/GroovyRoutesLoader.groovy | 4 +
.../k/groovy/dsl/ComponentConfiguration.groovy | 0
.../k/groovy/dsl/ComponentsConfiguration.groovy | 0
.../camel/k/groovy/dsl/ContextConfiguration.groovy | 2 +-
.../k/groovy/dsl/IntegrationConfiguration.groovy | 2 +-
.../k/groovy/dsl/RegistryConfiguration.groovy | 2 +-
.../camel/k/groovy/dsl/RestConfiguration.groovy | 0
.../groovy/extension/LogComponentExtension.groovy | 0
.../org.codehaus.groovy.runtime.ExtensionModule | 0
.../services/org/apache/camel/k/loader/groovy} | 2 +-
.../org/apache/camel/k/groovy/LoaderTest.groovy | 7 +-
.../camel/k/groovy/dsl/IntegrationTest.groovy | 0
.../k/groovy/dsl/extension/LogExtensionTest.groovy | 0
.../src/test/resources/log4j2-test.xml | 0
.../src/test/resources/routes-with-bindings.groovy | 0
.../routes-with-component-configuration.groovy | 0
.../src/test/resources/routes-with-rest.groovy | 0
.../src/test/resources/routes.groovy | 0
runtime/{jvm => camel-k-runtime-jvm}/pom.xml | 14 +-
.../java/org/apache/camel/k/jvm/Application.java | 23 ++-
.../main/java/org/apache/camel/k/jvm/Runtime.java | 5 +-
.../org/apache/camel/k/jvm/RuntimeSupport.java | 56 +++++++
.../apache/camel/k/jvm/SimpleRuntimeRegistry.java | 1 +
.../java/org/apache/camel/k/jvm/URIResolver.java | 2 +
.../org/apache/camel/k/jvm/dsl/Components.java | 0
.../apache/camel/k/jvm/loader/JavaClassLoader.java | 34 ++++
.../camel/k/jvm/loader/JavaScriptLoader.java | 58 +++++++
.../camel/k/jvm/loader/JavaSourceLoader.java | 45 ++++++
.../org/apache/camel/k/jvm/loader/XmlLoader.java | 50 ++++++
.../services/org/apache/camel/k/loader/java-class} | 2 +-
.../org/apache/camel/k/loader/java-source} | 2 +-
.../services/org/apache/camel/k/loader/js} | 2 +-
.../services/org/apache/camel/k/loader/xml} | 2 +-
.../src/main/resources/log4j2.properties | 0
.../org/apache/camel/k/jvm/PropertiesTest.java | 110 +++++--------
.../org/apache/camel/k/jvm/RoutesLoadersTest.java | 35 ++--
.../java/org/apache/camel/k/jvm/RuntimeTest.java | 0
.../apache/camel/k/jvm/RuntimeTestSupport.java} | 42 +++--
.../src/test/resources/MyRoutes.java | 0
.../test/resources/MyRoutesWithNestedClass.java | 0
.../src/test/resources/conf.d/001/conf.properties | 0
.../src/test/resources/conf.d/002/conf.properties | 0
.../src/test/resources/conf.properties | 0
.../src/test/resources/log4j2-test.xml | 0
.../src/test/resources/r1.js | 0
.../src/test/resources/r2.mytype | 0
.../src/test/resources/routes-compressed.js.gz.b64 | 0
.../src/test/resources/routes.js | 0
.../src/test/resources/routes.mytype | 0
.../src/test/resources/routes.xml | 0
runtime/{kotlin => camel-k-runtime-kotlin}/pom.xml | 0
.../apache/camel/k/kotlin/KotlinRoutesLoader.kt | 4 +
.../camel/k/kotlin/dsl/ComponentsConfiguration.kt | 0
.../camel/k/kotlin/dsl/ContextConfiguration.kt | 2 +-
.../camel/k/kotlin/dsl/IntegrationConfiguration.kt | 2 +-
.../camel/k/kotlin/dsl/RegistryConfiguration.kt | 2 +-
.../apache/camel/k/kotlin/dsl/RestConfiguration.kt | 0
.../k/kotlin/extension/LogComponentExtensions.kt | 0
.../services/org/apache/camel/k/loader/kotlin} | 2 +-
.../kotlin/org/apache/camel/k/kotlin/LoaderTest.kt | 7 +-
.../apache/camel/k/kotlin/dsl/IntegrationTest.kt | 0
.../camel/k/kotlin/extension/LogExtensionTest.kt | 0
.../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
.../src/test/resources/routes-with-rest.kts | 0
.../src/test/resources/routes.kts | 0
.../pom.xml | 0
.../apache/camel/k/spring/boot/Application.java | 18 ++-
.../services/org.apache.camel.k.jvm.RoutesLoader | 1 -
.../java/org/apache/camel/k/jvm/RoutesLoaders.java | 179 ---------------------
.../services/org.apache.camel.k.jvm.RoutesLoader | 4 -
.../services/javax.script.ScriptEngineFactory | 1 -
.../services/org.apache.camel.k.jvm.RoutesLoader | 1 -
runtime/pom.xml | 13 +-
84 files changed, 428 insertions(+), 384 deletions(-)
copy runtime/{jvm => camel-k-runtime-core}/pom.xml (76%)
rename runtime/{jvm/src/main/java/org/apache/camel/k/jvm =>
camel-k-runtime-core/src/main/java/org/apache/camel/k}/Constants.java (80%)
rename runtime/{jvm/src/main/java/org/apache/camel/k/jvm =>
camel-k-runtime-core/src/main/java/org/apache/camel/k}/Language.java (86%)
rename runtime/{jvm/src/main/java/org/apache/camel/k/jvm =>
camel-k-runtime-core/src/main/java/org/apache/camel/k}/RoutesLoader.java (97%)
rename runtime/{jvm/src/main/java/org/apache/camel/k/jvm =>
camel-k-runtime-core/src/main/java/org/apache/camel/k}/RuntimeRegistry.java
(96%)
copy
runtime/{camel-knative-http/src/main/java/org/apache/camel/component/knative/http/KnativeHttp.java
=> camel-k-runtime-core/src/main/java/org/apache/camel/k/RuntimeTrait.java}
(78%)
rename runtime/{jvm/src/main/java/org/apache/camel/k/jvm =>
camel-k-runtime-core/src/main/java/org/apache/camel/k}/Source.java (98%)
rename runtime/{groovy => camel-k-runtime-groovy}/pom.xml (100%)
rename runtime/{groovy =>
camel-k-runtime-groovy}/src/main/groovy/org/apache/camel/k/groovy/GroovyRoutesLoader.groovy
(93%)
rename runtime/{groovy =>
camel-k-runtime-groovy}/src/main/groovy/org/apache/camel/k/groovy/dsl/ComponentConfiguration.groovy
(100%)
rename runtime/{groovy =>
camel-k-runtime-groovy}/src/main/groovy/org/apache/camel/k/groovy/dsl/ComponentsConfiguration.groovy
(100%)
rename runtime/{groovy =>
camel-k-runtime-groovy}/src/main/groovy/org/apache/camel/k/groovy/dsl/ContextConfiguration.groovy
(97%)
rename runtime/{groovy =>
camel-k-runtime-groovy}/src/main/groovy/org/apache/camel/k/groovy/dsl/IntegrationConfiguration.groovy
(98%)
rename runtime/{groovy =>
camel-k-runtime-groovy}/src/main/groovy/org/apache/camel/k/groovy/dsl/RegistryConfiguration.groovy
(96%)
rename runtime/{groovy =>
camel-k-runtime-groovy}/src/main/groovy/org/apache/camel/k/groovy/dsl/RestConfiguration.groovy
(100%)
rename runtime/{groovy =>
camel-k-runtime-groovy}/src/main/groovy/org/apache/camel/k/groovy/extension/LogComponentExtension.groovy
(100%)
rename runtime/{groovy =>
camel-k-runtime-groovy}/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule
(100%)
copy
runtime/{camel-knative/src/main/resources/META-INF/services/org/apache/camel/component/knative
=>
camel-k-runtime-groovy/src/main/resources/META-INF/services/org/apache/camel/k/loader/groovy}
(93%)
rename runtime/{groovy =>
camel-k-runtime-groovy}/src/test/groovy/org/apache/camel/k/groovy/LoaderTest.groovy
(88%)
rename runtime/{groovy =>
camel-k-runtime-groovy}/src/test/groovy/org/apache/camel/k/groovy/dsl/IntegrationTest.groovy
(100%)
rename runtime/{groovy =>
camel-k-runtime-groovy}/src/test/groovy/org/apache/camel/k/groovy/dsl/extension/LogExtensionTest.groovy
(100%)
rename runtime/{groovy =>
camel-k-runtime-groovy}/src/test/resources/log4j2-test.xml (100%)
rename runtime/{groovy =>
camel-k-runtime-groovy}/src/test/resources/routes-with-bindings.groovy (100%)
rename runtime/{groovy =>
camel-k-runtime-groovy}/src/test/resources/routes-with-component-configuration.groovy
(100%)
rename runtime/{groovy =>
camel-k-runtime-groovy}/src/test/resources/routes-with-rest.groovy (100%)
rename runtime/{groovy =>
camel-k-runtime-groovy}/src/test/resources/routes.groovy (100%)
rename runtime/{jvm => camel-k-runtime-jvm}/pom.xml (90%)
rename runtime/{jvm =>
camel-k-runtime-jvm}/src/main/java/org/apache/camel/k/jvm/Application.java (83%)
rename runtime/{jvm =>
camel-k-runtime-jvm}/src/main/java/org/apache/camel/k/jvm/Runtime.java (94%)
rename runtime/{jvm =>
camel-k-runtime-jvm}/src/main/java/org/apache/camel/k/jvm/RuntimeSupport.java
(72%)
rename runtime/{jvm =>
camel-k-runtime-jvm}/src/main/java/org/apache/camel/k/jvm/SimpleRuntimeRegistry.java
(98%)
rename runtime/{jvm =>
camel-k-runtime-jvm}/src/main/java/org/apache/camel/k/jvm/URIResolver.java (97%)
copy runtime/{jvm =>
camel-k-runtime-jvm}/src/main/java/org/apache/camel/k/jvm/dsl/Components.java
(100%)
create mode 100644
runtime/camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/loader/JavaClassLoader.java
create mode 100644
runtime/camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/loader/JavaScriptLoader.java
create mode 100644
runtime/camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/loader/JavaSourceLoader.java
create mode 100644
runtime/camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/loader/XmlLoader.java
copy
runtime/{camel-knative/src/main/resources/META-INF/services/org/apache/camel/component/knative
=>
camel-k-runtime-jvm/src/main/resources/META-INF/services/org/apache/camel/k/loader/java-class}
(93%)
copy
runtime/{camel-knative/src/main/resources/META-INF/services/org/apache/camel/component/knative
=>
camel-k-runtime-jvm/src/main/resources/META-INF/services/org/apache/camel/k/loader/java-source}
(93%)
copy
runtime/{camel-knative/src/main/resources/META-INF/services/org/apache/camel/component/knative
=>
camel-k-runtime-jvm/src/main/resources/META-INF/services/org/apache/camel/k/loader/js}
(93%)
copy
runtime/{camel-knative/src/main/resources/META-INF/services/org/apache/camel/component/knative
=>
camel-k-runtime-jvm/src/main/resources/META-INF/services/org/apache/camel/k/loader/xml}
(93%)
rename runtime/{jvm =>
camel-k-runtime-jvm}/src/main/resources/log4j2.properties (100%)
rename runtime/{jvm =>
camel-k-runtime-jvm}/src/test/java/org/apache/camel/k/jvm/PropertiesTest.java
(55%)
rename runtime/{jvm =>
camel-k-runtime-jvm}/src/test/java/org/apache/camel/k/jvm/RoutesLoadersTest.java
(82%)
rename runtime/{jvm =>
camel-k-runtime-jvm}/src/test/java/org/apache/camel/k/jvm/RuntimeTest.java
(100%)
rename runtime/{jvm/src/main/java/org/apache/camel/k/jvm/dsl/Components.java
=>
camel-k-runtime-jvm/src/test/java/org/apache/camel/k/jvm/RuntimeTestSupport.java}
(52%)
rename runtime/{jvm => camel-k-runtime-jvm}/src/test/resources/MyRoutes.java
(100%)
rename runtime/{jvm =>
camel-k-runtime-jvm}/src/test/resources/MyRoutesWithNestedClass.java (100%)
rename runtime/{jvm =>
camel-k-runtime-jvm}/src/test/resources/conf.d/001/conf.properties (100%)
rename runtime/{jvm =>
camel-k-runtime-jvm}/src/test/resources/conf.d/002/conf.properties (100%)
rename runtime/{jvm => camel-k-runtime-jvm}/src/test/resources/conf.properties
(100%)
rename runtime/{jvm => camel-k-runtime-jvm}/src/test/resources/log4j2-test.xml
(100%)
rename runtime/{jvm => camel-k-runtime-jvm}/src/test/resources/r1.js (100%)
rename runtime/{jvm => camel-k-runtime-jvm}/src/test/resources/r2.mytype (100%)
rename runtime/{jvm =>
camel-k-runtime-jvm}/src/test/resources/routes-compressed.js.gz.b64 (100%)
rename runtime/{jvm => camel-k-runtime-jvm}/src/test/resources/routes.js (100%)
rename runtime/{jvm => camel-k-runtime-jvm}/src/test/resources/routes.mytype
(100%)
rename runtime/{jvm => camel-k-runtime-jvm}/src/test/resources/routes.xml
(100%)
rename runtime/{kotlin => camel-k-runtime-kotlin}/pom.xml (100%)
rename runtime/{kotlin =>
camel-k-runtime-kotlin}/src/main/kotlin/org/apache/camel/k/kotlin/KotlinRoutesLoader.kt
(96%)
rename runtime/{kotlin =>
camel-k-runtime-kotlin}/src/main/kotlin/org/apache/camel/k/kotlin/dsl/ComponentsConfiguration.kt
(100%)
rename runtime/{kotlin =>
camel-k-runtime-kotlin}/src/main/kotlin/org/apache/camel/k/kotlin/dsl/ContextConfiguration.kt
(96%)
rename runtime/{kotlin =>
camel-k-runtime-kotlin}/src/main/kotlin/org/apache/camel/k/kotlin/dsl/IntegrationConfiguration.kt
(97%)
rename runtime/{kotlin =>
camel-k-runtime-kotlin}/src/main/kotlin/org/apache/camel/k/kotlin/dsl/RegistryConfiguration.kt
(95%)
rename runtime/{kotlin =>
camel-k-runtime-kotlin}/src/main/kotlin/org/apache/camel/k/kotlin/dsl/RestConfiguration.kt
(100%)
rename runtime/{kotlin =>
camel-k-runtime-kotlin}/src/main/kotlin/org/apache/camel/k/kotlin/extension/LogComponentExtensions.kt
(100%)
copy
runtime/{camel-knative/src/main/resources/META-INF/services/org/apache/camel/component/knative
=>
camel-k-runtime-kotlin/src/main/resources/META-INF/services/org/apache/camel/k/loader/kotlin}
(93%)
rename runtime/{kotlin =>
camel-k-runtime-kotlin}/src/test/kotlin/org/apache/camel/k/kotlin/LoaderTest.kt
(89%)
rename runtime/{kotlin =>
camel-k-runtime-kotlin}/src/test/kotlin/org/apache/camel/k/kotlin/dsl/IntegrationTest.kt
(100%)
rename runtime/{kotlin =>
camel-k-runtime-kotlin}/src/test/kotlin/org/apache/camel/k/kotlin/extension/LogExtensionTest.kt
(100%)
rename runtime/{kotlin =>
camel-k-runtime-kotlin}/src/test/resources/log4j2-test.xml (100%)
rename runtime/{kotlin =>
camel-k-runtime-kotlin}/src/test/resources/routes-new.kts (100%)
rename runtime/{kotlin =>
camel-k-runtime-kotlin}/src/test/resources/routes-with-bindings.kts (100%)
rename runtime/{kotlin =>
camel-k-runtime-kotlin}/src/test/resources/routes-with-component-configuration.kts
(100%)
rename runtime/{kotlin =>
camel-k-runtime-kotlin}/src/test/resources/routes-with-rest.kts (100%)
rename runtime/{kotlin =>
camel-k-runtime-kotlin}/src/test/resources/routes.kts (100%)
rename runtime/{spring-boot => camel-k-runtime-spring-boot}/pom.xml (100%)
rename runtime/{spring-boot =>
camel-k-runtime-spring-boot}/src/main/java/org/apache/camel/k/spring/boot/Application.java
(91%)
delete mode 100644
runtime/groovy/src/main/resources/META-INF/services/org.apache.camel.k.jvm.RoutesLoader
delete mode 100644
runtime/jvm/src/main/java/org/apache/camel/k/jvm/RoutesLoaders.java
delete mode 100644
runtime/jvm/src/main/resources/META-INF/services/org.apache.camel.k.jvm.RoutesLoader
delete mode 100644
runtime/kotlin/src/main/resources/META-INF/services/javax.script.ScriptEngineFactory
delete mode 100644
runtime/kotlin/src/main/resources/META-INF/services/org.apache.camel.k.jvm.RoutesLoader
