This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
commit 0072d05c7700d9884b3de30d574f78ff9763f353
Author: Marat Gubaidullin <marat.gubaidul...@gmail.com>
AuthorDate: Thu Oct 27 08:31:03 2022 -0400
Rename karavan.config to karavan.default
---
.../org/apache/camel/karavan/api/ConfigurationResource.java | 2 +-
.../org/apache/camel/karavan/service/GeneratorService.java | 10 ++++------
.../java/org/apache/camel/karavan/service/ImportService.java | 2 +-
.../org/apache/camel/karavan/service/InfinispanService.java | 2 +-
.../org/apache/camel/karavan/service/KubernetesService.java | 1 -
karavan-app/src/main/resources/application.properties | 8 ++++----
6 files changed, 11 insertions(+), 14 deletions(-)
diff --git
a/karavan-app/src/main/java/org/apache/camel/karavan/api/ConfigurationResource.java
b/karavan-app/src/main/java/org/apache/camel/karavan/api/ConfigurationResource.java
index cf17e9b..7980e61 100644
---
a/karavan-app/src/main/java/org/apache/camel/karavan/api/ConfigurationResource.java
+++
b/karavan-app/src/main/java/org/apache/camel/karavan/api/ConfigurationResource.java
@@ -37,7 +37,7 @@ public class ConfigurationResource {
@ConfigProperty(name = "karavan.environment")
String environment;
- @ConfigProperty(name = "karavan.config.runtime")
+ @ConfigProperty(name = "karavan.default.runtime")
String runtime;
@Inject
diff --git
a/karavan-app/src/main/java/org/apache/camel/karavan/service/GeneratorService.java
b/karavan-app/src/main/java/org/apache/camel/karavan/service/GeneratorService.java
index 9c7d931..70e0485 100644
---
a/karavan-app/src/main/java/org/apache/camel/karavan/service/GeneratorService.java
+++
b/karavan-app/src/main/java/org/apache/camel/karavan/service/GeneratorService.java
@@ -30,24 +30,22 @@ import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.constructor.SafeConstructor;
import javax.enterprise.context.ApplicationScoped;
-import java.io.FileInputStream;
import java.io.FileNotFoundException;
-import java.nio.file.Paths;
import java.util.Map;
@ApplicationScoped
public class GeneratorService {
- @ConfigProperty(name = "karavan.config.group-id")
+ @ConfigProperty(name = "karavan.default.group-id")
String groupId;
- @ConfigProperty(name = "karavan.config.image-group")
+ @ConfigProperty(name = "karavan.default.image-group")
String imageGroup;
- @ConfigProperty(name = "karavan.config.runtime")
+ @ConfigProperty(name = "karavan.default.runtime")
String runtime;
- @ConfigProperty(name = "karavan.config.runtime-version")
+ @ConfigProperty(name = "karavan.default.runtime-version")
String runtimeVersion;
private static final Logger LOGGER =
Logger.getLogger(GeneratorService.class.getName());
diff --git
a/karavan-app/src/main/java/org/apache/camel/karavan/service/ImportService.java
b/karavan-app/src/main/java/org/apache/camel/karavan/service/ImportService.java
index c83a121..33d59f4 100644
---
a/karavan-app/src/main/java/org/apache/camel/karavan/service/ImportService.java
+++
b/karavan-app/src/main/java/org/apache/camel/karavan/service/ImportService.java
@@ -44,7 +44,7 @@ public class ImportService {
@Inject
GitService gitService;
- @ConfigProperty(name = "karavan.config.runtime")
+ @ConfigProperty(name = "karavan.default.runtime")
String runtime;
@ConsumeEvent(value = IMPORT_PROJECTS, blocking = true)
diff --git
a/karavan-app/src/main/java/org/apache/camel/karavan/service/InfinispanService.java
b/karavan-app/src/main/java/org/apache/camel/karavan/service/InfinispanService.java
index 88db2e3..9a0fd03 100644
---
a/karavan-app/src/main/java/org/apache/camel/karavan/service/InfinispanService.java
+++
b/karavan-app/src/main/java/org/apache/camel/karavan/service/InfinispanService.java
@@ -65,7 +65,7 @@ public class InfinispanService {
@Inject
GeneratorService generatorService;
- @ConfigProperty(name = "karavan.config.runtime")
+ @ConfigProperty(name = "karavan.default.runtime")
String runtime;
private static final String CACHE_CONFIG = "<distributed-cache
name=\"%s\">"
diff --git
a/karavan-app/src/main/java/org/apache/camel/karavan/service/KubernetesService.java
b/karavan-app/src/main/java/org/apache/camel/karavan/service/KubernetesService.java
index 626eb93..735b47e 100644
---
a/karavan-app/src/main/java/org/apache/camel/karavan/service/KubernetesService.java
+++
b/karavan-app/src/main/java/org/apache/camel/karavan/service/KubernetesService.java
@@ -39,7 +39,6 @@ import
io.fabric8.tekton.pipeline.v1beta1.WorkspaceBindingBuilder;
import io.quarkus.runtime.ShutdownEvent;
import io.quarkus.vertx.ConsumeEvent;
import io.vertx.mutiny.core.eventbus.EventBus;
-import org.apache.camel.karavan.model.DeploymentStatus;
import org.apache.camel.karavan.model.PipelineRunLog;
import org.apache.camel.karavan.model.Project;
import org.apache.camel.karavan.watcher.DeploymentWatcher;
diff --git a/karavan-app/src/main/resources/application.properties
b/karavan-app/src/main/resources/application.properties
index 6c1a38c..d13b127 100644
--- a/karavan-app/src/main/resources/application.properties
+++ b/karavan-app/src/main/resources/application.properties
@@ -16,10 +16,10 @@ karavan.kamelets-git-password=${GIT_TOKEN}
karavan.kamelets-git-branch=main
# Projects default configuration
-karavan.config.group-id=org.camel.karavan.demo
-karavan.config.image-group=karavan
-karavan.config.runtime=QUARKUS
-karavan.config.runtime-version=2.13.3.Final
+karavan.default.group-id=org.camel.karavan.demo
+karavan.default.image-group=karavan
+karavan.default.runtime=QUARKUS
+karavan.default.runtime-version=2.13.3.Final
# Infinispan Server address
#quarkus.infinispan-client.server-list=localhost:12345
