Rename binaries/scripts in vespaclient-java to use vespa- prefix.

18 files changed, 26 insertions, 26 deletions

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 <options> [documentid...]", "Fetch a document from a Vespa Content cluster.", options,
+                "vespa-get <options> [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 <options>", "Visit documents from VDS", options , "");
+        formatter.printHelp("vespa-visit <options>", "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 <options>", "Retrieve results from a visitor", options ,
+        formatter.printHelp("vespa-visit-target <options>", "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 {}
diff --git a/vespaclient-java/src/main/sh/vespadestination.sh b/vespaclient-java/src/main/sh/vespa-destination.sh
index a56e7033784..a56e7033784 100755
--- a/vespaclient-java/src/main/sh/vespadestination.sh
+++ b/vespaclient-java/src/main/sh/vespa-destination.sh
diff --git a/vespaclient-java/src/main/sh/vds-document-statistics.sh b/vespaclient-java/src/main/sh/vespa-document-statistics.sh
index bf8191e8b02..bbe9c210d3c 100755
--- a/vespaclient-java/src/main/sh/vds-document-statistics.sh
+++ b/vespaclient-java/src/main/sh/vespa-document-statistics.sh
@@ -61,10 +61,10 @@ findroot
 # END environment bootstrap section
 
 function help {
-    echo "Usage: vds-document-statistics [ category, ... ]"
+    echo "Usage: vespa-document-statistics [ category, ... ]"
     echo "  Where category is one or more of: user, group, scheme, namespace"
     echo ""
-    echo "vds-document-statistics generates documents counts based on one or more categories."
+    echo "vespa-document-statistics generates documents counts based on one or more categories."
     exit 0
 }
 if [ "$1" == "-h" ]; then
diff --git a/vespaclient-java/src/main/sh/vespafeeder.sh b/vespaclient-java/src/main/sh/vespa-feeder.sh
index ba3aa9012a2..ba3aa9012a2 100755
--- a/vespaclient-java/src/main/sh/vespafeeder.sh
+++ b/vespaclient-java/src/main/sh/vespa-feeder.sh
diff --git a/vespaclient-java/src/main/sh/vespaget.sh b/vespaclient-java/src/main/sh/vespa-get.sh
index 5111714b71d..5111714b71d 100644
--- a/vespaclient-java/src/main/sh/vespaget.sh
+++ b/vespaclient-java/src/main/sh/vespa-get.sh
diff --git a/vespaclient-java/src/main/sh/vdsstat.sh b/vespaclient-java/src/main/sh/vespa-stat.sh
index ec3cc70ef48..ec3cc70ef48 100644
--- a/vespaclient-java/src/main/sh/vdsstat.sh
+++ b/vespaclient-java/src/main/sh/vespa-stat.sh
diff --git a/vespaclient-java/src/main/sh/vespavisittarget.1 b/vespaclient-java/src/main/sh/vespa-visit-target.1
index ab0b0b5d105..fd15965fc79 100644
--- a/vespaclient-java/src/main/sh/vespavisittarget.1
+++ b/vespaclient-java/src/main/sh/vespa-visit-target.1
@@ -1,9 +1,9 @@
 ." Copyright 2017 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 .TH VESPAVISITTARGET 1 2008-03-07 "Vespa" "Vespa Documentation"
 .SH NAME
-vespavisittarget \- An endpoint for documents visited from a Vespa installation
+vespa-visit-target \- An endpoint for documents visited from a Vespa installation
 .SH SYNPOSIS
-.B vespavisittarget
+.B vespa-visit-target
 [\fIOPTION\fR]...
 .SH DESCRIPTION
 .PP
diff --git a/vespaclient-java/src/main/sh/vespavisittarget.sh b/vespaclient-java/src/main/sh/vespa-visit-target.sh
index 42cffe9978d..42cffe9978d 100755
--- a/vespaclient-java/src/main/sh/vespavisittarget.sh
+++ b/vespaclient-java/src/main/sh/vespa-visit-target.sh
diff --git a/vespaclient-java/src/main/sh/vespavisit.1 b/vespaclient-java/src/main/sh/vespa-visit.1
index 4873f3ac74e..7b8f7521865 100644
--- a/vespaclient-java/src/main/sh/vespavisit.1
+++ b/vespaclient-java/src/main/sh/vespa-visit.1
@@ -1,9 +1,9 @@
 ." Copyright 2017 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 .TH VESPAVISIT 1 2008-03-07 "Vespa" "Vespa Documentation"
 .SH NAME
-vespavisit \- Visit documents from a Vespa installation
+vespa-visit \- Visit documents from a Vespa installation
 .SH SYNPOSIS
-.B vespavisit
+.B vespa-visit
 [\fIOPTION\fR]...
 .SH DESCRIPTION
 .PP
@@ -49,7 +49,7 @@ visiting, and can only be used if no datahandler is specified.
 .TP
 \fB\-d\fR, \fB\-\-datahandler\fR \fIVISITTARGET\fR
 The data handler is the destination of messages sent from the visitor library.
-By default, the data handler is the vespavisit process you start, which will
+By default, the data handler is the vespa-visit process you start, which will
 merely print all returned data to STDOUT. A visit target can be specified
 instead. See the chapter below on visit targets.
 .TP
@@ -140,20 +140,20 @@ not send all the data to one or all the nodes. The data sent from the visitor
 will be distributed among the matching nodes, but each message will just be sent
 to one node.
 
-Slobrok names may also be used if you use the \fBvespavisittarget\fR tool to
-retrieve the data at some location. If you start vespavisittarget on two nodes,
+Slobrok names may also be used if you use the \fBvespa-visit-target\fR tool to
+retrieve the data at some location. If you start vespa-visit-target on two nodes,
 listening to slobrok names \fImynode/0/visit-destination\fR and
 \fImynode/1/visit-destination\fR you can send the results to these nodes by
 specifying \fImynode/*/visit-destination\fR as the data handler. See
-\fBman vespavisittarget\fR for naming conventions used for such targets.
+\fBman vespa-visit-target\fR for naming conventions used for such targets.
 .TP
 \fBTCP socket\fR
 TCP sockets can also be specified directly. This requires that the endpoint
 speaks FNET RPC though. This is typically done, either by using the
-\fBvespavisittarget\fR tool, or by using a visitor destination programmatically
+\fBvespa-visit-target\fR tool, or by using a visitor destination programmatically
 by using utility class in the document API. A socket address looks like the
 following: tcp/\fIhostname\fR:\fIport\fR/\fIservicename\fR. For instance, an
-address generated by the \fBvespavisittarget\fR tool might look like the
+address generated by the \fBvespa-visit-target\fR tool might look like the
 following: \fItcp/myhost.com:12345/visit-destination\fR.
 
 .SH AUTHOR
diff --git a/vespaclient-java/src/main/sh/vespavisit.sh b/vespaclient-java/src/main/sh/vespa-visit.sh
index bca8d1881fa..bca8d1881fa 100755
--- a/vespaclient-java/src/main/sh/vespavisit.sh
+++ b/vespaclient-java/src/main/sh/vespa-visit.sh
diff --git a/vespaclient-java/src/test/java/com/yahoo/vespaget/CommandLineOptionsTest.java b/vespaclient-java/src/test/java/com/yahoo/vespaget/CommandLineOptionsTest.java
index 3e707b04256..4b849828a27 100644
--- a/vespaclient-java/src/test/java/com/yahoo/vespaget/CommandLineOptionsTest.java
+++ b/vespaclient-java/src/test/java/com/yahoo/vespaget/CommandLineOptionsTest.java
@@ -184,7 +184,7 @@ public class CommandLineOptionsTest {
             options.printHelp();
 
             String output = outContent.toString();
-            assertTrue(output.contains("vespaget <options> [documentid...]"));
+            assertTrue(output.contains("vespa-get <options> [documentid...]"));
             assertTrue(output.contains("Fetch a document from a Vespa Content cluster."));
         } finally {
             System.setOut(oldOut);
diff --git a/vespaclient-java/src/test/java/com/yahoo/vespastat/CommandLineOptionsTest.java b/vespaclient-java/src/test/java/com/yahoo/vespastat/CommandLineOptionsTest.java
index e90c47e3150..8e0ecdcaa64 100644
--- a/vespaclient-java/src/test/java/com/yahoo/vespastat/CommandLineOptionsTest.java
+++ b/vespaclient-java/src/test/java/com/yahoo/vespastat/CommandLineOptionsTest.java
@@ -63,7 +63,7 @@ public class CommandLineOptionsTest {
             CommandLineOptions options = new CommandLineOptions();
             options.printHelp();
             String output = outContent.toString();
-            assertTrue(output.contains("vdsstat [options]"));
+            assertTrue(output.contains("vespa-stat [options]"));
         } finally {
             System.setOut(oldOut);
             outContent.reset();