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-spring-boot.git
The following commit(s) were added to refs/heads/main by this push: new e811d1dcfd8 CAMEL-18425: camel-cli - Make regular Camel applications work with Camel CLI e811d1dcfd8 is described below commit e811d1dcfd831cfc6851d2c06c31270b27e75f19 Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Fri Aug 26 10:56:23 2022 +0200 CAMEL-18425: camel-cli - Make regular Camel applications work with Camel CLI --- .../connector/CliConnectorAutoConfiguration.java | 27 +++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/components-starter/camel-cli-connector-starter/src/main/java/org/apache/camel/springboot/cli/connector/CliConnectorAutoConfiguration.java b/components-starter/camel-cli-connector-starter/src/main/java/org/apache/camel/springboot/cli/connector/CliConnectorAutoConfiguration.java index 8d956545bbc..e11d4a38e47 100644 --- a/components-starter/camel-cli-connector-starter/src/main/java/org/apache/camel/springboot/cli/connector/CliConnectorAutoConfiguration.java +++ b/components-starter/camel-cli-connector-starter/src/main/java/org/apache/camel/springboot/cli/connector/CliConnectorAutoConfiguration.java @@ -16,6 +16,7 @@ */ package org.apache.camel.springboot.cli.connector; +import org.apache.camel.CamelContext; import org.apache.camel.cli.connector.DefaultCliConnectorFactory; import org.apache.camel.spi.CliConnectorFactory; import org.springframework.boot.SpringBootVersion; @@ -27,6 +28,11 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import java.io.InputStream; +import java.net.URL; +import java.util.Enumeration; +import java.util.jar.Manifest; + @Configuration(proxyBeanMethods = false) @ConditionalOnProperty(name = "camel.cli.enabled", matchIfMissing = true) @ConditionalOnBean(type = "org.apache.camel.spring.boot.CamelAutoConfiguration") @@ -36,11 +42,30 @@ public class CliConnectorAutoConfiguration { @Bean @ConditionalOnMissingBean(CliConnectorFactory.class) - public CliConnectorFactory cliConnectorFactory(CliConnectorConfiguration config) { + public CliConnectorFactory cliConnectorFactory(CamelContext camelContext, CliConnectorConfiguration config) { CliConnectorFactory answer = new DefaultCliConnectorFactory(); answer.setEnabled(config.getEnabled()); answer.setRuntime("Spring Boot"); answer.setRuntimeVersion(SpringBootVersion.getVersion()); + + // if packaged as fat-jar then we need to know what was the main class that started this integration + try { + Enumeration<URL> en = this.getClass().getClassLoader().getResources("META-INF/MANIFEST.MF"); + while (en.hasMoreElements()) { + URL u = en.nextElement(); + try (InputStream is = u.openStream()) { + Manifest manifest = new Manifest(is); + String sc = manifest.getMainAttributes().getValue("Start-Class"); + if (sc != null) { + answer.setRuntimeStartClass(sc); + break; + } + } + } + } catch (Exception e) { + // ignore + } + return answer; }