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 2025/05/21 04:39:14 UTC
(camel) branch main updated: CAMEL-22087: Make name and port camel CLI option working on CSB and CEQ (#18131)
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 069cb8caf30 CAMEL-22087: Make name and port camel CLI option working on CSB and CEQ (#18131)
069cb8caf30 is described below
commit 069cb8caf30617e2cfa3c20e8e03a908693856aa
Author: Salvatore Mongiardo <sm...@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 b3c268420f6..a32d6b4d44c 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
@@ -115,6 +115,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;
@@ -335,6 +339,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 5a3c369aaf2..9801a31bee0 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
@@ -105,6 +105,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 d3bf2da8ce5..3fce795c388 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
@@ -120,6 +120,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 27e14f08fd7..dd77c36cd02 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
@@ -1030,6 +1030,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) {
@@ -1111,6 +1113,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) {