Merge branch 'master' into balder/decouple-datatype-and-fiedlvalue-some-more

9 files changed, 20 insertions, 23 deletions

diff --git a/searchcore/src/apps/fdispatch/.gitignore b/searchcore/src/apps/fdispatch/.gitignore
index 7ef8af69759..6cb8d53bdc1 100644
--- a/searchcore/src/apps/fdispatch/.gitignore
+++ b/searchcore/src/apps/fdispatch/.gitignore
@@ -1,2 +1 @@
-/fdispatch
-fdispatch-bin
+vespa-fdispatch-bin
diff --git a/searchcore/src/apps/fdispatch/CMakeLists.txt b/searchcore/src/apps/fdispatch/CMakeLists.txt
index 728f4e46883..63e1e6ca515 100644
--- a/searchcore/src/apps/fdispatch/CMakeLists.txt
+++ b/searchcore/src/apps/fdispatch/CMakeLists.txt
@@ -2,7 +2,7 @@
 vespa_add_executable(searchcore_fdispatch_app
     SOURCES
     fdispatch.cpp
-    OUTPUT_NAME fdispatch-bin
+    OUTPUT_NAME vespa-fdispatch-bin
     INSTALL sbin
     DEPENDS
     searchcore_fdispatch_program
diff --git a/searchcore/src/apps/proton/.gitignore b/searchcore/src/apps/proton/.gitignore
index 4c244afd919..c2cc445d918 100644
--- a/searchcore/src/apps/proton/.gitignore
+++ b/searchcore/src/apps/proton/.gitignore
@@ -1,4 +1,3 @@
 .depend
 Makefile
-proton
-proton-bin
+vespa-proton-bin
diff --git a/searchcore/src/apps/proton/CMakeLists.txt b/searchcore/src/apps/proton/CMakeLists.txt
index 13f04d2d6f4..c5398feed2e 100644
--- a/searchcore/src/apps/proton/CMakeLists.txt
+++ b/searchcore/src/apps/proton/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchcore_proton_app
     SOURCES
     downpersistence.cpp
     proton.cpp
-    OUTPUT_NAME proton-bin
+    OUTPUT_NAME vespa-proton-bin
     INSTALL sbin
     DEPENDS
     searchcore_server
diff --git a/searchcore/src/apps/verify_ranksetup/.gitignore b/searchcore/src/apps/verify_ranksetup/.gitignore
index 269b313f1f0..d32b68f0f38 100644
--- a/searchcore/src/apps/verify_ranksetup/.gitignore
+++ b/searchcore/src/apps/verify_ranksetup/.gitignore
@@ -1,4 +1,3 @@
 .depend
 Makefile
-verify_ranksetup
-verify_ranksetup-bin
+vespa-verify-ranksetup-bin
diff --git a/searchcore/src/apps/verify_ranksetup/CMakeLists.txt b/searchcore/src/apps/verify_ranksetup/CMakeLists.txt
index de777f88182..7dd6d0490da 100644
--- a/searchcore/src/apps/verify_ranksetup/CMakeLists.txt
+++ b/searchcore/src/apps/verify_ranksetup/CMakeLists.txt
@@ -2,7 +2,7 @@
 vespa_add_executable(searchcore_verify_ranksetup_app
     SOURCES
     verify_ranksetup.cpp
-    OUTPUT_NAME verify_ranksetup-bin
+    OUTPUT_NAME vespa-verify-ranksetup-bin
     INSTALL bin
     DEPENDS
     searchcore_fconfig
diff --git a/searchcore/src/tests/proton/docsummary/docsummary.cpp b/searchcore/src/tests/proton/docsummary/docsummary.cpp
index 5567eb970bb..6c36b004133 100644
--- a/searchcore/src/tests/proton/docsummary/docsummary.cpp
+++ b/searchcore/src/tests/proton/docsummary/docsummary.cpp
@@ -952,13 +952,13 @@ Test::requireThatUrisAreUsed()
                        startIndexField("urisingle").
                        startSubField("all").
                        addUrlTokenizedString(
-                               "http://www.yahoo.com:81/fluke?ab=2#4").
+                               "http://www.example.com:81/fluke?ab=2#4").
                        endSubField().
                        startSubField("scheme").
                        addUrlTokenizedString("http").
                        endSubField().
                        startSubField("host").
-                       addUrlTokenizedString("www.yahoo.com").
+                       addUrlTokenizedString("www.example.com").
                        endSubField().
                        startSubField("port").
                        addUrlTokenizedString("81").
@@ -977,13 +977,13 @@ Test::requireThatUrisAreUsed()
                        startElement(1).
                        startSubField("all").
                        addUrlTokenizedString(
-                               "http://www.yahoo.com:82/fluke?ab=2#8").
+                               "http://www.example.com:82/fluke?ab=2#8").
                        endSubField().
                        startSubField("scheme").
                        addUrlTokenizedString("http").
                        endSubField().
                        startSubField("host").
-                       addUrlTokenizedString("www.yahoo.com").
+                       addUrlTokenizedString("www.example.com").
                        endSubField().
                        startSubField("port").
                        addUrlTokenizedString("82").
