[camel] 02/02: CAMEL-19296: xml loader to also support camel.xml as file extension like yaml can do

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 4579a6c53a9dd920f28ee4d8b81bc5d21c68ba90
Author: Claus Ibsen <claus.ib...@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 9260be83eaf..67c7d0fb0a2 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 fe0272d829a..ec28da89b78 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
@@ -53,7 +53,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)