Export moved config definitions.

21 files changed, 3 insertions, 22 deletions

diff --git a/searchcore/src/tests/proton/common/hw_info_sampler/CMakeLists.txt b/searchcore/src/tests/proton/common/hw_info_sampler/CMakeLists.txt
index 7173431dae2..67139479974 100644
--- a/searchcore/src/tests/proton/common/hw_info_sampler/CMakeLists.txt
+++ b/searchcore/src/tests/proton/common/hw_info_sampler/CMakeLists.txt
@@ -4,6 +4,5 @@ vespa_add_executable(searchcore_hw_info_sampler_test_app TEST
     hw_info_sampler_test.cpp
     DEPENDS
     searchcore_pcommon
-    searchcore_fconfig
 )
 vespa_add_test(NAME searchcore_hw_info_sampler_test_app COMMAND searchcore_hw_info_sampler_test_app)
diff --git a/searchcore/src/tests/proton/common/hw_info_sampler/hw_info_sampler_test.cpp b/searchcore/src/tests/proton/common/hw_info_sampler/hw_info_sampler_test.cpp
index 585a8b38fe1..a60c7e7516a 100644
--- a/searchcore/src/tests/proton/common/hw_info_sampler/hw_info_sampler_test.cpp
+++ b/searchcore/src/tests/proton/common/hw_info_sampler/hw_info_sampler_test.cpp
@@ -1,7 +1,7 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
+#include <vespa/config-hwinfo.h>
 #include <vespa/config/print/fileconfigwriter.h>
-#include <vespa/searchcore/config/config-hwinfo.h>
 #include <vespa/searchcore/proton/common/hw_info_sampler.h>
 #include <vespa/searchlib/test/directory_handler.h>
 #include <vespa/vespalib/util/size_literals.h>
diff --git a/searchcore/src/tests/proton/docsummary/CMakeLists.txt b/searchcore/src/tests/proton/docsummary/CMakeLists.txt
index 1636c347ea6..f2e29a8b5b5 100644
--- a/searchcore/src/tests/proton/docsummary/CMakeLists.txt
+++ b/searchcore/src/tests/proton/docsummary/CMakeLists.txt
@@ -21,7 +21,6 @@ vespa_add_executable(searchcore_docsummary_test_app TEST
     searchcore_pcommon
     searchcore_grouping
     searchcore_proton_metrics
-    searchcore_fconfig
 )
 vespa_add_test(NAME searchcore_docsummary_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/docsummary_test.sh
                DEPENDS searchcore_docsummary_test_app)
diff --git a/searchcore/src/tests/proton/documentdb/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/CMakeLists.txt
index 0cb678992b9..1ac3945e068 100644
--- a/searchcore/src/tests/proton/documentdb/CMakeLists.txt
+++ b/searchcore/src/tests/proton/documentdb/CMakeLists.txt
@@ -19,7 +19,6 @@ vespa_add_executable(searchcore_documentdb_test_app TEST
     searchcore_pcommon
     searchcore_grouping
     searchcore_proton_metrics
-    searchcore_fconfig
 )
 vespa_add_test(NAME searchcore_documentdb_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/documentdb_test.sh
                DEPENDS searchcore_documentdb_test_app)
diff --git a/searchcore/src/tests/proton/documentdb/buckethandler/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/buckethandler/CMakeLists.txt
index 272b239dd2e..70a358e2b6b 100644
--- a/searchcore/src/tests/proton/documentdb/buckethandler/CMakeLists.txt
+++ b/searchcore/src/tests/proton/documentdb/buckethandler/CMakeLists.txt
@@ -12,6 +12,5 @@ vespa_add_executable(searchcore_buckethandler_test_app TEST
     searchcore_bucketdb
     searchcore_pcommon
     searchcore_grouping
-    searchcore_fconfig
 )
 vespa_add_test(NAME searchcore_buckethandler_test_app COMMAND searchcore_buckethandler_test_app)
