You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ma...@apache.org on 2023/09/13 20:17:34 UTC
[camel-karavan] branch main updated (6adaf249 -> 3a363934)
This is an automated email from the ASF dual-hosted git repository.
marat pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
from 6adaf249 UI Consistency for #885
new 5939135a Issue with Java code generator for #885
new 3a363934 Accesss build-in registry for #885
The 2 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:
.../java/org/apache/camel/karavan/registry/RegistryService.java | 6 +-----
karavan-web/karavan-app/src/main/webui/src/api/ProjectService.ts | 3 ++-
2 files changed, 3 insertions(+), 6 deletions(-)
[camel-karavan] 02/02: Accesss build-in registry for #885
Posted by ma...@apache.org.
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 3a363934c80f226287aa29501a1fddb31c72db65
Author: Marat Gubaidullin <ma...@talismancloud.io>
AuthorDate: Wed Sep 13 16:17:26 2023 -0400
Accesss build-in registry for #885
---
.../java/org/apache/camel/karavan/registry/RegistryService.java | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/registry/RegistryService.java b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/registry/RegistryService.java
index a3d80e8c..0da492a7 100644
--- a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/registry/RegistryService.java
+++ b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/registry/RegistryService.java
@@ -60,13 +60,9 @@ public class RegistryService {
return new RegistryConfig(registryUrl, imageGroup, registryUsername, registryPassword);
}
- public String getRegistryWithGroup() {
- return getRegistryConfig().getRegistry() + "/" + group;
- }
-
public String getRegistryWithGroupForSync() {
String registryUrl = registry;
- if (!ConfigService.inDocker() && installRegistry) {
+ if (!ConfigService.inKubernetes() && installRegistry) {
registryUrl = "localhost:5555";
}
return registryUrl + "/" + group;
[camel-karavan] 01/02: Issue with Java code generator for #885
Posted by ma...@apache.org.
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 5939135abfa635b001e03ee81321c75a1f20b9c7
Author: Marat Gubaidullin <ma...@talismancloud.io>
AuthorDate: Wed Sep 13 16:17:09 2023 -0400
Issue with Java code generator for #885
---
karavan-web/karavan-app/src/main/webui/src/api/ProjectService.ts | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/karavan-web/karavan-app/src/main/webui/src/api/ProjectService.ts b/karavan-web/karavan-app/src/main/webui/src/api/ProjectService.ts
index 4c0c3335..86353a30 100644
--- a/karavan-web/karavan-app/src/main/webui/src/api/ProjectService.ts
+++ b/karavan-web/karavan-app/src/main/webui/src/api/ProjectService.ts
@@ -213,7 +213,8 @@ export class ProjectService {
KaravanApi.getTemplatesFiles((files: ProjectFile[]) => {
files.filter(f => f.name.endsWith('java'))
.forEach(f => {
- TemplateApi.saveTemplate(f.name, f.code);
+ const name = f.name.replace(".java", '');
+ TemplateApi.saveTemplate(name, f.code);
})
});
});