(camel) branch main updated: camel-jbang: polished
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 0a18461de0b camel-jbang: polished
0a18461de0b is described below
commit 0a18461de0b2ef0226e4ac8c5d1401898a87da24
Author: Claus Ibsen
AuthorDate: Thu Jul 11 09:52:24 2024 +0200
camel-jbang: polished
---
.../apache/camel/dsl/jbang/core/commands/action/CamelSourceAction.java | 2 --
1 file changed, 2 deletions(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelSourceAction.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelSourceAction.java
index 454398f95cd..c4e4b725d8f 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelSourceAction.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelSourceAction.java
@@ -35,8 +35,6 @@ import static
org.apache.camel.support.LoggerHelper.stripSourceLocationLineNumbe
@Command(name = "source", description = "Display Camel route source code",
sortOptions = false)
public class CamelSourceAction extends ActionBaseCommand {
-// TODO: strip license header
-
@CommandLine.Parameters(description = "Name or pid of running Camel
integration", arity = "0..1")
String name = "*";
(camel) branch main updated: camel-jbang - Polished
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 87153c391ba camel-jbang - Polished
87153c391ba is described below
commit 87153c391ba595c5368be178c360519a8a10d0e5
Author: Claus Ibsen
AuthorDate: Fri Jul 5 19:49:14 2024 +0200
camel-jbang - Polished
---
.../org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java | 8
.../camel/dsl/jbang/core/commands/action/CamelSendAction.java | 2 +-
.../dsl/jbang/core/commands/action/RouteControllerAction.java | 2 +-
.../apache/camel/dsl/jbang/core/commands/process/CamelCount.java | 2 +-
.../camel/dsl/jbang/core/commands/process/ListVariable.java | 2 +-
.../apache/camel/dsl/jbang/core/commands/process/ListVault.java | 2 +-
.../camel/dsl/jbang/core/commands/version/VersionCommand.java | 2 +-
7 files changed, 10 insertions(+), 10 deletions(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java
index 31a64f611fc..d39848eee04 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java
@@ -77,6 +77,7 @@ public class CamelJBangMain implements Callable {
.addSubcommand("log", new CommandLine(new
CamelLogAction(main)))
.addSubcommand("ps", new CommandLine(new ListProcess(main)))
.addSubcommand("stop", new CommandLine(new StopProcess(main)))
+.addSubcommand("export", new CommandLine(new Export(main)))
.addSubcommand("trace", new CommandLine(new
CamelTraceAction(main)))
.addSubcommand("transform", new CommandLine(new
TransformCommand(main))
.addSubcommand("route", new CommandLine(new
TransformRoute(main)))
@@ -126,7 +127,6 @@ public class CamelJBangMain implements Callable {
.addSubcommand("list", new CommandLine(new
DependencyList(main)))
.addSubcommand("copy", new CommandLine(new
DependencyCopy(main)))
.addSubcommand("update", new CommandLine(new
DependencyUpdate(main
-.addSubcommand("sbom", new CommandLine(new
SBOMGenerator(main)))
.addSubcommand("catalog", new CommandLine(new
CatalogCommand(main))
.addSubcommand("component", new CommandLine(new
CatalogComponent(main)))
.addSubcommand("dataformat", new CommandLine(new
CatalogDataFormat(main)))
@@ -136,11 +136,11 @@ public class CamelJBangMain implements Callable {
.addSubcommand("other", new CommandLine(new
CatalogOther(main)))
.addSubcommand("kamelet", new CommandLine(new
CatalogKamelet(main
.addSubcommand("doc", new CommandLine(new CatalogDoc(main)))
-.addSubcommand("jolokia", new CommandLine(new Jolokia(main)))
-.addSubcommand("hawtio", new CommandLine(new Hawtio(main)))
.addSubcommand("bind", new CommandLine(new Bind(main)))
.addSubcommand("script", new CommandLine(new Script(main)))
-.addSubcommand("export", new CommandLine(new Export(main)))
+.addSubcommand("jolokia", new CommandLine(new Jolokia(main)))
+.addSubcommand("hawtio", new CommandLine(new Hawtio(main)))
+.addSubcommand("sbom", new CommandLine(new
SBOMGenerator(main)))
.addSubcommand("completion", new CommandLine(new
Complete(main)))
.addSubcommand("config", new CommandLine(new
ConfigCommand(main))
.addSubcommand("list", new CommandLine(new
ConfigList(main)))
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelSendAction.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelSendAction.java
index 266b576a11c..dfdb67dfc79 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelSendAction.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelSendAction.java
@@ -36,7 +36,7 @@ import org.fusesource.jansi.AnsiConsole;
import picocli.CommandLine;
@CommandLine.Command(name = "send",
- description = "Sends a message to a system via an
existing running Camel integration", sortOptions = false)
+ description = "Send messages to endpoints via running
C
[camel] branch main updated: camel-jbang - Polished
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 3135750e0a9 camel-jbang - Polished
3135750e0a9 is described below
commit 3135750e0a9eeb95e4c9121771ada9c92a381017
Author: Claus Ibsen
AuthorDate: Thu Aug 10 17:31:59 2023 +0200
camel-jbang - Polished
---
.../src/main/java/org/apache/camel/dsl/jbang/core/commands/Export.java | 2 +-
.../org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Export.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Export.java
index 830e36a0b07..1b0c4a1f7b0 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Export.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Export.java
@@ -26,7 +26,7 @@ import org.apache.camel.util.CamelCaseOrderedProperties;
import picocli.CommandLine.Command;
@Command(name = "export",
- description = "Export Camel integration to Spring Boot or Quarkus
based project")
+ description = "Export to other runtimes (Camel Main, Spring Boot, or
Quarkus)")
public class Export extends ExportBaseCommand {
public Export(CamelJBangMain main) {
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 8ddc2dd4339..cdf6460d6c2 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
@@ -54,8 +54,6 @@ import org.apache.camel.util.IOHelper;
import org.apache.camel.util.StringHelper;
import picocli.CommandLine;
-@CommandLine.Command(name = "export",
- description = "Export to other runtimes such as Spring
Boot or Quarkus")
abstract class ExportBaseCommand extends CamelCommand {
protected static final String BUILD_DIR = ".camel-jbang/work";
[camel] branch main updated: camel-jbang - Polished
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 ccca2795070 camel-jbang - Polished
ccca2795070 is described below
commit ccca2795070786121dc964087dc091f7681922da
Author: Claus Ibsen
AuthorDate: Thu Nov 10 10:59:52 2022 +0100
camel-jbang - Polished
---
docs/user-manual/modules/ROOT/pages/camel-jbang.adoc | 8
.../org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java | 2 +-
.../org/apache/camel/dsl/jbang/core/commands/DependencyTree.java | 2 ++
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc
b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc
index ddf39882ca6..8f97b020863 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc
@@ -1304,7 +1304,7 @@ you do not have to use a build system like Maven or
Gradle to add every Camel co
as a dependency.
However, you may want to know what dependencies are required to run the Camel
integration.
-To see this, you can use the `dependency-tree` command. The command output
does not output a detailed
+To see this, you can use the `dependencies` command. The command output does
not output a detailed
tree, such as `mvn dependencies:tree`, as the output is intended to list which
Camel components,
and other JARs needed (when using Kamelets).
@@ -1312,7 +1312,7 @@ The dependency output by default is _vanilla_ Apache
Camel with the camel-main a
[source,bash]
-camel dependency-tree
+camel dependencies
org.apache.camel:camel-dsl-modeline:3.20.0
org.apache.camel:camel-health:3.20.0
org.apache.camel:camel-kamelet:3.20.0
@@ -1331,7 +1331,7 @@ You can also specify the output should be in _Maven
format_ as shown:
[source,bash]
-camel dependency-tree --output=maven
+camel dependencies --output=maven
org.apache.camel
camel-main
@@ -1393,7 +1393,7 @@ You can also choose the target runtime as either
_quarkus_ or _spring-boot_ as s
[source,bash]
-camel dependency-tree --runtime=spring-boot
+camel dependencies --runtime=spring-boot
org.springframework.boot:spring-boot-starter-actuator:2.7.5
org.springframework.boot:spring-boot-starter-web:2.7.5
org.apache.camel.springboot:camel-spring-boot-engine-starter:3.20.0
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java
index f3474659540..aeb3527cc74 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java
@@ -114,7 +114,7 @@ public class CamelJBangMain implements Callable {
.addSubcommand("hawtio", new CommandLine(new Hawtio(main)))
.addSubcommand("bind", new CommandLine(new Bind(main)))
.addSubcommand("pipe", new CommandLine(new Pipe(main)))
-.addSubcommand("dependency-tree", new CommandLine(new
DependencyTree(main)))
+.addSubcommand("dependencies", new CommandLine(new
DependencyTree(main)))
.addSubcommand("export", new CommandLine(new Export(main)));
commandLine.getCommandSpec().versionProvider(() -> {
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/DependencyTree.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/DependencyTree.java
index be9b50df944..040150d1123 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/DependencyTree.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/DependencyTree.java
@@ -35,6 +35,8 @@ import org.apache.camel.util.CamelCaseOrderedProperties;
import org.apache.camel.util.FileUtil;
import picocli.CommandLine;
+@CommandLine.Command(name = "dependencies",
+ description = "Displays all Camel dependencies required
to run")
public class DependencyTree extends Export {
protected static final String EXPORT_DIR = ".camel-jbang/export";
[camel] branch main updated: camel-jbang - Polished
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 a2298a28766 camel-jbang - Polished
a2298a28766 is described below
commit a2298a287664740de96caf79f53b29db45ca0a4b
Author: Claus Ibsen
AuthorDate: Mon Sep 26 17:25:32 2022 +0200
camel-jbang - Polished
---
.../org/apache/camel/dsl/jbang/core/commands/process/ListEvent.java | 6 +-
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListEvent.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListEvent.java
index c114e3a9c18..bc0fce859c2 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListEvent.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListEvent.java
@@ -68,8 +68,6 @@ public class ListEvent extends ProcessBaseCommand {
row.name = extractName(root, ph);
}
row.pid = "" + ph.pid();
-row.uptime = extractSince(ph);
-row.age = TimeUtils.printSince(row.uptime);
if (filter == null || filter.contains("context")) {
fetchEvents(root, row, "events", rows);
@@ -140,7 +138,7 @@ public class ListEvent extends ProcessBaseCommand {
case "name":
return o1.name.compareToIgnoreCase(o2.name) * negate;
case "age":
-return Long.compare(o1.uptime, o2.uptime) * negate;
+return Long.compare(o1.timestamp, o2.timestamp) * negate;
default:
return 0;
}
@@ -149,8 +147,6 @@ public class ListEvent extends ProcessBaseCommand {
private static class Row implements Cloneable {
String pid;
String name;
-String age;
-long uptime;
String type;
long timestamp;
String exchangeId;
[camel] branch main updated: camel-jbang - Polished
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 3e5c1fcf1e2 camel-jbang - Polished
3e5c1fcf1e2 is described below
commit 3e5c1fcf1e231f62a9f0462438df143d4364ca2a
Author: Claus Ibsen
AuthorDate: Thu Sep 22 09:42:29 2022 +0200
camel-jbang - Polished
---
.../camel/dsl/jbang/core/commands/catalog/CatalogBaseCommand.java | 6 +++---
.../camel/dsl/jbang/core/commands/catalog/CatalogKamelet.java | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogBaseCommand.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogBaseCommand.java
index d0f02f4febe..e5cdf93b606 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogBaseCommand.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogBaseCommand.java
@@ -39,7 +39,7 @@ public abstract class CatalogBaseCommand extends CamelCommand
{
String sort;
@CommandLine.Option(names = { "--gav" },
-description = "Include column with Maven GAV",
defaultValue = "false")
+description = "Display Maven GAV instead of name",
defaultValue = "false")
boolean gav;
@CommandLine.Option(names = { "--filter" },
@@ -75,9 +75,9 @@ public abstract class CatalogBaseCommand extends CamelCommand
{
if (!rows.isEmpty()) {
System.out.println(AsciiTable.getTable(AsciiTable.NO_BORDERS,
rows, Arrays.asList(
-new
Column().header("NAME").dataAlign(HorizontalAlign.LEFT).with(r -> r.name),
+new
Column().header("NAME").visible(!gav).dataAlign(HorizontalAlign.LEFT).with(r ->
r.name),
new
Column().header("ARTIFACT-ID").visible(gav).dataAlign(HorizontalAlign.LEFT).with(this::shortGav),
-new
Column().header("LEVEL").dataAlign(HorizontalAlign.LEFT).with(r -> r.level),
+new
Column().header("LEVEL").dataAlign(HorizontalAlign.LEFT).minWidth(12).with(r ->
r.level),
new
Column().header("DESCRIPTION").dataAlign(HorizontalAlign.LEFT).with(this::shortDescription;
}
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogKamelet.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogKamelet.java
index 5c35c5b1d35..faef90d6a51 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogKamelet.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogKamelet.java
@@ -102,8 +102,8 @@ public class CatalogKamelet extends CamelCommand {
if (!rows.isEmpty()) {
System.out.println(AsciiTable.getTable(AsciiTable.NO_BORDERS,
rows, Arrays.asList(
new
Column().header("NAME").dataAlign(HorizontalAlign.LEFT).with(r -> r.name),
-new
Column().header("TYPE").dataAlign(HorizontalAlign.LEFT).with(r -> r.type),
-new
Column().header("LEVEL").dataAlign(HorizontalAlign.LEFT).with(r ->
r.supportLevel),
+new
Column().header("TYPE").dataAlign(HorizontalAlign.LEFT).minWidth(10).with(r ->
r.type),
+new
Column().header("LEVEL").dataAlign(HorizontalAlign.LEFT).minWidth(12).with(r ->
r.supportLevel),
new
Column().header("DESCRIPTION").dataAlign(HorizontalAlign.LEFT).with(this::getDescription;
}
[camel] branch main updated: camel-jbang - Polished
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 f1bb1405bb7 camel-jbang - Polished
f1bb1405bb7 is described below
commit f1bb1405bb7f5d8d279b289364a8bdd8f95852ec
Author: Claus Ibsen
AuthorDate: Sat Sep 17 09:58:42 2022 +0200
camel-jbang - Polished
---
.../java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java | 4 ++--
.../dsl/jbang/core/commands/{kamelet => catalog}/CatalogCommand.java | 2 +-
.../dsl/jbang/core/commands/{kamelet => catalog}/CatalogKamelet.java | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java
index 05fa2aa7921..5b049d6ebaa 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java
@@ -28,8 +28,8 @@ import
org.apache.camel.dsl.jbang.core.commands.action.CamelRouteStartAction;
import org.apache.camel.dsl.jbang.core.commands.action.CamelRouteStopAction;
import org.apache.camel.dsl.jbang.core.commands.action.CamelSourceTop;
import org.apache.camel.dsl.jbang.core.commands.action.CamelThreadDump;
-import org.apache.camel.dsl.jbang.core.commands.kamelet.CatalogCommand;
-import org.apache.camel.dsl.jbang.core.commands.kamelet.CatalogKamelet;
+import org.apache.camel.dsl.jbang.core.commands.catalog.CatalogCommand;
+import org.apache.camel.dsl.jbang.core.commands.catalog.CatalogKamelet;
import org.apache.camel.dsl.jbang.core.commands.process.CamelContextStatus;
import org.apache.camel.dsl.jbang.core.commands.process.CamelContextTop;
import org.apache.camel.dsl.jbang.core.commands.process.CamelProcessorStatus;
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/kamelet/CatalogCommand.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogCommand.java
similarity index 95%
rename from
dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/kamelet/CatalogCommand.java
rename to
dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogCommand.java
index da9d41dfe32..cea0a8eef55 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/kamelet/CatalogCommand.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogCommand.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.dsl.jbang.core.commands.kamelet;
+package org.apache.camel.dsl.jbang.core.commands.catalog;
import org.apache.camel.dsl.jbang.core.commands.CamelCommand;
import org.apache.camel.dsl.jbang.core.commands.CamelJBangMain;
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/kamelet/CatalogKamelet.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogKamelet.java
similarity index 99%
rename from
dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/kamelet/CatalogKamelet.java
rename to
dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogKamelet.java
index 9598fa74741..31767a59a35 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/kamelet/CatalogKamelet.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogKamelet.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.dsl.jbang.core.commands.kamelet;
+package org.apache.camel.dsl.jbang.core.commands.catalog;
import java.lang.reflect.Method;
import java.util.ArrayList;
[camel] branch main updated: camel-jbang: Polished
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 a8c25c7af32 camel-jbang: Polished
a8c25c7af32 is described below
commit a8c25c7af32f7125486eaf8abfea6cd49e2eca5a
Author: Claus Ibsen
AuthorDate: Thu Sep 8 12:46:59 2022 +0200
camel-jbang: Polished
---
.../camel/dsl/jbang/core/commands/process/CamelContextStatus.java | 2 +-
.../apache/camel/dsl/jbang/core/commands/process/CamelRouteStatus.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelContextStatus.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelContextStatus.java
index 7ecada01fa0..09bd9bdcb49 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelContextStatus.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelContextStatus.java
@@ -130,7 +130,7 @@ public class CamelContextStatus extends ProcessBaseCommand {
new
Column().header("AGE").headerAlign(HorizontalAlign.CENTER).with(r -> r.ago),
new Column().header("ROUTE").with(this::getRoutes),
new Column().header("TOTAL").with(r -> r.total),
-new Column().header("FAILED").with(r -> r.failed),
+new Column().header("FAIL").with(r -> r.failed),
new Column().header("INFLIGHT").with(r -> r.inflight),
new
Column().header("SINCE-LAST").with(this::getSinceLast;
}
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelRouteStatus.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelRouteStatus.java
index c411c994769..c984d7bff92 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelRouteStatus.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelRouteStatus.java
@@ -136,7 +136,7 @@ public class CamelRouteStatus extends ProcessBaseCommand {
.with(r -> r.state),
new
Column().header("AGE").headerAlign(HorizontalAlign.CENTER).with(r -> r.age),
new Column().header("TOTAL").with(r -> r.total),
-new Column().header("FAILED").with(r -> r.failed),
+new Column().header("FAIL").with(r -> r.failed),
new Column().header("INFLIGHT").with(r -> r.inflight),
new Column().header("MEAN").with(r -> r.mean),
new Column().header("MIN").with(r -> r.min),
[camel] branch main updated: camel-jbang: polished
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 d448652203e camel-jbang: polished
d448652203e is described below
commit d448652203ee39793496278a65f4119299acaaa8
Author: Claus Ibsen
AuthorDate: Tue Aug 23 07:19:26 2022 +0200
camel-jbang: polished
---
.../java/org/apache/camel/dsl/jbang/core/commands/process/Hawtio.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/Hawtio.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/Hawtio.java
index 928295ec0d0..b974590a242 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/Hawtio.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/Hawtio.java
@@ -33,7 +33,7 @@ import picocli.CommandLine.Command;
@Command(name = "hawtio", description = "Launch Hawtio web console")
public class Hawtio extends CamelCommand {
-@CommandLine.Parameters(description = "Name or pid of running Camel
integration", arity = "1")
+@CommandLine.Parameters(description = "Name or pid of running Camel
integration", arity = "0..1")
String name;
@CommandLine.Option(names = { "--version" },
@@ -42,7 +42,7 @@ public class Hawtio extends CamelCommand {
// use port as 8080 is too commonly used
@CommandLine.Option(names = { "--port" },
-description = "Port number to use for Hawtio web
console", defaultValue = "")
+description = "Port number to use for Hawtio web
console (port by default)", defaultValue = "")
int port = ;
@CommandLine.Option(names = { "--openUrl" },
[camel] branch main updated: camel-jbang: polished pid
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 139927b7e5d camel-jbang: polished pid
139927b7e5d is described below
commit 139927b7e5d846b10e4c8e7d2e12998d463ee9c9
Author: Claus Ibsen
AuthorDate: Mon Aug 22 12:35:21 2022 +0200
camel-jbang: polished pid
---
.../src/main/java/org/apache/camel/main/KameletMain.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletMain.java
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletMain.java
index 6752b76fba5..e34fe0b7eee 100644
---
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletMain.java
+++
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletMain.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.main;
-import java.lang.management.ManagementFactory;
import java.util.LinkedList;
import java.util.Map;
import java.util.Objects;
@@ -441,7 +440,7 @@ public class KameletMain extends MainCommandLineSupport {
private static String getPid() {
try {
-return "" + ManagementFactory.getRuntimeMXBean().getPid();
+return "" + ProcessHandle.current().pid();
} catch (Throwable e) {
return null;
}
[camel] branch main updated: camel-jbang - Polished docs
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 9c66e648fd0 camel-jbang - Polished docs 9c66e648fd0 is described below commit 9c66e648fd0571fc73d718bc1933788e3fc9a0a0 Author: Claus Ibsen AuthorDate: Fri Aug 5 07:22:42 2022 +0200 camel-jbang - Polished docs --- docs/user-manual/modules/ROOT/pages/camel-jbang.adoc | 18 -- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc index f83ddd699a5..cbba4e88eb9 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc @@ -61,7 +61,7 @@ camel run cheese.xml NOTE: You can create and run any of the supported xref:dsl.adoc[DSLs] in Camel such as YAML, XML, Java, Groovy. -To create a new .java integration, you simply do: +To create a new .java route, you simply do: [source,bash] @@ -98,6 +98,13 @@ Or you can run all files starting with foo* camel run foo* +And to run everything + +[source,bash] + +camel run * + + TIP: The run goal can also detect files that are `properties`. === Dev mode with live reload @@ -107,11 +114,18 @@ using the `--dev` options as shown: [source,bash] -camel run jms-amqp-10-sink-binding.yaml --dev +camel run foo.yaml --dev Then while the Camel application is running, you can update the YAML route and update when saving. +This works for all DLS even java, so you can do: + +[source,bash] + +camel run hello.java --dev + + NOTE: The live reload is meant for development purposes, and if you encounter problems with reloading such as JVM class loading issues, then you may need to restart the application.
[camel] branch main updated: camel-jbang - Polished
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 6ca838aec94 camel-jbang - Polished
6ca838aec94 is described below
commit 6ca838aec945de8fd1fcc8a814fea94a40d4d0ff
Author: Claus Ibsen
AuthorDate: Sun Apr 17 09:41:17 2022 +0200
camel-jbang - Polished
---
.../java/org/apache/camel/dsl/jbang/core/commands/AbstractSearch.java | 4
1 file changed, 4 insertions(+)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/AbstractSearch.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/AbstractSearch.java
index 43f4f903bb2..2d26114d952 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/AbstractSearch.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/AbstractSearch.java
@@ -25,6 +25,7 @@ import java.util.regex.Pattern;
import org.apache.camel.CamelContext;
import org.apache.camel.dsl.jbang.core.api.Extractor;
+import org.apache.camel.dsl.jbang.core.common.RuntimeUtil;
import org.apache.camel.dsl.jbang.core.common.exceptions.ResourceDoesNotExist;
import org.apache.camel.github.GitHubResourceResolver;
import org.apache.camel.main.KameletMain;
@@ -53,6 +54,9 @@ public abstract class AbstractSearch {
}
protected void downloadResource(File indexFile) throws
ResourceDoesNotExist, IOException {
+// turn off logging as we use camel to download
+RuntimeUtil.configureLog("off");
+
KameletMain main = new KameletMain();
main.start();
CamelContext context = main.getCamelContext();
