From 003ba6c36236294bfad547072b25009eb36fb5ea Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Tue, 15 Sep 2020 17:51:06 -0500 Subject: [PATCH] use 'appserver' instead of 'docserver' with backwards compatible --- .../io/nosqlbench/docsys/core/DocServerApp.java | 17 ++++++++--------- .../java/io/nosqlbench/engine/cli/NBCLI.java | 2 +- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/docsys/src/main/java/io/nosqlbench/docsys/core/DocServerApp.java b/docsys/src/main/java/io/nosqlbench/docsys/core/DocServerApp.java index 480a1da2c..e99c836ff 100644 --- a/docsys/src/main/java/io/nosqlbench/docsys/core/DocServerApp.java +++ b/docsys/src/main/java/io/nosqlbench/docsys/core/DocServerApp.java @@ -12,7 +12,6 @@ import java.nio.file.StandardOpenOption; import java.util.Arrays; public class DocServerApp { - public final static String APPNAME_DOCSERVER = "docserver"; private static final Logger logger = LogManager.getLogger(DocServerApp.class); // static { @@ -129,14 +128,14 @@ public class DocServerApp { private static void showHelp(String... helpArgs) { System.out.println( - "Usage: " + APPNAME_DOCSERVER + " " + - " [url] " + - " [path]... " + "\n" + - "\n" + - "If [url] is provided, then the scheme, address and port are all taken from it.\n" + - "Any additional paths are served from the filesystem, in addition to the internal ones.\n" + - "\n" + - "For now, only http:// is supported." + "Usage: appserver " + + " [url] " + + " [path]... " + "\n" + + "\n" + + "If [url] is provided, then the scheme, address and port are all taken from it.\n" + + "Any additional paths are served from the filesystem, in addition to the internal ones.\n" + + "\n" + + "For now, only http:// is supported." ); } diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java index e49c3dad2..e24e10584 100644 --- a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java +++ b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java @@ -97,7 +97,7 @@ public class NBCLI { VirtDataMainApp.main(Arrays.copyOfRange(args, 1, args.length)); System.exit(0); } - if (args.length > 0 && args[0].toLowerCase().equals("docserver")) { + if (args.length > 0 && args[0].toLowerCase().matches("docserver|appserver")) { DocServerApp.main(Arrays.copyOfRange(args, 1, args.length)); System.exit(0); }