diff options
| author | Harald Musum <musum@verizonmedia.com> | 2020-09-11 18:41:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-11 18:41:54 +0200 |
| commit | 807761ce70f955f20fcc26dbd4d857e4f0c5fdb2 (patch) | |
| tree | f7545a1913f5a502779bc80f7cc50c131442cf7c /docproc | |
| parent | b9d08a9fe934e1d94a7402ad5e9f9b7cfd990633 (diff) | |
| parent | 64ebd3904a7e76072e3841bed45cf7e408542f4f (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 'docproc')
| -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 |
5 files changed, 1 insertions, 3 deletions
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 |