You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by nf...@apache.org on 2018/12/14 08:07:02 UTC
[camel-k] branch master updated (7313fa4 -> 6a8c149)
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.
discard 7313fa4 refactor: consistent env var management in traits
discard 1331a29 runtime: refactor project layout
discard 4a14f8c runtime: use camel built-in service loader to find routes loaders
discard aa2890f runtime: initial support for traits #287
omit be365ed Inject camel-k version as environment variable #285
omit 5142303 chore(git): remove redundant .gitignore files
omit 0174361 chore(build): add a simple profile to check for dependencies updates
omit 5075870 chore(dev) make dev mode 10x faster on remote clusters by caching client
This update removed existing revisions from the reference, leaving the
reference pointing at a previous point in the repository history.
* -- * -- N refs/heads/master (6a8c149)
\
O -- O -- O (7313fa4)
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
pkg/client/cmd/install.go | 5 -
pkg/client/cmd/root.go | 6 +
pkg/install/operator.go | 2 +-
pkg/trait/builder.go | 4 +-
pkg/trait/builder_test.go | 6 +-
pkg/trait/catalog.go | 6 +-
pkg/trait/debug.go | 3 +-
pkg/trait/debug_test.go | 17 +-
pkg/trait/deployment.go | 44 +++--
pkg/trait/environment.go | 34 ++--
pkg/trait/environment_test.go | 23 +--
pkg/trait/knative.go | 40 ++---
pkg/trait/knative_test.go | 24 ++-
pkg/trait/springboot.go | 10 +-
pkg/trait/trait.go | 3 +-
pkg/trait/trait_test.go | 2 +-
pkg/trait/types.go | 3 +-
pkg/trait/util.go | 76 +++++----
pkg/util/envvar/envvar.go | 87 ----------
pkg/util/envvar/envvar_test.go | 103 ------------
runtime/.maven-versions-rules.xml | 39 -----
runtime/camel-k-runtime-core/pom.xml | 82 ----------
.../main/java/org/apache/camel/k/RuntimeTrait.java | 28 ----
.../services/org/apache/camel/k/loader/groovy | 18 ---
.../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 | 18 ---
.../services/org/apache/camel/k/loader/java-source | 18 ---
.../META-INF/services/org/apache/camel/k/loader/js | 18 ---
.../services/org/apache/camel/k/loader/xml | 18 ---
.../org/apache/camel/k/jvm/RuntimeTestSupport.java | 41 -----
.../services/org/apache/camel/k/loader/kotlin | 18 ---
runtime/{ => camel-knative}/.gitignore | 0
runtime/{ => catalog-builder}/.gitignore | 0
runtime/{ => dependency-lister}/.gitignore | 0
runtime/{ => groovy}/.gitignore | 0
runtime/{camel-k-runtime-groovy => 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
.../services/org.apache.camel.k.jvm.RoutesLoader | 1 +
.../org.codehaus.groovy.runtime.ExtensionModule | 0
.../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}/.gitignore | 0
runtime/{camel-k-runtime-jvm => jvm}/pom.xml | 14 +-
.../java/org/apache/camel/k/jvm/Application.java | 23 +--
.../java/org/apache/camel/k/jvm}/Constants.java | 5 +-
.../java/org/apache/camel/k/jvm}/Language.java | 18 +--
.../java/org/apache/camel/k/jvm}/RoutesLoader.java | 2 +-
.../java/org/apache/camel/k/jvm/RoutesLoaders.java | 179 +++++++++++++++++++++
.../main/java/org/apache/camel/k/jvm/Runtime.java | 5 +-
.../org/apache/camel/k/jvm}/RuntimeRegistry.java | 6 +-
.../org/apache/camel/k/jvm/RuntimeSupport.java | 56 -------
.../apache/camel/k/jvm/SimpleRuntimeRegistry.java | 1 -
.../main/java/org/apache/camel/k/jvm}/Source.java | 2 +-
.../java/org/apache/camel/k/jvm/URIResolver.java | 2 -
.../org/apache/camel/k/jvm/dsl/Components.java | 0
.../services/org.apache.camel.k.jvm.RoutesLoader | 4 +
.../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
.../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}/.gitignore | 0
runtime/{camel-k-runtime-kotlin => 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/javax.script.ScriptEngineFactory | 1 +
.../services/org.apache.camel.k.jvm.RoutesLoader | 1 +
.../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
runtime/pom.xml | 61 ++-----
runtime/{ => spring-boot}/.gitignore | 0
.../pom.xml | 0
.../apache/camel/k/spring/boot/Application.java | 18 +--
112 files changed, 477 insertions(+), 1084 deletions(-)
delete mode 100644 pkg/util/envvar/envvar.go
delete mode 100644 pkg/util/envvar/envvar_test.go
delete mode 100644 runtime/.maven-versions-rules.xml
delete mode 100644 runtime/camel-k-runtime-core/pom.xml
delete mode 100644 runtime/camel-k-runtime-core/src/main/java/org/apache/camel/k/RuntimeTrait.java
delete mode 100644 runtime/camel-k-runtime-groovy/src/main/resources/META-INF/services/org/apache/camel/k/loader/groovy
delete mode 100644 runtime/camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/loader/JavaClassLoader.java
delete mode 100644 runtime/camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/loader/JavaScriptLoader.java
delete mode 100644 runtime/camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/loader/JavaSourceLoader.java
delete mode 100644 runtime/camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/loader/XmlLoader.java
delete mode 100644 runtime/camel-k-runtime-jvm/src/main/resources/META-INF/services/org/apache/camel/k/loader/java-class
delete mode 100644 runtime/camel-k-runtime-jvm/src/main/resources/META-INF/services/org/apache/camel/k/loader/java-source
delete mode 100644 runtime/camel-k-runtime-jvm/src/main/resources/META-INF/services/org/apache/camel/k/loader/js
delete mode 100644 runtime/camel-k-runtime-jvm/src/main/resources/META-INF/services/org/apache/camel/k/loader/xml
delete mode 100644 runtime/camel-k-runtime-jvm/src/test/java/org/apache/camel/k/jvm/RuntimeTestSupport.java
delete mode 100644 runtime/camel-k-runtime-kotlin/src/main/resources/META-INF/services/org/apache/camel/k/loader/kotlin
copy runtime/{ => camel-knative}/.gitignore (100%)
copy runtime/{ => catalog-builder}/.gitignore (100%)
copy runtime/{ => dependency-lister}/.gitignore (100%)
copy runtime/{ => groovy}/.gitignore (100%)
rename runtime/{camel-k-runtime-groovy => groovy}/pom.xml (100%)
rename runtime/{camel-k-runtime-groovy => groovy}/src/main/groovy/org/apache/camel/k/groovy/GroovyRoutesLoader.groovy (93%)
rename runtime/{camel-k-runtime-groovy => groovy}/src/main/groovy/org/apache/camel/k/groovy/dsl/ComponentConfiguration.groovy (100%)
rename runtime/{camel-k-runtime-groovy => groovy}/src/main/groovy/org/apache/camel/k/groovy/dsl/ComponentsConfiguration.groovy (100%)
rename runtime/{camel-k-runtime-groovy => groovy}/src/main/groovy/org/apache/camel/k/groovy/dsl/ContextConfiguration.groovy (97%)
rename runtime/{camel-k-runtime-groovy => groovy}/src/main/groovy/org/apache/camel/k/groovy/dsl/IntegrationConfiguration.groovy (98%)
rename runtime/{camel-k-runtime-groovy => groovy}/src/main/groovy/org/apache/camel/k/groovy/dsl/RegistryConfiguration.groovy (96%)
rename runtime/{camel-k-runtime-groovy => groovy}/src/main/groovy/org/apache/camel/k/groovy/dsl/RestConfiguration.groovy (100%)
rename runtime/{camel-k-runtime-groovy => groovy}/src/main/groovy/org/apache/camel/k/groovy/extension/LogComponentExtension.groovy (100%)
create mode 100644 runtime/groovy/src/main/resources/META-INF/services/org.apache.camel.k.jvm.RoutesLoader
rename runtime/{camel-k-runtime-groovy => groovy}/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule (100%)
rename runtime/{camel-k-runtime-groovy => groovy}/src/test/groovy/org/apache/camel/k/groovy/LoaderTest.groovy (88%)
rename runtime/{camel-k-runtime-groovy => groovy}/src/test/groovy/org/apache/camel/k/groovy/dsl/IntegrationTest.groovy (100%)
rename runtime/{camel-k-runtime-groovy => groovy}/src/test/groovy/org/apache/camel/k/groovy/dsl/extension/LogExtensionTest.groovy (100%)
rename runtime/{camel-k-runtime-groovy => groovy}/src/test/resources/log4j2-test.xml (100%)
rename runtime/{camel-k-runtime-groovy => groovy}/src/test/resources/routes-with-bindings.groovy (100%)
rename runtime/{camel-k-runtime-groovy => groovy}/src/test/resources/routes-with-component-configuration.groovy (100%)
rename runtime/{camel-k-runtime-groovy => groovy}/src/test/resources/routes-with-rest.groovy (100%)
rename runtime/{camel-k-runtime-groovy => groovy}/src/test/resources/routes.groovy (100%)
copy runtime/{ => jvm}/.gitignore (100%)
rename runtime/{camel-k-runtime-jvm => jvm}/pom.xml (90%)
rename runtime/{camel-k-runtime-jvm => jvm}/src/main/java/org/apache/camel/k/jvm/Application.java (83%)
rename runtime/{camel-k-runtime-core/src/main/java/org/apache/camel/k => jvm/src/main/java/org/apache/camel/k/jvm}/Constants.java (80%)
rename runtime/{camel-k-runtime-core/src/main/java/org/apache/camel/k => jvm/src/main/java/org/apache/camel/k/jvm}/Language.java (86%)
rename runtime/{camel-k-runtime-core/src/main/java/org/apache/camel/k => jvm/src/main/java/org/apache/camel/k/jvm}/RoutesLoader.java (97%)
create mode 100644 runtime/jvm/src/main/java/org/apache/camel/k/jvm/RoutesLoaders.java
rename runtime/{camel-k-runtime-jvm => jvm}/src/main/java/org/apache/camel/k/jvm/Runtime.java (94%)
rename runtime/{camel-k-runtime-core/src/main/java/org/apache/camel/k => jvm/src/main/java/org/apache/camel/k/jvm}/RuntimeRegistry.java (96%)
rename runtime/{camel-k-runtime-jvm => jvm}/src/main/java/org/apache/camel/k/jvm/RuntimeSupport.java (72%)
rename runtime/{camel-k-runtime-jvm => jvm}/src/main/java/org/apache/camel/k/jvm/SimpleRuntimeRegistry.java (98%)
rename runtime/{camel-k-runtime-core/src/main/java/org/apache/camel/k => jvm/src/main/java/org/apache/camel/k/jvm}/Source.java (98%)
rename runtime/{camel-k-runtime-jvm => jvm}/src/main/java/org/apache/camel/k/jvm/URIResolver.java (97%)
rename runtime/{camel-k-runtime-jvm => jvm}/src/main/java/org/apache/camel/k/jvm/dsl/Components.java (100%)
create mode 100644 runtime/jvm/src/main/resources/META-INF/services/org.apache.camel.k.jvm.RoutesLoader
rename runtime/{camel-k-runtime-jvm => jvm}/src/main/resources/log4j2.properties (100%)
rename runtime/{camel-k-runtime-jvm => jvm}/src/test/java/org/apache/camel/k/jvm/PropertiesTest.java (55%)
rename runtime/{camel-k-runtime-jvm => jvm}/src/test/java/org/apache/camel/k/jvm/RoutesLoadersTest.java (82%)
rename runtime/{camel-k-runtime-jvm => jvm}/src/test/java/org/apache/camel/k/jvm/RuntimeTest.java (100%)
rename runtime/{camel-k-runtime-jvm => jvm}/src/test/resources/MyRoutes.java (100%)
rename runtime/{camel-k-runtime-jvm => jvm}/src/test/resources/MyRoutesWithNestedClass.java (100%)
rename runtime/{camel-k-runtime-jvm => jvm}/src/test/resources/conf.d/001/conf.properties (100%)
rename runtime/{camel-k-runtime-jvm => jvm}/src/test/resources/conf.d/002/conf.properties (100%)
rename runtime/{camel-k-runtime-jvm => jvm}/src/test/resources/conf.properties (100%)
rename runtime/{camel-k-runtime-jvm => jvm}/src/test/resources/log4j2-test.xml (100%)
rename runtime/{camel-k-runtime-jvm => jvm}/src/test/resources/r1.js (100%)
rename runtime/{camel-k-runtime-jvm => jvm}/src/test/resources/r2.mytype (100%)
rename runtime/{camel-k-runtime-jvm => jvm}/src/test/resources/routes-compressed.js.gz.b64 (100%)
rename runtime/{camel-k-runtime-jvm => jvm}/src/test/resources/routes.js (100%)
rename runtime/{camel-k-runtime-jvm => jvm}/src/test/resources/routes.mytype (100%)
rename runtime/{camel-k-runtime-jvm => jvm}/src/test/resources/routes.xml (100%)
copy runtime/{ => kotlin}/.gitignore (100%)
rename runtime/{camel-k-runtime-kotlin => kotlin}/pom.xml (100%)
rename runtime/{camel-k-runtime-kotlin => kotlin}/src/main/kotlin/org/apache/camel/k/kotlin/KotlinRoutesLoader.kt (96%)
rename runtime/{camel-k-runtime-kotlin => kotlin}/src/main/kotlin/org/apache/camel/k/kotlin/dsl/ComponentsConfiguration.kt (100%)
rename runtime/{camel-k-runtime-kotlin => kotlin}/src/main/kotlin/org/apache/camel/k/kotlin/dsl/ContextConfiguration.kt (96%)
rename runtime/{camel-k-runtime-kotlin => kotlin}/src/main/kotlin/org/apache/camel/k/kotlin/dsl/IntegrationConfiguration.kt (97%)
rename runtime/{camel-k-runtime-kotlin => kotlin}/src/main/kotlin/org/apache/camel/k/kotlin/dsl/RegistryConfiguration.kt (95%)
rename runtime/{camel-k-runtime-kotlin => kotlin}/src/main/kotlin/org/apache/camel/k/kotlin/dsl/RestConfiguration.kt (100%)
rename runtime/{camel-k-runtime-kotlin => kotlin}/src/main/kotlin/org/apache/camel/k/kotlin/extension/LogComponentExtensions.kt (100%)
create mode 100644 runtime/kotlin/src/main/resources/META-INF/services/javax.script.ScriptEngineFactory
create mode 100644 runtime/kotlin/src/main/resources/META-INF/services/org.apache.camel.k.jvm.RoutesLoader
rename runtime/{camel-k-runtime-kotlin => kotlin}/src/test/kotlin/org/apache/camel/k/kotlin/LoaderTest.kt (89%)
rename runtime/{camel-k-runtime-kotlin => kotlin}/src/test/kotlin/org/apache/camel/k/kotlin/dsl/IntegrationTest.kt (100%)
rename runtime/{camel-k-runtime-kotlin => kotlin}/src/test/kotlin/org/apache/camel/k/kotlin/extension/LogExtensionTest.kt (100%)
rename runtime/{camel-k-runtime-kotlin => kotlin}/src/test/resources/log4j2-test.xml (100%)
rename runtime/{camel-k-runtime-kotlin => kotlin}/src/test/resources/routes-new.kts (100%)
rename runtime/{camel-k-runtime-kotlin => kotlin}/src/test/resources/routes-with-bindings.kts (100%)
rename runtime/{camel-k-runtime-kotlin => kotlin}/src/test/resources/routes-with-component-configuration.kts (100%)
rename runtime/{camel-k-runtime-kotlin => kotlin}/src/test/resources/routes-with-rest.kts (100%)
rename runtime/{camel-k-runtime-kotlin => kotlin}/src/test/resources/routes.kts (100%)
copy runtime/{ => spring-boot}/.gitignore (100%)
rename runtime/{camel-k-runtime-spring-boot => spring-boot}/pom.xml (100%)
rename runtime/{camel-k-runtime-spring-boot => spring-boot}/src/main/java/org/apache/camel/k/spring/boot/Application.java (91%)