Use full name in config definition file names

18 files changed, 21 insertions, 30 deletions

diff --git a/storage/src/vespa/storage/bucketdb/CMakeLists.txt b/storage/src/vespa/storage/bucketdb/CMakeLists.txt
index 048cc25ec95..22d43eb494e 100644
--- a/storage/src/vespa/storage/bucketdb/CMakeLists.txt
+++ b/storage/src/vespa/storage/bucketdb/CMakeLists.txt
@@ -15,7 +15,7 @@ vespa_add_library(storage_bucketdb OBJECT
     storbucketdb.cpp
     DEPENDS
 )
-vespa_generate_config(storage_bucketdb stor-bucketdb.def)
-install_config_definition(stor-bucketdb.def vespa.config.content.core.stor-bucketdb.def)
-vespa_generate_config(storage_bucketdb stor-bucket-init.def)
-install_config_definition(stor-bucket-init.def vespa.config.content.core.stor-bucket-init.def)
+vespa_generate_config(storage_bucketdb vespa.config.content.core.stor-bucketdb.def)
+vespa_generate_config(storage_bucketdb vespa.config.content.core.stor-bucket-init.def)
+
+install_config_definitions(src/vespa/storage/bucketdb)
diff --git a/storage/src/vespa/storage/bucketdb/stor-bucket-init.def b/storage/src/vespa/storage/bucketdb/vespa.config.content.core.stor-bucket-init.def
index 3517afabd44..3517afabd44 100644
--- a/storage/src/vespa/storage/bucketdb/stor-bucket-init.def
+++ b/storage/src/vespa/storage/bucketdb/vespa.config.content.core.stor-bucket-init.def
diff --git a/storage/src/vespa/storage/bucketdb/stor-bucketdb.def b/storage/src/vespa/storage/bucketdb/vespa.config.content.core.stor-bucketdb.def
index 470dd3afbf0..470dd3afbf0 100644
--- a/storage/src/vespa/storage/bucketdb/stor-bucketdb.def
+++ b/storage/src/vespa/storage/bucketdb/vespa.config.content.core.stor-bucketdb.def
diff --git a/storage/src/vespa/storage/config/CMakeLists.txt b/storage/src/vespa/storage/config/CMakeLists.txt
index 4a20d510043..5382048ece7 100644
--- a/storage/src/vespa/storage/config/CMakeLists.txt
+++ b/storage/src/vespa/storage/config/CMakeLists.txt
@@ -4,27 +4,17 @@ vespa_add_library(storage_storageconfig OBJECT
     distributorconfiguration.cpp
     DEPENDS
 )
