Rename slobrok programs to have vespa- prefix.

Temporarily add symlinks from old name to new name.

8 files changed, 10 insertions, 11 deletions

diff --git a/slobrok/src/apps/check_slobrok/CMakeLists.txt b/slobrok/src/apps/check_slobrok/CMakeLists.txt
index 638f1c8c9d1..92d58e0045e 100644
--- a/slobrok/src/apps/check_slobrok/CMakeLists.txt
+++ b/slobrok/src/apps/check_slobrok/CMakeLists.txt
@@ -2,6 +2,5 @@
 vespa_add_executable(slobrok_check_slobrok_app
     SOURCES
     check_slobrok.cpp
-    INSTALL bin
     DEPENDS
 )
diff --git a/slobrok/src/apps/sbcmd/.gitignore b/slobrok/src/apps/sbcmd/.gitignore
index c035466f4f9..2b106b70225 100644
--- a/slobrok/src/apps/sbcmd/.gitignore
+++ b/slobrok/src/apps/sbcmd/.gitignore
@@ -1,3 +1,3 @@
 /.depend
 /Makefile
-/sbcmd
+/vespa-slobrok-cmd
diff --git a/slobrok/src/apps/sbcmd/CMakeLists.txt b/slobrok/src/apps/sbcmd/CMakeLists.txt
index 3eea280ac55..c9df0a44500 100644
--- a/slobrok/src/apps/sbcmd/CMakeLists.txt
+++ b/slobrok/src/apps/sbcmd/CMakeLists.txt
@@ -2,7 +2,7 @@
 vespa_add_executable(slobrok_sbcmd_app
     SOURCES
     sbcmd.cpp
-    OUTPUT_NAME sbcmd
+    OUTPUT_NAME vespa-slobrok-cmd
     INSTALL bin
     DEPENDS
 )
diff --git a/slobrok/src/apps/sbcmd/sbcmd.cpp b/slobrok/src/apps/sbcmd/sbcmd.cpp
index 927fab6ebff..bbf8c21abe6 100644
--- a/slobrok/src/apps/sbcmd/sbcmd.cpp
+++ b/slobrok/src/apps/sbcmd/sbcmd.cpp
@@ -7,7 +7,7 @@
 #include <sstream>
 
 #include <vespa/log/log.h>
-LOG_SETUP("sb-cmd");
+LOG_SETUP("vespa-slobrok-cmd");
 
 class Slobrok_CMD : public FastOS_Application
 {
@@ -135,7 +135,7 @@ Slobrok_CMD::Main()
     _target->InvokeSync(req, 5.0);
 
     if (req->IsError()) {
-        fprintf(stderr, "sb-cmd error %d: %s\n",
+        fprintf(stderr, "vespa-slobrok-cmd error %d: %s\n",
                 req->GetErrorCode(), req->GetErrorMessage());
     } else {
         FRT_Values &answer = *(req->GetReturn());
@@ -163,7 +163,7 @@ Slobrok_CMD::Main()
                        answer[1]._string_array._pt[j]._str);
             }
         } else {
-            fprintf(stderr, "sb-cmd OK, returntypes '%s'\n", atypes);
+            fprintf(stderr, "vespa-slobrok-cmd OK, returntypes '%s'\n", atypes);
             uint32_t idx = 0;
             while (atypes != NULL && *atypes != '\0') {
                 switch (*atypes) {
diff --git a/slobrok/src/apps/slobrok/.gitignore b/slobrok/src/apps/slobrok/.gitignore
index e0038c324fb..d562c5b3250 100644
--- a/slobrok/src/apps/slobrok/.gitignore
+++ b/slobrok/src/apps/slobrok/.gitignore
@@ -1,3 +1,3 @@
 /.depend
 /Makefile
-/slobrok
+/vespa-slobrok
diff --git a/slobrok/src/apps/slobrok/CMakeLists.txt b/slobrok/src/apps/slobrok/CMakeLists.txt
index edb3976b74e..84c1f6426ad 100644
--- a/slobrok/src/apps/slobrok/CMakeLists.txt
+++ b/slobrok/src/apps/slobrok/CMakeLists.txt
@@ -2,7 +2,7 @@
 vespa_add_executable(slobrok_app
     SOURCES
     slobrok.cpp
-    OUTPUT_NAME slobrok
+    OUTPUT_NAME vespa-slobrok
     INSTALL bin
     DEPENDS
     slobrok_slobrokserver
diff --git a/slobrok/src/apps/slobrok/slobrok.cpp b/slobrok/src/apps/slobrok/slobrok.cpp
index 50d0c2a0399..6945cc11292 100644
--- a/slobrok/src/apps/slobrok/slobrok.cpp
+++ b/slobrok/src/apps/slobrok/slobrok.cpp
@@ -6,7 +6,7 @@
 #include <vespa/fastos/app.h>
 
 #include <vespa/log/log.h>
-LOG_SETUP("slobrok");
+LOG_SETUP("vespa-slobrok");
 
 /**
  * @brief namespace for the actual slobrok application.
diff --git a/slobrok/src/tests/startsome/startsome.sh b/slobrok/src/tests/startsome/startsome.sh
index 2a865988c41..db2f61307f9 100755
--- a/slobrok/src/tests/startsome/startsome.sh
+++ b/slobrok/src/tests/startsome/startsome.sh
@@ -2,8 +2,8 @@
 # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 set -e
 
-SBCMD=../../apps/sbcmd/sbcmd
-SLOBROK=../../apps/slobrok/slobrok
+SBCMD=../../apps/sbcmd/vespa-slobrok-cmd
+SLOBROK=../../apps/slobrok/vespa-slobrok
 
 
 listall () {