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
commit 45f87f23fd3f188de35310bf0210158333309642 Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Mon Aug 22 13:33:14 2022 +0200 Polished --- .../org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java | 8 ++++---- .../java/org/apache/camel/dsl/jbang/core/commands/Export.java | 2 +- .../main/java/org/apache/camel/dsl/jbang/core/commands/Init.java | 2 +- .../main/java/org/apache/camel/dsl/jbang/core/commands/Pipe.java | 2 +- .../apache/camel/dsl/jbang/core/commands/process/CamelStatus.java | 2 +- .../apache/camel/dsl/jbang/core/commands/process/ListProcess.java | 2 +- .../apache/camel/dsl/jbang/core/commands/process/StopProcess.java | 6 +++--- 7 files changed, 12 insertions(+), 12 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 8dfe2bf9373..3e77d1153d1 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 @@ -35,17 +35,17 @@ public class CamelJBangMain implements Callable<Integer> { public static void run(String... args) { CamelJBangMain main = new CamelJBangMain(); commandLine = new CommandLine(main) + .addSubcommand("init", new CommandLine(new Init(main))) .addSubcommand("run", new CommandLine(new Run(main))) .addSubcommand("ps", new CommandLine(new ListProcess(main))) .addSubcommand("stop", new CommandLine(new StopProcess(main))) .addSubcommand("status", new CommandLine(new CamelStatus(main))) - .addSubcommand("init", new CommandLine(new Init(main))) - .addSubcommand("bind", new CommandLine(new Bind(main))) + .addSubcommand("generate", new CommandLine(new CodeGenerator(main)) + .addSubcommand("rest", new CommandLine(new CodeRestGenerator(main)))) .addSubcommand("jolokia", new CommandLine(new Jolokia(main))) .addSubcommand("hawtio", new CommandLine(new Hawtio(main))) + .addSubcommand("bind", new CommandLine(new Bind(main))) .addSubcommand("pipe", new CommandLine(new Pipe(main))) - .addSubcommand("generate", new CommandLine(new CodeGenerator(main)) - .addSubcommand("rest", new CommandLine(new CodeRestGenerator(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/Export.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Export.java index 78267d67e5c..9566f7adeca 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 @@ -24,7 +24,7 @@ import org.apache.camel.util.CamelCaseOrderedProperties; import picocli.CommandLine.Command; @Command(name = "export", - description = "Export to other runtimes such as Spring Boot or Quarkus") + description = "Export Camel integration to Maven based runtime (such as Spring Boot or Quarkus)") 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/Init.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Init.java index 17d4313445a..08de929a00a 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Init.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Init.java @@ -38,7 +38,7 @@ import static org.apache.camel.dsl.jbang.core.common.GistHelper.fetchGistUrls; import static org.apache.camel.dsl.jbang.core.common.GitHubHelper.asGithubSingleUrl; import static org.apache.camel.dsl.jbang.core.common.GitHubHelper.fetchGithubUrls; -@Command(name = "init", description = "Initialize empty Camel integration") +@Command(name = "init", description = "Creates a new Camel integration") class Init extends CamelCommand { @CommandLine.Parameters(description = "Name of integration file (or a github link)", arity = "1") diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Pipe.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Pipe.java index 0f999afc6c3..247e84ff776 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Pipe.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Pipe.java @@ -18,7 +18,7 @@ package org.apache.camel.dsl.jbang.core.commands; import picocli.CommandLine; -@CommandLine.Command(name = "pipe", description = "Run Camel in pipe and filters mode for terminal scripting") +@CommandLine.Command(name = "pipe", description = "Run Camel integration in pipe and filters mode for terminal scripting") class Pipe extends CamelCommand { @CommandLine.Parameters(description = "Name of file", arity = "1") diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelStatus.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelStatus.java index f8678efdf0e..fbfa79610b6 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelStatus.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelStatus.java @@ -31,7 +31,7 @@ import org.apache.camel.util.json.Jsoner; import picocli.CommandLine; import picocli.CommandLine.Command; -@Command(name = "status", description = "List status of the running Camel applications") +@Command(name = "status", description = "List status of the running Camel integrations") public class CamelStatus extends ProcessBaseCommand { @CommandLine.Option(names = { "--sort" }, diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListProcess.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListProcess.java index 6167614cc0a..3f022678093 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListProcess.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListProcess.java @@ -22,7 +22,7 @@ import org.apache.camel.util.TimeUtils; import picocli.CommandLine; import picocli.CommandLine.Command; -@Command(name = "ps", description = "List running Camel applications") +@Command(name = "ps", description = "List running Camel integrations") public class ListProcess extends ProcessBaseCommand { @CommandLine.Option(names = { "--sort" }, diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/StopProcess.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/StopProcess.java index 8444780101a..821e5a3f64b 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/StopProcess.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/StopProcess.java @@ -24,14 +24,14 @@ import org.apache.camel.util.FileUtil; import picocli.CommandLine; import picocli.CommandLine.Command; -@Command(name = "stop", description = "Stop a running Camel integration") +@Command(name = "stop", description = "Shuts down a running Camel integration") public class StopProcess extends ProcessBaseCommand { @CommandLine.Parameters(description = "Name or pid of running Camel integration", arity = "0..1") String name; @CommandLine.Option(names = { "--all" }, - description = "To stop all running Camel integrations") + description = "To shutdown all running Camel integrations") boolean all; public StopProcess(CamelJBangMain main) { @@ -52,7 +52,7 @@ public class StopProcess extends ProcessBaseCommand { for (Long pid : pids) { File dir = new File(System.getProperty("user.home"), ".camel"); File pidFile = new File(dir, "" + pid); - System.out.println("Stopping Camel integration (pid: " + pid + ")"); + System.out.println("Shutting down Camel integration (pid: " + pid + ")"); FileUtil.deleteFile(pidFile); }