diff --git a/searchcore/src/tests/proton/documentdb/clusterstatehandler/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/clusterstatehandler/CMakeLists.txt
index 1ea6f5cc729..cfab118e8d5 100644
--- a/searchcore/src/tests/proton/documentdb/clusterstatehandler/CMakeLists.txt
+++ b/searchcore/src/tests/proton/documentdb/clusterstatehandler/CMakeLists.txt
@@ -10,6 +10,5 @@ vespa_add_executable(searchcore_clusterstatehandler_test_app TEST
     searchcore_attribute
     searchcore_pcommon
     searchcore_grouping
-    searchcore_fconfig
 )
 vespa_add_test(NAME searchcore_clusterstatehandler_test_app COMMAND searchcore_clusterstatehandler_test_app)
diff --git a/searchcore/src/tests/proton/documentdb/combiningfeedview/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/combiningfeedview/CMakeLists.txt
index 038a1ce0d27..e233701d704 100644
--- a/searchcore/src/tests/proton/documentdb/combiningfeedview/CMakeLists.txt
+++ b/searchcore/src/tests/proton/documentdb/combiningfeedview/CMakeLists.txt
@@ -13,6 +13,5 @@ vespa_add_executable(searchcore_combiningfeedview_test_app TEST
     searchcore_pcommon
     searchcore_grouping
     searchcore_proton_metrics
-    searchcore_fconfig
 )
 vespa_add_test(NAME searchcore_combiningfeedview_test_app COMMAND searchcore_combiningfeedview_test_app)
diff --git a/searchcore/src/tests/proton/documentdb/configurer/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/configurer/CMakeLists.txt
index f217c4da740..cd611051efa 100644
--- a/searchcore/src/tests/proton/documentdb/configurer/CMakeLists.txt
+++ b/searchcore/src/tests/proton/documentdb/configurer/CMakeLists.txt
@@ -17,6 +17,5 @@ vespa_add_executable(searchcore_configurer_test_app TEST
     searchcore_pcommon
     searchcore_grouping
     searchcore_proton_metrics
-    searchcore_fconfig
 )
 vespa_add_test(NAME searchcore_configurer_test_app COMMAND searchcore_configurer_test_app)
diff --git a/searchcore/src/tests/proton/documentdb/document_subdbs/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/document_subdbs/CMakeLists.txt
index bc783c2eb3d..0d142a3041b 100644
--- a/searchcore/src/tests/proton/documentdb/document_subdbs/CMakeLists.txt
+++ b/searchcore/src/tests/proton/documentdb/document_subdbs/CMakeLists.txt
@@ -19,6 +19,5 @@ vespa_add_executable(searchcore_document_subdbs_test_app TEST
     searchcore_pcommon
     searchcore_grouping
     searchcore_proton_metrics
-    searchcore_fconfig
 )
 vespa_add_test(NAME searchcore_document_subdbs_test_app COMMAND searchcore_document_subdbs_test_app)
diff --git a/searchcore/src/tests/proton/documentdb/feedhandler/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/feedhandler/CMakeLists.txt
index e3d2afe7734..a03b9a662c3 100644
--- a/searchcore/src/tests/proton/documentdb/feedhandler/CMakeLists.txt
+++ b/searchcore/src/tests/proton/documentdb/feedhandler/CMakeLists.txt
@@ -13,7 +13,6 @@ vespa_add_executable(searchcore_feedhandler_test_app TEST
     searchcore_pcommon
     searchcore_grouping
     searchcore_proton_metrics
-    searchcore_fconfig
 )
 vespa_add_test(NAME searchcore_feedhandler_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/feedhandler_test.sh
                DEPENDS searchcore_feedhandler_test_app)
diff --git a/searchcore/src/tests/proton/documentdb/feedview/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/feedview/CMakeLists.txt
index 04d9800653b..a37674c8963 100644
--- a/searchcore/src/tests/proton/documentdb/feedview/CMakeLists.txt
+++ b/searchcore/src/tests/proton/documentdb/feedview/CMakeLists.txt
@@ -14,6 +14,5 @@ vespa_add_executable(searchcore_feedview_test_app TEST
     searchcore_pcommon
     searchcore_grouping
     searchcore_proton_metrics
-    searchcore_fconfig
 )
 vespa_add_test(NAME searchcore_feedview_test_app COMMAND searchcore_feedview_test_app)