-vespa_generate_config(storage_storageconfig stor-communicationmanager.def)
-install_config_definition(stor-communicationmanager.def vespa.config.content.core.stor-communicationmanager.def)
-vespa_generate_config(storage_storageconfig stor-distributormanager.def)
-install_config_definition(stor-distributormanager.def vespa.config.content.core.stor-distributormanager.def)
-vespa_generate_config(storage_storageconfig stor-server.def)
-install_config_definition(stor-server.def vespa.config.content.core.stor-server.def)
-vespa_generate_config(storage_storageconfig stor-status.def)
-install_config_definition(stor-status.def vespa.config.content.core.stor-status.def)
-vespa_generate_config(storage_storageconfig stor-messageforwarder.def)
-install_config_definition(stor-messageforwarder.def vespa.config.content.core.stor-messageforwarder.def)
-vespa_generate_config(storage_storageconfig stor-opslogger.def)
-install_config_definition(stor-opslogger.def vespa.config.content.core.stor-opslogger.def)
-vespa_generate_config(storage_storageconfig stor-visitordispatcher.def)
-install_config_definition(stor-visitordispatcher.def vespa.config.content.core.stor-visitordispatcher.def)
-vespa_generate_config(storage_storageconfig stor-integritychecker.def)
-install_config_definition(stor-integritychecker.def vespa.config.content.core.stor-integritychecker.def)
-vespa_generate_config(storage_storageconfig stor-bucketmover.def)
-install_config_definition(stor-bucketmover.def vespa.config.content.core.stor-bucketmover.def)
-vespa_generate_config(storage_storageconfig stor-bouncer.def)
-install_config_definition(stor-bouncer.def vespa.config.content.core.stor-bouncer.def)
-vespa_generate_config(storage_storageconfig stor-prioritymapping.def)
-install_config_definition(stor-prioritymapping.def vespa.config.content.core.stor-prioritymapping.def)
-vespa_generate_config(storage_storageconfig rpc-provider.def)
-install_config_definition(rpc-provider.def vespa.config.content.core.rpc-provider.def)
+vespa_generate_config(storage_storageconfig vespa.config.content.core.stor-communicationmanager.def)
+vespa_generate_config(storage_storageconfig vespa.config.content.core.stor-distributormanager.def)
+vespa_generate_config(storage_storageconfig vespa.config.content.core.stor-server.def)
+vespa_generate_config(storage_storageconfig vespa.config.content.core.stor-status.def)
+vespa_generate_config(storage_storageconfig vespa.config.content.core.stor-messageforwarder.def)
+vespa_generate_config(storage_storageconfig vespa.config.content.core.stor-opslogger.def)
+vespa_generate_config(storage_storageconfig vespa.config.content.core.stor-visitordispatcher.def)
+vespa_generate_config(storage_storageconfig vespa.config.content.core.stor-integritychecker.def)
+vespa_generate_config(storage_storageconfig vespa.config.content.core.stor-bucketmover.def)
+vespa_generate_config(storage_storageconfig vespa.config.content.core.stor-bouncer.def)
+vespa_generate_config(storage_storageconfig vespa.config.content.core.stor-prioritymapping.def)
+vespa_generate_config(storage_storageconfig vespa.config.content.core.rpc-provider.def)
+
+install_config_definitions(src/vespa/storage/config)
diff --git a/storage/src/vespa/storage/config/rpc-provider.def b/storage/src/vespa/storage/config/vespa.config.content.core.rpc-provider.def
index f54b0e00fe4..f54b0e00fe4 100644
--- a/storage/src/vespa/storage/config/rpc-provider.def
+++ b/storage/src/vespa/storage/config/vespa.config.content.core.rpc-provider.def
diff --git a/storage/src/vespa/storage/config/stor-bouncer.def b/storage/src/vespa/storage/config/vespa.config.content.core.stor-bouncer.def
index 6af5ee078e9..6af5ee078e9 100644
--- a/storage/src/vespa/storage/config/stor-bouncer.def
+++ b/storage/src/vespa/storage/config/vespa.config.content.core.stor-bouncer.def
diff --git a/storage/src/vespa/storage/config/stor-bucketmover.def b/storage/src/vespa/storage/config/vespa.config.content.core.stor-bucketmover.def
index 1fc200f83ca..1fc200f83ca 100644
--- a/storage/src/vespa/storage/config/stor-bucketmover.def
+++ b/storage/src/vespa/storage/config/vespa.config.content.core.stor-bucketmover.def
diff --git a/storage/src/vespa/storage/config/stor-communicationmanager.def b/storage/src/vespa/storage/config/vespa.config.content.core.stor-communicationmanager.def
index 3e4b1fd6515..3e4b1fd6515 100644
--- a/storage/src/vespa/storage/config/stor-communicationmanager.def
+++ b/storage/src/vespa/storage/config/vespa.config.content.core.stor-communicationmanager.def
diff --git a/storage/src/vespa/storage/config/stor-distributormanager.def b/storage/src/vespa/storage/config/vespa.config.content.core.stor-distributormanager.def
index db2bfb61376..db2bfb61376 100644
--- a/storage/src/vespa/storage/config/stor-distributormanager.def
+++ b/storage/src/vespa/storage/config/vespa.config.content.core.stor-distributormanager.def
diff --git a/storage/src/vespa/storage/config/stor-integritychecker.def b/storage/src/vespa/storage/config/vespa.config.content.core.stor-integritychecker.def
index 657537ac015..657537ac015 100644
--- a/storage/src/vespa/storage/config/stor-integritychecker.def
+++ b/storage/src/vespa/storage/config/vespa.config.content.core.stor-integritychecker.def
diff --git a/storage/src/vespa/storage/config/stor-messageforwarder.def b/storage/src/vespa/storage/config/vespa.config.content.core.stor-messageforwarder.def
index 4a3f481e659..4a3f481e659 100644
--- a/storage/src/vespa/storage/config/stor-messageforwarder.def
+++ b/storage/src/vespa/storage/config/vespa.config.content.core.stor-messageforwarder.def
diff --git a/storage/src/vespa/storage/config/stor-opslogger.def b/storage/src/vespa/storage/config/vespa.config.content.core.stor-opslogger.def
index 3ba2c621427..3ba2c621427 100644
--- a/storage/src/vespa/storage/config/stor-opslogger.def
+++ b/storage/src/vespa/storage/config/vespa.config.content.core.stor-opslogger.def
diff --git a/storage/src/vespa/storage/config/stor-prioritymapping.def b/storage/src/vespa/storage/config/vespa.config.content.core.stor-prioritymapping.def
index decf4c68ee2..decf4c68ee2 100644
--- a/storage/src/vespa/storage/config/stor-prioritymapping.def
+++ b/storage/src/vespa/storage/config/vespa.config.content.core.stor-prioritymapping.def
diff --git a/storage/src/vespa/storage/config/stor-server.def b/storage/src/vespa/storage/config/vespa.config.content.core.stor-server.def
index e1446aa8ed1..e1446aa8ed1 100644
--- a/storage/src/vespa/storage/config/stor-server.def
+++ b/storage/src/vespa/storage/config/vespa.config.content.core.stor-server.def
diff --git a/storage/src/vespa/storage/config/stor-status.def b/storage/src/vespa/storage/config/vespa.config.content.core.stor-status.def
index 640a03299c2..640a03299c2 100644
--- a/storage/src/vespa/storage/config/stor-status.def
+++ b/storage/src/vespa/storage/config/vespa.config.content.core.stor-status.def
diff --git a/storage/src/vespa/storage/config/stor-visitordispatcher.def b/storage/src/vespa/storage/config/vespa.config.content.core.stor-visitordispatcher.def
index 2e418c97989..2e418c97989 100644
--- a/storage/src/vespa/storage/config/stor-visitordispatcher.def
+++ b/storage/src/vespa/storage/config/vespa.config.content.core.stor-visitordispatcher.def
diff --git a/storage/src/vespa/storage/visiting/CMakeLists.txt b/storage/src/vespa/storage/visiting/CMakeLists.txt
index 05097163479..c8a824877c5 100644
--- a/storage/src/vespa/storage/visiting/CMakeLists.txt
+++ b/storage/src/vespa/storage/visiting/CMakeLists.txt
@@ -13,5 +13,6 @@ vespa_add_library(storage_visitor OBJECT
     visitorthread.cpp
     DEPENDS
 )
-vespa_generate_config(storage_visitor stor-visitor.def)
-install_config_definition(stor-visitor.def vespa.config.content.core.stor-visitor.def)
+vespa_generate_config(storage_visitor vespa.config.content.core.stor-visitor.def)
+
+install_config_definitions(src/vespa/storage/visiting)
diff --git a/storage/src/vespa/storage/visiting/stor-visitor.def b/storage/src/vespa/storage/visiting/vespa.config.content.core.stor-visitor.def
index 72b3699fe2d..72b3699fe2d 100644
--- a/storage/src/vespa/storage/visiting/stor-visitor.def
+++ b/storage/src/vespa/storage/visiting/vespa.config.content.core.stor-visitor.def