This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch camel-4.10.x in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-4.10.x by this push: new b5ecd394335 CAMEL-22087: Make name and port camel CLI option working on CSB and CEQ (#18131) b5ecd394335 is described below commit b5ecd394335b2d8a09ac7eff6d965ffaa4b970a0 Author: Salvatore Mongiardo <smong...@redhat.com> AuthorDate: Wed May 21 06:39:07 2025 +0200 CAMEL-22087: Make name and port camel CLI option working on CSB and CEQ (#18131) --- .../apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java | 6 ++++++ .../org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java | 8 ++++++++ .../apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java | 8 ++++++++ .../main/java/org/apache/camel/dsl/jbang/core/commands/Run.java | 4 ++++ 4 files changed, 26 insertions(+) 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 1fc17580723..b96d89117c0 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 @@ -112,6 +112,10 @@ public abstract class ExportBaseCommand extends CamelCommand { description = "The integration name. Use this when the name should not get derived otherwise.") protected String name; + @CommandLine.Option(names = { "--port" }, + description = "Embeds a local HTTP server on this port", defaultValue = "8080") + int port; + @CommandLine.Option(names = { "--gav" }, description = "The Maven group:artifact:version") protected String gav; @@ -328,6 +332,8 @@ public abstract class ExportBaseCommand extends CamelCommand { // need to declare the profile to use for run run.dependencies = dependencies; run.files = files; + run.name = name; + run.port = port; run.excludes = excludes; run.openapi = openapi; run.download = download; 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 995276a589f..62b3d6c5830 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 @@ -104,6 +104,14 @@ class ExportQuarkus extends Export { if (!hasModeline(settings)) { prop.remove("camel.main.modeline"); } + // are we using http then enable embedded HTTP server (if not explicit configured already) + int port = httpServerPort(settings); + if (port == -1) { + port = 8080; + } + if (port != -1 && port != 8080) { + prop.put("quarkus.http.port", port); + } return prop; }); // copy docker files 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 5b83a73ab47..d37afada26d 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 @@ -117,6 +117,14 @@ class ExportSpringBoot extends Export { if (!http) { prop.put("camel.springboot.main-run-controller", "true"); } + // are we using http then enable embedded HTTP server (if not explicit configured already) + int port = httpServerPort(settings); + if (port == -1 && http) { + port = 8080; + } + if (port != -1 && port != 8080) { + prop.put("server.port", port); + } return prop; }); if ("maven".equals(buildTool)) { diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java index d1b188cd704..a77946623f2 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java @@ -964,6 +964,8 @@ public class Run extends CamelCommand { eq.filePaths = this.filePaths; eq.files = this.files; eq.name = this.name; + eq.verbose = this.verbose; + eq.port = this.port; eq.gav = this.gav; if (eq.gav == null) { if (eq.name == null) { @@ -1035,6 +1037,8 @@ public class Run extends CamelCommand { eq.filePaths = this.filePaths; eq.files = this.files; eq.name = this.name; + eq.verbose = this.verbose; + eq.port = this.port; eq.gav = this.gav; eq.repositories = this.repositories; if (eq.gav == null) {