diff --git a/searchcore/src/tests/proton/documentdb/fileconfigmanager/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/fileconfigmanager/CMakeLists.txt
index e3a97676d7a..f20201ffa73 100644
--- a/searchcore/src/tests/proton/documentdb/fileconfigmanager/CMakeLists.txt
+++ b/searchcore/src/tests/proton/documentdb/fileconfigmanager/CMakeLists.txt
@@ -6,7 +6,6 @@ vespa_add_executable(searchcore_fileconfigmanager_test_app TEST
     searchcore_test
     searchcore_server
     searchcore_pcommon
-    searchcore_fconfig
 )
 vespa_add_test(NAME searchcore_fileconfigmanager_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/fileconfigmanager_test.sh
                DEPENDS searchcore_fileconfigmanager_test_app)
diff --git a/searchcore/src/tests/proton/documentdb/maintenancecontroller/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/maintenancecontroller/CMakeLists.txt
index 8febaf0bb26..2872ff57990 100644
--- a/searchcore/src/tests/proton/documentdb/maintenancecontroller/CMakeLists.txt
+++ b/searchcore/src/tests/proton/documentdb/maintenancecontroller/CMakeLists.txt
@@ -14,7 +14,6 @@ vespa_add_executable(searchcore_maintenancecontroller_test_app TEST
     searchcore_persistenceengine
     searchcore_grouping
     searchcore_proton_metrics
-    searchcore_fconfig
     searchlib_test
 )
 vespa_add_test(NAME searchcore_maintenancecontroller_test_app COMMAND searchcore_maintenancecontroller_test_app)
diff --git a/searchcore/src/tests/proton/documentdb/threading_service_config/threading_service_config_test.cpp b/searchcore/src/tests/proton/documentdb/threading_service_config/threading_service_config_test.cpp
index 1cee63ecfcc..b3d4f4ce31d 100644
--- a/searchcore/src/tests/proton/documentdb/threading_service_config/threading_service_config_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/threading_service_config/threading_service_config_test.cpp
@@ -1,6 +1,6 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-#include <vespa/searchcore/config/config-proton.h>
+#include <vespa/config-proton.h>
 #include <vespa/searchcore/proton/common/hw_info.h>
 #include <vespa/searchcore/proton/server/threading_service_config.h>
 #include <vespa/vespalib/testkit/testapp.h>
diff --git a/searchcore/src/tests/proton/documentmetastore/CMakeLists.txt b/searchcore/src/tests/proton/documentmetastore/CMakeLists.txt
index c3d70bd7410..a9b8b0aee4f 100644
--- a/searchcore/src/tests/proton/documentmetastore/CMakeLists.txt
+++ b/searchcore/src/tests/proton/documentmetastore/CMakeLists.txt
@@ -8,7 +8,6 @@ vespa_add_executable(searchcore_documentmetastore_test_app TEST
     searchcore_bucketdb
     searchcore_attribute
     searchcore_feedoperation
-    searchcore_fconfig
     GTest::GTest
 )
 vespa_add_test(NAME searchcore_documentmetastore_test_app COMMAND searchcore_documentmetastore_test_app)
