diff options
| author | Harald Musum <musum@verizonmedia.com> | 2020-09-10 19:54:48 +0200 |
|---|---|---|
| committer | Harald Musum <musum@verizonmedia.com> | 2020-09-10 19:54:48 +0200 |
| commit | 9b948718144e5d556cc6ea49d2ff6bbf05f00b0e (patch) | |
| tree | ba85cd69adb80f4eb2b885d792f4ff5ecf01ef93 | |
| parent | 2f6d5764a8ac5fea80e44fc3d022a6b0b47ba890 (diff) | |
Use full name in config definition file names
| -rw-r--r-- | application/src/test/resources/configdefinitions/application.mock-application.def (renamed from application/src/test/resources/configdefinitions/mock-application.def) | 0 | ||||
| -rw-r--r-- | bundle-plugin-test/test-bundles/main/src/main/resources/configdefinitions/example.test.def (renamed from bundle-plugin-test/test-bundles/main/src/main/resources/configdefinitions/test.def) | 0 | ||||
| -rw-r--r-- | chain/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | chain/src/main/resources/configdefinitions/container.core.chains.def (renamed from chain/src/main/resources/configdefinitions/chains.def) | 0 | ||||
| -rw-r--r-- | config-lib/src/test/resources/configdefinitions/foo.maptypes.def (renamed from config-lib/src/test/resources/configdefinitions/maptypes.def) | 0 | ||||
| -rw-r--r-- | config-lib/src/test/resources/configdefinitions/foo.structtypes.def (renamed from config-lib/src/test/resources/configdefinitions/structtypes.def) | 0 | ||||
| -rw-r--r-- | config-lib/src/test/resources/configdefinitions/my.namespace.namespace-and-package.def (renamed from config-lib/src/test/resources/configdefinitions/namespace-and-package.def) | 0 | ||||
| -rw-r--r-- | config-lib/src/test/resources/configdefinitions/my.namespace.namespace.def (renamed from config-lib/src/test/resources/configdefinitions/namespace.def) | 0 | ||||
| -rw-r--r-- | config-lib/src/test/resources/configdefinitions/test.app.def (renamed from config-lib/src/test/resources/configdefinitions/app.def) | 0 | ||||
| -rw-r--r-- | config-lib/src/test/resources/configdefinitions/test.function-test.def (renamed from config-lib/src/test/resources/configdefinitions/function-test.def) | 0 | ||||
| -rwxr-xr-x | config-lib/src/test/resources/configdefinitions/test.int.def (renamed from config-lib/src/test/resources/configdefinitions/int.def) | 0 | ||||
| -rwxr-xr-x | config-lib/src/test/resources/configdefinitions/test.restart.def (renamed from config-lib/src/test/resources/configdefinitions/restart.def) | 0 | ||||
| -rw-r--r-- | config-model/src/test/cfg/admin/userconfigs/test.function-test.def (renamed from config-model/src/test/cfg/admin/userconfigs/function-test.def) | 0 | ||||
| -rw-r--r-- | config-model/src/test/cfg/application/classes/vespa.config.search.attributes.def (renamed from config-model/src/test/cfg/application/classes/attributes.def) | 0 | ||||
| -rw-r--r-- | config-model/src/test/cfg/application/configdeftest/configdefinitions/config.foo.def (renamed from config-model/src/test/cfg/application/configdeftest/configdefinitions/foo.def) | 0 | ||||
| -rw-r--r-- | config-model/src/test/cfg/application/configdeftest/configdefinitions/config.xyzzy.def (renamed from config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.def) | 0 | ||||
| -rw-r--r-- | config-model/src/test/cfg/application/configdeftest/configdefinitions/qux.qux.foo.def (renamed from config-model/src/test/cfg/application/configdeftest/configdefinitions/qux.foo.def) | 0 | ||||
| -rw-r--r-- | config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.bar.def | 3 | ||||
| -rw-r--r-- | config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.baz.def (renamed from config-model/src/test/cfg/application/configdeftest/configdefinitions/baz.def) | 0 | ||||
| -rw-r--r-- | config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.xyzzy.bar.def (renamed from config-model/src/test/cfg/application/configdeftest/configdefinitions/bar.def) | 3 | ||||
| -rw-r--r-- | config-model/src/test/cfg/application/serverdefs/vespa.config.search.attributes.def (renamed from config-model/src/test/cfg/application/serverdefs/attributes.def) | 0 | ||||
| -rw-r--r-- | config-model/src/test/derived/music/defs/document.config.documentmanager.def (renamed from config-model/src/test/derived/music/defs/documentmanager.def) | 0 | ||||
| -rw-r--r-- | config-model/src/test/derived/music/defs/test.extra.def (renamed from config-model/src/test/derived/music/defs/extra.def) | 0 | ||||
| -rw-r--r-- | config-model/src/test/derived/music/defs/vespa.config.search.attributes.def (renamed from config-model/src/test/derived/music/defs/attributes.def) | 0 | ||||
| -rw-r--r-- | config-model/src/test/derived/music/defs/vespa.config.search.rank-profiles.def (renamed from config-model/src/test/derived/music/defs/rank-profiles.def) | 0 | ||||
| -rw-r--r-- | config-model/src/test/derived/music/defs/vespa.config.search.summarymap.def (renamed from config-model/src/test/derived/music/defs/summarymap.def) | 0 | ||||
| -rw-r--r-- | config-model/src/test/derived/music/defs/vespa.configdefinition.ilscripts.def (renamed from config-model/src/test/derived/music/defs/ilscripts.def) | 0 | ||||
| -rw-r--r-- | config-model/src/test/derived/newrank/defs/document.config.documentmanager.def (renamed from config-model/src/test/derived/newrank/defs/documentmanager.def) | 0 | ||||
| -rw-r--r-- | config-model/src/test/derived/newrank/defs/test.extra.def (renamed from config-model/src/test/derived/newrank/defs/extra.def) | 0 | ||||
| -rw-r--r-- | config-model/src/test/derived/newrank/defs/vespa.config.search.attributes.def (renamed from config-model/src/test/derived/newrank/defs/attributes.def) | 0 | ||||
| -rw-r--r-- | config-model/src/test/derived/newrank/defs/vespa.config.search.rank-profiles.def (renamed from config-model/src/test/derived/newrank/defs/rank-profiles.def) | 0 | ||||
| -rw-r--r-- | config-model/src/test/derived/newrank/defs/vespa.config.search.summarymap.def (renamed from config-model/src/test/derived/newrank/defs/summarymap.def) | 0 | ||||
| -rw-r--r-- | config-model/src/test/derived/newrank/defs/vespa.configdefinition.ilscripts.def (renamed from config-model/src/test/derived/newrank/defs/ilscripts.def) | 0 | ||||
| -rw-r--r-- | config-model/src/test/resources/configdefinitions/test.anotherrestart.def (renamed from config-model/src/test/resources/configdefinitions/anotherrestart.def) | 0 | ||||
| -rw-r--r-- | config-model/src/test/resources/configdefinitions/test.arraytypes.def (renamed from config-model/src/test/resources/configdefinitions/arraytypes.def) | 0 | ||||
| -rw-r--r-- | config-model/src/test/resources/configdefinitions/test.function-test.def (renamed from config-model/src/test/resources/configdefinitions/function-test.def) | 0 | ||||
| -rw-r--r-- | config-model/src/test/resources/configdefinitions/test.nonrestart.def (renamed from config-model/src/test/resources/configdefinitions/nonrestart.def) | 0 | ||||
| -rw-r--r-- | config-model/src/test/resources/configdefinitions/test.restart.def (renamed from config-model/src/test/resources/configdefinitions/restart.def) | 0 | ||||
| -rw-r--r-- | config-model/src/test/resources/configdefinitions/test.simpletypes.def (renamed from config-model/src/test/resources/configdefinitions/simpletypes.def) | 0 | ||||
| -rw-r--r-- | config-model/src/test/resources/configdefinitions/test.standard.def (renamed from config-model/src/test/resources/configdefinitions/standard.def) | 0 | ||||
| -rw-r--r-- | config-provisioning/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | config-provisioning/src/main/resources/configdefinitions/config.provisioning.cloud.def (renamed from config-provisioning/src/main/resources/configdefinitions/cloud.def) | 0 | ||||
| -rw-r--r-- | config-provisioning/src/main/resources/configdefinitions/config.provisioning.flavors.def (renamed from config-provisioning/src/main/resources/configdefinitions/flavors.def) | 0 | ||||
| -rw-r--r-- | config-provisioning/src/main/resources/configdefinitions/config.provisioning.node-repository.def (renamed from config-provisioning/src/main/resources/configdefinitions/node-repository.def) | 0 | ||||
| -rw-r--r-- | config/src/test/resources/configdefinitions/config.bar.def (renamed from config/src/test/resources/configdefinitions/bar.def) | 0 | ||||
| -rw-r--r-- | config/src/test/resources/configdefinitions/config.baz.def (renamed from config/src/test/resources/configdefinitions/baz.def) | 0 | ||||
| -rw-r--r-- | config/src/test/resources/configdefinitions/config.bootstrap.def (renamed from config/src/test/resources/configdefinitions/bootstrap.def) | 0 | ||||
| -rw-r--r-- | config/src/test/resources/configdefinitions/config.foo.def (renamed from config/src/test/resources/configdefinitions/foo.def) | 0 | ||||
| -rw-r--r-- | config/src/test/resources/configdefinitions/config.foobar.def (renamed from config/src/test/resources/configdefinitions/foobar.def) | 0 | ||||
| -rw-r--r-- | config/src/test/resources/configdefinitions/config.foodefault.def (renamed from config/src/test/resources/configdefinitions/foodefault.def) | 0 | ||||
| -rw-r--r-- | config/src/test/resources/configdefinitions/config.function-test.def (renamed from config/src/test/resources/configdefinitions/function-test.def) | 0 | ||||
| -rw-r--r-- | config/src/test/resources/configdefinitions/config.motd.def (renamed from config/src/test/resources/configdefinitions/motd.def) | 0 | ||||
| -rw-r--r-- | config/src/test/resources/configdefinitions/config.my.def (renamed from config/src/test/resources/configdefinitions/my.def) | 0 | ||||
| -rw-r--r-- | config/src/test/resources/configs/def-files-nogen/mynamespace.foo.bar.app.def (renamed from config/src/test/resources/configs/def-files-nogen/foo.bar.app.def) | 0 | ||||
| -rw-r--r-- | config/src/test/resources/configs/def-files/foo.app.def (renamed from config/src/test/resources/configs/def-files/app.def) | 0 | ||||
| -rw-r--r-- | config/src/test/resources/configs/def-files/foo.arraytypes.def (renamed from config/src/test/resources/configs/def-files/arraytypes.def) | 0 | ||||
| -rw-r--r-- | config/src/test/resources/configs/def-files/foo.defaulttest.def (renamed from config/src/test/resources/configs/def-files/defaulttest.def) | 0 | ||||
| -rw-r--r-- | config/src/test/resources/configs/def-files/foo.function-test.def (renamed from config/src/test/resources/configs/def-files/function-test.def) | 0 | ||||
| -rwxr-xr-x | config/src/test/resources/configs/def-files/foo.int.def (renamed from config/src/test/resources/configs/def-files/int.def) | 0 | ||||
| -rw-r--r-- | config/src/test/resources/configs/def-files/foo.maptypes.def (renamed from config/src/test/resources/configs/def-files/maptypes.def) | 0 | ||||
| -rw-r--r-- | config/src/test/resources/configs/def-files/foo.simpletypes.def (renamed from config/src/test/resources/configs/def-files/simpletypes.def) | 0 | ||||
| -rw-r--r-- | config/src/test/resources/configs/def-files/foo.specialtypes.def (renamed from config/src/test/resources/configs/def-files/specialtypes.def) | 0 | ||||
| -rwxr-xr-x | config/src/test/resources/configs/def-files/foo.string.def (renamed from config/src/test/resources/configs/def-files/string.def) | 0 | ||||
| -rw-r--r-- | config/src/test/resources/configs/def-files/foo.structtypes.def (renamed from config/src/test/resources/configs/def-files/structtypes.def) | 0 | ||||
| -rw-r--r-- | config/src/test/resources/configs/def-files/foo.test-nodefs.def (renamed from config/src/test/resources/configs/def-files/test-nodefs.def) | 0 | ||||
| -rw-r--r-- | config/src/test/resources/configs/def-files/foo.test-nonstring.def (renamed from config/src/test/resources/configs/def-files/test-nonstring.def) | 0 | ||||
| -rw-r--r-- | config/src/test/resources/configs/def-files/foo.test-reference.def (renamed from config/src/test/resources/configs/def-files/test-reference.def) | 0 | ||||
| -rw-r--r-- | config/src/test/resources/configs/def-files/foo.testnamespace.def (renamed from config/src/test/resources/configs/def-files/testnamespace.def) | 0 | ||||
| -rw-r--r-- | config/src/test/resources/configs/def-files/foo.unicode.def (renamed from config/src/test/resources/configs/def-files/unicode.def) | 0 | ||||
| -rw-r--r-- | config/src/test/resources/configs/def-files/myproject.config.namespace.def (renamed from config/src/test/resources/configs/def-files/namespace.def) | 0 | ||||
| -rw-r--r-- | config_test/src/main/resources/configdefinitions/configtest.greeting.def (renamed from config_test/src/main/resources/configdefinitions/greeting.def) | 0 | ||||
| -rw-r--r-- | configdefinitions/src/vespa/CMakeLists.txt | 106 | ||||
| -rw-r--r-- | configdefinitions/src/vespa/cloud.config.application-id.def (renamed from configdefinitions/src/vespa/application-id.def) | 0 | ||||
| -rw-r--r-- | configdefinitions/src/vespa/cloud.config.cluster-info.def (renamed from configdefinitions/src/vespa/cluster-info.def) | 0 | ||||
| -rw-r--r-- | configdefinitions/src/vespa/cloud.config.cluster-list.def (renamed from configdefinitions/src/vespa/cluster-list.def) | 0 | ||||
| -rw-r--r-- | configdefinitions/src/vespa/cloud.config.configserver.def (renamed from configdefinitions/src/vespa/configserver.def) | 0 | ||||
| -rw-r--r-- | configdefinitions/src/vespa/cloud.config.filedistribution.filereferences.def (renamed from configdefinitions/src/vespa/filereferences.def) | 0 | ||||
| -rw-r--r-- | configdefinitions/src/vespa/cloud.config.lb-services.def (renamed from configdefinitions/src/vespa/lb-services.def) | 0 | ||||
| -rw-r--r-- | configdefinitions/src/vespa/cloud.config.logforwarder.def (renamed from configdefinitions/src/vespa/logforwarder.def) | 0 | ||||
| -rw-r--r-- | configdefinitions/src/vespa/cloud.config.model.def (renamed from configdefinitions/src/vespa/model.def) | 0 | ||||
| -rwxr-xr-x | configdefinitions/src/vespa/cloud.config.routing-provider.def (renamed from configdefinitions/src/vespa/routing-provider.def) | 0 | ||||
| -rw-r--r-- | configdefinitions/src/vespa/cloud.config.sentinel.def (renamed from configdefinitions/src/vespa/sentinel.def) | 0 | ||||
| -rw-r--r-- | configdefinitions/src/vespa/cloud.config.slobroks.def (renamed from configdefinitions/src/vespa/slobroks.def) | 0 | ||||
| -rw-r--r-- | configdefinitions/src/vespa/cloud.config.ymon.def (renamed from configdefinitions/src/vespa/ymon.def) | 0 | ||||
| -rw-r--r-- | configdefinitions/src/vespa/cloud.config.zookeeper-server.def (renamed from configdefinitions/src/vespa/zookeeper-server.def) | 0 | ||||
| -rw-r--r-- | configdefinitions/src/vespa/cloud.config.zookeepers.def (renamed from configdefinitions/src/vespa/zookeepers.def) | 0 | ||||
| -rw-r--r-- | configdefinitions/src/vespa/vespa.config.content.all-clusters-bucket-spaces.def (renamed from configdefinitions/src/vespa/all-clusters-bucket-spaces.def) | 0 | ||||
| -rw-r--r-- | configdefinitions/src/vespa/vespa.config.content.core.bucketspaces.def (renamed from configdefinitions/src/vespa/bucketspaces.def) | 0 | ||||
| -rw-r--r-- | configdefinitions/src/vespa/vespa.config.content.fleetcontroller.def (renamed from configdefinitions/src/vespa/fleetcontroller.def) | 0 | ||||
| -rw-r--r-- | configdefinitions/src/vespa/vespa.config.content.load-type.def (renamed from configdefinitions/src/vespa/load-type.def) | 0 | ||||
| -rw-r--r-- | configdefinitions/src/vespa/vespa.config.content.messagetyperouteselectorpolicy.def (renamed from configdefinitions/src/vespa/messagetyperouteselectorpolicy.def) | 0 | ||||
| -rw-r--r-- | configdefinitions/src/vespa/vespa.config.content.persistence.def (renamed from configdefinitions/src/vespa/persistence.def) | 0 | ||||
| -rw-r--r-- | configdefinitions/src/vespa/vespa.config.content.stor-distribution.def (renamed from configdefinitions/src/vespa/stor-distribution.def) | 0 | ||||
| -rw-r--r-- | configdefinitions/src/vespa/vespa.config.content.stor-filestor.def (renamed from configdefinitions/src/vespa/stor-filestor.def) | 0 | ||||
| -rw-r--r-- | configdefinitions/src/vespa/vespa.config.content.upgrading.def (renamed from configdefinitions/src/vespa/upgrading.def) | 0 | ||||
| -rw-r--r-- | configdefinitions/src/vespa/vespa.config.core.stateserver.def (renamed from configdefinitions/src/vespa/stateserver.def) | 0 | ||||
| -rw-r--r-- | configdefinitions/src/vespa/vespa.config.search.attributes.def (renamed from configdefinitions/src/vespa/attributes.def) | 0 | ||||
| -rw-r--r-- | configdefinitions/src/vespa/vespa.config.search.dispatch.def (renamed from configdefinitions/src/vespa/dispatch.def) | 0 | ||||
| -rw-r--r-- | configdefinitions/src/vespa/vespa.config.search.imported-fields.def (renamed from configdefinitions/src/vespa/imported-fields.def) | 0 | ||||
| -rw-r--r-- | configdefinitions/src/vespa/vespa.config.search.indexschema.def (renamed from configdefinitions/src/vespa/indexschema.def) | 0 | ||||
| -rw-r--r-- | configdefinitions/src/vespa/vespa.config.search.rank-profiles.def (renamed from configdefinitions/src/vespa/rank-profiles.def) | 0 | ||||
| -rw-r--r-- | configdefinitions/src/vespa/vespa.config.search.summary.def (renamed from configdefinitions/src/vespa/summary.def) | 0 | ||||
| -rw-r--r-- | configdefinitions/src/vespa/vespa.config.search.summarymap.def (renamed from configdefinitions/src/vespa/summarymap.def) | 0 | ||||
| -rw-r--r-- | configdefinitions/src/vespa/vespa.configdefinition.ilscripts.def (renamed from configdefinitions/src/vespa/ilscripts.def) | 0 | ||||
| -rw-r--r-- | configdefinitions/src/vespa/vespa.configdefinition.specialtokens.def (renamed from configdefinitions/src/vespa/specialtokens.def) | 0 | ||||
| -rw-r--r-- | configdefinitions/src/vespa/vespa.hosted.athenz.instanceproviderservice.config.athenz-provider-service.def (renamed from configdefinitions/src/vespa/athenz-provider-service.def) | 0 | ||||
| -rw-r--r-- | configdefinitions/src/vespa/vespa.orchestrator.config.orchestrator.def (renamed from configdefinitions/src/vespa/orchestrator.def) | 0 | ||||
| -rw-r--r-- | configgen/src/test/resources/baz.bar.foo.def (renamed from configgen/src/test/resources/bar.foo.def) | 0 | ||||
| -rw-r--r-- | configgen/src/test/resources/configgen.allfeatures.def (renamed from configgen/src/test/resources/allfeatures.def) | 0 | ||||
| -rw-r--r-- | configserver/src/test/apps/serverdb/serverdefs/config.attributes.def (renamed from configserver/src/test/apps/serverdb/serverdefs/attributes.def) | 0 | ||||
| -rw-r--r-- | configserver/src/test/apps/zkfeed/configdefinitions/a.b.a.b.test2.def (renamed from configserver/src/test/apps/zkfeed/configdefinitions/a.b.test2.def) | 0 | ||||
| -rw-r--r-- | configserver/src/test/resources/configdefinitions/config.app.def (renamed from configserver/src/test/resources/configdefinitions/app.def) | 0 | ||||
| -rw-r--r-- | configserver/src/test/resources/configdefinitions/config.md5test.def (renamed from configserver/src/test/resources/configdefinitions/md5test.def) | 0 | ||||
| -rw-r--r-- | configserver/src/test/resources/configdefinitions/config.simpletypes.def (renamed from configserver/src/test/resources/configdefinitions/simpletypes.def) | 0 | ||||
| -rw-r--r-- | container-accesslogging/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | container-accesslogging/src/main/resources/configdefinitions/container.core.access-log.def (renamed from container-accesslogging/src/main/resources/configdefinitions/access-log.def) | 0 | ||||
| -rw-r--r-- | container-core/CMakeLists.txt | 18 | ||||
| -rw-r--r-- | container-core/src/main/resources/configdefinitions/container.core.application-metadata.def (renamed from container-core/src/main/resources/configdefinitions/application-metadata.def) | 0 | ||||
| -rw-r--r-- | container-core/src/main/resources/configdefinitions/container.core.container-http.def (renamed from container-core/src/main/resources/configdefinitions/container-http.def) | 0 | ||||
| -rw-r--r-- | container-core/src/main/resources/configdefinitions/container.core.document.container-document.def (renamed from container-core/src/main/resources/configdefinitions/container-document.def) | 0 | ||||
| -rw-r--r-- | container-core/src/main/resources/configdefinitions/container.core.http.http-filter.def (renamed from container-core/src/main/resources/configdefinitions/http-filter.def) | 0 | ||||
| -rw-r--r-- | container-core/src/main/resources/configdefinitions/container.core.identity.identity.def (renamed from container-core/src/main/resources/configdefinitions/identity.def) | 0 | ||||
| -rw-r--r-- | container-core/src/main/resources/configdefinitions/container.core.log-handler.def (renamed from container-core/src/main/resources/configdefinitions/log-handler.def) | 0 | ||||
| -rw-r--r-- | container-core/src/main/resources/configdefinitions/container.core.vip-status.def (renamed from container-core/src/main/resources/configdefinitions/vip-status.def) | 0 | ||||
| -rw-r--r-- | container-core/src/main/resources/configdefinitions/container.handler.metrics.metrics-proxy-api.def (renamed from container-core/src/main/resources/configdefinitions/metrics-proxy-api.def) | 0 | ||||
| -rw-r--r-- | container-core/src/main/resources/configdefinitions/container.handler.test.mockservice.def (renamed from container-core/src/main/resources/configdefinitions/mockservice.def) | 0 | ||||
| -rw-r--r-- | container-core/src/main/resources/configdefinitions/container.handler.threadpool.container-threadpool.def (renamed from container-core/src/main/resources/configdefinitions/container-threadpool.def) | 0 | ||||
| -rw-r--r-- | container-core/src/main/resources/configdefinitions/container.handler.threadpool.def (renamed from container-core/src/main/resources/configdefinitions/threadpool.def) | 0 | ||||
| -rw-r--r-- | container-core/src/main/resources/configdefinitions/container.jdisc.config.health-monitor.def (renamed from container-core/src/main/resources/configdefinitions/health-monitor.def) | 0 | ||||
| -rw-r--r-- | container-core/src/main/resources/configdefinitions/container.jdisc.state.metrics-packets-handler.def (renamed from container-core/src/main/resources/configdefinitions/metrics-packets-handler.def) | 0 | ||||
| -rw-r--r-- | container-core/src/main/resources/configdefinitions/container.qr-searchers.def (renamed from container-core/src/main/resources/configdefinitions/qr-searchers.def) | 0 | ||||
| -rw-r--r-- | container-core/src/main/resources/configdefinitions/container.qr.def (renamed from container-core/src/main/resources/configdefinitions/qr.def) | 0 | ||||
| -rw-r--r-- | container-core/src/main/resources/configdefinitions/container.servlet.servlet-config.def (renamed from container-core/src/main/resources/configdefinitions/servlet-config.def) | 0 | ||||
| -rw-r--r-- | container-core/src/main/resources/configdefinitions/metrics.metrics-presentation.def (renamed from container-core/src/main/resources/configdefinitions/metrics-presentation.def) | 0 | ||||
| -rw-r--r-- | container-core/src/test/vespa-configdef/config.core.int.def (renamed from container-core/src/test/vespa-configdef/int.def) | 0 | ||||
| -rw-r--r-- | container-core/src/test/vespa-configdef/config.core.string.def (renamed from container-core/src/test/vespa-configdef/string.def) | 0 | ||||
| -rw-r--r-- | container-di/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | container-di/src/main/resources/configdefinitions/container.bundles.def (renamed from container-di/src/main/resources/configdefinitions/bundles.def) | 0 | ||||
| -rw-r--r-- | container-di/src/main/resources/configdefinitions/container.components.def (renamed from container-di/src/main/resources/configdefinitions/components.def) | 0 | ||||
| -rw-r--r-- | container-di/src/main/resources/configdefinitions/container.di.config.jersey-bundles.def (renamed from container-di/src/main/resources/configdefinitions/jersey-bundles.def) | 0 | ||||
| -rw-r--r-- | container-di/src/main/resources/configdefinitions/container.di.config.jersey-injection.def (renamed from container-di/src/main/resources/configdefinitions/jersey-injection.def) | 0 | ||||
| -rw-r--r-- | container-di/src/test/vespa-configdef/config.di.int.def (renamed from container-di/src/test/vespa-configdef/int.def) | 0 | ||||
| -rw-r--r-- | container-di/src/test/vespa-configdef/config.di.string.def (renamed from container-di/src/test/vespa-configdef/string.def) | 0 | ||||
| -rw-r--r-- | container-di/src/test/vespa-configdef/config.test.bootstrap1.def (renamed from container-di/src/test/vespa-configdef/bootstrap1.def) | 0 | ||||
| -rw-r--r-- | container-di/src/test/vespa-configdef/config.test.bootstrap2.def (renamed from container-di/src/test/vespa-configdef/bootstrap2.def) | 0 | ||||
| -rw-r--r-- | container-di/src/test/vespa-configdef/config.test.components1.def (renamed from container-di/src/test/vespa-configdef/components1.def) | 0 | ||||
| -rw-r--r-- | container-di/src/test/vespa-configdef/config.test.test.def (renamed from container-di/src/test/vespa-configdef/test.def) | 0 | ||||
| -rw-r--r-- | container-di/src/test/vespa-configdef/config.test.test2.def (renamed from container-di/src/test/vespa-configdef/test2.def) | 0 | ||||
| -rw-r--r-- | container-di/src/test/vespa-configdef/config.test.thread-pool.def (renamed from container-di/src/test/vespa-configdef/thread-pool.def) | 0 | ||||
| -rw-r--r-- | container-disc/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | container-disc/src/main/resources/configdefinitions/container.config.jersey.jersey-connection.def (renamed from container-disc/src/main/resources/configdefinitions/jersey-connection.def) | 0 | ||||
| -rw-r--r-- | container-disc/src/main/resources/configdefinitions/container.config.jersey.jersey-web-app-pool.def (renamed from container-disc/src/main/resources/configdefinitions/jersey-web-app-pool.def) | 0 | ||||
| -rw-r--r-- | container-disc/src/main/resources/configdefinitions/container.jdisc.jdisc-bindings.def (renamed from container-disc/src/main/resources/configdefinitions/jdisc-bindings.def) | 0 | ||||
| -rw-r--r-- | container-messagebus/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | container-messagebus/src/main/resources/configdefinitions/container.jdisc.config.session.def (renamed from container-messagebus/src/main/resources/configdefinitions/session.def) | 0 | ||||
| -rw-r--r-- | container-messagebus/src/main/resources/configdefinitions/container.jdisc.container-mbus.def (renamed from container-messagebus/src/main/resources/configdefinitions/container-mbus.def) | 0 | ||||
| -rw-r--r-- | container-search-and-docproc/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | container-search-and-docproc/src/main/resources/configdefinitions/container.handler.observability.application-userdata.def (renamed from container-search-and-docproc/src/main/resources/configdefinitions/application-userdata.def) | 0 | ||||
| -rw-r--r-- | container-search/CMakeLists.txt | 24 | ||||
| -rw-r--r-- | container-search/src/main/resources/configdefinitions/container.search.fs4.def (renamed from container-search/src/main/resources/configdefinitions/fs4.def) | 0 | ||||
| -rw-r--r-- | container-search/src/main/resources/configdefinitions/prelude.cluster.qr-monitor.def (renamed from container-search/src/main/resources/configdefinitions/qr-monitor.def) | 0 | ||||
| -rw-r--r-- | container-search/src/main/resources/configdefinitions/prelude.emulation.def (renamed from container-search/src/main/resources/configdefinitions/emulation.def) | 0 | ||||
| -rw-r--r-- | container-search/src/main/resources/configdefinitions/prelude.fastsearch.documentdb-info.def (renamed from container-search/src/main/resources/configdefinitions/documentdb-info.def) | 0 | ||||
| -rw-r--r-- | container-search/src/main/resources/configdefinitions/prelude.searcher.keyvalue.def (renamed from container-search/src/main/resources/configdefinitions/keyvalue.def) | 0 | ||||
| -rw-r--r-- | container-search/src/main/resources/configdefinitions/prelude.searcher.qr-quotetable.def (renamed from container-search/src/main/resources/configdefinitions/qr-quotetable.def) | 0 | ||||
| -rw-r--r-- | container-search/src/main/resources/configdefinitions/prelude.semantics.semantic-rules.def (renamed from container-search/src/main/resources/configdefinitions/semantic-rules.def) | 0 | ||||
| -rw-r--r-- | container-search/src/main/resources/configdefinitions/search.config.cluster.def (renamed from container-search/src/main/resources/configdefinitions/cluster.def) | 0 | ||||
| -rw-r--r-- | container-search/src/main/resources/configdefinitions/search.config.index-info.def (renamed from container-search/src/main/resources/configdefinitions/index-info.def) | 0 | ||||
| -rw-r--r-- | container-search/src/main/resources/configdefinitions/search.config.qr-start.def (renamed from container-search/src/main/resources/configdefinitions/qr-start.def) | 0 | ||||
| -rw-r--r-- | container-search/src/main/resources/configdefinitions/search.config.rate-limiting.def (renamed from container-search/src/main/resources/configdefinitions/rate-limiting.def) | 0 | ||||
| -rw-r--r-- | container-search/src/main/resources/configdefinitions/search.federation.federation.def (renamed from container-search/src/main/resources/configdefinitions/federation.def) | 0 | ||||
| -rw-r--r-- | container-search/src/main/resources/configdefinitions/search.federation.provider.def (renamed from container-search/src/main/resources/configdefinitions/provider.def) | 0 | ||||
| -rw-r--r-- | container-search/src/main/resources/configdefinitions/search.federation.searchchain-forward.def (renamed from container-search/src/main/resources/configdefinitions/searchchain-forward.def) | 0 | ||||
| -rw-r--r-- | container-search/src/main/resources/configdefinitions/search.federation.strict-contracts.def (renamed from container-search/src/main/resources/configdefinitions/strict-contracts.def) | 0 | ||||
| -rw-r--r-- | container-search/src/main/resources/configdefinitions/search.handler.search-with-renderer-handler.def (renamed from container-search/src/main/resources/configdefinitions/search-with-renderer-handler.def) | 0 | ||||
| -rw-r--r-- | container-search/src/main/resources/configdefinitions/search.pagetemplates.page-templates.def (renamed from container-search/src/main/resources/configdefinitions/page-templates.def) | 0 | ||||
| -rw-r--r-- | container-search/src/main/resources/configdefinitions/search.pagetemplates.resolvers.def (renamed from container-search/src/main/resources/configdefinitions/resolvers.def) | 0 | ||||
| -rw-r--r-- | container-search/src/main/resources/configdefinitions/search.query.profile.config.query-profiles.def (renamed from container-search/src/main/resources/configdefinitions/query-profiles.def) | 0 | ||||
| -rw-r--r-- | container-search/src/main/resources/configdefinitions/search.query.rewrite.rewrites.def (renamed from container-search/src/main/resources/configdefinitions/rewrites.def) | 0 | ||||
| -rw-r--r-- | container-search/src/main/resources/configdefinitions/search.querytransform.lowercasing.def (renamed from container-search/src/main/resources/configdefinitions/lowercasing.def) | 0 | ||||
| -rw-r--r-- | container-search/src/main/resources/configdefinitions/search.statistics.measure-qps.def (renamed from container-search/src/main/resources/configdefinitions/measure-qps.def) | 0 | ||||
| -rw-r--r-- | container-search/src/main/resources/configdefinitions/search.statistics.timing-searcher.def (renamed from container-search/src/main/resources/configdefinitions/timing-searcher.def) | 0 | ||||
| -rw-r--r-- | container-search/src/test/vespa-configdef/config.search.int.def (renamed from container-search/src/test/vespa-configdef/int.def) | 0 | ||||
| -rw-r--r-- | container-search/src/test/vespa-configdef/config.search.string.def (renamed from container-search/src/test/vespa-configdef/string.def) | 0 | ||||
| -rw-r--r-- | controller-server/src/main/resources/configdefinitions/vespa.hosted.controller.athenz.config.athenz.def (renamed from controller-server/src/main/resources/configdefinitions/athenz.def) | 0 | ||||
| -rw-r--r-- | controller-server/src/main/resources/configdefinitions/vespa.hosted.controller.config.controller.def (renamed from controller-server/src/main/resources/configdefinitions/controller.def) | 0 | ||||
| -rw-r--r-- | controller-server/src/main/resources/configdefinitions/vespa.hosted.controller.maintenance.config.maintainer.def (renamed from controller-server/src/main/resources/configdefinitions/maintainer.def) | 0 | ||||
| -rw-r--r-- | controller-server/src/main/resources/configdefinitions/vespa.hosted.controller.maven.repository.config.maven-repository.def (renamed from controller-server/src/main/resources/configdefinitions/maven-repository.def) | 0 | ||||
| -rw-r--r-- | controller-server/src/main/resources/configdefinitions/vespa.hosted.controller.tls.config.tls.def (renamed from controller-server/src/main/resources/configdefinitions/tls.def) | 0 | ||||
| -rw-r--r-- | controller-server/src/main/resources/configdefinitions/vespa.hosted.rotation.config.rotations.def (renamed from controller-server/src/main/resources/configdefinitions/rotations.def) | 0 | ||||
| -rw-r--r-- | docproc/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | docproc/src/main/resources/configdefinitions/config.docproc.docproc.def (renamed from docproc/src/main/resources/configdefinitions/docproc.def) | 0 | ||||
| -rw-r--r-- | docproc/src/main/resources/configdefinitions/config.docproc.schemamapping.def (renamed from docproc/src/main/resources/configdefinitions/schemamapping.def) | 0 | ||||
| -rw-r--r-- | docproc/src/main/resources/configdefinitions/config.docproc.splitter-joiner-document-processor.def (renamed from docproc/src/main/resources/configdefinitions/splitter-joiner-document-processor.def) | 0 | ||||
| -rw-r--r-- | docproc/src/test/vespa-configdef/config.docproc.string.def (renamed from docproc/src/test/vespa-configdef/string.def) | 0 | ||||
| -rw-r--r-- | document/src/vespa/document/config/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | document/src/vespa/document/config/document.config.documentmanager.def (renamed from document/src/vespa/document/config/documentmanager.def) | 0 | ||||
| -rw-r--r-- | document/src/vespa/document/config/document.documenttypes.def (renamed from document/src/vespa/document/config/documenttypes.def) | 0 | ||||
| -rw-r--r-- | documentapi/src/main/resources/configdefinitions/documentapi.messagebus.protocol.documentrouteselectorpolicy.def (renamed from documentapi/src/main/resources/configdefinitions/documentrouteselectorpolicy.def) | 0 | ||||
| -rw-r--r-- | documentapi/src/vespa/documentapi/messagebus/policies/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | fileacquirer/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | fileacquirer/src/main/resources/configdefinitions/cloud.config.filedistribution.filedistributorrpc.def (renamed from fileacquirer/src/main/resources/configdefinitions/filedistributorrpc.def) | 0 | ||||
| l--------- | fileacquirer/src/vespa/fileacquirer/cloud.config.filedistribution.filedistributorrpc.def (renamed from fileacquirer/src/vespa/fileacquirer/filedistributorrpc.def) | 0 | ||||
| -rw-r--r-- | functions.cmake | 2 | ||||
| -rw-r--r-- | jdisc-security-filters/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | jdisc-security-filters/src/main/resources/configdefinitions/jdisc.http.filter.security.athenz.athenz-authorization-filter.def (renamed from jdisc-security-filters/src/main/resources/configdefinitions/athenz-authorization-filter.def) | 0 | ||||
| -rw-r--r-- | jdisc-security-filters/src/main/resources/configdefinitions/jdisc.http.filter.security.athenz.athenz-principal-filter.def (renamed from jdisc-security-filters/src/main/resources/configdefinitions/athenz-principal-filter.def) | 0 | ||||
| -rw-r--r-- | jdisc-security-filters/src/main/resources/configdefinitions/jdisc.http.filter.security.athenz.static-request-resource-mapper.def (renamed from jdisc-security-filters/src/main/resources/configdefinitions/static-request-resource-mapper.def) | 0 | ||||
| -rw-r--r-- | jdisc-security-filters/src/main/resources/configdefinitions/jdisc.http.filter.security.cors.cors-filter.def (renamed from jdisc-security-filters/src/main/resources/configdefinitions/cors-filter.def) | 0 | ||||
| -rw-r--r-- | jdisc_http_service/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.client.jdisc.http.client.http-client.def (renamed from jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.client.http-client.def) | 0 | ||||
| -rw-r--r-- | jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.jdisc.http.connector.def (renamed from jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.connector.def) | 0 | ||||
| -rw-r--r-- | jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.jdisc.http.server.def (renamed from jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.server.def) | 0 | ||||
| -rw-r--r-- | jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.jdisc.http.servlet-paths.def (renamed from jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.servlet-paths.def) | 0 | ||||
| -rw-r--r-- | linguistics/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | linguistics/src/main/resources/configdefinitions/language.opennlp.opennlp-linguistics.def (renamed from linguistics/src/main/resources/configdefinitions/opennlp-linguistics.def) | 0 | ||||
| -rw-r--r-- | logd/src/logd/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | logd/src/main/resources/configdefinitions/cloud.config.log.logd.def (renamed from logd/src/main/resources/configdefinitions/logd.def) | 0 | ||||
| -rw-r--r-- | messagebus/src/main/config/messagebus.messagebus.def (renamed from messagebus/src/main/config/messagebus.def) | 0 | ||||
| -rw-r--r-- | messagebus/src/vespa/messagebus/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | metrics-proxy/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | metrics/src/vespa/metrics/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | metrics/src/vespa/metrics/metrics.metricsmanager.def (renamed from metrics/src/vespa/metrics/metricsmanager.def) | 0 | ||||
| -rw-r--r-- | searchcore/src/apps/verify_ranksetup/vespa.config.search.core.verify-ranksetup.def (renamed from searchcore/src/apps/verify_ranksetup/verify-ranksetup.def) | 0 | ||||
| -rw-r--r-- | searchcore/src/tests/proton/documentdb/fileconfigmanager/config.mycfg.def (renamed from searchcore/src/tests/proton/documentdb/fileconfigmanager/mycfg.def) | 0 | ||||
| -rw-r--r-- | searchcore/src/vespa/searchcore/config/CMakeLists.txt | 16 | ||||
| -rw-r--r-- | searchcore/src/vespa/searchcore/config/vespa.config.search.core.fdispatchrc.def (renamed from searchcore/src/vespa/searchcore/config/fdispatchrc.def) | 0 | ||||
| -rw-r--r-- | searchcore/src/vespa/searchcore/config/vespa.config.search.core.hwinfo.def (renamed from searchcore/src/vespa/searchcore/config/hwinfo.def) | 0 | ||||
| -rw-r--r-- | searchcore/src/vespa/searchcore/config/vespa.config.search.core.onnx-models.def (renamed from searchcore/src/vespa/searchcore/config/onnx-models.def) | 0 | ||||
| -rw-r--r-- | searchcore/src/vespa/searchcore/config/vespa.config.search.core.proton.def (renamed from searchcore/src/vespa/searchcore/config/proton.def) | 0 | ||||
| -rw-r--r-- | searchcore/src/vespa/searchcore/config/vespa.config.search.core.ranking-constants.def (renamed from searchcore/src/vespa/searchcore/config/ranking-constants.def) | 0 | ||||
| -rw-r--r-- | searchlib/src/vespa/searchlib/config/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | searchlib/src/vespa/searchlib/config/searchlib.translogserver.def (renamed from searchlib/src/vespa/searchlib/config/translogserver.def) | 0 | ||||
| -rw-r--r-- | searchsummary/src/vespa/searchsummary/config/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | searchsummary/src/vespa/searchsummary/config/vespa.config.search.summary.juniperrc.def (renamed from searchsummary/src/vespa/searchsummary/config/juniperrc.def) | 0 | ||||
| -rw-r--r-- | simplemetrics/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | simplemetrics/src/main/resources/configdefinitions/metrics.manager.def (renamed from simplemetrics/src/main/resources/configdefinitions/manager.def) | 0 | ||||
| -rw-r--r-- | statistics/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | statistics/src/main/resources/configdefinitions/container.statistics.def (renamed from statistics/src/main/resources/configdefinitions/statistics.def) | 0 | ||||
| -rw-r--r-- | storage/src/vespa/storage/bucketdb/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | storage/src/vespa/storage/bucketdb/vespa.config.content.core.stor-bucket-init.def (renamed from storage/src/vespa/storage/bucketdb/stor-bucket-init.def) | 0 | ||||
| -rw-r--r-- | storage/src/vespa/storage/bucketdb/vespa.config.content.core.stor-bucketdb.def (renamed from storage/src/vespa/storage/bucketdb/stor-bucketdb.def) | 0 | ||||
| -rw-r--r-- | storage/src/vespa/storage/config/CMakeLists.txt | 38 | ||||
| -rw-r--r-- | storage/src/vespa/storage/config/vespa.config.content.core.rpc-provider.def (renamed from storage/src/vespa/storage/config/rpc-provider.def) | 0 | ||||
| -rw-r--r-- | storage/src/vespa/storage/config/vespa.config.content.core.stor-bouncer.def (renamed from storage/src/vespa/storage/config/stor-bouncer.def) | 0 | ||||
| -rw-r--r-- | storage/src/vespa/storage/config/vespa.config.content.core.stor-bucketmover.def (renamed from storage/src/vespa/storage/config/stor-bucketmover.def) | 0 | ||||
| -rw-r--r-- | storage/src/vespa/storage/config/vespa.config.content.core.stor-communicationmanager.def (renamed from storage/src/vespa/storage/config/stor-communicationmanager.def) | 0 | ||||
| -rw-r--r-- | storage/src/vespa/storage/config/vespa.config.content.core.stor-distributormanager.def (renamed from storage/src/vespa/storage/config/stor-distributormanager.def) | 0 | ||||
| -rw-r--r-- | storage/src/vespa/storage/config/vespa.config.content.core.stor-integritychecker.def (renamed from storage/src/vespa/storage/config/stor-integritychecker.def) | 0 | ||||
| -rw-r--r-- | storage/src/vespa/storage/config/vespa.config.content.core.stor-messageforwarder.def (renamed from storage/src/vespa/storage/config/stor-messageforwarder.def) | 0 | ||||
| -rw-r--r-- | storage/src/vespa/storage/config/vespa.config.content.core.stor-opslogger.def (renamed from storage/src/vespa/storage/config/stor-opslogger.def) | 0 | ||||
| -rw-r--r-- | storage/src/vespa/storage/config/vespa.config.content.core.stor-prioritymapping.def (renamed from storage/src/vespa/storage/config/stor-prioritymapping.def) | 0 | ||||
| -rw-r--r-- | storage/src/vespa/storage/config/vespa.config.content.core.stor-server.def (renamed from storage/src/vespa/storage/config/stor-server.def) | 0 | ||||
| -rw-r--r-- | storage/src/vespa/storage/config/vespa.config.content.core.stor-status.def (renamed from storage/src/vespa/storage/config/stor-status.def) | 0 | ||||
| -rw-r--r-- | storage/src/vespa/storage/config/vespa.config.content.core.stor-visitordispatcher.def (renamed from storage/src/vespa/storage/config/stor-visitordispatcher.def) | 0 | ||||
| -rw-r--r-- | storage/src/vespa/storage/visiting/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | storage/src/vespa/storage/visiting/vespa.config.content.core.stor-visitor.def (renamed from storage/src/vespa/storage/visiting/stor-visitor.def) | 0 | ||||
| -rw-r--r-- | vespa-athenz/src/main/resources/configdefinitions/vespa.athenz.identity.sia-provider.def (renamed from vespa-athenz/src/main/resources/configdefinitions/sia-provider.def) | 0 | ||||
| -rw-r--r-- | vespa-osgi-testrunner/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | vespa-testrunner-components/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | vespaclient-core/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | vespaclient-core/src/main/resources/configdefinitions/vespaclient.config.feeder.def (renamed from vespaclient-core/src/main/resources/configdefinitions/feeder.def) | 0 | ||||
| -rw-r--r-- | vsm/src/vespa/vsm/config/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | vsm/src/vespa/vsm/config/vespa.config.search.vsm.vsm.def (renamed from vsm/src/vespa/vsm/config/vsm.def) | 0 | ||||
| -rw-r--r-- | vsm/src/vespa/vsm/config/vespa.config.search.vsm.vsmfields.def (renamed from vsm/src/vespa/vsm/config/vsmfields.def) | 0 | ||||
| -rw-r--r-- | vsm/src/vespa/vsm/config/vespa.config.search.vsm.vsmsummary.def (renamed from vsm/src/vespa/vsm/config/vsmsummary.def) | 0 |
266 files changed, 109 insertions, 215 deletions
diff --git a/application/src/test/resources/configdefinitions/mock-application.def b/application/src/test/resources/configdefinitions/application.mock-application.def index fa3a48bae96..fa3a48bae96 100644 --- a/application/src/test/resources/configdefinitions/mock-application.def +++ b/application/src/test/resources/configdefinitions/application.mock-application.def diff --git a/bundle-plugin-test/test-bundles/main/src/main/resources/configdefinitions/test.def b/bundle-plugin-test/test-bundles/main/src/main/resources/configdefinitions/example.test.def index b4ba9ec518a..b4ba9ec518a 100644 --- a/bundle-plugin-test/test-bundles/main/src/main/resources/configdefinitions/test.def +++ b/bundle-plugin-test/test-bundles/main/src/main/resources/configdefinitions/example.test.def diff --git a/chain/CMakeLists.txt b/chain/CMakeLists.txt index 3b5b5fd2c99..14909bc4ca1 100644 --- a/chain/CMakeLists.txt +++ b/chain/CMakeLists.txt @@ -1,2 +1,2 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -install_config_definition(src/main/resources/configdefinitions/chains.def container.core.chains.def) +install_config_definitions(src/main/resources/configdefinitions) diff --git a/chain/src/main/resources/configdefinitions/chains.def b/chain/src/main/resources/configdefinitions/container.core.chains.def index 8520a8d6332..8520a8d6332 100644 --- a/chain/src/main/resources/configdefinitions/chains.def +++ b/chain/src/main/resources/configdefinitions/container.core.chains.def diff --git a/config-lib/src/test/resources/configdefinitions/maptypes.def b/config-lib/src/test/resources/configdefinitions/foo.maptypes.def index 0e39c7ccdb9..0e39c7ccdb9 100644 --- a/config-lib/src/test/resources/configdefinitions/maptypes.def +++ b/config-lib/src/test/resources/configdefinitions/foo.maptypes.def diff --git a/config-lib/src/test/resources/configdefinitions/structtypes.def b/config-lib/src/test/resources/configdefinitions/foo.structtypes.def index fe9d879fb64..fe9d879fb64 100644 --- a/config-lib/src/test/resources/configdefinitions/structtypes.def +++ b/config-lib/src/test/resources/configdefinitions/foo.structtypes.def diff --git a/config-lib/src/test/resources/configdefinitions/namespace-and-package.def b/config-lib/src/test/resources/configdefinitions/my.namespace.namespace-and-package.def index 4e61d25f05f..4e61d25f05f 100644 --- a/config-lib/src/test/resources/configdefinitions/namespace-and-package.def +++ b/config-lib/src/test/resources/configdefinitions/my.namespace.namespace-and-package.def diff --git a/config-lib/src/test/resources/configdefinitions/namespace.def b/config-lib/src/test/resources/configdefinitions/my.namespace.namespace.def index b1406fc1bc4..b1406fc1bc4 100644 --- a/config-lib/src/test/resources/configdefinitions/namespace.def +++ b/config-lib/src/test/resources/configdefinitions/my.namespace.namespace.def diff --git a/config-lib/src/test/resources/configdefinitions/app.def b/config-lib/src/test/resources/configdefinitions/test.app.def index 78388998ef3..78388998ef3 100644 --- a/config-lib/src/test/resources/configdefinitions/app.def +++ b/config-lib/src/test/resources/configdefinitions/test.app.def diff --git a/config-lib/src/test/resources/configdefinitions/function-test.def b/config-lib/src/test/resources/configdefinitions/test.function-test.def index 73681d95544..73681d95544 100644 --- a/config-lib/src/test/resources/configdefinitions/function-test.def +++ b/config-lib/src/test/resources/configdefinitions/test.function-test.def diff --git a/config-lib/src/test/resources/configdefinitions/int.def b/config-lib/src/test/resources/configdefinitions/test.int.def index ea29b911fc4..ea29b911fc4 100755 --- a/config-lib/src/test/resources/configdefinitions/int.def +++ b/config-lib/src/test/resources/configdefinitions/test.int.def diff --git a/config-lib/src/test/resources/configdefinitions/restart.def b/config-lib/src/test/resources/configdefinitions/test.restart.def index 4b28e5a5d95..4b28e5a5d95 100755 --- a/config-lib/src/test/resources/configdefinitions/restart.def +++ b/config-lib/src/test/resources/configdefinitions/test.restart.def diff --git a/config-model/src/test/cfg/admin/userconfigs/function-test.def b/config-model/src/test/cfg/admin/userconfigs/test.function-test.def index 86a110c3413..86a110c3413 100644 --- a/config-model/src/test/cfg/admin/userconfigs/function-test.def +++ b/config-model/src/test/cfg/admin/userconfigs/test.function-test.def diff --git a/config-model/src/test/cfg/application/classes/attributes.def b/config-model/src/test/cfg/application/classes/vespa.config.search.attributes.def index c8e51c391f7..c8e51c391f7 100644 --- a/config-model/src/test/cfg/application/classes/attributes.def +++ b/config-model/src/test/cfg/application/classes/vespa.config.search.attributes.def diff --git a/config-model/src/test/cfg/application/configdeftest/configdefinitions/foo.def b/config-model/src/test/cfg/application/configdeftest/configdefinitions/config.foo.def index c37aafd6fc4..c37aafd6fc4 100644 --- a/config-model/src/test/cfg/application/configdeftest/configdefinitions/foo.def +++ b/config-model/src/test/cfg/application/configdeftest/configdefinitions/config.foo.def diff --git a/config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.def b/config-model/src/test/cfg/application/configdeftest/configdefinitions/config.xyzzy.def index c37aafd6fc4..c37aafd6fc4 100644 --- a/config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.def +++ b/config-model/src/test/cfg/application/configdeftest/configdefinitions/config.xyzzy.def diff --git a/config-model/src/test/cfg/application/configdeftest/configdefinitions/qux.foo.def b/config-model/src/test/cfg/application/configdeftest/configdefinitions/qux.qux.foo.def index 1ff4daea194..1ff4daea194 100644 --- a/config-model/src/test/cfg/application/configdeftest/configdefinitions/qux.foo.def +++ b/config-model/src/test/cfg/application/configdeftest/configdefinitions/qux.qux.foo.def diff --git a/config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.bar.def b/config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.bar.def index d4ef225830a..e1d5e8341e7 100644 --- a/config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.bar.def +++ b/config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.bar.def @@ -1,4 +1,3 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=xyzzy -bar int default="2" -foo int +bar int default="1" diff --git a/config-model/src/test/cfg/application/configdeftest/configdefinitions/baz.def b/config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.baz.def index c30d4b36ad3..c30d4b36ad3 100644 --- a/config-model/src/test/cfg/application/configdeftest/configdefinitions/baz.def +++ b/config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.baz.def diff --git a/config-model/src/test/cfg/application/configdeftest/configdefinitions/bar.def b/config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.xyzzy.bar.def index e1d5e8341e7..d4ef225830a 100644 --- a/config-model/src/test/cfg/application/configdeftest/configdefinitions/bar.def +++ b/config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.xyzzy.bar.def @@ -1,3 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=xyzzy -bar int default="1" +bar int default="2" +foo int diff --git a/config-model/src/test/cfg/application/serverdefs/attributes.def b/config-model/src/test/cfg/application/serverdefs/vespa.config.search.attributes.def index 0bb16fb8079..0bb16fb8079 100644 --- a/config-model/src/test/cfg/application/serverdefs/attributes.def +++ b/config-model/src/test/cfg/application/serverdefs/vespa.config.search.attributes.def diff --git a/config-model/src/test/derived/music/defs/documentmanager.def b/config-model/src/test/derived/music/defs/document.config.documentmanager.def index fa52e08a1de..fa52e08a1de 100644 --- a/config-model/src/test/derived/music/defs/documentmanager.def +++ b/config-model/src/test/derived/music/defs/document.config.documentmanager.def diff --git a/config-model/src/test/derived/music/defs/extra.def b/config-model/src/test/derived/music/defs/test.extra.def index 3c3eaa51ab5..3c3eaa51ab5 100644 --- a/config-model/src/test/derived/music/defs/extra.def +++ b/config-model/src/test/derived/music/defs/test.extra.def diff --git a/config-model/src/test/derived/music/defs/attributes.def b/config-model/src/test/derived/music/defs/vespa.config.search.attributes.def index c8e51c391f7..c8e51c391f7 100644 --- a/config-model/src/test/derived/music/defs/attributes.def +++ b/config-model/src/test/derived/music/defs/vespa.config.search.attributes.def diff --git a/config-model/src/test/derived/music/defs/rank-profiles.def b/config-model/src/test/derived/music/defs/vespa.config.search.rank-profiles.def index 03037865bb9..03037865bb9 100644 --- a/config-model/src/test/derived/music/defs/rank-profiles.def +++ b/config-model/src/test/derived/music/defs/vespa.config.search.rank-profiles.def diff --git a/config-model/src/test/derived/music/defs/summarymap.def b/config-model/src/test/derived/music/defs/vespa.config.search.summarymap.def index a994309e207..a994309e207 100644 --- a/config-model/src/test/derived/music/defs/summarymap.def +++ b/config-model/src/test/derived/music/defs/vespa.config.search.summarymap.def diff --git a/config-model/src/test/derived/music/defs/ilscripts.def b/config-model/src/test/derived/music/defs/vespa.configdefinition.ilscripts.def index 1147fd6469d..1147fd6469d 100644 --- a/config-model/src/test/derived/music/defs/ilscripts.def +++ b/config-model/src/test/derived/music/defs/vespa.configdefinition.ilscripts.def diff --git a/config-model/src/test/derived/newrank/defs/documentmanager.def b/config-model/src/test/derived/newrank/defs/document.config.documentmanager.def index fa52e08a1de..fa52e08a1de 100644 --- a/config-model/src/test/derived/newrank/defs/documentmanager.def +++ b/config-model/src/test/derived/newrank/defs/document.config.documentmanager.def diff --git a/config-model/src/test/derived/newrank/defs/extra.def b/config-model/src/test/derived/newrank/defs/test.extra.def index 3c3eaa51ab5..3c3eaa51ab5 100644 --- a/config-model/src/test/derived/newrank/defs/extra.def +++ b/config-model/src/test/derived/newrank/defs/test.extra.def diff --git a/config-model/src/test/derived/newrank/defs/attributes.def b/config-model/src/test/derived/newrank/defs/vespa.config.search.attributes.def index c8e51c391f7..c8e51c391f7 100644 --- a/config-model/src/test/derived/newrank/defs/attributes.def +++ b/config-model/src/test/derived/newrank/defs/vespa.config.search.attributes.def diff --git a/config-model/src/test/derived/newrank/defs/rank-profiles.def b/config-model/src/test/derived/newrank/defs/vespa.config.search.rank-profiles.def index 03037865bb9..03037865bb9 100644 --- a/config-model/src/test/derived/newrank/defs/rank-profiles.def +++ b/config-model/src/test/derived/newrank/defs/vespa.config.search.rank-profiles.def diff --git a/config-model/src/test/derived/newrank/defs/summarymap.def b/config-model/src/test/derived/newrank/defs/vespa.config.search.summarymap.def index 3f98c2b40eb..3f98c2b40eb 100644 --- a/config-model/src/test/derived/newrank/defs/summarymap.def +++ b/config-model/src/test/derived/newrank/defs/vespa.config.search.summarymap.def diff --git a/config-model/src/test/derived/newrank/defs/ilscripts.def b/config-model/src/test/derived/newrank/defs/vespa.configdefinition.ilscripts.def index 1147fd6469d..1147fd6469d 100644 --- a/config-model/src/test/derived/newrank/defs/ilscripts.def +++ b/config-model/src/test/derived/newrank/defs/vespa.configdefinition.ilscripts.def diff --git a/config-model/src/test/resources/configdefinitions/anotherrestart.def b/config-model/src/test/resources/configdefinitions/test.anotherrestart.def index 01da11e7c45..01da11e7c45 100644 --- a/config-model/src/test/resources/configdefinitions/anotherrestart.def +++ b/config-model/src/test/resources/configdefinitions/test.anotherrestart.def diff --git a/config-model/src/test/resources/configdefinitions/arraytypes.def b/config-model/src/test/resources/configdefinitions/test.arraytypes.def index 8add790c6cb..8add790c6cb 100644 --- a/config-model/src/test/resources/configdefinitions/arraytypes.def +++ b/config-model/src/test/resources/configdefinitions/test.arraytypes.def diff --git a/config-model/src/test/resources/configdefinitions/function-test.def b/config-model/src/test/resources/configdefinitions/test.function-test.def index 4208f7ab906..4208f7ab906 100644 --- a/config-model/src/test/resources/configdefinitions/function-test.def +++ b/config-model/src/test/resources/configdefinitions/test.function-test.def diff --git a/config-model/src/test/resources/configdefinitions/nonrestart.def b/config-model/src/test/resources/configdefinitions/test.nonrestart.def index b9b1227349a..b9b1227349a 100644 --- a/config-model/src/test/resources/configdefinitions/nonrestart.def +++ b/config-model/src/test/resources/configdefinitions/test.nonrestart.def diff --git a/config-model/src/test/resources/configdefinitions/restart.def b/config-model/src/test/resources/configdefinitions/test.restart.def index a0826edf881..a0826edf881 100644 --- a/config-model/src/test/resources/configdefinitions/restart.def +++ b/config-model/src/test/resources/configdefinitions/test.restart.def diff --git a/config-model/src/test/resources/configdefinitions/simpletypes.def b/config-model/src/test/resources/configdefinitions/test.simpletypes.def index b54ea43435d..b54ea43435d 100644 --- a/config-model/src/test/resources/configdefinitions/simpletypes.def +++ b/config-model/src/test/resources/configdefinitions/test.simpletypes.def diff --git a/config-model/src/test/resources/configdefinitions/standard.def b/config-model/src/test/resources/configdefinitions/test.standard.def index b06e858d391..b06e858d391 100644 --- a/config-model/src/test/resources/configdefinitions/standard.def +++ b/config-model/src/test/resources/configdefinitions/test.standard.def diff --git a/config-provisioning/CMakeLists.txt b/config-provisioning/CMakeLists.txt index 73101f8a7a6..ee0bc7f1bae 100644 --- a/config-provisioning/CMakeLists.txt +++ b/config-provisioning/CMakeLists.txt @@ -1,4 +1,3 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. install_fat_java_artifact(config-provisioning) -install_config_definition(src/main/resources/configdefinitions/flavors.def config.provisioning.flavors.def) -install_config_definition(src/main/resources/configdefinitions/node-repository.def config.provisioning.node-repository.def) +install_config_definitions(src/main/resources/configdefinitions) diff --git a/config-provisioning/src/main/resources/configdefinitions/cloud.def b/config-provisioning/src/main/resources/configdefinitions/config.provisioning.cloud.def index 36523482ab2..36523482ab2 100644 --- a/config-provisioning/src/main/resources/configdefinitions/cloud.def +++ b/config-provisioning/src/main/resources/configdefinitions/config.provisioning.cloud.def diff --git a/config-provisioning/src/main/resources/configdefinitions/flavors.def b/config-provisioning/src/main/resources/configdefinitions/config.provisioning.flavors.def index c5040c58b74..c5040c58b74 100644 --- a/config-provisioning/src/main/resources/configdefinitions/flavors.def +++ b/config-provisioning/src/main/resources/configdefinitions/config.provisioning.flavors.def diff --git a/config-provisioning/src/main/resources/configdefinitions/node-repository.def b/config-provisioning/src/main/resources/configdefinitions/config.provisioning.node-repository.def index 8ea9265aa23..8ea9265aa23 100644 --- a/config-provisioning/src/main/resources/configdefinitions/node-repository.def +++ b/config-provisioning/src/main/resources/configdefinitions/config.provisioning.node-repository.def diff --git a/config/src/test/resources/configdefinitions/bar.def b/config/src/test/resources/configdefinitions/config.bar.def index 8e97154d3d5..8e97154d3d5 100644 --- a/config/src/test/resources/configdefinitions/bar.def +++ b/config/src/test/resources/configdefinitions/config.bar.def diff --git a/config/src/test/resources/configdefinitions/baz.def b/config/src/test/resources/configdefinitions/config.baz.def index ff3101e52a6..ff3101e52a6 100644 --- a/config/src/test/resources/configdefinitions/baz.def +++ b/config/src/test/resources/configdefinitions/config.baz.def diff --git a/config/src/test/resources/configdefinitions/bootstrap.def b/config/src/test/resources/configdefinitions/config.bootstrap.def index f0e5b3db71a..f0e5b3db71a 100644 --- a/config/src/test/resources/configdefinitions/bootstrap.def +++ b/config/src/test/resources/configdefinitions/config.bootstrap.def diff --git a/config/src/test/resources/configdefinitions/foo.def b/config/src/test/resources/configdefinitions/config.foo.def index d7357822e7e..d7357822e7e 100644 --- a/config/src/test/resources/configdefinitions/foo.def +++ b/config/src/test/resources/configdefinitions/config.foo.def diff --git a/config/src/test/resources/configdefinitions/foobar.def b/config/src/test/resources/configdefinitions/config.foobar.def index 59f0bbd9913..59f0bbd9913 100644 --- a/config/src/test/resources/configdefinitions/foobar.def +++ b/config/src/test/resources/configdefinitions/config.foobar.def diff --git a/config/src/test/resources/configdefinitions/foodefault.def b/config/src/test/resources/configdefinitions/config.foodefault.def index 4b9014b9274..4b9014b9274 100644 --- a/config/src/test/resources/configdefinitions/foodefault.def +++ b/config/src/test/resources/configdefinitions/config.foodefault.def diff --git a/config/src/test/resources/configdefinitions/function-test.def b/config/src/test/resources/configdefinitions/config.function-test.def index 2e18fb2ee8c..2e18fb2ee8c 100644 --- a/config/src/test/resources/configdefinitions/function-test.def +++ b/config/src/test/resources/configdefinitions/config.function-test.def diff --git a/config/src/test/resources/configdefinitions/motd.def b/config/src/test/resources/configdefinitions/config.motd.def index 95ac367560d..95ac367560d 100644 --- a/config/src/test/resources/configdefinitions/motd.def +++ b/config/src/test/resources/configdefinitions/config.motd.def diff --git a/config/src/test/resources/configdefinitions/my.def b/config/src/test/resources/configdefinitions/config.my.def index 3999cc46273..3999cc46273 100644 --- a/config/src/test/resources/configdefinitions/my.def +++ b/config/src/test/resources/configdefinitions/config.my.def diff --git a/config/src/test/resources/configs/def-files-nogen/foo.bar.app.def b/config/src/test/resources/configs/def-files-nogen/mynamespace.foo.bar.app.def index 6082072695a..6082072695a 100644 --- a/config/src/test/resources/configs/def-files-nogen/foo.bar.app.def +++ b/config/src/test/resources/configs/def-files-nogen/mynamespace.foo.bar.app.def diff --git a/config/src/test/resources/configs/def-files/app.def b/config/src/test/resources/configs/def-files/foo.app.def index 37c3dd75e26..37c3dd75e26 100644 --- a/config/src/test/resources/configs/def-files/app.def +++ b/config/src/test/resources/configs/def-files/foo.app.def diff --git a/config/src/test/resources/configs/def-files/arraytypes.def b/config/src/test/resources/configs/def-files/foo.arraytypes.def index ad18c4e5386..ad18c4e5386 100644 --- a/config/src/test/resources/configs/def-files/arraytypes.def +++ b/config/src/test/resources/configs/def-files/foo.arraytypes.def diff --git a/config/src/test/resources/configs/def-files/defaulttest.def b/config/src/test/resources/configs/def-files/foo.defaulttest.def index fa8005b77c3..fa8005b77c3 100644 --- a/config/src/test/resources/configs/def-files/defaulttest.def +++ b/config/src/test/resources/configs/def-files/foo.defaulttest.def diff --git a/config/src/test/resources/configs/def-files/function-test.def b/config/src/test/resources/configs/def-files/foo.function-test.def index 24eeb81ab7a..24eeb81ab7a 100644 --- a/config/src/test/resources/configs/def-files/function-test.def +++ b/config/src/test/resources/configs/def-files/foo.function-test.def diff --git a/config/src/test/resources/configs/def-files/int.def b/config/src/test/resources/configs/def-files/foo.int.def index c1a1241c413..c1a1241c413 100755 --- a/config/src/test/resources/configs/def-files/int.def +++ b/config/src/test/resources/configs/def-files/foo.int.def diff --git a/config/src/test/resources/configs/def-files/maptypes.def b/config/src/test/resources/configs/def-files/foo.maptypes.def index 0e39c7ccdb9..0e39c7ccdb9 100644 --- a/config/src/test/resources/configs/def-files/maptypes.def +++ b/config/src/test/resources/configs/def-files/foo.maptypes.def diff --git a/config/src/test/resources/configs/def-files/simpletypes.def b/config/src/test/resources/configs/def-files/foo.simpletypes.def index 2603e2f4100..2603e2f4100 100644 --- a/config/src/test/resources/configs/def-files/simpletypes.def +++ b/config/src/test/resources/configs/def-files/foo.simpletypes.def diff --git a/config/src/test/resources/configs/def-files/specialtypes.def b/config/src/test/resources/configs/def-files/foo.specialtypes.def index 06fdd0d4348..06fdd0d4348 100644 --- a/config/src/test/resources/configs/def-files/specialtypes.def +++ b/config/src/test/resources/configs/def-files/foo.specialtypes.def diff --git a/config/src/test/resources/configs/def-files/string.def b/config/src/test/resources/configs/def-files/foo.string.def index 78596515b7c..78596515b7c 100755 --- a/config/src/test/resources/configs/def-files/string.def +++ b/config/src/test/resources/configs/def-files/foo.string.def diff --git a/config/src/test/resources/configs/def-files/structtypes.def b/config/src/test/resources/configs/def-files/foo.structtypes.def index fe9d879fb64..fe9d879fb64 100644 --- a/config/src/test/resources/configs/def-files/structtypes.def +++ b/config/src/test/resources/configs/def-files/foo.structtypes.def diff --git a/config/src/test/resources/configs/def-files/test-nodefs.def b/config/src/test/resources/configs/def-files/foo.test-nodefs.def index e3b700c5732..e3b700c5732 100644 --- a/config/src/test/resources/configs/def-files/test-nodefs.def +++ b/config/src/test/resources/configs/def-files/foo.test-nodefs.def diff --git a/config/src/test/resources/configs/def-files/test-nonstring.def b/config/src/test/resources/configs/def-files/foo.test-nonstring.def index eaa6fafe87d..eaa6fafe87d 100644 --- a/config/src/test/resources/configs/def-files/test-nonstring.def +++ b/config/src/test/resources/configs/def-files/foo.test-nonstring.def diff --git a/config/src/test/resources/configs/def-files/test-reference.def b/config/src/test/resources/configs/def-files/foo.test-reference.def index b5bbb5f4462..b5bbb5f4462 100644 --- a/config/src/test/resources/configs/def-files/test-reference.def +++ b/config/src/test/resources/configs/def-files/foo.test-reference.def diff --git a/config/src/test/resources/configs/def-files/testnamespace.def b/config/src/test/resources/configs/def-files/foo.testnamespace.def index 6e58c691097..6e58c691097 100644 --- a/config/src/test/resources/configs/def-files/testnamespace.def +++ b/config/src/test/resources/configs/def-files/foo.testnamespace.def diff --git a/config/src/test/resources/configs/def-files/unicode.def b/config/src/test/resources/configs/def-files/foo.unicode.def index 493e3e37630..493e3e37630 100644 --- a/config/src/test/resources/configs/def-files/unicode.def +++ b/config/src/test/resources/configs/def-files/foo.unicode.def diff --git a/config/src/test/resources/configs/def-files/namespace.def b/config/src/test/resources/configs/def-files/myproject.config.namespace.def index a8b55fb315e..a8b55fb315e 100644 --- a/config/src/test/resources/configs/def-files/namespace.def +++ b/config/src/test/resources/configs/def-files/myproject.config.namespace.def diff --git a/config_test/src/main/resources/configdefinitions/greeting.def b/config_test/src/main/resources/configdefinitions/configtest.greeting.def index 924c1331e2c..924c1331e2c 100644 --- a/config_test/src/main/resources/configdefinitions/greeting.def +++ b/config_test/src/main/resources/configdefinitions/configtest.greeting.def diff --git a/configdefinitions/src/vespa/CMakeLists.txt b/configdefinitions/src/vespa/CMakeLists.txt index 0673e803057..ad870ff6a87 100644 --- a/configdefinitions/src/vespa/CMakeLists.txt +++ b/configdefinitions/src/vespa/CMakeLists.txt @@ -4,73 +4,39 @@ vespa_add_library(configdefinitions INSTALL lib64 DEPENDS ) -vespa_generate_config(configdefinitions application-id.def) -install_config_definition(application-id.def cloud.config.application-id.def) -vespa_generate_config(configdefinitions athenz-provider-service.def) -install_config_definition(athenz-provider-service.def vespa.hosted.athenz.instanceproviderservice.config.athenz-provider-service.def) -vespa_generate_config(configdefinitions attributes.def) -install_config_definition(attributes.def vespa.config.search.attributes.def) -vespa_generate_config(configdefinitions cluster-info.def) -install_config_definition(cluster-info.def cloud.config.cluster-info.def) -vespa_generate_config(configdefinitions cluster-list.def) -install_config_definition(cluster-list.def cloud.config.cluster-list.def) -vespa_generate_config(configdefinitions configserver.def) -install_config_definition(configserver.def cloud.config.configserver.def) -vespa_generate_config(configdefinitions dispatch.def) -install_config_definition(dispatch.def vespa.config.search.dispatch.def) -vespa_generate_config(configdefinitions filereferences.def) -install_config_definition(filereferences.def cloud.config.filedistribution.filereferences.def) -vespa_generate_config(configdefinitions fleetcontroller.def) -install_config_definition(fleetcontroller.def vespa.config.content.fleetcontroller.def) -vespa_generate_config(configdefinitions ilscripts.def) -install_config_definition(ilscripts.def vespa.configdefinition.ilscripts.def) -vespa_generate_config(configdefinitions imported-fields.def) -install_config_definition(imported-fields.def vespa.config.search.imported-fields.def) -vespa_generate_config(configdefinitions indexschema.def) -install_config_definition(indexschema.def vespa.config.search.indexschema.def) -vespa_generate_config(configdefinitions lb-services.def) -install_config_definition(lb-services.def cloud.config.lb-services.def) -vespa_generate_config(configdefinitions load-type.def) -install_config_definition(load-type.def vespa.config.content.load-type.def) -vespa_generate_config(configdefinitions logforwarder.def) -install_config_definition(logforwarder.def cloud.config.logforwarder.def) -vespa_generate_config(configdefinitions messagetyperouteselectorpolicy.def) -install_config_definition(messagetyperouteselectorpolicy.def vespa.config.content.messagetyperouteselectorpolicy.def) -vespa_generate_config(configdefinitions model.def) -install_config_definition(model.def cloud.config.model.def) -vespa_generate_config(configdefinitions orchestrator.def) -install_config_definition(orchestrator.def vespa.orchestrator.config.orchestrator.def) -vespa_generate_config(configdefinitions persistence.def) -install_config_definition(persistence.def vespa.config.content.persistence.def) -vespa_generate_config(configdefinitions rank-profiles.def) -install_config_definition(rank-profiles.def vespa.config.search.rank-profiles.def) -vespa_generate_config(configdefinitions routing-provider.def) -install_config_definition(routing-provider.def cloud.config.routing-provider.def) -vespa_generate_config(configdefinitions sentinel.def) -install_config_definition(sentinel.def cloud.config.sentinel.def) -vespa_generate_config(configdefinitions slobroks.def) -install_config_definition(slobroks.def cloud.config.slobroks.def) -vespa_generate_config(configdefinitions specialtokens.def) -install_config_definition(specialtokens.def vespa.configdefinition.specialtokens.def) -vespa_generate_config(configdefinitions stor-distribution.def) -install_config_definition(stor-distribution.def vespa.config.content.stor-distribution.def) -vespa_generate_config(configdefinitions stor-filestor.def) -install_config_definition(stor-filestor.def vespa.config.content.stor-filestor.def) -vespa_generate_config(configdefinitions summary.def) -install_config_definition(summary.def vespa.config.search.summary.def) -vespa_generate_config(configdefinitions summarymap.def) -install_config_definition(summarymap.def vespa.config.search.summarymap.def) -vespa_generate_config(configdefinitions upgrading.def) -install_config_definition(upgrading.def vespa.config.content.upgrading.def) -vespa_generate_config(configdefinitions ymon.def) -install_config_definition(ymon.def cloud.config.ymon.def) -vespa_generate_config(configdefinitions zookeeper-server.def) -install_config_definition(zookeeper-server.def cloud.config.zookeeper-server.def) -vespa_generate_config(configdefinitions zookeepers.def) -install_config_definition(zookeepers.def cloud.config.zookeepers.def) -vespa_generate_config(configdefinitions bucketspaces.def) -install_config_definition(bucketspaces.def vespa.config.content.core.bucketspaces.def) -vespa_generate_config(configdefinitions all-clusters-bucket-spaces.def) -install_config_definition(all-clusters-bucket-spaces.def vespa.config.content.all-clusters-bucket-spaces.def) -vespa_generate_config(configdefinitions stateserver.def) -install_config_definition(stateserver.def vespa.config.core.stateserver.def) +vespa_generate_config(configdefinitions cloud.config.application-id.def) +vespa_generate_config(configdefinitions vespa.hosted.athenz.instanceproviderservice.config.athenz-provider-service.def) +vespa_generate_config(configdefinitions vespa.config.search.attributes.def) +vespa_generate_config(configdefinitions cloud.config.cluster-info.def) +vespa_generate_config(configdefinitions cloud.config.cluster-list.def) +vespa_generate_config(configdefinitions cloud.config.configserver.def) +vespa_generate_config(configdefinitions vespa.config.search.dispatch.def) +vespa_generate_config(configdefinitions cloud.config.filedistribution.filereferences.def) +vespa_generate_config(configdefinitions vespa.config.content.fleetcontroller.def) +vespa_generate_config(configdefinitions vespa.configdefinition.ilscripts.def) +vespa_generate_config(configdefinitions vespa.config.search.imported-fields.def) +vespa_generate_config(configdefinitions vespa.config.search.indexschema.def) +vespa_generate_config(configdefinitions cloud.config.lb-services.def) +vespa_generate_config(configdefinitions vespa.config.content.load-type.def) +vespa_generate_config(configdefinitions cloud.config.logforwarder.def) +vespa_generate_config(configdefinitions vespa.config.content.messagetyperouteselectorpolicy.def) +vespa_generate_config(configdefinitions cloud.config.model.def) +vespa_generate_config(configdefinitions vespa.orchestrator.config.orchestrator.def) +vespa_generate_config(configdefinitions vespa.config.content.persistence.def) +vespa_generate_config(configdefinitions vespa.config.search.rank-profiles.def) +vespa_generate_config(configdefinitions cloud.config.routing-provider.def) +vespa_generate_config(configdefinitions cloud.config.sentinel.def) +vespa_generate_config(configdefinitions cloud.config.slobroks.def) +vespa_generate_config(configdefinitions vespa.configdefinition.specialtokens.def) +vespa_generate_config(configdefinitions vespa.config.content.stor-distribution.def) +vespa_generate_config(configdefinitions vespa.config.content.stor-filestor.def) +vespa_generate_config(configdefinitions vespa.config.search.summary.def) +vespa_generate_config(configdefinitions vespa.config.search.summarymap.def) +vespa_generate_config(configdefinitions vespa.config.content.upgrading.def) +vespa_generate_config(configdefinitions cloud.config.ymon.def) +vespa_generate_config(configdefinitions cloud.config.zookeeper-server.def) +vespa_generate_config(configdefinitions cloud.config.zookeepers.def) +vespa_generate_config(configdefinitions vespa.config.content.core.bucketspaces.def) +vespa_generate_config(configdefinitions vespa.config.content.all-clusters-bucket-spaces.def) +vespa_generate_config(configdefinitions vespa.config.core.stateserver.def) +install_config_definitions(src/vespa) diff --git a/configdefinitions/src/vespa/application-id.def b/configdefinitions/src/vespa/cloud.config.application-id.def index 72f69f48519..72f69f48519 100644 --- a/configdefinitions/src/vespa/application-id.def +++ b/configdefinitions/src/vespa/cloud.config.application-id.def diff --git a/configdefinitions/src/vespa/cluster-info.def b/configdefinitions/src/vespa/cloud.config.cluster-info.def index f5e94ad61b3..f5e94ad61b3 100644 --- a/configdefinitions/src/vespa/cluster-info.def +++ b/configdefinitions/src/vespa/cloud.config.cluster-info.def diff --git a/configdefinitions/src/vespa/cluster-list.def b/configdefinitions/src/vespa/cloud.config.cluster-list.def index ad6f9715eb9..ad6f9715eb9 100644 --- a/configdefinitions/src/vespa/cluster-list.def +++ b/configdefinitions/src/vespa/cloud.config.cluster-list.def diff --git a/configdefinitions/src/vespa/configserver.def b/configdefinitions/src/vespa/cloud.config.configserver.def index 7405f5f2d05..7405f5f2d05 100644 --- a/configdefinitions/src/vespa/configserver.def +++ b/configdefinitions/src/vespa/cloud.config.configserver.def diff --git a/configdefinitions/src/vespa/filereferences.def b/configdefinitions/src/vespa/cloud.config.filedistribution.filereferences.def index 03e071959ce..03e071959ce 100644 --- a/configdefinitions/src/vespa/filereferences.def +++ b/configdefinitions/src/vespa/cloud.config.filedistribution.filereferences.def diff --git a/configdefinitions/src/vespa/lb-services.def b/configdefinitions/src/vespa/cloud.config.lb-services.def index 33c568061fe..33c568061fe 100644 --- a/configdefinitions/src/vespa/lb-services.def +++ b/configdefinitions/src/vespa/cloud.config.lb-services.def diff --git a/configdefinitions/src/vespa/logforwarder.def b/configdefinitions/src/vespa/cloud.config.logforwarder.def index ab56589298f..ab56589298f 100644 --- a/configdefinitions/src/vespa/logforwarder.def +++ b/configdefinitions/src/vespa/cloud.config.logforwarder.def diff --git a/configdefinitions/src/vespa/model.def b/configdefinitions/src/vespa/cloud.config.model.def index 59c04cee143..59c04cee143 100644 --- a/configdefinitions/src/vespa/model.def +++ b/configdefinitions/src/vespa/cloud.config.model.def diff --git a/configdefinitions/src/vespa/routing-provider.def b/configdefinitions/src/vespa/cloud.config.routing-provider.def index eedf4f3c86f..eedf4f3c86f 100755 --- a/configdefinitions/src/vespa/routing-provider.def +++ b/configdefinitions/src/vespa/cloud.config.routing-provider.def diff --git a/configdefinitions/src/vespa/sentinel.def b/configdefinitions/src/vespa/cloud.config.sentinel.def index d318a55cccf..d318a55cccf 100644 --- a/configdefinitions/src/vespa/sentinel.def +++ b/configdefinitions/src/vespa/cloud.config.sentinel.def diff --git a/configdefinitions/src/vespa/slobroks.def b/configdefinitions/src/vespa/cloud.config.slobroks.def index b4e5536d2df..b4e5536d2df 100644 --- a/configdefinitions/src/vespa/slobroks.def +++ b/configdefinitions/src/vespa/cloud.config.slobroks.def diff --git a/configdefinitions/src/vespa/ymon.def b/configdefinitions/src/vespa/cloud.config.ymon.def index 2296248bf8b..2296248bf8b 100644 --- a/configdefinitions/src/vespa/ymon.def +++ b/configdefinitions/src/vespa/cloud.config.ymon.def diff --git a/configdefinitions/src/vespa/zookeeper-server.def b/configdefinitions/src/vespa/cloud.config.zookeeper-server.def index 483e772b818..483e772b818 100644 --- a/configdefinitions/src/vespa/zookeeper-server.def +++ b/configdefinitions/src/vespa/cloud.config.zookeeper-server.def diff --git a/configdefinitions/src/vespa/zookeepers.def b/configdefinitions/src/vespa/cloud.config.zookeepers.def index d12bdd334ca..d12bdd334ca 100644 --- a/configdefinitions/src/vespa/zookeepers.def +++ b/configdefinitions/src/vespa/cloud.config.zookeepers.def diff --git a/configdefinitions/src/vespa/all-clusters-bucket-spaces.def b/configdefinitions/src/vespa/vespa.config.content.all-clusters-bucket-spaces.def index 7676bc2a03f..7676bc2a03f 100644 --- a/configdefinitions/src/vespa/all-clusters-bucket-spaces.def +++ b/configdefinitions/src/vespa/vespa.config.content.all-clusters-bucket-spaces.def diff --git a/configdefinitions/src/vespa/bucketspaces.def b/configdefinitions/src/vespa/vespa.config.content.core.bucketspaces.def index c9468850018..c9468850018 100644 --- a/configdefinitions/src/vespa/bucketspaces.def +++ b/configdefinitions/src/vespa/vespa.config.content.core.bucketspaces.def diff --git a/configdefinitions/src/vespa/fleetcontroller.def b/configdefinitions/src/vespa/vespa.config.content.fleetcontroller.def index 96b43a15c5e..96b43a15c5e 100644 --- a/configdefinitions/src/vespa/fleetcontroller.def +++ b/configdefinitions/src/vespa/vespa.config.content.fleetcontroller.def diff --git a/configdefinitions/src/vespa/load-type.def b/configdefinitions/src/vespa/vespa.config.content.load-type.def index 2e3f65cfbba..2e3f65cfbba 100644 --- a/configdefinitions/src/vespa/load-type.def +++ b/configdefinitions/src/vespa/vespa.config.content.load-type.def diff --git a/configdefinitions/src/vespa/messagetyperouteselectorpolicy.def b/configdefinitions/src/vespa/vespa.config.content.messagetyperouteselectorpolicy.def index 7fbd6e45bd7..7fbd6e45bd7 100644 --- a/configdefinitions/src/vespa/messagetyperouteselectorpolicy.def +++ b/configdefinitions/src/vespa/vespa.config.content.messagetyperouteselectorpolicy.def diff --git a/configdefinitions/src/vespa/persistence.def b/configdefinitions/src/vespa/vespa.config.content.persistence.def index b2709dedc57..b2709dedc57 100644 --- a/configdefinitions/src/vespa/persistence.def +++ b/configdefinitions/src/vespa/vespa.config.content.persistence.def diff --git a/configdefinitions/src/vespa/stor-distribution.def b/configdefinitions/src/vespa/vespa.config.content.stor-distribution.def index 518626228c1..518626228c1 100644 --- a/configdefinitions/src/vespa/stor-distribution.def +++ b/configdefinitions/src/vespa/vespa.config.content.stor-distribution.def diff --git a/configdefinitions/src/vespa/stor-filestor.def b/configdefinitions/src/vespa/vespa.config.content.stor-filestor.def index 8ac372c0575..8ac372c0575 100644 --- a/configdefinitions/src/vespa/stor-filestor.def +++ b/configdefinitions/src/vespa/vespa.config.content.stor-filestor.def diff --git a/configdefinitions/src/vespa/upgrading.def b/configdefinitions/src/vespa/vespa.config.content.upgrading.def index 3f610c9352d..3f610c9352d 100644 --- a/configdefinitions/src/vespa/upgrading.def +++ b/configdefinitions/src/vespa/vespa.config.content.upgrading.def diff --git a/configdefinitions/src/vespa/stateserver.def b/configdefinitions/src/vespa/vespa.config.core.stateserver.def index a25844fa148..a25844fa148 100644 --- a/configdefinitions/src/vespa/stateserver.def +++ b/configdefinitions/src/vespa/vespa.config.core.stateserver.def diff --git a/configdefinitions/src/vespa/attributes.def b/configdefinitions/src/vespa/vespa.config.search.attributes.def index 6c69d71fdf6..6c69d71fdf6 100644 --- a/configdefinitions/src/vespa/attributes.def +++ b/configdefinitions/src/vespa/vespa.config.search.attributes.def diff --git a/configdefinitions/src/vespa/dispatch.def b/configdefinitions/src/vespa/vespa.config.search.dispatch.def index aa40c317d75..aa40c317d75 100644 --- a/configdefinitions/src/vespa/dispatch.def +++ b/configdefinitions/src/vespa/vespa.config.search.dispatch.def diff --git a/configdefinitions/src/vespa/imported-fields.def b/configdefinitions/src/vespa/vespa.config.search.imported-fields.def index 0947ff63e2a..0947ff63e2a 100644 --- a/configdefinitions/src/vespa/imported-fields.def +++ b/configdefinitions/src/vespa/vespa.config.search.imported-fields.def diff --git a/configdefinitions/src/vespa/indexschema.def b/configdefinitions/src/vespa/vespa.config.search.indexschema.def index 245570ef7b5..245570ef7b5 100644 --- a/configdefinitions/src/vespa/indexschema.def +++ b/configdefinitions/src/vespa/vespa.config.search.indexschema.def diff --git a/configdefinitions/src/vespa/rank-profiles.def b/configdefinitions/src/vespa/vespa.config.search.rank-profiles.def index 525930c990b..525930c990b 100644 --- a/configdefinitions/src/vespa/rank-profiles.def +++ b/configdefinitions/src/vespa/vespa.config.search.rank-profiles.def diff --git a/configdefinitions/src/vespa/summary.def b/configdefinitions/src/vespa/vespa.config.search.summary.def index 20ca6b10450..20ca6b10450 100644 --- a/configdefinitions/src/vespa/summary.def +++ b/configdefinitions/src/vespa/vespa.config.search.summary.def diff --git a/configdefinitions/src/vespa/summarymap.def b/configdefinitions/src/vespa/vespa.config.search.summarymap.def index a994309e207..a994309e207 100644 --- a/configdefinitions/src/vespa/summarymap.def +++ b/configdefinitions/src/vespa/vespa.config.search.summarymap.def diff --git a/configdefinitions/src/vespa/ilscripts.def b/configdefinitions/src/vespa/vespa.configdefinition.ilscripts.def index 901e87dbd04..901e87dbd04 100644 --- a/configdefinitions/src/vespa/ilscripts.def +++ b/configdefinitions/src/vespa/vespa.configdefinition.ilscripts.def diff --git a/configdefinitions/src/vespa/specialtokens.def b/configdefinitions/src/vespa/vespa.configdefinition.specialtokens.def index 1e6addcf358..1e6addcf358 100644 --- a/configdefinitions/src/vespa/specialtokens.def +++ b/configdefinitions/src/vespa/vespa.configdefinition.specialtokens.def diff --git a/configdefinitions/src/vespa/athenz-provider-service.def b/configdefinitions/src/vespa/vespa.hosted.athenz.instanceproviderservice.config.athenz-provider-service.def index bd929cb17d4..bd929cb17d4 100644 --- a/configdefinitions/src/vespa/athenz-provider-service.def +++ b/configdefinitions/src/vespa/vespa.hosted.athenz.instanceproviderservice.config.athenz-provider-service.def diff --git a/configdefinitions/src/vespa/orchestrator.def b/configdefinitions/src/vespa/vespa.orchestrator.config.orchestrator.def index ab52c777398..ab52c777398 100644 --- a/configdefinitions/src/vespa/orchestrator.def +++ b/configdefinitions/src/vespa/vespa.orchestrator.config.orchestrator.def diff --git a/configgen/src/test/resources/bar.foo.def b/configgen/src/test/resources/baz.bar.foo.def index e0084b792a5..e0084b792a5 100644 --- a/configgen/src/test/resources/bar.foo.def +++ b/configgen/src/test/resources/baz.bar.foo.def diff --git a/configgen/src/test/resources/allfeatures.def b/configgen/src/test/resources/configgen.allfeatures.def index fb627f614d6..fb627f614d6 100644 --- a/configgen/src/test/resources/allfeatures.def +++ b/configgen/src/test/resources/configgen.allfeatures.def diff --git a/configserver/src/test/apps/serverdb/serverdefs/attributes.def b/configserver/src/test/apps/serverdb/serverdefs/config.attributes.def index 89671b57046..89671b57046 100644 --- a/configserver/src/test/apps/serverdb/serverdefs/attributes.def +++ b/configserver/src/test/apps/serverdb/serverdefs/config.attributes.def diff --git a/configserver/src/test/apps/zkfeed/configdefinitions/a.b.test2.def b/configserver/src/test/apps/zkfeed/configdefinitions/a.b.a.b.test2.def index 9e5c787df09..9e5c787df09 100644 --- a/configserver/src/test/apps/zkfeed/configdefinitions/a.b.test2.def +++ b/configserver/src/test/apps/zkfeed/configdefinitions/a.b.a.b.test2.def diff --git a/configserver/src/test/resources/configdefinitions/app.def b/configserver/src/test/resources/configdefinitions/config.app.def index 7c7bb58b3a6..7c7bb58b3a6 100644 --- a/configserver/src/test/resources/configdefinitions/app.def +++ b/configserver/src/test/resources/configdefinitions/config.app.def diff --git a/configserver/src/test/resources/configdefinitions/md5test.def b/configserver/src/test/resources/configdefinitions/config.md5test.def index 1c6eae0e587..1c6eae0e587 100644 --- a/configserver/src/test/resources/configdefinitions/md5test.def +++ b/configserver/src/test/resources/configdefinitions/config.md5test.def diff --git a/configserver/src/test/resources/configdefinitions/simpletypes.def b/configserver/src/test/resources/configdefinitions/config.simpletypes.def index 569df41c97d..569df41c97d 100644 --- a/configserver/src/test/resources/configdefinitions/simpletypes.def +++ b/configserver/src/test/resources/configdefinitions/config.simpletypes.def diff --git a/container-accesslogging/CMakeLists.txt b/container-accesslogging/CMakeLists.txt index fb2ba9ac031..14909bc4ca1 100644 --- a/container-accesslogging/CMakeLists.txt +++ b/container-accesslogging/CMakeLists.txt @@ -1,2 +1,2 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -install_config_definition(src/main/resources/configdefinitions/access-log.def container.core.access-log.def) +install_config_definitions(src/main/resources/configdefinitions) diff --git a/container-accesslogging/src/main/resources/configdefinitions/access-log.def b/container-accesslogging/src/main/resources/configdefinitions/container.core.access-log.def index 788fadcdf90..788fadcdf90 100644 --- a/container-accesslogging/src/main/resources/configdefinitions/access-log.def +++ b/container-accesslogging/src/main/resources/configdefinitions/container.core.access-log.def diff --git a/container-core/CMakeLists.txt b/container-core/CMakeLists.txt index 1f416ee2516..de3ef9a517e 100644 --- a/container-core/CMakeLists.txt +++ b/container-core/CMakeLists.txt @@ -1,20 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -install_config_definition(src/main/resources/configdefinitions/application-metadata.def container.core.application-metadata.def) -install_config_definition(src/main/resources/configdefinitions/container-document.def container.core.document.container-document.def) -install_config_definition(src/main/resources/configdefinitions/container-http.def container.core.container-http.def) -install_config_definition(src/main/resources/configdefinitions/container-threadpool.def container.core.container-threadpool.def) -install_config_definition(src/main/resources/configdefinitions/health-monitor.def container.jdisc.config.health-monitor.def) -install_config_definition(src/main/resources/configdefinitions/http-filter.def container.core.http.http-filter.def) -install_config_definition(src/main/resources/configdefinitions/identity.def container.core.identity.identity.def) -install_config_definition(src/main/resources/configdefinitions/log-handler.def container.core.log-handler.def) -install_config_definition(src/main/resources/configdefinitions/metrics-packets-handler.def container.jdisc.state.metrics-packets-handler.def) -install_config_definition(src/main/resources/configdefinitions/metrics-presentation.def metrics.metrics-presentation.def) -install_config_definition(src/main/resources/configdefinitions/metrics-proxy-api.def container.handler.metrics.metrics-proxy-api.def) -install_config_definition(src/main/resources/configdefinitions/mockservice.def container.handler.test.mockservice.def) -install_config_definition(src/main/resources/configdefinitions/qr-searchers.def container.qr-searchers.def) -install_config_definition(src/main/resources/configdefinitions/qr.def container.qr.def) -install_config_definition(src/main/resources/configdefinitions/servlet-config.def container.servlet.servlet-config.def) -install_config_definition(src/main/resources/configdefinitions/threadpool.def container.handler.threadpool.def) -install_config_definition(src/main/resources/configdefinitions/vip-status.def container.core.vip-status.def) +install_config_definitions(src/main/resources/configdefinitions) vespa_install_script(src/main/sh/vespa-load-balancer-status libexec/vespa) diff --git a/container-core/src/main/resources/configdefinitions/application-metadata.def b/container-core/src/main/resources/configdefinitions/container.core.application-metadata.def index a3ccf1b55cf..a3ccf1b55cf 100644 --- a/container-core/src/main/resources/configdefinitions/application-metadata.def +++ b/container-core/src/main/resources/configdefinitions/container.core.application-metadata.def diff --git a/container-core/src/main/resources/configdefinitions/container-http.def b/container-core/src/main/resources/configdefinitions/container.core.container-http.def index 23edd402893..23edd402893 100644 --- a/container-core/src/main/resources/configdefinitions/container-http.def +++ b/container-core/src/main/resources/configdefinitions/container.core.container-http.def diff --git a/container-core/src/main/resources/configdefinitions/container-document.def b/container-core/src/main/resources/configdefinitions/container.core.document.container-document.def index e8db64b011a..e8db64b011a 100644 --- a/container-core/src/main/resources/configdefinitions/container-document.def +++ b/container-core/src/main/resources/configdefinitions/container.core.document.container-document.def diff --git a/container-core/src/main/resources/configdefinitions/http-filter.def b/container-core/src/main/resources/configdefinitions/container.core.http.http-filter.def index 829147479d6..829147479d6 100644 --- a/container-core/src/main/resources/configdefinitions/http-filter.def +++ b/container-core/src/main/resources/configdefinitions/container.core.http.http-filter.def diff --git a/container-core/src/main/resources/configdefinitions/identity.def b/container-core/src/main/resources/configdefinitions/container.core.identity.identity.def index 539bf07fa7d..539bf07fa7d 100644 --- a/container-core/src/main/resources/configdefinitions/identity.def +++ b/container-core/src/main/resources/configdefinitions/container.core.identity.identity.def diff --git a/container-core/src/main/resources/configdefinitions/log-handler.def b/container-core/src/main/resources/configdefinitions/container.core.log-handler.def index b30d6eebcf3..b30d6eebcf3 100644 --- a/container-core/src/main/resources/configdefinitions/log-handler.def +++ b/container-core/src/main/resources/configdefinitions/container.core.log-handler.def diff --git a/container-core/src/main/resources/configdefinitions/vip-status.def b/container-core/src/main/resources/configdefinitions/container.core.vip-status.def index a042f5915c2..a042f5915c2 100644 --- a/container-core/src/main/resources/configdefinitions/vip-status.def +++ b/container-core/src/main/resources/configdefinitions/container.core.vip-status.def diff --git a/container-core/src/main/resources/configdefinitions/metrics-proxy-api.def b/container-core/src/main/resources/configdefinitions/container.handler.metrics.metrics-proxy-api.def index d2b85cc1df7..d2b85cc1df7 100644 --- a/container-core/src/main/resources/configdefinitions/metrics-proxy-api.def +++ b/container-core/src/main/resources/configdefinitions/container.handler.metrics.metrics-proxy-api.def diff --git a/container-core/src/main/resources/configdefinitions/mockservice.def b/container-core/src/main/resources/configdefinitions/container.handler.test.mockservice.def index 9ee162bc6b8..9ee162bc6b8 100644 --- a/container-core/src/main/resources/configdefinitions/mockservice.def +++ b/container-core/src/main/resources/configdefinitions/container.handler.test.mockservice.def diff --git a/container-core/src/main/resources/configdefinitions/container-threadpool.def b/container-core/src/main/resources/configdefinitions/container.handler.threadpool.container-threadpool.def index 9248bf2e2bf..9248bf2e2bf 100644 --- a/container-core/src/main/resources/configdefinitions/container-threadpool.def +++ b/container-core/src/main/resources/configdefinitions/container.handler.threadpool.container-threadpool.def diff --git a/container-core/src/main/resources/configdefinitions/threadpool.def b/container-core/src/main/resources/configdefinitions/container.handler.threadpool.def index d966738ea9f..d966738ea9f 100644 --- a/container-core/src/main/resources/configdefinitions/threadpool.def +++ b/container-core/src/main/resources/configdefinitions/container.handler.threadpool.def diff --git a/container-core/src/main/resources/configdefinitions/health-monitor.def b/container-core/src/main/resources/configdefinitions/container.jdisc.config.health-monitor.def index 4e91d85b2b8..4e91d85b2b8 100644 --- a/container-core/src/main/resources/configdefinitions/health-monitor.def +++ b/container-core/src/main/resources/configdefinitions/container.jdisc.config.health-monitor.def diff --git a/container-core/src/main/resources/configdefinitions/metrics-packets-handler.def b/container-core/src/main/resources/configdefinitions/container.jdisc.state.metrics-packets-handler.def index c295954fc5d..c295954fc5d 100644 --- a/container-core/src/main/resources/configdefinitions/metrics-packets-handler.def +++ b/container-core/src/main/resources/configdefinitions/container.jdisc.state.metrics-packets-handler.def diff --git a/container-core/src/main/resources/configdefinitions/qr-searchers.def b/container-core/src/main/resources/configdefinitions/container.qr-searchers.def index 1e8bd54acc3..1e8bd54acc3 100644 --- a/container-core/src/main/resources/configdefinitions/qr-searchers.def +++ b/container-core/src/main/resources/configdefinitions/container.qr-searchers.def diff --git a/container-core/src/main/resources/configdefinitions/qr.def b/container-core/src/main/resources/configdefinitions/container.qr.def index fe44b04e9d5..fe44b04e9d5 100644 --- a/container-core/src/main/resources/configdefinitions/qr.def +++ b/container-core/src/main/resources/configdefinitions/container.qr.def diff --git a/container-core/src/main/resources/configdefinitions/servlet-config.def b/container-core/src/main/resources/configdefinitions/container.servlet.servlet-config.def index 2b3ef402792..2b3ef402792 100644 --- a/container-core/src/main/resources/configdefinitions/servlet-config.def +++ b/container-core/src/main/resources/configdefinitions/container.servlet.servlet-config.def diff --git a/container-core/src/main/resources/configdefinitions/metrics-presentation.def b/container-core/src/main/resources/configdefinitions/metrics.metrics-presentation.def index b6c40993ef5..b6c40993ef5 100644 --- a/container-core/src/main/resources/configdefinitions/metrics-presentation.def +++ b/container-core/src/main/resources/configdefinitions/metrics.metrics-presentation.def diff --git a/container-core/src/test/vespa-configdef/int.def b/container-core/src/test/vespa-configdef/config.core.int.def index 48a94e6bfcd..48a94e6bfcd 100644 --- a/container-core/src/test/vespa-configdef/int.def +++ b/container-core/src/test/vespa-configdef/config.core.int.def diff --git a/container-core/src/test/vespa-configdef/string.def b/container-core/src/test/vespa-configdef/config.core.string.def index 250dec3955e..250dec3955e 100644 --- a/container-core/src/test/vespa-configdef/string.def +++ b/container-core/src/test/vespa-configdef/config.core.string.def diff --git a/container-di/CMakeLists.txt b/container-di/CMakeLists.txt index 02b2b0d34d9..14909bc4ca1 100644 --- a/container-di/CMakeLists.txt +++ b/container-di/CMakeLists.txt @@ -1,7 +1,2 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -install_config_definition(src/main/resources/configdefinitions/bundles.def container.bundles.def) -install_config_definition(src/main/resources/configdefinitions/application-bundles.def com.yahoo.container.di.config.application-bundles.def) -install_config_definition(src/main/resources/configdefinitions/platform-bundles.def com.yahoo.container.di.config.platform-bundles.def) -install_config_definition(src/main/resources/configdefinitions/components.def container.components.def) -install_config_definition(src/main/resources/configdefinitions/jersey-bundles.def container.di.config.jersey-bundles.def) -install_config_definition(src/main/resources/configdefinitions/jersey-injection.def container.di.config.jersey-injection.def) +install_config_definitions(src/main/resources/configdefinitions) diff --git a/container-di/src/main/resources/configdefinitions/bundles.def b/container-di/src/main/resources/configdefinitions/container.bundles.def index 79e24742398..79e24742398 100644 --- a/container-di/src/main/resources/configdefinitions/bundles.def +++ b/container-di/src/main/resources/configdefinitions/container.bundles.def diff --git a/container-di/src/main/resources/configdefinitions/components.def b/container-di/src/main/resources/configdefinitions/container.components.def index f27abc2fa5a..f27abc2fa5a 100644 --- a/container-di/src/main/resources/configdefinitions/components.def +++ b/container-di/src/main/resources/configdefinitions/container.components.def diff --git a/container-di/src/main/resources/configdefinitions/jersey-bundles.def b/container-di/src/main/resources/configdefinitions/container.di.config.jersey-bundles.def index a226420274d..a226420274d 100644 --- a/container-di/src/main/resources/configdefinitions/jersey-bundles.def +++ b/container-di/src/main/resources/configdefinitions/container.di.config.jersey-bundles.def diff --git a/container-di/src/main/resources/configdefinitions/jersey-injection.def b/container-di/src/main/resources/configdefinitions/container.di.config.jersey-injection.def index 9f5be59abbd..9f5be59abbd 100644 --- a/container-di/src/main/resources/configdefinitions/jersey-injection.def +++ b/container-di/src/main/resources/configdefinitions/container.di.config.jersey-injection.def diff --git a/container-di/src/test/vespa-configdef/int.def b/container-di/src/test/vespa-configdef/config.di.int.def index a34539c4a0f..a34539c4a0f 100644 --- a/container-di/src/test/vespa-configdef/int.def +++ b/container-di/src/test/vespa-configdef/config.di.int.def diff --git a/container-di/src/test/vespa-configdef/string.def b/container-di/src/test/vespa-configdef/config.di.string.def index 396afe54f3f..396afe54f3f 100644 --- a/container-di/src/test/vespa-configdef/string.def +++ b/container-di/src/test/vespa-configdef/config.di.string.def diff --git a/container-di/src/test/vespa-configdef/bootstrap1.def b/container-di/src/test/vespa-configdef/config.test.bootstrap1.def index bdee16d99ea..bdee16d99ea 100644 --- a/container-di/src/test/vespa-configdef/bootstrap1.def +++ b/container-di/src/test/vespa-configdef/config.test.bootstrap1.def diff --git a/container-di/src/test/vespa-configdef/bootstrap2.def b/container-di/src/test/vespa-configdef/config.test.bootstrap2.def index b4fbffd8ae6..b4fbffd8ae6 100644 --- a/container-di/src/test/vespa-configdef/bootstrap2.def +++ b/container-di/src/test/vespa-configdef/config.test.bootstrap2.def diff --git a/container-di/src/test/vespa-configdef/components1.def b/container-di/src/test/vespa-configdef/config.test.components1.def index bdee16d99ea..bdee16d99ea 100644 --- a/container-di/src/test/vespa-configdef/components1.def +++ b/container-di/src/test/vespa-configdef/config.test.components1.def diff --git a/container-di/src/test/vespa-configdef/test.def b/container-di/src/test/vespa-configdef/config.test.test.def index d3e0ed17748..d3e0ed17748 100644 --- a/container-di/src/test/vespa-configdef/test.def +++ b/container-di/src/test/vespa-configdef/config.test.test.def diff --git a/container-di/src/test/vespa-configdef/test2.def b/container-di/src/test/vespa-configdef/config.test.test2.def index d3e0ed17748..d3e0ed17748 100644 --- a/container-di/src/test/vespa-configdef/test2.def +++ b/container-di/src/test/vespa-configdef/config.test.test2.def diff --git a/container-di/src/test/vespa-configdef/thread-pool.def b/container-di/src/test/vespa-configdef/config.test.thread-pool.def index 9e6b6694e84..9e6b6694e84 100644 --- a/container-di/src/test/vespa-configdef/thread-pool.def +++ b/container-di/src/test/vespa-configdef/config.test.thread-pool.def diff --git a/container-disc/CMakeLists.txt b/container-disc/CMakeLists.txt index 7eaf845a883..3d781a95075 100644 --- a/container-disc/CMakeLists.txt +++ b/container-disc/CMakeLists.txt @@ -3,6 +3,4 @@ install_fat_java_artifact(container-disc) vespa_install_script(src/main/sh/vespa-start-container-daemon.sh vespa-start-container-daemon bin) -install_config_definition(src/main/resources/configdefinitions/jdisc-bindings.def container.jdisc.jdisc-bindings.def) -install_config_definition(src/main/resources/configdefinitions/jersey-connection.def container.config.jersey.jersey-connection.def) -install_config_definition(src/main/resources/configdefinitions/jersey-web-app-pool.def container.config.jersey.jersey-web-app-pool.def) +install_config_definitions(src/main/resources/configdefinitions) diff --git a/container-disc/src/main/resources/configdefinitions/jersey-connection.def b/container-disc/src/main/resources/configdefinitions/container.config.jersey.jersey-connection.def index b8662e07bf9..b8662e07bf9 100644 --- a/container-disc/src/main/resources/configdefinitions/jersey-connection.def +++ b/container-disc/src/main/resources/configdefinitions/container.config.jersey.jersey-connection.def diff --git a/container-disc/src/main/resources/configdefinitions/jersey-web-app-pool.def b/container-disc/src/main/resources/configdefinitions/container.config.jersey.jersey-web-app-pool.def index 52cb9f2229a..52cb9f2229a 100644 --- a/container-disc/src/main/resources/configdefinitions/jersey-web-app-pool.def +++ b/container-disc/src/main/resources/configdefinitions/container.config.jersey.jersey-web-app-pool.def diff --git a/container-disc/src/main/resources/configdefinitions/jdisc-bindings.def b/container-disc/src/main/resources/configdefinitions/container.jdisc.jdisc-bindings.def index c1b65d39d7a..c1b65d39d7a 100644 --- a/container-disc/src/main/resources/configdefinitions/jdisc-bindings.def +++ b/container-disc/src/main/resources/configdefinitions/container.jdisc.jdisc-bindings.def diff --git a/container-messagebus/CMakeLists.txt b/container-messagebus/CMakeLists.txt index 3cd62d83b73..14909bc4ca1 100644 --- a/container-messagebus/CMakeLists.txt +++ b/container-messagebus/CMakeLists.txt @@ -1,3 +1,2 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -install_config_definition(src/main/resources/configdefinitions/container-mbus.def container.jdisc.container-mbus.def) -install_config_definition(src/main/resources/configdefinitions/session.def container.jdisc.config.session.def) +install_config_definitions(src/main/resources/configdefinitions) diff --git a/container-messagebus/src/main/resources/configdefinitions/session.def b/container-messagebus/src/main/resources/configdefinitions/container.jdisc.config.session.def index 93e71449e98..93e71449e98 100644 --- a/container-messagebus/src/main/resources/configdefinitions/session.def +++ b/container-messagebus/src/main/resources/configdefinitions/container.jdisc.config.session.def diff --git a/container-messagebus/src/main/resources/configdefinitions/container-mbus.def b/container-messagebus/src/main/resources/configdefinitions/container.jdisc.container-mbus.def index 9aef2b32a66..9aef2b32a66 100644 --- a/container-messagebus/src/main/resources/configdefinitions/container-mbus.def +++ b/container-messagebus/src/main/resources/configdefinitions/container.jdisc.container-mbus.def diff --git a/container-search-and-docproc/CMakeLists.txt b/container-search-and-docproc/CMakeLists.txt index 29bbe5bdb0f..aef014583f5 100644 --- a/container-search-and-docproc/CMakeLists.txt +++ b/container-search-and-docproc/CMakeLists.txt @@ -1,4 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. install_fat_java_artifact(container-search-and-docproc) -install_config_definition(src/main/resources/configdefinitions/application-userdata.def container.handler.observability.application-userdata.def) +install_config_definitions(src/main/resources/configdefinitions) diff --git a/container-search-and-docproc/src/main/resources/configdefinitions/application-userdata.def b/container-search-and-docproc/src/main/resources/configdefinitions/container.handler.observability.application-userdata.def index 0285d3d2103..0285d3d2103 100644 --- a/container-search-and-docproc/src/main/resources/configdefinitions/application-userdata.def +++ b/container-search-and-docproc/src/main/resources/configdefinitions/container.handler.observability.application-userdata.def diff --git a/container-search/CMakeLists.txt b/container-search/CMakeLists.txt index 87d192a50f4..14909bc4ca1 100644 --- a/container-search/CMakeLists.txt +++ b/container-search/CMakeLists.txt @@ -1,24 +1,2 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -install_config_definition(src/main/resources/configdefinitions/cluster.def search.config.cluster.def) -install_config_definition(src/main/resources/configdefinitions/documentdb-info.def prelude.fastsearch.documentdb-info.def) -install_config_definition(src/main/resources/configdefinitions/emulation.def prelude.emulation.def) -install_config_definition(src/main/resources/configdefinitions/federation.def search.federation.federation.def) -install_config_definition(src/main/resources/configdefinitions/fs4.def container.search.fs4.def) -install_config_definition(src/main/resources/configdefinitions/index-info.def search.config.index-info.def) -install_config_definition(src/main/resources/configdefinitions/keyvalue.def prelude.searcher.keyvalue.def) -install_config_definition(src/main/resources/configdefinitions/lowercasing.def search.querytransform.lowercasing.def) -install_config_definition(src/main/resources/configdefinitions/measure-qps.def search.statistics.measure-qps.def) -install_config_definition(src/main/resources/configdefinitions/page-templates.def search.pagetemplates.page-templates.def) -install_config_definition(src/main/resources/configdefinitions/provider.def search.federation.provider.def) -install_config_definition(src/main/resources/configdefinitions/qr-monitor.def prelude.cluster.qr-monitor.def) -install_config_definition(src/main/resources/configdefinitions/qr-quotetable.def prelude.searcher.qr-quotetable.def) -install_config_definition(src/main/resources/configdefinitions/qr-start.def search.config.qr-start.def) -install_config_definition(src/main/resources/configdefinitions/query-profiles.def search.query.profile.config.query-profiles.def) -install_config_definition(src/main/resources/configdefinitions/rate-limiting.def search.config.rate-limiting.def) -install_config_definition(src/main/resources/configdefinitions/resolvers.def search.pagetemplates.resolvers.def) -install_config_definition(src/main/resources/configdefinitions/rewrites.def search.query.rewrite.rewrites.def) -install_config_definition(src/main/resources/configdefinitions/search-with-renderer-handler.def search.handler.search-with-renderer-handler.def) -install_config_definition(src/main/resources/configdefinitions/searchchain-forward.def search.federation.searchchain-forward.def) -install_config_definition(src/main/resources/configdefinitions/semantic-rules.def prelude.semantics.semantic-rules.def) -install_config_definition(src/main/resources/configdefinitions/strict-contracts.def search.federation.strict-contracts.def) -install_config_definition(src/main/resources/configdefinitions/timing-searcher.def search.statistics.timing-searcher.def) +install_config_definitions(src/main/resources/configdefinitions) diff --git a/container-search/src/main/resources/configdefinitions/fs4.def b/container-search/src/main/resources/configdefinitions/container.search.fs4.def index 9562cfa75bd..9562cfa75bd 100644 --- a/container-search/src/main/resources/configdefinitions/fs4.def +++ b/container-search/src/main/resources/configdefinitions/container.search.fs4.def diff --git a/container-search/src/main/resources/configdefinitions/qr-monitor.def b/container-search/src/main/resources/configdefinitions/prelude.cluster.qr-monitor.def index 2c4ff3c6167..2c4ff3c6167 100644 --- a/container-search/src/main/resources/configdefinitions/qr-monitor.def +++ b/container-search/src/main/resources/configdefinitions/prelude.cluster.qr-monitor.def diff --git a/container-search/src/main/resources/configdefinitions/emulation.def b/container-search/src/main/resources/configdefinitions/prelude.emulation.def index 70d2d4954a4..70d2d4954a4 100644 --- a/container-search/src/main/resources/configdefinitions/emulation.def +++ b/container-search/src/main/resources/configdefinitions/prelude.emulation.def diff --git a/container-search/src/main/resources/configdefinitions/documentdb-info.def b/container-search/src/main/resources/configdefinitions/prelude.fastsearch.documentdb-info.def index 76096b4a6f7..76096b4a6f7 100644 --- a/container-search/src/main/resources/configdefinitions/documentdb-info.def +++ b/container-search/src/main/resources/configdefinitions/prelude.fastsearch.documentdb-info.def diff --git a/container-search/src/main/resources/configdefinitions/keyvalue.def b/container-search/src/main/resources/configdefinitions/prelude.searcher.keyvalue.def index 95153708aa2..95153708aa2 100644 --- a/container-search/src/main/resources/configdefinitions/keyvalue.def +++ b/container-search/src/main/resources/configdefinitions/prelude.searcher.keyvalue.def diff --git a/container-search/src/main/resources/configdefinitions/qr-quotetable.def b/container-search/src/main/resources/configdefinitions/prelude.searcher.qr-quotetable.def index 40979ad2a35..40979ad2a35 100644 --- a/container-search/src/main/resources/configdefinitions/qr-quotetable.def +++ b/container-search/src/main/resources/configdefinitions/prelude.searcher.qr-quotetable.def diff --git a/container-search/src/main/resources/configdefinitions/semantic-rules.def b/container-search/src/main/resources/configdefinitions/prelude.semantics.semantic-rules.def index 5ac0cca7ff6..5ac0cca7ff6 100644 --- a/container-search/src/main/resources/configdefinitions/semantic-rules.def +++ b/container-search/src/main/resources/configdefinitions/prelude.semantics.semantic-rules.def diff --git a/container-search/src/main/resources/configdefinitions/cluster.def b/container-search/src/main/resources/configdefinitions/search.config.cluster.def index 52eca7ef753..52eca7ef753 100644 --- a/container-search/src/main/resources/configdefinitions/cluster.def +++ b/container-search/src/main/resources/configdefinitions/search.config.cluster.def diff --git a/container-search/src/main/resources/configdefinitions/index-info.def b/container-search/src/main/resources/configdefinitions/search.config.index-info.def index f3b905d4d0a..f3b905d4d0a 100644 --- a/container-search/src/main/resources/configdefinitions/index-info.def +++ b/container-search/src/main/resources/configdefinitions/search.config.index-info.def diff --git a/container-search/src/main/resources/configdefinitions/qr-start.def b/container-search/src/main/resources/configdefinitions/search.config.qr-start.def index 95e9d4575dd..95e9d4575dd 100644 --- a/container-search/src/main/resources/configdefinitions/qr-start.def +++ b/container-search/src/main/resources/configdefinitions/search.config.qr-start.def diff --git a/container-search/src/main/resources/configdefinitions/rate-limiting.def b/container-search/src/main/resources/configdefinitions/search.config.rate-limiting.def index 23235617f8c..23235617f8c 100644 --- a/container-search/src/main/resources/configdefinitions/rate-limiting.def +++ b/container-search/src/main/resources/configdefinitions/search.config.rate-limiting.def diff --git a/container-search/src/main/resources/configdefinitions/federation.def b/container-search/src/main/resources/configdefinitions/search.federation.federation.def index 36eb5d4b4c8..36eb5d4b4c8 100644 --- a/container-search/src/main/resources/configdefinitions/federation.def +++ b/container-search/src/main/resources/configdefinitions/search.federation.federation.def diff --git a/container-search/src/main/resources/configdefinitions/provider.def b/container-search/src/main/resources/configdefinitions/search.federation.provider.def index f9ab305b114..f9ab305b114 100644 --- a/container-search/src/main/resources/configdefinitions/provider.def +++ b/container-search/src/main/resources/configdefinitions/search.federation.provider.def diff --git a/container-search/src/main/resources/configdefinitions/searchchain-forward.def b/container-search/src/main/resources/configdefinitions/search.federation.searchchain-forward.def index 0e86490e120..0e86490e120 100644 --- a/container-search/src/main/resources/configdefinitions/searchchain-forward.def +++ b/container-search/src/main/resources/configdefinitions/search.federation.searchchain-forward.def diff --git a/container-search/src/main/resources/configdefinitions/strict-contracts.def b/container-search/src/main/resources/configdefinitions/search.federation.strict-contracts.def index 5ceb37db8d1..5ceb37db8d1 100644 --- a/container-search/src/main/resources/configdefinitions/strict-contracts.def +++ b/container-search/src/main/resources/configdefinitions/search.federation.strict-contracts.def diff --git a/container-search/src/main/resources/configdefinitions/search-with-renderer-handler.def b/container-search/src/main/resources/configdefinitions/search.handler.search-with-renderer-handler.def index a34e08a1c82..a34e08a1c82 100644 --- a/container-search/src/main/resources/configdefinitions/search-with-renderer-handler.def +++ b/container-search/src/main/resources/configdefinitions/search.handler.search-with-renderer-handler.def diff --git a/container-search/src/main/resources/configdefinitions/page-templates.def b/container-search/src/main/resources/configdefinitions/search.pagetemplates.page-templates.def index 31ec7644d18..31ec7644d18 100644 --- a/container-search/src/main/resources/configdefinitions/page-templates.def +++ b/container-search/src/main/resources/configdefinitions/search.pagetemplates.page-templates.def diff --git a/container-search/src/main/resources/configdefinitions/resolvers.def b/container-search/src/main/resources/configdefinitions/search.pagetemplates.resolvers.def index 6003fdf81f1..6003fdf81f1 100644 --- a/container-search/src/main/resources/configdefinitions/resolvers.def +++ b/container-search/src/main/resources/configdefinitions/search.pagetemplates.resolvers.def diff --git a/container-search/src/main/resources/configdefinitions/query-profiles.def b/container-search/src/main/resources/configdefinitions/search.query.profile.config.query-profiles.def index 3c6d11e2944..3c6d11e2944 100644 --- a/container-search/src/main/resources/configdefinitions/query-profiles.def +++ b/container-search/src/main/resources/configdefinitions/search.query.profile.config.query-profiles.def diff --git a/container-search/src/main/resources/configdefinitions/rewrites.def b/container-search/src/main/resources/configdefinitions/search.query.rewrite.rewrites.def index ecca422342a..ecca422342a 100644 --- a/container-search/src/main/resources/configdefinitions/rewrites.def +++ b/container-search/src/main/resources/configdefinitions/search.query.rewrite.rewrites.def diff --git a/container-search/src/main/resources/configdefinitions/lowercasing.def b/container-search/src/main/resources/configdefinitions/search.querytransform.lowercasing.def index b656c451e11..b656c451e11 100644 --- a/container-search/src/main/resources/configdefinitions/lowercasing.def +++ b/container-search/src/main/resources/configdefinitions/search.querytransform.lowercasing.def diff --git a/container-search/src/main/resources/configdefinitions/measure-qps.def b/container-search/src/main/resources/configdefinitions/search.statistics.measure-qps.def index c8b38b9db6e..c8b38b9db6e 100644 --- a/container-search/src/main/resources/configdefinitions/measure-qps.def +++ b/container-search/src/main/resources/configdefinitions/search.statistics.measure-qps.def diff --git a/container-search/src/main/resources/configdefinitions/timing-searcher.def b/container-search/src/main/resources/configdefinitions/search.statistics.timing-searcher.def index 7c2b698bdb0..7c2b698bdb0 100644 --- a/container-search/src/main/resources/configdefinitions/timing-searcher.def +++ b/container-search/src/main/resources/configdefinitions/search.statistics.timing-searcher.def diff --git a/container-search/src/test/vespa-configdef/int.def b/container-search/src/test/vespa-configdef/config.search.int.def index b526a956b5c..b526a956b5c 100644 --- a/container-search/src/test/vespa-configdef/int.def +++ b/container-search/src/test/vespa-configdef/config.search.int.def diff --git a/container-search/src/test/vespa-configdef/string.def b/container-search/src/test/vespa-configdef/config.search.string.def index 4b39de61e0a..4b39de61e0a 100644 --- a/container-search/src/test/vespa-configdef/string.def +++ b/container-search/src/test/vespa-configdef/config.search.string.def diff --git a/controller-server/src/main/resources/configdefinitions/athenz.def b/controller-server/src/main/resources/configdefinitions/vespa.hosted.controller.athenz.config.athenz.def index dc1a2337aaf..dc1a2337aaf 100644 --- a/controller-server/src/main/resources/configdefinitions/athenz.def +++ b/controller-server/src/main/resources/configdefinitions/vespa.hosted.controller.athenz.config.athenz.def diff --git a/controller-server/src/main/resources/configdefinitions/controller.def b/controller-server/src/main/resources/configdefinitions/vespa.hosted.controller.config.controller.def index 069deaf276d..069deaf276d 100644 --- a/controller-server/src/main/resources/configdefinitions/controller.def +++ b/controller-server/src/main/resources/configdefinitions/vespa.hosted.controller.config.controller.def diff --git a/controller-server/src/main/resources/configdefinitions/maintainer.def b/controller-server/src/main/resources/configdefinitions/vespa.hosted.controller.maintenance.config.maintainer.def index 7ec8860bef4..7ec8860bef4 100644 --- a/controller-server/src/main/resources/configdefinitions/maintainer.def +++ b/controller-server/src/main/resources/configdefinitions/vespa.hosted.controller.maintenance.config.maintainer.def diff --git a/controller-server/src/main/resources/configdefinitions/maven-repository.def b/controller-server/src/main/resources/configdefinitions/vespa.hosted.controller.maven.repository.config.maven-repository.def index 0fd2d410e9b..0fd2d410e9b 100644 --- a/controller-server/src/main/resources/configdefinitions/maven-repository.def +++ b/controller-server/src/main/resources/configdefinitions/vespa.hosted.controller.maven.repository.config.maven-repository.def diff --git a/controller-server/src/main/resources/configdefinitions/tls.def b/controller-server/src/main/resources/configdefinitions/vespa.hosted.controller.tls.config.tls.def index ddaa1e635db..ddaa1e635db 100644 --- a/controller-server/src/main/resources/configdefinitions/tls.def +++ b/controller-server/src/main/resources/configdefinitions/vespa.hosted.controller.tls.config.tls.def diff --git a/controller-server/src/main/resources/configdefinitions/rotations.def b/controller-server/src/main/resources/configdefinitions/vespa.hosted.rotation.config.rotations.def index d4f3636d0d8..d4f3636d0d8 100644 --- a/controller-server/src/main/resources/configdefinitions/rotations.def +++ b/controller-server/src/main/resources/configdefinitions/vespa.hosted.rotation.config.rotations.def diff --git a/docproc/CMakeLists.txt b/docproc/CMakeLists.txt index bacb45df319..14909bc4ca1 100644 --- a/docproc/CMakeLists.txt +++ b/docproc/CMakeLists.txt @@ -1,4 +1,2 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -install_config_definition(src/main/resources/configdefinitions/docproc.def config.docproc.docproc.def) -install_config_definition(src/main/resources/configdefinitions/schemamapping.def config.docproc.schemamapping.def) -install_config_definition(src/main/resources/configdefinitions/splitter-joiner-document-processor.def config.docproc.splitter-joiner-document-processor.def) +install_config_definitions(src/main/resources/configdefinitions) diff --git a/docproc/src/main/resources/configdefinitions/docproc.def b/docproc/src/main/resources/configdefinitions/config.docproc.docproc.def index 53f5c2de21f..53f5c2de21f 100644 --- a/docproc/src/main/resources/configdefinitions/docproc.def +++ b/docproc/src/main/resources/configdefinitions/config.docproc.docproc.def diff --git a/docproc/src/main/resources/configdefinitions/schemamapping.def b/docproc/src/main/resources/configdefinitions/config.docproc.schemamapping.def index d70235fbfc0..d70235fbfc0 100644 --- a/docproc/src/main/resources/configdefinitions/schemamapping.def +++ b/docproc/src/main/resources/configdefinitions/config.docproc.schemamapping.def diff --git a/docproc/src/main/resources/configdefinitions/splitter-joiner-document-processor.def b/docproc/src/main/resources/configdefinitions/config.docproc.splitter-joiner-document-processor.def index dea6141e6cc..dea6141e6cc 100644 --- a/docproc/src/main/resources/configdefinitions/splitter-joiner-document-processor.def +++ b/docproc/src/main/resources/configdefinitions/config.docproc.splitter-joiner-document-processor.def diff --git a/docproc/src/test/vespa-configdef/string.def b/docproc/src/test/vespa-configdef/config.docproc.string.def index 3e76855f1e8..3e76855f1e8 100644 --- a/docproc/src/test/vespa-configdef/string.def +++ b/docproc/src/test/vespa-configdef/config.docproc.string.def diff --git a/document/src/vespa/document/config/CMakeLists.txt b/document/src/vespa/document/config/CMakeLists.txt index fc711c5e57a..1a610a968f9 100644 --- a/document/src/vespa/document/config/CMakeLists.txt +++ b/document/src/vespa/document/config/CMakeLists.txt @@ -3,6 +3,6 @@ vespa_add_library(document_documentconfig OBJECT SOURCES DEPENDS ) -vespa_generate_config(document_documentconfig documenttypes.def) -install_config_definition(documenttypes.def document.documenttypes.def) -install_config_definition(documentmanager.def document.config.documentmanager.def) +vespa_generate_config(document_documentconfig document.documenttypes.def) +vespa_generate_config(document_documentconfig document.config.documentmanager.def) +install_config_definitions(src/vespa/document/config) diff --git a/document/src/vespa/document/config/documentmanager.def b/document/src/vespa/document/config/document.config.documentmanager.def index d53fec43e5d..d53fec43e5d 100644 --- a/document/src/vespa/document/config/documentmanager.def +++ b/document/src/vespa/document/config/document.config.documentmanager.def diff --git a/document/src/vespa/document/config/documenttypes.def b/document/src/vespa/document/config/document.documenttypes.def index d02e9fe49f2..d02e9fe49f2 100644 --- a/document/src/vespa/document/config/documenttypes.def +++ b/document/src/vespa/document/config/document.documenttypes.def diff --git a/documentapi/src/main/resources/configdefinitions/documentrouteselectorpolicy.def b/documentapi/src/main/resources/configdefinitions/documentapi.messagebus.protocol.documentrouteselectorpolicy.def index f6f4461d220..f6f4461d220 100644 --- a/documentapi/src/main/resources/configdefinitions/documentrouteselectorpolicy.def +++ b/documentapi/src/main/resources/configdefinitions/documentapi.messagebus.protocol.documentrouteselectorpolicy.def diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/CMakeLists.txt b/documentapi/src/vespa/documentapi/messagebus/policies/CMakeLists.txt index 26d51e702e9..980dbcd2201 100644 --- a/documentapi/src/vespa/documentapi/messagebus/policies/CMakeLists.txt +++ b/documentapi/src/vespa/documentapi/messagebus/policies/CMakeLists.txt @@ -17,5 +17,5 @@ vespa_add_library(documentapi_documentapipolicies OBJECT asyncinitializationpolicy.cpp DEPENDS ) -vespa_generate_config(documentapi_documentapipolicies ../../../../main/resources/configdefinitions/documentrouteselectorpolicy.def) -install_config_definition(../../../../main/resources/configdefinitions/documentrouteselectorpolicy.def documentapi.messagebus.protocol.documentrouteselectorpolicy.def) +vespa_generate_config(documentapi_documentapipolicies ../../../../main/resources/configdefinitions/documentapi.messagebus.protocol.documentrouteselectorpolicy.def) +install_config_definitions(../../../../main/resources/configdefinitions) diff --git a/fileacquirer/CMakeLists.txt b/fileacquirer/CMakeLists.txt index 7a366aa3882..c05241bf795 100644 --- a/fileacquirer/CMakeLists.txt +++ b/fileacquirer/CMakeLists.txt @@ -10,4 +10,4 @@ vespa_define_module( src/vespa/fileacquirer ) -install_config_definition(src/main/resources/configdefinitions/filedistributorrpc.def cloud.config.filedistribution.filedistributorrpc.def) +install_config_definitions(src/main/resources/configdefinitions) diff --git a/fileacquirer/src/main/resources/configdefinitions/filedistributorrpc.def b/fileacquirer/src/main/resources/configdefinitions/cloud.config.filedistribution.filedistributorrpc.def index 3de65e632ee..3de65e632ee 100644 --- a/fileacquirer/src/main/resources/configdefinitions/filedistributorrpc.def +++ b/fileacquirer/src/main/resources/configdefinitions/cloud.config.filedistribution.filedistributorrpc.def diff --git a/fileacquirer/src/vespa/fileacquirer/filedistributorrpc.def b/fileacquirer/src/vespa/fileacquirer/cloud.config.filedistribution.filedistributorrpc.def index c12c0b8299e..c12c0b8299e 120000 --- a/fileacquirer/src/vespa/fileacquirer/filedistributorrpc.def +++ b/fileacquirer/src/vespa/fileacquirer/cloud.config.filedistribution.filedistributorrpc.def diff --git a/functions.cmake b/functions.cmake index e57e1d1c412..5d23a3cb9ad 100644 --- a/functions.cmake +++ b/functions.cmake @@ -644,7 +644,7 @@ function(install_config_definition) endfunction() function(install_config_definitions) - install(DIRECTORY ${ARGV0}/ DESTINATION share/vespa/configdefinitions) + install(DIRECTORY ${ARGV0}/ DESTINATION share/vespa/configdefinitions FILES_MATCHING PATTERN "*.def") endfunction() function(install_java_artifact NAME) diff --git a/jdisc-security-filters/CMakeLists.txt b/jdisc-security-filters/CMakeLists.txt index fd691ae84ca..fc39c20dc29 100644 --- a/jdisc-security-filters/CMakeLists.txt +++ b/jdisc-security-filters/CMakeLists.txt @@ -1,4 +1,4 @@ # Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. install_fat_java_artifact(jdisc-security-filters) -install_config_definition(src/main/resources/configdefinitions/cors-filter.def jdisc.http.filter.security.cors.cors-filter.def) +install_config_definitions(src/main/resources/configdefinitions) diff --git a/jdisc-security-filters/src/main/resources/configdefinitions/athenz-authorization-filter.def b/jdisc-security-filters/src/main/resources/configdefinitions/jdisc.http.filter.security.athenz.athenz-authorization-filter.def index ab8c4a204df..ab8c4a204df 100644 --- a/jdisc-security-filters/src/main/resources/configdefinitions/athenz-authorization-filter.def +++ b/jdisc-security-filters/src/main/resources/configdefinitions/jdisc.http.filter.security.athenz.athenz-authorization-filter.def diff --git a/jdisc-security-filters/src/main/resources/configdefinitions/athenz-principal-filter.def b/jdisc-security-filters/src/main/resources/configdefinitions/jdisc.http.filter.security.athenz.athenz-principal-filter.def index 8fd95ee1dde..8fd95ee1dde 100644 --- a/jdisc-security-filters/src/main/resources/configdefinitions/athenz-principal-filter.def +++ b/jdisc-security-filters/src/main/resources/configdefinitions/jdisc.http.filter.security.athenz.athenz-principal-filter.def diff --git a/jdisc-security-filters/src/main/resources/configdefinitions/static-request-resource-mapper.def b/jdisc-security-filters/src/main/resources/configdefinitions/jdisc.http.filter.security.athenz.static-request-resource-mapper.def index de89c1f9198..de89c1f9198 100644 --- a/jdisc-security-filters/src/main/resources/configdefinitions/static-request-resource-mapper.def +++ b/jdisc-security-filters/src/main/resources/configdefinitions/jdisc.http.filter.security.athenz.static-request-resource-mapper.def diff --git a/jdisc-security-filters/src/main/resources/configdefinitions/cors-filter.def b/jdisc-security-filters/src/main/resources/configdefinitions/jdisc.http.filter.security.cors.cors-filter.def index a5c69b2db62..a5c69b2db62 100644 --- a/jdisc-security-filters/src/main/resources/configdefinitions/cors-filter.def +++ b/jdisc-security-filters/src/main/resources/configdefinitions/jdisc.http.filter.security.cors.cors-filter.def diff --git a/jdisc_http_service/CMakeLists.txt b/jdisc_http_service/CMakeLists.txt index 3b1956e16de..e0f17286b85 100644 --- a/jdisc_http_service/CMakeLists.txt +++ b/jdisc_http_service/CMakeLists.txt @@ -2,8 +2,4 @@ install_fat_java_artifact(jdisc_http_service) install_java_artifact_dependencies(jdisc_http_service) -install_config_definition(src/main/resources/configdefinitions/jdisc.http.client.http-client.def) -install_config_definition(src/main/resources/configdefinitions/jdisc.http.connector.def) -install_config_definition(src/main/resources/configdefinitions/jdisc.http.server.def) -install_config_definition(src/main/resources/configdefinitions/jdisc.http.servlet-paths.def) - +install_config_definitions(src/main/resources/configdefinitions) diff --git a/jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.client.http-client.def b/jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.client.jdisc.http.client.http-client.def index 8f99fccec94..8f99fccec94 100644 --- a/jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.client.http-client.def +++ b/jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.client.jdisc.http.client.http-client.def diff --git a/jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.connector.def b/jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.jdisc.http.connector.def index 4c86c8b9bb6..4c86c8b9bb6 100644 --- a/jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.connector.def +++ b/jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.jdisc.http.connector.def diff --git a/jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.server.def b/jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.jdisc.http.server.def index 0cb5b89b20c..0cb5b89b20c 100644 --- a/jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.server.def +++ b/jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.jdisc.http.server.def diff --git a/jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.servlet-paths.def b/jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.jdisc.http.servlet-paths.def index 86707b027be..86707b027be 100644 --- a/jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.servlet-paths.def +++ b/jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.jdisc.http.servlet-paths.def diff --git a/linguistics/CMakeLists.txt b/linguistics/CMakeLists.txt index 44f645f2b57..f2179625aae 100644 --- a/linguistics/CMakeLists.txt +++ b/linguistics/CMakeLists.txt @@ -1,2 +1,2 @@ # Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -install_config_definition(src/main/resources/configdefinitions/opennlp-linguistics.def language.opennlp.opennlp-linguistics.def) +install_config_definitions(src/main/resources/configdefinitions) diff --git a/linguistics/src/main/resources/configdefinitions/opennlp-linguistics.def b/linguistics/src/main/resources/configdefinitions/language.opennlp.opennlp-linguistics.def index 13194d471fd..13194d471fd 100644 --- a/linguistics/src/main/resources/configdefinitions/opennlp-linguistics.def +++ b/linguistics/src/main/resources/configdefinitions/language.opennlp.opennlp-linguistics.def diff --git a/logd/src/logd/CMakeLists.txt b/logd/src/logd/CMakeLists.txt index cc73b51f0b1..43b85a8a28b 100644 --- a/logd/src/logd/CMakeLists.txt +++ b/logd/src/logd/CMakeLists.txt @@ -24,7 +24,7 @@ vespa_add_library(logd STATIC DEPENDS ) -vespa_generate_config(logd ../main/resources/configdefinitions/logd.def) -install_config_definition(../main/resources/configdefinitions/logd.def cloud.config.log.logd.def) +vespa_generate_config(logd ../main/resources/configdefinitions/cloud.config.log.logd.def) +install_config_definitions(../main/resources/configdefinitions) vespa_add_target_package_dependency(logd Protobuf) diff --git a/logd/src/main/resources/configdefinitions/logd.def b/logd/src/main/resources/configdefinitions/cloud.config.log.logd.def index bb5f487c47e..bb5f487c47e 100644 --- a/logd/src/main/resources/configdefinitions/logd.def +++ b/logd/src/main/resources/configdefinitions/cloud.config.log.logd.def diff --git a/messagebus/src/main/config/messagebus.def b/messagebus/src/main/config/messagebus.messagebus.def index b750530ec5f..b750530ec5f 100644 --- a/messagebus/src/main/config/messagebus.def +++ b/messagebus/src/main/config/messagebus.messagebus.def diff --git a/messagebus/src/vespa/messagebus/CMakeLists.txt b/messagebus/src/vespa/messagebus/CMakeLists.txt index 1dfac1fbdac..2d408e93358 100644 --- a/messagebus/src/vespa/messagebus/CMakeLists.txt +++ b/messagebus/src/vespa/messagebus/CMakeLists.txt @@ -36,5 +36,5 @@ vespa_add_library(messagebus INSTALL lib64 DEPENDS ) -vespa_generate_config(messagebus ../../main/config/messagebus.def) -install_config_definition(../../main/config/messagebus.def messagebus.messagebus.def) +vespa_generate_config(messagebus ../../main/config/messagebus.messagebus.def) +install_config_definitions(../../main/config) diff --git a/metrics-proxy/CMakeLists.txt b/metrics-proxy/CMakeLists.txt index 63520385bf5..20d508c84d3 100644 --- a/metrics-proxy/CMakeLists.txt +++ b/metrics-proxy/CMakeLists.txt @@ -4,12 +4,4 @@ install_fat_java_artifact(metrics-proxy) vespa_install_script(src/main/sh/start-telegraf.sh libexec/vespa) vespa_install_script(src/main/sh/stop-telegraf.sh libexec/vespa) -install_config_definition(src/main/resources/configdefinitions/application-dimensions.def ai.vespa.metricsproxy.metric.dimensions.application-dimensions.def) -install_config_definition(src/main/resources/configdefinitions/consumers.def ai.vespa.metricsproxy.core.consumers.def) -install_config_definition(src/main/resources/configdefinitions/monitoring.def ai.vespa.metricsproxy.core.monitoring.def) -install_config_definition(src/main/resources/configdefinitions/metrics-nodes.def ai.vespa.metricsproxy.http.application.metrics-nodes.def) -install_config_definition(src/main/resources/configdefinitions/node-dimensions.def ai.vespa.metricsproxy.metric.dimensions.node-dimensions.def) -install_config_definition(src/main/resources/configdefinitions/node-info.def ai.vespa.metricsproxy.http.metrics.node-info.def) -install_config_definition(src/main/resources/configdefinitions/rpc-connector.def ai.vespa.metricsproxy.rpc.rpc-connector.def) -install_config_definition(src/main/resources/configdefinitions/vespa-services.def ai.vespa.metricsproxy.service.vespa-services.def) -install_config_definition(src/main/resources/configdefinitions/telegraf.def ai.vespa.metricsproxy.telegraf.telegraf.def) +install_config_definitions(src/main/resources/configdefinitions) diff --git a/metrics/src/vespa/metrics/CMakeLists.txt b/metrics/src/vespa/metrics/CMakeLists.txt index 0d7eeba3601..705f57d977b 100644 --- a/metrics/src/vespa/metrics/CMakeLists.txt +++ b/metrics/src/vespa/metrics/CMakeLists.txt @@ -25,5 +25,5 @@ vespa_add_library(metrics INSTALL lib64 DEPENDS ) -vespa_generate_config(metrics metricsmanager.def) -install_config_definition(metricsmanager.def metrics.metricsmanager.def) +vespa_generate_config(metrics metrics.metricsmanager.def) +install_config_definitions(src/vespa/metrics) diff --git a/metrics/src/vespa/metrics/metricsmanager.def b/metrics/src/vespa/metrics/metrics.metricsmanager.def index 80f03a8e9e8..80f03a8e9e8 100644 --- a/metrics/src/vespa/metrics/metricsmanager.def +++ b/metrics/src/vespa/metrics/metrics.metricsmanager.def diff --git a/searchcore/src/apps/verify_ranksetup/verify-ranksetup.def b/searchcore/src/apps/verify_ranksetup/vespa.config.search.core.verify-ranksetup.def index f2199c4e726..f2199c4e726 100644 --- a/searchcore/src/apps/verify_ranksetup/verify-ranksetup.def +++ b/searchcore/src/apps/verify_ranksetup/vespa.config.search.core.verify-ranksetup.def diff --git a/searchcore/src/tests/proton/documentdb/fileconfigmanager/mycfg.def b/searchcore/src/tests/proton/documentdb/fileconfigmanager/config.mycfg.def index 52b374e1bbf..52b374e1bbf 100644 --- a/searchcore/src/tests/proton/documentdb/fileconfigmanager/mycfg.def +++ b/searchcore/src/tests/proton/documentdb/fileconfigmanager/config.mycfg.def diff --git a/searchcore/src/vespa/searchcore/config/CMakeLists.txt b/searchcore/src/vespa/searchcore/config/CMakeLists.txt index 915ab147978..25307f4a6c8 100644 --- a/searchcore/src/vespa/searchcore/config/CMakeLists.txt +++ b/searchcore/src/vespa/searchcore/config/CMakeLists.txt @@ -3,12 +3,10 @@ vespa_add_library(searchcore_fconfig STATIC SOURCES DEPENDS ) -vespa_generate_config(searchcore_fconfig fdispatchrc.def) -install_config_definition(fdispatchrc.def vespa.config.search.core.fdispatchrc.def) -vespa_generate_config(searchcore_fconfig proton.def) -install_config_definition(proton.def vespa.config.search.core.proton.def) -vespa_generate_config(searchcore_fconfig ranking-constants.def) -install_config_definition(ranking-constants.def vespa.config.search.core.ranking-constants.def) -vespa_generate_config(searchcore_fconfig onnx-models.def) -install_config_definition(onnx-models.def vespa.config.search.core.onnx-models.def) -vespa_generate_config(searchcore_fconfig hwinfo.def) +vespa_generate_config(searchcore_fconfig vespa.config.search.core.fdispatchrc.def) +vespa_generate_config(searchcore_fconfig vespa.config.search.core.proton.def) +vespa_generate_config(searchcore_fconfig vespa.config.search.core.ranking-constants.def) +vespa_generate_config(searchcore_fconfig vespa.config.search.core.onnx-models.def) +vespa_generate_config(searchcore_fconfig vespa.config.search.core.hwinfo.def) + +install_config_definitions(src/vespa/searchcore/config) diff --git a/searchcore/src/vespa/searchcore/config/fdispatchrc.def b/searchcore/src/vespa/searchcore/config/vespa.config.search.core.fdispatchrc.def index f2e33e463b8..f2e33e463b8 100644 --- a/searchcore/src/vespa/searchcore/config/fdispatchrc.def +++ b/searchcore/src/vespa/searchcore/config/vespa.config.search.core.fdispatchrc.def diff --git a/searchcore/src/vespa/searchcore/config/hwinfo.def b/searchcore/src/vespa/searchcore/config/vespa.config.search.core.hwinfo.def index 981c3fe655e..981c3fe655e 100644 --- a/searchcore/src/vespa/searchcore/config/hwinfo.def +++ b/searchcore/src/vespa/searchcore/config/vespa.config.search.core.hwinfo.def diff --git a/searchcore/src/vespa/searchcore/config/onnx-models.def b/searchcore/src/vespa/searchcore/config/vespa.config.search.core.onnx-models.def index ffe71ff70c2..ffe71ff70c2 100644 --- a/searchcore/src/vespa/searchcore/config/onnx-models.def +++ b/searchcore/src/vespa/searchcore/config/vespa.config.search.core.onnx-models.def diff --git a/searchcore/src/vespa/searchcore/config/proton.def b/searchcore/src/vespa/searchcore/config/vespa.config.search.core.proton.def index fd60781d868..fd60781d868 100644 --- a/searchcore/src/vespa/searchcore/config/proton.def +++ b/searchcore/src/vespa/searchcore/config/vespa.config.search.core.proton.def diff --git a/searchcore/src/vespa/searchcore/config/ranking-constants.def b/searchcore/src/vespa/searchcore/config/vespa.config.search.core.ranking-constants.def index 3b55eda3308..3b55eda3308 100644 --- a/searchcore/src/vespa/searchcore/config/ranking-constants.def +++ b/searchcore/src/vespa/searchcore/config/vespa.config.search.core.ranking-constants.def diff --git a/searchlib/src/vespa/searchlib/config/CMakeLists.txt b/searchlib/src/vespa/searchlib/config/CMakeLists.txt index 571cd3ad9f1..5b9aa96f80d 100644 --- a/searchlib/src/vespa/searchlib/config/CMakeLists.txt +++ b/searchlib/src/vespa/searchlib/config/CMakeLists.txt @@ -3,5 +3,6 @@ vespa_add_library(searchlib_sconfig OBJECT SOURCES DEPENDS ) -vespa_generate_config(searchlib_sconfig translogserver.def) -install_config_definition(translogserver.def searchlib.translogserver.def) +vespa_generate_config(searchlib_sconfig searchlib.translogserver.def) + +install_config_definitions(src/vespa/searchlib/config) diff --git a/searchlib/src/vespa/searchlib/config/translogserver.def b/searchlib/src/vespa/searchlib/config/searchlib.translogserver.def index f822fc80fc1..f822fc80fc1 100644 --- a/searchlib/src/vespa/searchlib/config/translogserver.def +++ b/searchlib/src/vespa/searchlib/config/searchlib.translogserver.def diff --git a/searchsummary/src/vespa/searchsummary/config/CMakeLists.txt b/searchsummary/src/vespa/searchsummary/config/CMakeLists.txt index a01938d8ad4..da94757e239 100644 --- a/searchsummary/src/vespa/searchsummary/config/CMakeLists.txt +++ b/searchsummary/src/vespa/searchsummary/config/CMakeLists.txt @@ -3,5 +3,6 @@ vespa_add_library(searchsummary_config OBJECT SOURCES DEPENDS ) -vespa_generate_config(searchsummary_config juniperrc.def) -install_config_definition(juniperrc.def vespa.config.search.summary.juniperrc.def) +vespa_generate_config(searchsummary_config vespa.config.search.summary.juniperrc.def) + +install_config_definitions(src/vespa/searchsummary/config) diff --git a/searchsummary/src/vespa/searchsummary/config/juniperrc.def b/searchsummary/src/vespa/searchsummary/config/vespa.config.search.summary.juniperrc.def index 52f8104aa46..52f8104aa46 100644 --- a/searchsummary/src/vespa/searchsummary/config/juniperrc.def +++ b/searchsummary/src/vespa/searchsummary/config/vespa.config.search.summary.juniperrc.def diff --git a/simplemetrics/CMakeLists.txt b/simplemetrics/CMakeLists.txt index c145fbb2ec7..f593afbfa0c 100644 --- a/simplemetrics/CMakeLists.txt +++ b/simplemetrics/CMakeLists.txt @@ -1,4 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. install_fat_java_artifact(simplemetrics) -install_config_definition(src/main/resources/configdefinitions/manager.def metrics.manager.def) +install_config_definitions(src/main/resources/configdefinitions) diff --git a/simplemetrics/src/main/resources/configdefinitions/manager.def b/simplemetrics/src/main/resources/configdefinitions/metrics.manager.def index 6446e0df8b6..6446e0df8b6 100644 --- a/simplemetrics/src/main/resources/configdefinitions/manager.def +++ b/simplemetrics/src/main/resources/configdefinitions/metrics.manager.def diff --git a/statistics/CMakeLists.txt b/statistics/CMakeLists.txt index 3b187b72d6e..14909bc4ca1 100644 --- a/statistics/CMakeLists.txt +++ b/statistics/CMakeLists.txt @@ -1,2 +1,2 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -install_config_definition(src/main/resources/configdefinitions/statistics.def container.statistics.def) +install_config_definitions(src/main/resources/configdefinitions) diff --git a/statistics/src/main/resources/configdefinitions/statistics.def b/statistics/src/main/resources/configdefinitions/container.statistics.def index 92da7704714..92da7704714 100644 --- a/statistics/src/main/resources/configdefinitions/statistics.def +++ b/statistics/src/main/resources/configdefinitions/container.statistics.def 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 diff --git a/vespa-athenz/src/main/resources/configdefinitions/sia-provider.def b/vespa-athenz/src/main/resources/configdefinitions/vespa.athenz.identity.sia-provider.def index 77310d0c91e..77310d0c91e 100644 --- a/vespa-athenz/src/main/resources/configdefinitions/sia-provider.def +++ b/vespa-athenz/src/main/resources/configdefinitions/vespa.athenz.identity.sia-provider.def diff --git a/vespa-osgi-testrunner/CMakeLists.txt b/vespa-osgi-testrunner/CMakeLists.txt index 4b097a2f7bf..13095c213a3 100644 --- a/vespa-osgi-testrunner/CMakeLists.txt +++ b/vespa-osgi-testrunner/CMakeLists.txt @@ -1,3 +1,3 @@ # Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. install_fat_java_artifact(vespa-osgi-testrunner) -install_config_definition(src/main/resources/configdefinitions/junit-test-runner.def com.yahoo.vespa.testrunner.junit-test-runner.def) +install_config_definitions(src/main/resources/configdefinitions) diff --git a/vespa-testrunner-components/CMakeLists.txt b/vespa-testrunner-components/CMakeLists.txt index e2eeb2feecb..475039cb38e 100644 --- a/vespa-testrunner-components/CMakeLists.txt +++ b/vespa-testrunner-components/CMakeLists.txt @@ -1,4 +1,4 @@ # Copyright 2020 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. install_java_artifact(vespa-testrunner-components) install_fat_java_artifact(vespa-testrunner-components) -install_config_definition(src/main/resources/configdefinitions/test-runner.def com.yahoo.vespa.hosted.testrunner.test-runner.def) +install_config_definitions(src/main/resources/configdefinitions) diff --git a/vespaclient-core/CMakeLists.txt b/vespaclient-core/CMakeLists.txt index 218276cf590..14909bc4ca1 100644 --- a/vespaclient-core/CMakeLists.txt +++ b/vespaclient-core/CMakeLists.txt @@ -1,2 +1,2 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -install_config_definition(src/main/resources/configdefinitions/feeder.def vespaclient.config.feeder.def) +install_config_definitions(src/main/resources/configdefinitions) diff --git a/vespaclient-core/src/main/resources/configdefinitions/feeder.def b/vespaclient-core/src/main/resources/configdefinitions/vespaclient.config.feeder.def index a376a4807a7..a376a4807a7 100644 --- a/vespaclient-core/src/main/resources/configdefinitions/feeder.def +++ b/vespaclient-core/src/main/resources/configdefinitions/vespaclient.config.feeder.def diff --git a/vsm/src/vespa/vsm/config/CMakeLists.txt b/vsm/src/vespa/vsm/config/CMakeLists.txt index e3bd2db68e2..ce84c569c0a 100644 --- a/vsm/src/vespa/vsm/config/CMakeLists.txt +++ b/vsm/src/vespa/vsm/config/CMakeLists.txt @@ -3,9 +3,7 @@ vespa_add_library(vsm_vconfig OBJECT SOURCES DEPENDS ) -vespa_generate_config(vsm_vconfig vsmfields.def) -install_config_definition(vsmfields.def vespa.config.search.vsm.vsmfields.def) -vespa_generate_config(vsm_vconfig vsm.def) -install_config_definition(vsm.def vespa.config.search.vsm.vsm.def) -vespa_generate_config(vsm_vconfig vsmsummary.def) -install_config_definition(vsmsummary.def vespa.config.search.vsm.vsmsummary.def) +vespa_generate_config(vsm_vconfig vespa.config.search.vsm.vsmfields.def) +vespa_generate_config(vsm_vconfig vespa.config.search.vsm.vsm.def) +vespa_generate_config(vsm_vconfig vespa.config.search.vsm.vsmsummary.def) +install_config_definitions(src/vespa/vsm/config) diff --git a/vsm/src/vespa/vsm/config/vsm.def b/vsm/src/vespa/vsm/config/vespa.config.search.vsm.vsm.def index c446efe5588..c446efe5588 100644 --- a/vsm/src/vespa/vsm/config/vsm.def +++ b/vsm/src/vespa/vsm/config/vespa.config.search.vsm.vsm.def diff --git a/vsm/src/vespa/vsm/config/vsmfields.def b/vsm/src/vespa/vsm/config/vespa.config.search.vsm.vsmfields.def index ca48692b526..ca48692b526 100644 --- a/vsm/src/vespa/vsm/config/vsmfields.def +++ b/vsm/src/vespa/vsm/config/vespa.config.search.vsm.vsmfields.def diff --git a/vsm/src/vespa/vsm/config/vsmsummary.def b/vsm/src/vespa/vsm/config/vespa.config.search.vsm.vsmsummary.def index 4664371faba..4664371faba 100644 --- a/vsm/src/vespa/vsm/config/vsmsummary.def +++ b/vsm/src/vespa/vsm/config/vespa.config.search.vsm.vsmsummary.def |