diff options
Diffstat (limited to 'container-disc')
| -rw-r--r-- | container-disc/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | container-disc/src/main/resources/configdefinitions/jersey-init.def | 8 |
2 files changed, 0 insertions, 9 deletions
diff --git a/container-disc/CMakeLists.txt b/container-disc/CMakeLists.txt index 1b661020166..92f5b303d41 100644 --- a/container-disc/CMakeLists.txt +++ b/container-disc/CMakeLists.txt @@ -6,7 +6,6 @@ vespa_install_script(src/main/sh/vespa-start-container-daemon.sh vespa-start-con install_config_definition(src/main/resources/configdefinitions/container.jdisc.config.http-server.def) 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-init.def container.config.jersey.jersey-init.def) install_config_definition(src/main/resources/configdefinitions/jersey-web-app-pool.def container.config.jersey.jersey-web-app-pool.def) install_config_definition(src/main/resources/configdefinitions/metric-defaults.def container.jdisc.config.metric-defaults.def) install_config_definition(src/main/resources/configdefinitions/score-board.def jdisc.metrics.yamasconsumer.cloud.score-board.def) diff --git a/container-disc/src/main/resources/configdefinitions/jersey-init.def b/container-disc/src/main/resources/configdefinitions/jersey-init.def deleted file mode 100644 index 95ec9f23906..00000000000 --- a/container-disc/src/main/resources/configdefinitions/jersey-init.def +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -## Do NOT move this file to the container-jersey module. If system bundles -## like config-model import packages from container-jersey, new class -## loaders for these bundles will be created after reconfig. -namespace=container.config.jersey - -# Controlled by the config framework, do not set this from services.xml! -jerseyMapping string |