diff --git a/searchcore/src/tests/proton/matching/CMakeLists.txt b/searchcore/src/tests/proton/matching/CMakeLists.txt
index b4737be7819..8ec7bf7c442 100644
--- a/searchcore/src/tests/proton/matching/CMakeLists.txt
+++ b/searchcore/src/tests/proton/matching/CMakeLists.txt
@@ -5,7 +5,6 @@ vespa_add_executable(searchcore_matching_test_app TEST
     DEPENDS
     searchcore_test
     searchcore_server
-    searchcore_fconfig
     searchcore_matching
     searchcore_feedoperation
     searchcore_documentmetastore
diff --git a/searchcore/src/tests/proton/proton_config_fetcher/CMakeLists.txt b/searchcore/src/tests/proton/proton_config_fetcher/CMakeLists.txt
index 20629733f09..22fec09c154 100644
--- a/searchcore/src/tests/proton/proton_config_fetcher/CMakeLists.txt
+++ b/searchcore/src/tests/proton/proton_config_fetcher/CMakeLists.txt
@@ -5,6 +5,5 @@ vespa_add_executable(searchcore_proton_config_fetcher_test_app TEST
     DEPENDS
     searchcore_test
     searchcore_server
-    searchcore_fconfig
 )
 vespa_add_test(NAME searchcore_proton_config_fetcher_test_app COMMAND searchcore_proton_config_fetcher_test_app)
diff --git a/searchcore/src/tests/proton/proton_configurer/CMakeLists.txt b/searchcore/src/tests/proton/proton_configurer/CMakeLists.txt
index c7d6187e90c..df969c33af3 100644
--- a/searchcore/src/tests/proton/proton_configurer/CMakeLists.txt
+++ b/searchcore/src/tests/proton/proton_configurer/CMakeLists.txt
@@ -4,7 +4,6 @@ vespa_add_executable(searchcore_proton_configurer_test_app TEST
     proton_configurer_test.cpp
     DEPENDS
     searchcore_server
-    searchcore_fconfig
     GTest::GTest
 )
 vespa_add_test(NAME searchcore_proton_configurer_test_app COMMAND searchcore_proton_configurer_test_app)
diff --git a/searchcore/src/tests/proton/proton_disk_layout/CMakeLists.txt b/searchcore/src/tests/proton/proton_disk_layout/CMakeLists.txt
index 5b6c84393f7..7c3b5d56d5c 100644
--- a/searchcore/src/tests/proton/proton_disk_layout/CMakeLists.txt
+++ b/searchcore/src/tests/proton/proton_disk_layout/CMakeLists.txt
@@ -5,6 +5,5 @@ vespa_add_executable(searchcore_proton_disk_layout_test_app TEST
     DEPENDS
     searchcore_test
     searchcore_server
-    searchcore_fconfig
 )
 vespa_add_test(NAME searchcore_proton_disk_layout_test_app COMMAND searchcore_proton_disk_layout_test_app)
diff --git a/searchcore/src/tests/proton/server/CMakeLists.txt b/searchcore/src/tests/proton/server/CMakeLists.txt
index fc211d460ab..94ffbfc1fc1 100644
--- a/searchcore/src/tests/proton/server/CMakeLists.txt
+++ b/searchcore/src/tests/proton/server/CMakeLists.txt
@@ -4,7 +4,6 @@ vespa_add_executable(searchcore_documentretriever_test_app TEST
     documentretriever_test.cpp
     DEPENDS
     searchcore_server
-    searchcore_fconfig
     searchcore_attribute
     searchcore_feedoperation
     searchcore_documentmetastore
@@ -32,7 +31,6 @@ vespa_add_executable(searchcore_feedstates_test_app TEST
     searchcore_feedoperation
     searchcore_pcommon
     searchcore_proton_metrics
-    searchcore_fconfig
 )
 vespa_add_test(NAME searchcore_feedstates_test_app COMMAND searchcore_feedstates_test_app)
 vespa_add_executable(searchcore_memoryconfigstore_test_app TEST
diff --git a/searchcore/src/tests/proton/server/shared_threading_service/shared_threading_service_test.cpp b/searchcore/src/tests/proton/server/shared_threading_service/shared_threading_service_test.cpp
index fe7303692ba..1b6fa49df72 100644
--- a/searchcore/src/tests/proton/server/shared_threading_service/shared_threading_service_test.cpp
+++ b/searchcore/src/tests/proton/server/shared_threading_service/shared_threading_service_test.cpp
@@ -1,7 +1,7 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
+#include <vespa/config-proton.h>
 #include <vespa/persistence/dummyimpl/dummy_bucket_executor.h>
-#include <vespa/searchcore/config/config-proton.h>
 #include <vespa/searchcore/proton/server/shared_threading_service.h>
 #include <vespa/searchcore/proton/server/shared_threading_service_config.h>
 #include <vespa/searchcore/proton/test/transport_helper.h>