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

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

commit 519635a56a4fe248fa52959576fbfb8e91c0d624
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Wed Apr 24 15:31:22 2024 +0200

    CAMEL-19041: camel-jbang - Run with runtime for spring-boot and quarkus
---
 .../src/main/java/org/apache/camel/main/BaseMainSupport.java  |  2 +-
 .../java/org/apache/camel/dsl/jbang/core/commands/Run.java    |  7 ++++---
 .../src/main/resources/spring-boot-logback.xml                | 11 +++++++++++
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git 
a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java 
b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
index 74b4ca1a78b..645cd0d2638 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
@@ -1691,7 +1691,7 @@ public abstract class BaseMainSupport extends BaseService 
{
             throws Exception {
 
         TracerConfigurationProperties config = 
mainConfigurationProperties.tracerConfig();
-        setPropertiesOnTarget(camelContext, config, properties, 
"camel.tracer.",
+        setPropertiesOnTarget(camelContext, config, properties, "camel.trace.",
                 failIfNotSet, true, autoConfiguredProperties);
 
         if (!config.isEnabled() && !config.isStandby()) {
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 fa275f68527..1a3ea36fa9b 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
@@ -953,9 +953,6 @@ public class Run extends CamelCommand {
 
         System.out.println("Running using Spring Boot v" + 
eq.springBootVersion + " (preparing and downloading files)");
         // TODO: camel log from spring-boot/quarkus is not possible
-        // TODO: copy files using symbolic link so you can edit the file 
(TODO: application.properties)
-        // TODO: camel stop does not stop quarkus correctly (spring boot does 
that)
-        // TODO: camel get does not show Quarkus as platform (spring boot does 
that)
         // TODO: spring-boot dev-tools reloading could update camel reload 
counter
         // TODO: docs
 
@@ -964,6 +961,10 @@ public class Run extends CamelCommand {
         if (exit != 0) {
             return exit;
         }
+        // prepare spring-boot for logging to file
+        InputStream is = 
Run.class.getClassLoader().getResourceAsStream("spring-boot-logback.xml");
+        eq.safeCopy(is, new File(eq.exportDir + 
"/src/main/resources/logback.xml"));
+
         // run spring-boot via maven
         ProcessBuilder pb = new ProcessBuilder();
         String mvnw = "/mvnw";
diff --git 
a/dsl/camel-jbang/camel-jbang-core/src/main/resources/spring-boot-logback.xml 
b/dsl/camel-jbang/camel-jbang-core/src/main/resources/spring-boot-logback.xml
new file mode 100644
index 00000000000..0cd45fcd609
--- /dev/null
+++ 
b/dsl/camel-jbang/camel-jbang-core/src/main/resources/spring-boot-logback.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <include resource="org/springframework/boot/logging/logback/defaults.xml"/>
+    <include 
resource="org/springframework/boot/logging/logback/console-appender.xml" />
+    <include 
resource="org/springframework/boot/logging/logback/file-appender.xml" />
+    <property name="LOG_FILE" 
value="${user.home}${file.separator}.camel${file.separator}${PID}.log"/>
+    <root level="INFO">
+        <appender-ref ref="CONSOLE" />
+        <appender-ref ref="FILE" />
+    </root>
+</configuration>
\ No newline at end of file

Reply via email to