Revert "Revert "Use new program names with vespa- prefix in config model.""

11 files changed, 13 insertions, 13 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/Logd.java b/config-model/src/main/java/com/yahoo/vespa/model/Logd.java
index 8fb60545071..f15c60ca3c0 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/Logd.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/Logd.java
@@ -29,6 +29,6 @@ public class Logd extends AbstractService {
      /**
      * @return The command used to start logd
      */
-    public String getStartupCommand() { return "exec sbin/logd"; }
+    public String getStartupCommand() { return "exec sbin/vespa-logd"; }
 
 }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/Logserver.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/Logserver.java
index dadb8bd408b..4f873b112cf 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/Logserver.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/Logserver.java
@@ -29,7 +29,7 @@ public class Logserver extends AbstractService {
      * @return the startup command for the logserver
      */
     public String getStartupCommand() {
-        return "exec $ROOT/bin/logserver-start " + getMyJVMArgs() + " " + getJvmArgs();
+        return "exec $ROOT/bin/vespa-logserver-start " + getMyJVMArgs() + " " + getJvmArgs();
     }
 
     /**
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/Slobrok.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/Slobrok.java
index 579b469ff14..0867fc2a299 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/Slobrok.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/Slobrok.java
@@ -41,7 +41,7 @@ public class Slobrok extends AbstractService {
     }
 
     public String getStartupCommand() {
-        return "exec $ROOT/bin/slobrok -p " + getPort() +
+        return "exec $ROOT/bin/vespa-slobrok -p " + getPort() +
                 " -s " + getStatePort() +
                 " -c " + getConfigId();
     }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankSetupValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankSetupValidator.java
index a8bdac15816..ee9cb2d564a 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankSetupValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankSetupValidator.java
@@ -33,7 +33,7 @@ import java.util.logging.Logger;
 
 /**
  * Validate rank setup for all search clusters (rank-profiles, index-schema, attributes configs), validating done
- * by running through the binary 'verify_ranksetup'
+ * by running through the binary 'vespa-verify-ranksetup'
  *
  * @author vegardh
  *
@@ -130,7 +130,7 @@ public class RankSetupValidator extends Validator {
     }
 
     private boolean execValidate(String configId, SearchCluster sc, String sdName, DeployLogger deployLogger) {
-        String job = "verify_ranksetup-bin " + configId;
+        String job = "vespa-verify-ranksetup-bin " + configId;
         ProcessExecuter executer = new ProcessExecuter();
         try {
             Pair<Integer, String> ret = executer.exec(job);
@@ -145,7 +145,7 @@ public class RankSetupValidator extends Validator {
     }
 
     private void validateWarn(Exception e, DeployLogger deployLogger) {
-        String msg = "Unable to execute 'verify_ranksetup', validation of rank expressions will only take place when you start Vespa: " +
+        String msg = "Unable to execute 'vespa-verify-ranksetup', validation of rank expressions will only take place when you start Vespa: " +
                 Exceptions.toMessageString(e);
         deployLogger.log(LogLevel.WARNING, msg);
     }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/clients/VespaSpoolMaster.java b/config-model/src/main/java/com/yahoo/vespa/model/clients/VespaSpoolMaster.java
index dcaacb9cde5..7013a09009a 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/clients/VespaSpoolMaster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/clients/VespaSpoolMaster.java
@@ -24,6 +24,6 @@ public class VespaSpoolMaster extends AbstractService {
 
     @Override
     public String getStartupCommand() {
-        return "exec spoolmaster";
+        return "exec vespa-spoolmaster";
     }
 }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/Distributor.java b/config-model/src/main/java/com/yahoo/vespa/model/content/Distributor.java
index cba349f227c..7da6ab9bd99 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/Distributor.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/Distributor.java
@@ -50,7 +50,7 @@ public class Distributor extends ContentNode {
 
     @Override
     public String getStartupCommand() {
-        return "exec sbin/distributord -c $VESPA_CONFIG_ID";
+        return "exec sbin/vespa-distributord -c $VESPA_CONFIG_ID";
     }
 
 }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/StorageNode.java b/config-model/src/main/java/com/yahoo/vespa/model/content/StorageNode.java
index 6b2a9a8c027..c8eceacc36d 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/StorageNode.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/StorageNode.java
@@ -54,7 +54,7 @@ public class StorageNode extends ContentNode implements StorServerConfig.Produce
     public String getStartupCommand() {
         return isProviderProton()
                 ? null
-                : "exec sbin/storaged -c $VESPA_CONFIG_ID";
+                : "exec sbin/vespa-storaged -c $VESPA_CONFIG_ID";
     }
 
     @Override
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributorService.java b/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributorService.java
index 3f4242cfedf..6c2da51f3e3 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributorService.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributorService.java
@@ -54,7 +54,7 @@ public class FileDistributorService extends AbstractService implements
 
     @Override
     public String getStartupCommand() {
-        return "exec $ROOT/sbin/filedistributor"
+        return "exec $ROOT/sbin/vespa-filedistributor"
                 + " --configid " + getConfigId();
     }
 
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/Dispatch.java b/config-model/src/main/java/com/yahoo/vespa/model/search/Dispatch.java
index 954eb711916..c0867d252a3 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/search/Dispatch.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/search/Dispatch.java
@@ -80,7 +80,7 @@ public class Dispatch extends AbstractService implements SearchInterface,
      * @return the startup command
      */
     public String getStartupCommand() {
-        return "exec sbin/fdispatch -c $VESPA_CONFIG_ID";
+        return "exec sbin/vespa-dispatch -c $VESPA_CONFIG_ID";
     }
 
     public int getFrtPort()  { return getRelativePort(0); }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java
index ed36fad1ac6..7a3ded592bd 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java
@@ -235,7 +235,7 @@ public class SearchNode extends AbstractService implements
 
     @Override
     public String getStartupCommand() {
-        String startup = getEnvVariables() + "exec $ROOT/sbin/proton " + "--identity " + getConfigId();
+        String startup = getEnvVariables() + "exec $ROOT/sbin/vespa-proton " + "--identity " + getConfigId();
         if (serviceLayerService != null) {
             startup = startup + " --serviceidentity " + serviceLayerService.getConfigId();
         }
diff --git a/config-model/src/main/perl/vespa-deploy-application b/config-model/src/main/perl/vespa-deploy-application
index 7e48d0048b1..aebf6652f3d 100755
--- a/config-model/src/main/perl/vespa-deploy-application
+++ b/config-model/src/main/perl/vespa-deploy-application
@@ -55,7 +55,7 @@ print "WARNING: vespa-deploy-application is deprecated, use 'vespa-deploy prepar
 my $DEPLOY="vespa-deploy $flags prepare $app";
 
 system($DEPLOY);
-if ($? == 0) { print "Activate the application by running 'activate-application'\n"; }
+if ($? == 0) { print "Activate the application by running 'vespa-activate-application'\n"; }
 
 sub print_usage {
   print "\n";