You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2023/04/26 09:00:39 UTC
[camel] 02/02: CAMEL-19296: xml loader to also support camel.xml as file extension like yaml can do
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 32d1e01ad51a433ebb5bc69f8f7a440a46a1c249
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Apr 26 11:00:14 2023 +0200
CAMEL-19296: xml loader to also support camel.xml as file extension like yaml can do
---
.../src/main/java/org/apache/camel/dsl/jbang/core/commands/Init.java | 4 ++--
.../apache/camel/main/download/DependencyDownloaderRoutesLoader.java | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Init.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Init.java
index 1dcfa364866..7a811cb8717 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Init.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Init.java
@@ -104,8 +104,8 @@ public class Init extends CamelCommand {
} else {
ext = "kamelet-action.yaml";
}
- } else if (ext != null && ext.startsWith("camel.yaml")) {
- // we allow xxx.camel.yaml
+ } else if (ext != null && (ext.startsWith("camel.yaml") || ext.startsWith("camel.xml"))) {
+ // we allow xxx.camel.yaml / xxx.camel.xml
ext = ext.substring(6);
}
diff --git a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderRoutesLoader.java b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderRoutesLoader.java
index 1238f82ca4f..a4cdd2ac87c 100644
--- a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderRoutesLoader.java
+++ b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderRoutesLoader.java
@@ -52,7 +52,8 @@ public class DependencyDownloaderRoutesLoader extends DefaultRoutesLoader {
downloadLoader("camel-jsh-dsl");
} else if ("kts".equals(extension)) {
downloadLoader("camel-kotlin-dsl");
- } else if ("xml".equals(extension)) {
+ } else if ("xml".equals(extension)
+ || "camel.xml".equals(extension)) {
downloadLoader("camel-xml-io-dsl");
} else if ("yaml".equals(extension)
|| "kamelet.yaml".equals(extension)