From 21f6efb43b0f789c99018e14057688b588ef6013 Mon Sep 17 00:00:00 2001 From: Geir Storli Date: Mon, 12 Jun 2017 14:30:00 +0000 Subject: Rename binaries/scripts in vespaclient-java to use vespa- prefix. --- vespaclient-java/src/main/java/com/yahoo/vespafeeder/Arguments.java | 2 +- .../src/main/java/com/yahoo/vespafeeder/VespaFeeder.java | 4 ++-- .../src/main/java/com/yahoo/vespaget/CommandLineOptions.java | 2 +- vespaclient-java/src/main/java/com/yahoo/vespaget/Main.java | 2 +- .../src/main/java/com/yahoo/vespastat/CommandLineOptions.java | 2 +- vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisit.java | 6 +++--- .../src/main/java/com/yahoo/vespavisit/VdsVisitTarget.java | 6 +++--- 7 files changed, 12 insertions(+), 12 deletions(-) (limited to 'vespaclient-java/src/main/java/com/yahoo') diff --git a/vespaclient-java/src/main/java/com/yahoo/vespafeeder/Arguments.java b/vespaclient-java/src/main/java/com/yahoo/vespafeeder/Arguments.java index 249ed1fd70c..4c588e6e318 100644 --- a/vespaclient-java/src/main/java/com/yahoo/vespafeeder/Arguments.java +++ b/vespaclient-java/src/main/java/com/yahoo/vespafeeder/Arguments.java @@ -71,7 +71,7 @@ public class Arguments { " are allowed to be pending at any given time. \n" + " --maxfeedrate arg Limits the feed rate to the given number (operations/second). You may still want to increase\n" + " the max pending size if your feed rate doesn't reach the desired number.\n" + - " --mode arg (=standard) The mode to run vespafeeder in (standard | benchmark).\n" + + " --mode arg (=standard) The mode to run vespa-feeder in (standard | benchmark).\n" + " --noretry Turns off retries of recoverable failures.\n" + " --retrydelay arg (=1) The time (in seconds) to wait between retries of \n" + " a failed operation.\n" + diff --git a/vespaclient-java/src/main/java/com/yahoo/vespafeeder/VespaFeeder.java b/vespaclient-java/src/main/java/com/yahoo/vespafeeder/VespaFeeder.java index a6ede66c43d..66eb17a744f 100755 --- a/vespaclient-java/src/main/java/com/yahoo/vespafeeder/VespaFeeder.java +++ b/vespaclient-java/src/main/java/com/yahoo/vespafeeder/VespaFeeder.java @@ -22,7 +22,7 @@ public class VespaFeeder { Arguments args; DocumentTypeManager manager; - Executor threadPool = Executors.newCachedThreadPool(ThreadFactoryFactory.getThreadFactory("vespafeeder")); + Executor threadPool = Executors.newCachedThreadPool(ThreadFactoryFactory.getThreadFactory("vespa-feeder")); public VespaFeeder(Arguments args, DocumentTypeManager manager) { this.args = args; @@ -141,7 +141,7 @@ public class VespaFeeder { } public static void main(String[] args) { - LogSetup.initVespaLogging("vespafeeder"); + LogSetup.initVespaLogging("vespa-feeder"); try { Arguments arguments = new Arguments(args, null); diff --git a/vespaclient-java/src/main/java/com/yahoo/vespaget/CommandLineOptions.java b/vespaclient-java/src/main/java/com/yahoo/vespaget/CommandLineOptions.java index cbaef17a70a..89d48caceb2 100644 --- a/vespaclient-java/src/main/java/com/yahoo/vespaget/CommandLineOptions.java +++ b/vespaclient-java/src/main/java/com/yahoo/vespaget/CommandLineOptions.java @@ -143,7 +143,7 @@ public class CommandLineOptions { HelpFormatter formatter = new HelpFormatter(); formatter.printHelp( - "vespaget [documentid...]", "Fetch a document from a Vespa Content cluster.", options, + "vespa-get [documentid...]", "Fetch a document from a Vespa Content cluster.", options, "If one or more document identifier are specified, these documents will be " + "retrieved. Otherwise, document identifiers (separated with line break) will be read from standard in.\n", false); diff --git a/vespaclient-java/src/main/java/com/yahoo/vespaget/Main.java b/vespaclient-java/src/main/java/com/yahoo/vespaget/Main.java index 324107d8909..eb840a9c271 100644 --- a/vespaclient-java/src/main/java/com/yahoo/vespaget/Main.java +++ b/vespaclient-java/src/main/java/com/yahoo/vespaget/Main.java @@ -6,7 +6,7 @@ import com.yahoo.documentapi.messagebus.loadtypes.LoadTypeSet; import com.yahoo.vespaclient.ClusterList; /** - * The vespaget tool retrieves documents from a Vespa Document Storage cluster, and prints them to stdout as XML. + * The vespa-get tool retrieves documents from a Vespa Document Storage cluster, and prints them to stdout as XML. * * @author bjorncs */ diff --git a/vespaclient-java/src/main/java/com/yahoo/vespastat/CommandLineOptions.java b/vespaclient-java/src/main/java/com/yahoo/vespastat/CommandLineOptions.java index b0b6246a262..042b2ecc426 100644 --- a/vespaclient-java/src/main/java/com/yahoo/vespastat/CommandLineOptions.java +++ b/vespaclient-java/src/main/java/com/yahoo/vespastat/CommandLineOptions.java @@ -96,7 +96,7 @@ public class CommandLineOptions { public void printHelp() { HelpFormatter formatter = new HelpFormatter(); - formatter.printHelp("vdsstat [options]", + formatter.printHelp("vespa-stat [options]", "Fetch statistics about a specific user, group, bucket, gid or document.", options, "", false); } diff --git a/vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisit.java b/vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisit.java index ff072b845de..f0b3df4d5d7 100644 --- a/vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisit.java +++ b/vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisit.java @@ -103,7 +103,7 @@ public class VdsVisit { } public static void main(String args[]) { - LogSetup.initVespaLogging("vespavisit"); + LogSetup.initVespaLogging("vespa-visit"); VdsVisit vdsVisit = new VdsVisit(); Options options = createOptions(); @@ -140,7 +140,7 @@ public class VdsVisit { private void printSyntax(Options options) { HelpFormatter formatter = new HelpFormatter(); - formatter.printHelp("vespavisit ", "Visit documents from VDS", options , ""); + formatter.printHelp("vespa-visit ", "Visit documents from VDS", options , ""); } @SuppressWarnings("AccessStaticViaInstance") @@ -204,7 +204,7 @@ public class VdsVisit { .longOpt("maxpendingsuperbuckets") .hasArg(true) .argName("num") - .desc("Maximum pending visitor messages from the vespavisit client. If set, dynamic throttling of visitors will be disabled!") + .desc("Maximum pending visitor messages from the vespa-visit client. If set, dynamic throttling of visitors will be disabled!") .type(Number.class) .build()); diff --git a/vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisitTarget.java b/vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisitTarget.java index 3ef0619cfd8..301d0989d65 100644 --- a/vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisitTarget.java +++ b/vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisitTarget.java @@ -72,7 +72,7 @@ public class VdsVisitTarget { } public static void main(String args[]) { - LogSetup.initVespaLogging("vespavisittarget"); + LogSetup.initVespaLogging("vespa-visit-target"); VdsVisitTarget visitTarget = new VdsVisitTarget(); @@ -144,11 +144,11 @@ public class VdsVisitTarget { private void printSyntax(Options options) { HelpFormatter formatter = new HelpFormatter(); - formatter.printHelp("vespavisittarget ", "Retrieve results from a visitor", options , + formatter.printHelp("vespa-visit-target ", "Retrieve results from a visitor", options , "One, and only one, of the binding options must be present.\n" + "\n" + "For more detailed information, such as defaults and format of\n" + - "arguments, refer to 'man vespavisittarget'.\n"); + "arguments, refer to 'man vespa-visit-target'.\n"); } class HelpShownException extends Exception {} -- cgit v1.2.3