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 /container-di | |
parent | 2f6d5764a8ac5fea80e44fc3d022a6b0b47ba890 (diff) |
Use full name in config definition file names
Diffstat (limited to 'container-di')
-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 |
13 files changed, 1 insertions, 6 deletions
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 |