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 2024/09/03 11:05:03 UTC

(camel) branch main updated: CAMEL-21110: camel-jbang export to Quarkus or Spring Boot should support small web apps

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


The following commit(s) were added to refs/heads/main by this push:
     new 40f758051de CAMEL-21110: camel-jbang export to Quarkus or Spring Boot should support small web apps
40f758051de is described below

commit 40f758051decfc8ef4503c17e45c4fb209e57985
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Sep 3 13:04:22 2024 +0200

    CAMEL-21110: camel-jbang export to Quarkus or Spring Boot should support small web apps
---
 .../camel/component/platform/http/main/MainHttpServer.java   |  4 ++++
 .../camel/dsl/jbang/core/commands/ExportBaseCommand.java     | 12 +++++++++---
 .../apache/camel/dsl/jbang/core/commands/ExportQuarkus.java  |  4 ++++
 .../camel/dsl/jbang/core/commands/ExportSpringBoot.java      |  4 ++++
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/components/camel-platform-http-main/src/main/java/org/apache/camel/component/platform/http/main/MainHttpServer.java b/components/camel-platform-http-main/src/main/java/org/apache/camel/component/platform/http/main/MainHttpServer.java
index c2d3169462d..86ad9cb221e 100644
--- a/components/camel-platform-http-main/src/main/java/org/apache/camel/component/platform/http/main/MainHttpServer.java
+++ b/components/camel-platform-http-main/src/main/java/org/apache/camel/component/platform/http/main/MainHttpServer.java
@@ -499,6 +499,10 @@ public class MainHttpServer extends ServiceSupport implements CamelContextAware,
                     }
                 } else {
                     is = camelContext.getClassResolver().loadResourceAsStream(u);
+                    if (is == null) {
+                        // common folder for java app servers like quarkus and spring-boot
+                        is = camelContext.getClassResolver().loadResourceAsStream("META-INF/resources/" + u);
+                    }
                 }
                 if (is != null) {
                     String mime = MimeMapping.getMimeTypeForFilename(f.getName());
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
index 2edea2f803e..43592362b30 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
@@ -490,7 +490,10 @@ public abstract class ExportBaseCommand extends CamelCommand {
                     boolean kamelet = "camel.component.kamelet.location".equals(k)
                             || "camel.jbang.localKameletDir".equals(k);
                     boolean jkube = "camel.jbang.jkubeFiles".equals(k);
-                    File target = java ? srcJavaDir : camel ? srcCamelResourcesDir : srcResourcesDir;
+                    boolean web = "html".equals(ext) || "js".equals(ext) || "css".equals(ext) || "jpeg".equals(ext)
+                            || "jpg".equals(ext) || "png".equals(ext) || "ico".equals(ext);
+                    File srcWeb = new File(srcResourcesDir, "META-INF/resources");
+                    File target = java ? srcJavaDir : camel ? srcCamelResourcesDir : web ? srcWeb : srcResourcesDir;
                     File source = new File(f);
                     File out;
                     if (source.isDirectory()) {
@@ -510,6 +513,7 @@ public abstract class ExportBaseCommand extends CamelCommand {
                             out.mkdirs();
                             safeCopy(source, out, true);
                         } else {
+                            out.mkdirs();
                             safeCopy(source, out, true);
                         }
                     } else {
@@ -630,8 +634,10 @@ public abstract class ExportBaseCommand extends CamelCommand {
                 }
                 if (!v.isBlank()) {
                     String line = applicationPropertyLine(k, v);
-                    fos.write(line.getBytes(StandardCharsets.UTF_8));
-                    fos.write("\n".getBytes(StandardCharsets.UTF_8));
+                    if (line != null && !line.isBlank()) {
+                        fos.write(line.getBytes(StandardCharsets.UTF_8));
+                        fos.write("\n".getBytes(StandardCharsets.UTF_8));
+                    }
                 }
             }
         } finally {
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java
index 63dc9fdf4c6..4c2fa09585d 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java
@@ -326,6 +326,10 @@ class ExportQuarkus extends Export {
 
     @Override
     protected String applicationPropertyLine(String key, String value) {
+        if (key.startsWith("camel.server.")) {
+            // skip "camel.server." as this is for camel-main only
+            return null;
+        }
         // quarkus use dash cased properties and lets turn camel into dash as well
         if (key.startsWith("quarkus.") || key.startsWith("camel.")) {
             key = StringHelper.camelCaseToDash(key);
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
index 00338e38f71..68a2af582ba 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
@@ -371,6 +371,10 @@ class ExportSpringBoot extends Export {
 
     @Override
     protected String applicationPropertyLine(String key, String value) {
+        if (key.startsWith("camel.server.")) {
+            // skip "camel.server." as this is for camel-main only
+            return null;
+        }
         boolean camel44orOlder = camelSpringBootVersion != null && VersionHelper.isLE("4.4", camelSpringBootVersion);
         if (camel44orOlder) {
             // camel.main.x should be renamed to camel.springboot.x (for camel 4.4.x or older)