Rename config programs to have vespa- prefix.

Temporarily add symlinks from old name to new name.

17 files changed, 19 insertions, 19 deletions

diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt
index 48b5e40ee30..26cedc2dc49 100644
--- a/config/CMakeLists.txt
+++ b/config/CMakeLists.txt
@@ -10,9 +10,9 @@ vespa_define_module(
     lz4
 
     LIBS
-    src/apps/configproxy-cmd
-    src/apps/getvespaconfig
-    src/apps/pingproxy
+    src/apps/vespa-configproxy-cmd
+    src/apps/vespa-get-config
+    src/apps/vespa-ping-configproxy
     src/vespa/config
     src/vespa/config/common
     src/vespa/config/configgen
@@ -55,5 +55,5 @@ vespa_define_module(
     src/tests/configparser
 )
 
-vespa_install_script(src/apps/activate-application/activate-application.sh activate-application bin)
+vespa_install_script(src/apps/vespa-activate-application/vespa-activate-application.sh vespa-activate-application bin)
 vespa_install_script(src/apps/vespa-config/vespa-config.pl libexec/vespa)
diff --git a/config/src/apps/configproxy-cmd/.gitignore b/config/src/apps/configproxy-cmd/.gitignore
deleted file mode 100644
index e39ac4f0c99..00000000000
--- a/config/src/apps/configproxy-cmd/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/.depend
-/Makefile
-/configproxy-cmd
diff --git a/config/src/apps/pingproxy/.gitignore b/config/src/apps/pingproxy/.gitignore
deleted file mode 100644
index 778ea35818c..00000000000
--- a/config/src/apps/pingproxy/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/.depend
-/Makefile
-/pingproxy
diff --git a/config/src/apps/activate-application/activate-application.sh b/config/src/apps/vespa-activate-application/vespa-activate-application.sh
index 45b90a04912..db6d8a9ac3f 100644
--- a/config/src/apps/activate-application/activate-application.sh
+++ b/config/src/apps/vespa-activate-application/vespa-activate-application.sh
@@ -62,7 +62,7 @@ findroot
 
 ROOT=${VESPA_HOME%/}
 
-printf "WARNING: activate-application is deprecated, use 'deploy activate' instead\n\n"
+printf "WARNING: vespa-activate-application is deprecated, use 'vespa-deploy activate' instead\n\n"
 
 if [ "-f" == "$1" ] ; then
     $ROOT/bin/deploy activate
@@ -75,7 +75,7 @@ else
        echo
        echo "Files are currently being distributed."
        echo "If you want to see the status, call 'vespa-status-filedistribution'."
-       echo "Otherwise, call 'activate-application -f' to activate the application now; the file transfers will continue in the background."
+       echo "Otherwise, call 'vespa-activate-application -f' to activate the application now; the file transfers will continue in the background."
        exit 1
     fi
 fi
diff --git a/config/src/apps/vespa-configproxy-cmd/.gitignore b/config/src/apps/vespa-configproxy-cmd/.gitignore
new file mode 100644
index 00000000000..dc57b8535bb
--- /dev/null
+++ b/config/src/apps/vespa-configproxy-cmd/.gitignore
@@ -0,0 +1,3 @@
+/.depend
+/Makefile
+/vespa-configproxy-cmd
diff --git a/config/src/apps/configproxy-cmd/CMakeLists.txt b/config/src/apps/vespa-configproxy-cmd/CMakeLists.txt
index 17e941cde08..58da672bcfa 100644
--- a/config/src/apps/configproxy-cmd/CMakeLists.txt
+++ b/config/src/apps/vespa-configproxy-cmd/CMakeLists.txt
@@ -4,7 +4,7 @@ vespa_add_executable(config_configproxy-cmd_app
     main.cpp
     methods.cpp
     proxycmd.cpp
-    OUTPUT_NAME configproxy-cmd
+    OUTPUT_NAME vespa-configproxy-cmd
     INSTALL bin
     DEPENDS
 )
diff --git a/config/src/apps/configproxy-cmd/main.cpp b/config/src/apps/vespa-configproxy-cmd/main.cpp
index 1d5934f2817..9e591e83f0b 100644
--- a/config/src/apps/configproxy-cmd/main.cpp
+++ b/config/src/apps/vespa-configproxy-cmd/main.cpp
@@ -61,7 +61,7 @@ void
 Application::usage(void)
 {
     std::cerr <<
-        "Usage: configproxy-cmd [options]"                                 << std::endl <<
+        "Usage: vespa-configproxy-cmd [options]"                                 << std::endl <<
         "    -m <method>                   method"                         << std::endl <<
         "    -s <hostname>                 hostname (default: localhost)"  << std::endl <<
         "    -p <port>                     port number (default: 19090)"   << std::endl <<
diff --git a/config/src/apps/configproxy-cmd/methods.cpp b/config/src/apps/vespa-configproxy-cmd/methods.cpp
index 086ec107553..086ec107553 100644
--- a/config/src/apps/configproxy-cmd/methods.cpp
+++ b/config/src/apps/vespa-configproxy-cmd/methods.cpp
diff --git a/config/src/apps/configproxy-cmd/methods.h b/config/src/apps/vespa-configproxy-cmd/methods.h
index 01f54a0a9d9..01f54a0a9d9 100644
--- a/config/src/apps/configproxy-cmd/methods.h
+++ b/config/src/apps/vespa-configproxy-cmd/methods.h
diff --git a/config/src/apps/configproxy-cmd/proxycmd.cpp b/config/src/apps/vespa-configproxy-cmd/proxycmd.cpp
index df37333f514..df37333f514 100644
--- a/config/src/apps/configproxy-cmd/proxycmd.cpp
+++ b/config/src/apps/vespa-configproxy-cmd/proxycmd.cpp
diff --git a/config/src/apps/configproxy-cmd/proxycmd.h b/config/src/apps/vespa-configproxy-cmd/proxycmd.h
index 57b4d83fd42..57b4d83fd42 100644
--- a/config/src/apps/configproxy-cmd/proxycmd.h
+++ b/config/src/apps/vespa-configproxy-cmd/proxycmd.h
diff --git a/config/src/apps/getvespaconfig/.gitignore b/config/src/apps/vespa-get-config/.gitignore
index 900ac81ea9b..c4cfff878b6 100644
--- a/config/src/apps/getvespaconfig/.gitignore
+++ b/config/src/apps/vespa-get-config/.gitignore
@@ -1,4 +1,4 @@
 /.depend
 /Makefile
 /getvespaconfig
-getvespaconfig-bin
+vespa-getconfig-bin
diff --git a/config/src/apps/getvespaconfig/CMakeLists.txt b/config/src/apps/vespa-get-config/CMakeLists.txt
index 93022581b30..a9dcbb50137 100644
--- a/config/src/apps/getvespaconfig/CMakeLists.txt
+++ b/config/src/apps/vespa-get-config/CMakeLists.txt
@@ -2,7 +2,7 @@
 vespa_add_executable(config_getvespaconfig_app
     SOURCES
     getconfig.cpp
-    OUTPUT_NAME getvespaconfig-bin
+    OUTPUT_NAME vespa-get-config-bin
     INSTALL bin
     DEPENDS
     config_cloudconfig
diff --git a/config/src/apps/getvespaconfig/getconfig.cpp b/config/src/apps/vespa-get-config/getconfig.cpp
index df7bbba48b0..795916241b2 100644
--- a/config/src/apps/getvespaconfig/getconfig.cpp
+++ b/config/src/apps/vespa-get-config/getconfig.cpp
@@ -13,7 +13,7 @@
 #include <fstream>
 
 #include <vespa/log/log.h>
-LOG_SETUP("getconfig");
+LOG_SETUP("vespa-get-config");
 
 using namespace config;
 
diff --git a/config/src/apps/vespa-ping-configproxy/.gitignore b/config/src/apps/vespa-ping-configproxy/.gitignore
new file mode 100644
index 00000000000..bb16e1dec89
--- /dev/null
+++ b/config/src/apps/vespa-ping-configproxy/.gitignore
@@ -0,0 +1,3 @@
+/.depend
+/Makefile
+/vespa-ping-configproxy
diff --git a/config/src/apps/pingproxy/CMakeLists.txt b/config/src/apps/vespa-ping-configproxy/CMakeLists.txt
index 60f06a4399e..f0d8ccbff25 100644
--- a/config/src/apps/pingproxy/CMakeLists.txt
+++ b/config/src/apps/vespa-ping-configproxy/CMakeLists.txt
@@ -2,7 +2,7 @@
 vespa_add_executable(config_pingproxy_app
     SOURCES
     pingproxy.cpp
-    OUTPUT_NAME pingproxy
+    OUTPUT_NAME vespa-ping-configproxy
     INSTALL bin
     DEPENDS
 )
diff --git a/config/src/apps/pingproxy/pingproxy.cpp b/config/src/apps/vespa-ping-configproxy/pingproxy.cpp
index ba35892c03c..fe121392300 100644
--- a/config/src/apps/pingproxy/pingproxy.cpp
+++ b/config/src/apps/vespa-ping-configproxy/pingproxy.cpp
@@ -6,7 +6,7 @@
 #include <sstream>
 
 #include <vespa/log/log.h>
-LOG_SETUP("pingproxy");
+LOG_SETUP("vespa-ping-configproxy");
 
 
 class PingProxy : public FastOS_Application