summaryrefslogtreecommitdiffstats
path: root/jdisc-security-filters
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2020-09-11 18:41:54 +0200
committerGitHub <noreply@github.com>2020-09-11 18:41:54 +0200
commit807761ce70f955f20fcc26dbd4d857e4f0c5fdb2 (patch)
treef7545a1913f5a502779bc80f7cc50c131442cf7c /jdisc-security-filters
parentb9d08a9fe934e1d94a7402ad5e9f9b7cfd990633 (diff)
parent64ebd3904a7e76072e3841bed45cf7e408542f4f (diff)
Merge pull request #14370 from vespa-engine/hmusum/move-config-definitions-to-use-full-name-in-filename
Use full name in config definition file names
Diffstat (limited to 'jdisc-security-filters')
-rw-r--r--jdisc-security-filters/CMakeLists.txt2
-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
5 files changed, 1 insertions, 1 deletions
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