aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Egge <Tor.Egge@verizonmedia.com>2019-11-29 13:11:23 +0100
committerTor Egge <Tor.Egge@verizonmedia.com>2019-11-29 13:43:41 +0100
commit27c18a2528b0c771c60ce644f838ae3a3fe0b604 (patch)
treeff8bf317df112eead3a3c380f1ccaab474e49555
parent69001649f409038c48827faf1c51e02d200b54b4 (diff)
Install more config definition files.
-rw-r--r--CMakeLists.txt1
-rw-r--r--config-provisioning/CMakeLists.txt1
-rw-r--r--container-core/CMakeLists.txt2
-rw-r--r--jdisc-security-filters/CMakeLists.txt2
-rw-r--r--linguistics/CMakeLists.txt2
-rw-r--r--vespa-testrunner-components/CMakeLists.txt2
6 files changed, 8 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9afb1819025..f04856ffd29 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -75,6 +75,7 @@ add_subdirectory(jdisc_http_service)
add_subdirectory(jdisc_jetty)
add_subdirectory(jrt_test)
add_subdirectory(juniper)
+add_subdirectory(linguistics)
add_subdirectory(logd)
add_subdirectory(logserver)
add_subdirectory(logforwarder)
diff --git a/config-provisioning/CMakeLists.txt b/config-provisioning/CMakeLists.txt
index 829ba87fab8..73101f8a7a6 100644
--- a/config-provisioning/CMakeLists.txt
+++ b/config-provisioning/CMakeLists.txt
@@ -1,3 +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(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)
diff --git a/container-core/CMakeLists.txt b/container-core/CMakeLists.txt
index 43225e38aee..341155457a8 100644
--- a/container-core/CMakeLists.txt
+++ b/container-core/CMakeLists.txt
@@ -4,7 +4,9 @@ install_config_definition(src/main/resources/configdefinitions/container-documen
install_config_definition(src/main/resources/configdefinitions/container-http.def container.core.container-http.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/mockservice.def container.handler.test.mockservice.def)
install_config_definition(src/main/resources/configdefinitions/qr-searchers.def container.qr-searchers.def)
diff --git a/jdisc-security-filters/CMakeLists.txt b/jdisc-security-filters/CMakeLists.txt
index 9c5b35941bb..fd691ae84ca 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)
+install_config_definition(src/main/resources/configdefinitions/cors-filter.def jdisc.http.filter.security.cors.cors-filter.def)
diff --git a/linguistics/CMakeLists.txt b/linguistics/CMakeLists.txt
new file mode 100644
index 00000000000..44f645f2b57
--- /dev/null
+++ b/linguistics/CMakeLists.txt
@@ -0,0 +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)
diff --git a/vespa-testrunner-components/CMakeLists.txt b/vespa-testrunner-components/CMakeLists.txt
index fe2cb84b7bb..35ddb17cbc6 100644
--- a/vespa-testrunner-components/CMakeLists.txt
+++ b/vespa-testrunner-components/CMakeLists.txt
@@ -1,3 +1,3 @@
install_java_artifact(vespa-testrunner-components)
install_fat_java_artifact(vespa-testrunner-components)
-install_config_definition(src/main/resources/configdefinitions/test-runner.def test-runner.def)
+install_config_definition(src/main/resources/configdefinitions/test-runner.def com.yahoo.vespa.hosted.testrunner.test-runner.def)