@@ -1027,13 +1027,13 @@ Test::requireThatUrisAreUsed()
                        startElement(4).
                        startSubField("all").
                        addUrlTokenizedString(
-                               "http://www.yahoo.com:83/fluke?ab=2#12").
+                               "http://www.example.com:83/fluke?ab=2#12").
                        endSubField().
                        startSubField("scheme").
                        addUrlTokenizedString("http").
                        endSubField().
                        startSubField("host").
-                       addUrlTokenizedString("www.yahoo.com").
+                       addUrlTokenizedString("www.example.com").
                        endSubField().
                        startSubField("port").
                        addUrlTokenizedString("83").
@@ -1086,14 +1086,14 @@ Test::requireThatUrisAreUsed()
                              bc.createFieldCacheRepo(getResultConfig())->getFieldCache("class0"),
                              getMarkupFields());
 
-    EXPECT_TRUE(assertString("http://www.yahoo.com:81/fluke?ab=2#4",
+    EXPECT_TRUE(assertString("http://www.example.com:81/fluke?ab=2#4",
                             "urisingle", dsa, 1));
     GeneralResultPtr res = getResult(dsa, 1);
     {
         vespalib::Slime slime;
         decode(res->GetEntry("uriarray"), slime);
         EXPECT_TRUE(slime.get().valid());
-        EXPECT_EQUAL("http://www.yahoo.com:82/fluke?ab=2#8",  asVstring(slime.get()[0]));
+        EXPECT_EQUAL("http://www.example.com:82/fluke?ab=2#8",  asVstring(slime.get()[0]));
         EXPECT_EQUAL("http://www.flickr.com:82/fluke?ab=2#9", asVstring(slime.get()[1]));
     }
     {
@@ -1104,7 +1104,7 @@ Test::requireThatUrisAreUsed()
         EXPECT_EQUAL(7L, slime.get()[1]["weight"].asLong());
         vespalib::string arr0s = asVstring(slime.get()[0]["item"]);
         vespalib::string arr1s = asVstring(slime.get()[1]["item"]);
-        EXPECT_EQUAL("http://www.yahoo.com:83/fluke?ab=2#12", arr0s);
+        EXPECT_EQUAL("http://www.example.com:83/fluke?ab=2#12", arr0s);
         EXPECT_EQUAL("http://www.flickr.com:85/fluke?ab=2#13", arr1s);
     }
 }
diff --git a/searchcore/src/tests/proton/docsummary/summaryfieldconverter_test.cpp b/searchcore/src/tests/proton/docsummary/summaryfieldconverter_test.cpp
index 878833fa58b..b9b74527dca 100644
--- a/searchcore/src/tests/proton/docsummary/summaryfieldconverter_test.cpp
+++ b/searchcore/src/tests/proton/docsummary/summaryfieldconverter_test.cpp
@@ -369,9 +369,9 @@ Document Test::makeDocument() {
     doc.setValue("position2", LongFieldValue(ZCurve::encode(4, 2)));
 
     StructFieldValue uri(getDataType("url"));
-    uri.setValue("all", annotateTerm("http://www.yahoo.com:42/foobar?q#frag"));
+    uri.setValue("all", annotateTerm("http://www.example.com:42/foobar?q#frag"));
     uri.setValue("scheme", annotateTerm("http"));
-    uri.setValue("host", annotateTerm("www.yahoo.com"));
+    uri.setValue("host", annotateTerm("www.example.com"));
     uri.setValue("port", annotateTerm("42"));
     uri.setValue("path", annotateTerm("foobar"));
     uri.setValue("query", annotateTerm("q"));
@@ -379,10 +379,10 @@ Document Test::makeDocument() {
     doc.setValue("uri", uri);
 
     ArrayFieldValue uri_array(getDataType("Array<url>"));
-    uri.setValue("all", annotateTerm("http://www.yahoo.com:80/foobar?q#frag"));
+    uri.setValue("all", annotateTerm("http://www.example.com:80/foobar?q#frag"));
     uri.setValue("port", annotateTerm("80"));
     uri_array.add(uri);
-    uri.setValue("all", annotateTerm("https://www.yahoo.com:443/foo?q#frag"));
+    uri.setValue("all", annotateTerm("https://www.example.com:443/foo?q#frag"));
     uri.setValue("scheme", annotateTerm("https"));
     uri.setValue("path", annotateTerm("foo"));
     uri.setValue("port", annotateTerm("443"));
diff --git a/searchcore/src/tests/proton/verify_ranksetup/verify_ranksetup_test.cpp b/searchcore/src/tests/proton/verify_ranksetup/verify_ranksetup_test.cpp
index 2c5e119ecbe..8439c2fb54f 100644
--- a/searchcore/src/tests/proton/verify_ranksetup/verify_ranksetup_test.cpp
+++ b/searchcore/src/tests/proton/verify_ranksetup/verify_ranksetup_test.cpp
@@ -9,7 +9,7 @@
 #include <map>
 #include <initializer_list>
 
-const char *prog = "../../../apps/verify_ranksetup/verify_ranksetup-bin";
+const char *prog = "../../../apps/verify_ranksetup/vespa-verify-ranksetup-bin";
 const std::string gen_dir("generated");
 
 const char *valid_feature = "value(0)";