diff options
Diffstat (limited to 'config')
23 files changed, 24 insertions, 0 deletions
diff --git a/config/src/test/java/com/yahoo/vespa/config/classes/app.1.def b/config/src/test/java/com/yahoo/vespa/config/classes/app.1.def index df2a57bad04..7a8f33e075c 100644 --- a/config/src/test/java/com/yahoo/vespa/config/classes/app.1.def +++ b/config/src/test/java/com/yahoo/vespa/config/classes/app.1.def @@ -1,4 +1,5 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +version=1 message string default="Hello!" diff --git a/config/src/test/java/com/yahoo/vespa/config/classes/qr-logging.def b/config/src/test/java/com/yahoo/vespa/config/classes/qr-logging.def index 3fcab08a63b..f2325a5d13f 100644 --- a/config/src/test/java/com/yahoo/vespa/config/classes/qr-logging.def +++ b/config/src/test/java/com/yahoo/vespa/config/classes/qr-logging.def @@ -1,4 +1,5 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +version=3 logger string default="com.yahoo" # Either QueryAccessLog for a regular Vespa access log, or YApacheAccessLog for a log on yApache format speciallog[].name string diff --git a/config/src/test/java/com/yahoo/vespa/config/classes/qr-templates.3.def b/config/src/test/java/com/yahoo/vespa/config/classes/qr-templates.3.def index d3d7ff87cbd..1b1538150a8 100644 --- a/config/src/test/java/com/yahoo/vespa/config/classes/qr-templates.3.def +++ b/config/src/test/java/com/yahoo/vespa/config/classes/qr-templates.3.def @@ -1,4 +1,5 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +version=3 ## Directory for temporary files directory string default="tmp/templates" diff --git a/config/src/test/java/com/yahoo/vespa/config/classes/ranges.1.def b/config/src/test/java/com/yahoo/vespa/config/classes/ranges.1.def index 5377b143d77..b165f37a898 100644 --- a/config/src/test/java/com/yahoo/vespa/config/classes/ranges.1.def +++ b/config/src/test/java/com/yahoo/vespa/config/classes/ranges.1.def @@ -1,4 +1,5 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +version=1 quux int default=5 range=[,] xyzzy double default=5 range=[,] longVal long default=5 range=[,] diff --git a/config/src/test/java/com/yahoo/vespa/config/classes/testfoobar.12.def b/config/src/test/java/com/yahoo/vespa/config/classes/testfoobar.12.def index ba008565f8d..acd825a7c54 100644 --- a/config/src/test/java/com/yahoo/vespa/config/classes/testfoobar.12.def +++ b/config/src/test/java/com/yahoo/vespa/config/classes/testfoobar.12.def @@ -1,4 +1,5 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +version=12-1-2 longVal long longWithDefault long default=8589934592 diff --git a/config/src/test/resources/configs/def-files/app.def b/config/src/test/resources/configs/def-files/app.def index 37c3dd75e26..1e91c9c665c 100644 --- a/config/src/test/resources/configs/def-files/app.def +++ b/config/src/test/resources/configs/def-files/app.def @@ -1,5 +1,6 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=foo +version=1 message string default="Hello!" diff --git a/config/src/test/resources/configs/def-files/arraytypes.def b/config/src/test/resources/configs/def-files/arraytypes.def index ad18c4e5386..da0ace98df6 100644 --- a/config/src/test/resources/configs/def-files/arraytypes.def +++ b/config/src/test/resources/configs/def-files/arraytypes.def @@ -2,6 +2,7 @@ # Config containing only simple array types that can be used for testing # individual types in detail. namespace=foo +version=1 boolarr[] bool doublearr[] double diff --git a/config/src/test/resources/configs/def-files/chains-test.def b/config/src/test/resources/configs/def-files/chains-test.def index b7da79931d5..7e9444970c3 100644 --- a/config/src/test/resources/configs/def-files/chains-test.def +++ b/config/src/test/resources/configs/def-files/chains-test.def @@ -1,6 +1,7 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. # Chains configuration namespace=foo +version=12 component[].id string diff --git a/config/src/test/resources/configs/def-files/datastructures.def b/config/src/test/resources/configs/def-files/datastructures.def index cbcbc4b8bed..52bd9ca965a 100644 --- a/config/src/test/resources/configs/def-files/datastructures.def +++ b/config/src/test/resources/configs/def-files/datastructures.def @@ -1,5 +1,6 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=foo +version=4 date[] string diff --git a/config/src/test/resources/configs/def-files/defaulttest.def b/config/src/test/resources/configs/def-files/defaulttest.def index fa8005b77c3..b122718d7c3 100644 --- a/config/src/test/resources/configs/def-files/defaulttest.def +++ b/config/src/test/resources/configs/def-files/defaulttest.def @@ -1,5 +1,6 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=foo +version=3 nondefaultstring string defaultstring string default="thedefault" diff --git a/config/src/test/resources/configs/def-files/function-test.def b/config/src/test/resources/configs/def-files/function-test.def index 24eeb81ab7a..b2185bf55b2 100644 --- a/config/src/test/resources/configs/def-files/function-test.def +++ b/config/src/test/resources/configs/def-files/function-test.def @@ -18,6 +18,7 @@ # - Have an array within a struct, to verify that we correctly recurse. # - Reuse type name further within to ensure that this works. +version=8 namespace=foo diff --git a/config/src/test/resources/configs/def-files/int.def b/config/src/test/resources/configs/def-files/int.def index c1a1241c413..91efe21556f 100755 --- a/config/src/test/resources/configs/def-files/int.def +++ b/config/src/test/resources/configs/def-files/int.def @@ -1,4 +1,5 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=foo +version=1 intVal int default=1 diff --git a/config/src/test/resources/configs/def-files/md5test.def b/config/src/test/resources/configs/def-files/md5test.def index da79d022648..868e62f674a 100644 --- a/config/src/test/resources/configs/def-files/md5test.def +++ b/config/src/test/resources/configs/def-files/md5test.def @@ -1,8 +1,10 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=foo +# version=4 , version in comment does not count. # Added empty line to see if we can confuse # the server's md5 calculation +version=3 #even adding a variable name starting with 'version' versiontag int default=3 diff --git a/config/src/test/resources/configs/def-files/namespace.def b/config/src/test/resources/configs/def-files/namespace.def index a8b55fb315e..23bb794f198 100644 --- a/config/src/test/resources/configs/def-files/namespace.def +++ b/config/src/test/resources/configs/def-files/namespace.def @@ -1,4 +1,5 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +version=1 namespace=myproject.config diff --git a/config/src/test/resources/configs/def-files/simpletypes.def b/config/src/test/resources/configs/def-files/simpletypes.def index 2603e2f4100..4fe74c23763 100644 --- a/config/src/test/resources/configs/def-files/simpletypes.def +++ b/config/src/test/resources/configs/def-files/simpletypes.def @@ -2,6 +2,7 @@ namespace=foo # Config containing only simple leaf types with default values, that can be used # for testing individual types in detail. +version=1 boolval bool default=false doubleval double default=0.0 diff --git a/config/src/test/resources/configs/def-files/standard.def b/config/src/test/resources/configs/def-files/standard.def index f4c6ced1e00..4955bea9139 100644 --- a/config/src/test/resources/configs/def-files/standard.def +++ b/config/src/test/resources/configs/def-files/standard.def @@ -2,6 +2,7 @@ # Config containing only simple leaf types with default values, that can be used # for testing individual types in detail. namespace=foo +version=1 basicStruct.intVal int default=0 basicStruct.stringVal string default="s" diff --git a/config/src/test/resources/configs/def-files/string.def b/config/src/test/resources/configs/def-files/string.def index 78596515b7c..44d94c7b8a5 100755 --- a/config/src/test/resources/configs/def-files/string.def +++ b/config/src/test/resources/configs/def-files/string.def @@ -1,4 +1,5 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=foo +version=1 stringVal string default="_default_" diff --git a/config/src/test/resources/configs/def-files/structtypes.def b/config/src/test/resources/configs/def-files/structtypes.def index fe9d879fb64..4f8260030a5 100644 --- a/config/src/test/resources/configs/def-files/structtypes.def +++ b/config/src/test/resources/configs/def-files/structtypes.def @@ -1,6 +1,7 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. # Config containing only structs in various forms namespace=foo +version=2 simple.name string default="_default_" simple.gender enum { MALE, FEMALE } default=MALE diff --git a/config/src/test/resources/configs/def-files/test-nodefs.def b/config/src/test/resources/configs/def-files/test-nodefs.def index e3b700c5732..2126d4461c3 100644 --- a/config/src/test/resources/configs/def-files/test-nodefs.def +++ b/config/src/test/resources/configs/def-files/test-nodefs.def @@ -1,4 +1,5 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +version=2 namespace=foo # test config vars with no defaults diff --git a/config/src/test/resources/configs/def-files/test-nonstring.def b/config/src/test/resources/configs/def-files/test-nonstring.def index eaa6fafe87d..b19b5aad1d9 100644 --- a/config/src/test/resources/configs/def-files/test-nonstring.def +++ b/config/src/test/resources/configs/def-files/test-nonstring.def @@ -1,4 +1,5 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +version=1 namespace=foo # Test non-string config vars with defaults diff --git a/config/src/test/resources/configs/def-files/test-reference.def b/config/src/test/resources/configs/def-files/test-reference.def index b5bbb5f4462..449f1eda557 100644 --- a/config/src/test/resources/configs/def-files/test-reference.def +++ b/config/src/test/resources/configs/def-files/test-reference.def @@ -1,4 +1,5 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +version=1 namespace=foo configId reference default=":parent:" diff --git a/config/src/test/resources/configs/def-files/testnamespace.def b/config/src/test/resources/configs/def-files/testnamespace.def index 6e58c691097..5a946f44c27 100644 --- a/config/src/test/resources/configs/def-files/testnamespace.def +++ b/config/src/test/resources/configs/def-files/testnamespace.def @@ -1,3 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +version=1 namespace=foo basicStruct.stringVal string diff --git a/config/src/test/resources/configs/def-files/unicode.def b/config/src/test/resources/configs/def-files/unicode.def index 493e3e37630..fa0a89d177d 100644 --- a/config/src/test/resources/configs/def-files/unicode.def +++ b/config/src/test/resources/configs/def-files/unicode.def @@ -1,4 +1,5 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +version=2 namespace=foo unicodestring1 string |