diff options
116 files changed, 0 insertions, 118 deletions
diff --git a/application/src/test/resources/configdefinitions/mock-application.def b/application/src/test/resources/configdefinitions/mock-application.def index 41b50df1125..fa3a48bae96 100644 --- a/application/src/test/resources/configdefinitions/mock-application.def +++ b/application/src/test/resources/configdefinitions/mock-application.def @@ -1,5 +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=application mystruct.id string diff --git a/bundle-plugin-test/src/main/resources/configdefinitions/test.def b/bundle-plugin-test/src/main/resources/configdefinitions/test.def index 5d09d00b992..b4ba9ec518a 100644 --- a/bundle-plugin-test/src/main/resources/configdefinitions/test.def +++ b/bundle-plugin-test/src/main/resources/configdefinitions/test.def @@ -1,5 +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=example exampleKey string default="exampleValue" diff --git a/chain/src/main/resources/configdefinitions/chains.def b/chain/src/main/resources/configdefinitions/chains.def index 0ad72727438..8520a8d6332 100644 --- a/chain/src/main/resources/configdefinitions/chains.def +++ b/chain/src/main/resources/configdefinitions/chains.def @@ -1,6 +1,5 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. # Chains configuration -version=13 namespace=container.core components[].id string diff --git a/config-lib/src/test/resources/configdefinitions/function-test.def b/config-lib/src/test/resources/configdefinitions/function-test.def index 63206fa7c3b..04d040a910b 100644 --- a/config-lib/src/test/resources/configdefinitions/function-test.def +++ b/config-lib/src/test/resources/configdefinitions/function-test.def @@ -18,7 +18,6 @@ # - Have an array within a struct, to verify that we correctly recurse. # - Reuse type name further within to ensure that this works. -version=8 # deprecated, remove in Vespa 7 namespace=test # Some random bool without a default value. These comments exist to check diff --git a/config-model/src/test/cfg/application/configdeftest/configdefinitions/foo.def b/config-model/src/test/cfg/application/configdeftest/configdefinitions/foo.def index 89ce911ce10..c37aafd6fc4 100644 --- a/config-model/src/test/cfg/application/configdeftest/configdefinitions/foo.def +++ b/config-model/src/test/cfg/application/configdeftest/configdefinitions/foo.def @@ -1,4 +1,3 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=2 namespace=config bar int default=1 diff --git a/config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.def b/config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.def index e94d98b448e..c37aafd6fc4 100644 --- a/config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.def +++ b/config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.def @@ -1,4 +1,3 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=1 namespace=config bar int default=1 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 7a8f33e075c..df2a57bad04 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,5 +1,4 @@ # 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 f2325a5d13f..3fcab08a63b 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,5 +1,4 @@ # 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 1b1538150a8..d3d7ff87cbd 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,5 +1,4 @@ # 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 b165f37a898..5377b143d77 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,5 +1,4 @@ # 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 acd825a7c54..ba008565f8d 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,5 +1,4 @@ # 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 1e91c9c665c..37c3dd75e26 100644 --- a/config/src/test/resources/configs/def-files/app.def +++ b/config/src/test/resources/configs/def-files/app.def @@ -1,6 +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 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 da0ace98df6..ad18c4e5386 100644 --- a/config/src/test/resources/configs/def-files/arraytypes.def +++ b/config/src/test/resources/configs/def-files/arraytypes.def @@ -2,7 +2,6 @@ # 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 7e9444970c3..b7da79931d5 100644 --- a/config/src/test/resources/configs/def-files/chains-test.def +++ b/config/src/test/resources/configs/def-files/chains-test.def @@ -1,7 +1,6 @@ # 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 52bd9ca965a..cbcbc4b8bed 100644 --- a/config/src/test/resources/configs/def-files/datastructures.def +++ b/config/src/test/resources/configs/def-files/datastructures.def @@ -1,6 +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=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 b122718d7c3..fa8005b77c3 100644 --- a/config/src/test/resources/configs/def-files/defaulttest.def +++ b/config/src/test/resources/configs/def-files/defaulttest.def @@ -1,6 +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=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 b2185bf55b2..24eeb81ab7a 100644 --- a/config/src/test/resources/configs/def-files/function-test.def +++ b/config/src/test/resources/configs/def-files/function-test.def @@ -18,7 +18,6 @@ # - 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 91efe21556f..c1a1241c413 100755 --- a/config/src/test/resources/configs/def-files/int.def +++ b/config/src/test/resources/configs/def-files/int.def @@ -1,5 +1,4 @@ # 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 868e62f674a..da79d022648 100644 --- a/config/src/test/resources/configs/def-files/md5test.def +++ b/config/src/test/resources/configs/def-files/md5test.def @@ -1,10 +1,8 @@ # 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 23bb794f198..a8b55fb315e 100644 --- a/config/src/test/resources/configs/def-files/namespace.def +++ b/config/src/test/resources/configs/def-files/namespace.def @@ -1,5 +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=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 4fe74c23763..2603e2f4100 100644 --- a/config/src/test/resources/configs/def-files/simpletypes.def +++ b/config/src/test/resources/configs/def-files/simpletypes.def @@ -2,7 +2,6 @@ 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 4955bea9139..f4c6ced1e00 100644 --- a/config/src/test/resources/configs/def-files/standard.def +++ b/config/src/test/resources/configs/def-files/standard.def @@ -2,7 +2,6 @@ # 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 44d94c7b8a5..78596515b7c 100755 --- a/config/src/test/resources/configs/def-files/string.def +++ b/config/src/test/resources/configs/def-files/string.def @@ -1,5 +1,4 @@ # 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 4f8260030a5..fe9d879fb64 100644 --- a/config/src/test/resources/configs/def-files/structtypes.def +++ b/config/src/test/resources/configs/def-files/structtypes.def @@ -1,7 +1,6 @@ # 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 2126d4461c3..e3b700c5732 100644 --- a/config/src/test/resources/configs/def-files/test-nodefs.def +++ b/config/src/test/resources/configs/def-files/test-nodefs.def @@ -1,5 +1,4 @@ # 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 b19b5aad1d9..eaa6fafe87d 100644 --- a/config/src/test/resources/configs/def-files/test-nonstring.def +++ b/config/src/test/resources/configs/def-files/test-nonstring.def @@ -1,5 +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 # 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 449f1eda557..b5bbb5f4462 100644 --- a/config/src/test/resources/configs/def-files/test-reference.def +++ b/config/src/test/resources/configs/def-files/test-reference.def @@ -1,5 +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 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 5a946f44c27..6e58c691097 100644 --- a/config/src/test/resources/configs/def-files/testnamespace.def +++ b/config/src/test/resources/configs/def-files/testnamespace.def @@ -1,4 +1,3 @@ # 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 fa0a89d177d..493e3e37630 100644 --- a/config/src/test/resources/configs/def-files/unicode.def +++ b/config/src/test/resources/configs/def-files/unicode.def @@ -1,5 +1,4 @@ # 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 diff --git a/config_test/src/main/resources/configdefinitions/greeting.def b/config_test/src/main/resources/configdefinitions/greeting.def index 64a14016f90..924c1331e2c 100644 --- a/config_test/src/main/resources/configdefinitions/greeting.def +++ b/config_test/src/main/resources/configdefinitions/greeting.def @@ -1,5 +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=configtest greeting string default="Hello, world." diff --git a/configdefinitions/src/vespa/ilscripts.def b/configdefinitions/src/vespa/ilscripts.def index 2fe34f678cc..901e87dbd04 100644 --- a/configdefinitions/src/vespa/ilscripts.def +++ b/configdefinitions/src/vespa/ilscripts.def @@ -1,5 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=5 namespace=vespa.configdefinition ## The maximum number of occurrences of a given term to index per field diff --git a/configdefinitions/src/vespa/indexschema.def b/configdefinitions/src/vespa/indexschema.def index dfc13b463c7..5352e4d9009 100644 --- a/configdefinitions/src/vespa/indexschema.def +++ b/configdefinitions/src/vespa/indexschema.def @@ -1,6 +1,5 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. ## Config specifying the index fields and field collections that are part of an index schema. -version=7 namespace=vespa.config.search ## The name of the index field. diff --git a/configdefinitions/src/vespa/rank-profiles.def b/configdefinitions/src/vespa/rank-profiles.def index d0f19b9ac0d..525930c990b 100644 --- a/configdefinitions/src/vespa/rank-profiles.def +++ b/configdefinitions/src/vespa/rank-profiles.def @@ -1,5 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=13 namespace=vespa.config.search ## name of this rank profile. maps to table index for internal use. diff --git a/configdefinitions/src/vespa/specialtokens.def b/configdefinitions/src/vespa/specialtokens.def index 2a84a0c7875..1e6addcf358 100644 --- a/configdefinitions/src/vespa/specialtokens.def +++ b/configdefinitions/src/vespa/specialtokens.def @@ -13,7 +13,6 @@ ## prefix of another token, Vespa will prefer to return the first ## matching token in the list when encountering the longest ## special token. -version=3 namespace=vespa.configdefinition ## Path to makefsa binary, needed to create specialtokens-dictionary diff --git a/configdefinitions/src/vespa/summary.def b/configdefinitions/src/vespa/summary.def index 90103da3c42..20ca6b10450 100644 --- a/configdefinitions/src/vespa/summary.def +++ b/configdefinitions/src/vespa/summary.def @@ -1,5 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=2 namespace=vespa.config.search defaultsummaryid int default=-1 diff --git a/configgen/src/test/resources/allfeatures.def b/configgen/src/test/resources/allfeatures.def index bedb8cb6dbf..e13e14c9e36 100644 --- a/configgen/src/test/resources/allfeatures.def +++ b/configgen/src/test/resources/allfeatures.def @@ -18,7 +18,6 @@ # - Have an array within a struct, to verify that we correctly recurse. # - Reuse type name further within to ensure that this works. -version=11 namespace=configgen # Some random bool without a default value. These comments exist to check # that comment parsing works.e diff --git a/configgen/src/test/resources/bar.foo.def b/configgen/src/test/resources/bar.foo.def index b22be0c62dc..e0084b792a5 100644 --- a/configgen/src/test/resources/bar.foo.def +++ b/configgen/src/test/resources/bar.foo.def @@ -1,4 +1,3 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=1 namespace=baz xyzzy int default=10 diff --git a/configserver/src/test/apps/serverdb/serverdefs/attributes.def b/configserver/src/test/apps/serverdb/serverdefs/attributes.def index 7943091ae6e..89671b57046 100644 --- a/configserver/src/test/apps/serverdb/serverdefs/attributes.def +++ b/configserver/src/test/apps/serverdb/serverdefs/attributes.def @@ -1,5 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=2 namespace=config attribute[].name string attribute[].datatype string diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/configdefs/a.def b/configserver/src/test/java/com/yahoo/vespa/config/server/configdefs/a.def index d9791909f69..bf99c65ec14 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/configdefs/a.def +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/configdefs/a.def @@ -1,5 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=1 storage[].feeder[] string search[].feeder[] string storage[].id reference diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/configdefs/b.def b/configserver/src/test/java/com/yahoo/vespa/config/server/configdefs/b.def index 81d9f1d30bd..42e58eb4f9e 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/configdefs/b.def +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/configdefs/b.def @@ -1,4 +1,3 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=1 gaff int default=0 usercfgwithid int diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/configdefs/c.def b/configserver/src/test/java/com/yahoo/vespa/config/server/configdefs/c.def index fb0fb64172e..3621e2eeb9a 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/configdefs/c.def +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/configdefs/c.def @@ -1,4 +1,3 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=1 foo string gaz int diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/configdefs/compositeinclude.def b/configserver/src/test/java/com/yahoo/vespa/config/server/configdefs/compositeinclude.def index 39d16c616e8..195acc54718 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/configdefs/compositeinclude.def +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/configdefs/compositeinclude.def @@ -1,5 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=1 classes[].id int classes[].name string classes[].fields[].name string diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/configdefs/d.def b/configserver/src/test/java/com/yahoo/vespa/config/server/configdefs/d.def index 4b65de94e36..eb19c8a95ba 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/configdefs/d.def +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/configdefs/d.def @@ -1,4 +1,3 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=1 thestring string default="g" theint int default=6 diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/configdefs/e.def b/configserver/src/test/java/com/yahoo/vespa/config/server/configdefs/e.def index dd5ffa7ed16..20d311db6e0 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/configdefs/e.def +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/configdefs/e.def @@ -1,4 +1,3 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=1 # this one will be implicit, no cfg fo int default=-45 diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/configdefs/recursiveinclude.def b/configserver/src/test/java/com/yahoo/vespa/config/server/configdefs/recursiveinclude.def index 0d5a81f0a63..aca6789c179 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/configdefs/recursiveinclude.def +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/configdefs/recursiveinclude.def @@ -1,5 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=4 rec int ursive string national int diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/configdefs/spooler.def b/configserver/src/test/java/com/yahoo/vespa/config/server/configdefs/spooler.def index 675d2601873..2721af7e278 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/configdefs/spooler.def +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/configdefs/spooler.def @@ -1,5 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=2 # Which directory to find spool files in. directory string default="/home/vespa/var/spool/vespa" diff --git a/configserver/src/test/resources/configdefinitions/app.def b/configserver/src/test/resources/configdefinitions/app.def index 02250339d81..7c7bb58b3a6 100644 --- a/configserver/src/test/resources/configdefinitions/app.def +++ b/configserver/src/test/resources/configdefinitions/app.def @@ -1,5 +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=config message string default="Hello!" diff --git a/configserver/src/test/resources/configdefinitions/datastructures.def b/configserver/src/test/resources/configdefinitions/datastructures.def index 8d5582daeb4..79b3a8e77a0 100644 --- a/configserver/src/test/resources/configdefinitions/datastructures.def +++ b/configserver/src/test/resources/configdefinitions/datastructures.def @@ -1,5 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=3 namespace=config date[] string diff --git a/configserver/src/test/resources/configdefinitions/function-test.def b/configserver/src/test/resources/configdefinitions/function-test.def index da024b7fb02..b2a27c42285 100644 --- a/configserver/src/test/resources/configdefinitions/function-test.def +++ b/configserver/src/test/resources/configdefinitions/function-test.def @@ -18,7 +18,6 @@ # - Have an array within a struct, to verify that we correctly recurse. # - Reuse type name further within to ensure that this works. -version=4 namespace=config # Some random bool without a default value. These comments exist to check diff --git a/configserver/src/test/resources/configdefinitions/md5test.def b/configserver/src/test/resources/configdefinitions/md5test.def index a9483f417ab..1c6eae0e587 100644 --- a/configserver/src/test/resources/configdefinitions/md5test.def +++ b/configserver/src/test/resources/configdefinitions/md5test.def @@ -1,9 +1,7 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -# version=4 , version in comment does not count. # Added empty line to see if we can confuse # the server's md5 calculation -version=3 namespace=config #even adding a variable name starting with 'version' diff --git a/configserver/src/test/resources/configdefinitions/simpletypes.def b/configserver/src/test/resources/configdefinitions/simpletypes.def index c5296e5a25e..569df41c97d 100644 --- a/configserver/src/test/resources/configdefinitions/simpletypes.def +++ b/configserver/src/test/resources/configdefinitions/simpletypes.def @@ -1,7 +1,6 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. # Config containing only simple leaf types with default values, that can be used # for testing individual types in detail. -version=1 namespace=config boolval bool default=false diff --git a/configserver/src/test/resources/configdefinitions/unicode.def b/configserver/src/test/resources/configdefinitions/unicode.def index 389db0f502e..e3b93671e99 100644 --- a/configserver/src/test/resources/configdefinitions/unicode.def +++ b/configserver/src/test/resources/configdefinitions/unicode.def @@ -1,5 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=2 namespace=config unicodestring1 string diff --git a/container-accesslogging/src/main/resources/configdefinitions/access-log.def b/container-accesslogging/src/main/resources/configdefinitions/access-log.def index 099b9cd7a26..c0b6c0ffd40 100644 --- a/container-accesslogging/src/main/resources/configdefinitions/access-log.def +++ b/container-accesslogging/src/main/resources/configdefinitions/access-log.def @@ -1,5 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=2 namespace=container.core diff --git a/container-core/src/main/resources/configdefinitions/application-metadata.def b/container-core/src/main/resources/configdefinitions/application-metadata.def index 802db6c36da..a3ccf1b55cf 100644 --- a/container-core/src/main/resources/configdefinitions/application-metadata.def +++ b/container-core/src/main/resources/configdefinitions/application-metadata.def @@ -1,7 +1,6 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. # Contains meta info about one deployed application -version=4 namespace=container.core # The name of the directory that contained the application package diff --git a/container-core/src/main/resources/configdefinitions/container-document.def b/container-core/src/main/resources/configdefinitions/container-document.def index 9d1d41d2b48..e8db64b011a 100644 --- a/container-core/src/main/resources/configdefinitions/container-document.def +++ b/container-core/src/main/resources/configdefinitions/container-document.def @@ -2,7 +2,6 @@ # # Container settings for document type management # -version=1 namespace=container.core.document # A document type name to use a concrete document type for diff --git a/container-core/src/main/resources/configdefinitions/diagnostics.def b/container-core/src/main/resources/configdefinitions/diagnostics.def index cab58b0df97..33f733d4386 100644 --- a/container-core/src/main/resources/configdefinitions/diagnostics.def +++ b/container-core/src/main/resources/configdefinitions/diagnostics.def @@ -1,5 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=2 namespace=container.core ## The fraction of queries to time out over a period of 10s to consider diff --git a/container-core/src/main/resources/configdefinitions/health-monitor.def b/container-core/src/main/resources/configdefinitions/health-monitor.def index adc8c9f9487..dc5cdbc6ca4 100644 --- a/container-core/src/main/resources/configdefinitions/health-monitor.def +++ b/container-core/src/main/resources/configdefinitions/health-monitor.def @@ -1,5 +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=container.jdisc.config diff --git a/container-core/src/main/resources/configdefinitions/metrics-presentation.def b/container-core/src/main/resources/configdefinitions/metrics-presentation.def index f1dbeeb43fd..b6c40993ef5 100644 --- a/container-core/src/main/resources/configdefinitions/metrics-presentation.def +++ b/container-core/src/main/resources/configdefinitions/metrics-presentation.def @@ -1,5 +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=metrics diff --git a/container-core/src/main/resources/configdefinitions/qr-logging.def b/container-core/src/main/resources/configdefinitions/qr-logging.def index 8db776eafbf..f828f321ae7 100644 --- a/container-core/src/main/resources/configdefinitions/qr-logging.def +++ b/container-core/src/main/resources/configdefinitions/qr-logging.def @@ -1,5 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=4 namespace=container.core logger string default="com.yahoo" # Either QueryAccessLog for a regular Vespa access log, or YApacheAccessLog for a log on yApache format diff --git a/container-core/src/main/resources/configdefinitions/qr-searchers.def b/container-core/src/main/resources/configdefinitions/qr-searchers.def index e9c7d0ff06f..a688749da6d 100644 --- a/container-core/src/main/resources/configdefinitions/qr-searchers.def +++ b/container-core/src/main/resources/configdefinitions/qr-searchers.def @@ -1,5 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=49 namespace=container # this file needs more comments diff --git a/container-core/src/main/resources/configdefinitions/qr-templates.def b/container-core/src/main/resources/configdefinitions/qr-templates.def index 4d419e12bc2..46b1a5cbd65 100644 --- a/container-core/src/main/resources/configdefinitions/qr-templates.def +++ b/container-core/src/main/resources/configdefinitions/qr-templates.def @@ -1,7 +1,6 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. # Not used # TODO: Remove on Vespa 7 -version=8 namespace=container.core ## Prefix to use in queries to choose a given template diff --git a/container-core/src/main/resources/configdefinitions/qr.def b/container-core/src/main/resources/configdefinitions/qr.def index 6efd2d5646c..f06cd2061c1 100644 --- a/container-core/src/main/resources/configdefinitions/qr.def +++ b/container-core/src/main/resources/configdefinitions/qr.def @@ -1,5 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=37 namespace=container ### All params must be flagged as 'restart' because this config is manually diff --git a/container-core/src/main/resources/configdefinitions/threadpool.def b/container-core/src/main/resources/configdefinitions/threadpool.def index 36d15ca9bca..5b5e7e2f4a2 100644 --- a/container-core/src/main/resources/configdefinitions/threadpool.def +++ b/container-core/src/main/resources/configdefinitions/threadpool.def @@ -1,5 +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=container.handler diff --git a/container-core/src/main/resources/configdefinitions/vip-status.def b/container-core/src/main/resources/configdefinitions/vip-status.def index abed5194b10..44da7292f05 100644 --- a/container-core/src/main/resources/configdefinitions/vip-status.def +++ b/container-core/src/main/resources/configdefinitions/vip-status.def @@ -1,5 +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=container.core ## If there is a Vespa search backend connected to this container, and that diff --git a/container-core/src/test/vespa-configdef/int.def b/container-core/src/test/vespa-configdef/int.def index 45431fb5571..48a94e6bfcd 100644 --- a/container-core/src/test/vespa-configdef/int.def +++ b/container-core/src/test/vespa-configdef/int.def @@ -1,5 +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=config.core diff --git a/container-core/src/test/vespa-configdef/string.def b/container-core/src/test/vespa-configdef/string.def index f08dad5baee..250dec3955e 100644 --- a/container-core/src/test/vespa-configdef/string.def +++ b/container-core/src/test/vespa-configdef/string.def @@ -1,5 +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=config.core diff --git a/container-di/src/main/resources/configdefinitions/bundles.def b/container-di/src/main/resources/configdefinitions/bundles.def index 089afb6a086..9e10d863106 100644 --- a/container-di/src/main/resources/configdefinitions/bundles.def +++ b/container-di/src/main/resources/configdefinitions/bundles.def @@ -1,5 +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=container # References to all 3rd-party bundles to be installed. diff --git a/container-di/src/main/resources/configdefinitions/components.def b/container-di/src/main/resources/configdefinitions/components.def index d35d5086d55..f27abc2fa5a 100644 --- a/container-di/src/main/resources/configdefinitions/components.def +++ b/container-di/src/main/resources/configdefinitions/components.def @@ -1,5 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=3 namespace=container ## A list of components. Components depending on other components may use this to diff --git a/container-di/src/test/vespa-configdef/bootstrap1.def b/container-di/src/test/vespa-configdef/bootstrap1.def index 10e920c8b6e..bdee16d99ea 100644 --- a/container-di/src/test/vespa-configdef/bootstrap1.def +++ b/container-di/src/test/vespa-configdef/bootstrap1.def @@ -1,5 +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=config.test dummy string default="" diff --git a/container-di/src/test/vespa-configdef/bootstrap2.def b/container-di/src/test/vespa-configdef/bootstrap2.def index 5571b9de3c2..b4fbffd8ae6 100644 --- a/container-di/src/test/vespa-configdef/bootstrap2.def +++ b/container-di/src/test/vespa-configdef/bootstrap2.def @@ -1,5 +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=config.test dummy string default="" diff --git a/container-di/src/test/vespa-configdef/components1.def b/container-di/src/test/vespa-configdef/components1.def index 10e920c8b6e..bdee16d99ea 100644 --- a/container-di/src/test/vespa-configdef/components1.def +++ b/container-di/src/test/vespa-configdef/components1.def @@ -1,5 +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=config.test dummy string default="" diff --git a/container-di/src/test/vespa-configdef/int.def b/container-di/src/test/vespa-configdef/int.def index 9f461321ba5..a34539c4a0f 100644 --- a/container-di/src/test/vespa-configdef/int.def +++ b/container-di/src/test/vespa-configdef/int.def @@ -1,5 +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=config.di diff --git a/container-di/src/test/vespa-configdef/string.def b/container-di/src/test/vespa-configdef/string.def index eaaba80d74e..396afe54f3f 100644 --- a/container-di/src/test/vespa-configdef/string.def +++ b/container-di/src/test/vespa-configdef/string.def @@ -1,5 +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=config.di diff --git a/container-di/src/test/vespa-configdef/test.def b/container-di/src/test/vespa-configdef/test.def index 53b38c579cb..d3e0ed17748 100644 --- a/container-di/src/test/vespa-configdef/test.def +++ b/container-di/src/test/vespa-configdef/test.def @@ -1,5 +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=config.test diff --git a/container-di/src/test/vespa-configdef/test2.def b/container-di/src/test/vespa-configdef/test2.def index 53b38c579cb..d3e0ed17748 100644 --- a/container-di/src/test/vespa-configdef/test2.def +++ b/container-di/src/test/vespa-configdef/test2.def @@ -1,5 +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=config.test diff --git a/container-di/src/test/vespa-configdef/thread-pool.def b/container-di/src/test/vespa-configdef/thread-pool.def index a38c024fad7..9e6b6694e84 100644 --- a/container-di/src/test/vespa-configdef/thread-pool.def +++ b/container-di/src/test/vespa-configdef/thread-pool.def @@ -1,5 +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=config.test diff --git a/container-disc/src/main/resources/configdefinitions/jdisc-bindings.def b/container-disc/src/main/resources/configdefinitions/jdisc-bindings.def index 70017be423b..c1b65d39d7a 100644 --- a/container-disc/src/main/resources/configdefinitions/jdisc-bindings.def +++ b/container-disc/src/main/resources/configdefinitions/jdisc-bindings.def @@ -1,5 +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=container.jdisc handlers{}.serverBindings[] string diff --git a/container-messagebus/src/main/resources/configdefinitions/container-mbus.def b/container-messagebus/src/main/resources/configdefinitions/container-mbus.def index ed6ce8437ef..b18bec66959 100644 --- a/container-messagebus/src/main/resources/configdefinitions/container-mbus.def +++ b/container-messagebus/src/main/resources/configdefinitions/container-mbus.def @@ -1,5 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=2 namespace=container.jdisc #settings for message bus in container diff --git a/container-messagebus/src/main/resources/configdefinitions/session.def b/container-messagebus/src/main/resources/configdefinitions/session.def index 9551a6c1ecc..93e71449e98 100644 --- a/container-messagebus/src/main/resources/configdefinitions/session.def +++ b/container-messagebus/src/main/resources/configdefinitions/session.def @@ -1,5 +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=container.jdisc.config diff --git a/container-search-and-docproc/src/main/resources/configdefinitions/application-userdata.def b/container-search-and-docproc/src/main/resources/configdefinitions/application-userdata.def index 0f3884b222f..0285d3d2103 100644 --- a/container-search-and-docproc/src/main/resources/configdefinitions/application-userdata.def +++ b/container-search-and-docproc/src/main/resources/configdefinitions/application-userdata.def @@ -2,7 +2,6 @@ # Contains user generated info about one deployed application # The values in this config are set by config overrides in vespa-services -version=1 namespace=container.handler.observability # The user-defined version of this application. diff --git a/container-search/src/main/resources/configdefinitions/documentdb-info.def b/container-search/src/main/resources/configdefinitions/documentdb-info.def index af010f1c161..76096b4a6f7 100644 --- a/container-search/src/main/resources/configdefinitions/documentdb-info.def +++ b/container-search/src/main/resources/configdefinitions/documentdb-info.def @@ -1,5 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=2 namespace=prelude.fastsearch ## The name of the search definition that this document database info applies to diff --git a/container-search/src/main/resources/configdefinitions/emulation.def b/container-search/src/main/resources/configdefinitions/emulation.def index 26dedb77b69..70d2d4954a4 100644 --- a/container-search/src/main/resources/configdefinitions/emulation.def +++ b/container-search/src/main/resources/configdefinitions/emulation.def @@ -1,5 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=2 namespace=prelude ## Keep emulating old (4.2, 5.0, early 5.1) string type fields for structured data diff --git a/container-search/src/main/resources/configdefinitions/federation.def b/container-search/src/main/resources/configdefinitions/federation.def index da9846d5246..36eb5d4b4c8 100644 --- a/container-search/src/main/resources/configdefinitions/federation.def +++ b/container-search/src/main/resources/configdefinitions/federation.def @@ -1,5 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=7 namespace=search.federation target[].id string diff --git a/container-search/src/main/resources/configdefinitions/fs4.def b/container-search/src/main/resources/configdefinitions/fs4.def index a4af65bef02..d0c68540071 100644 --- a/container-search/src/main/resources/configdefinitions/fs4.def +++ b/container-search/src/main/resources/configdefinitions/fs4.def @@ -1,5 +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=container.search ##Number of listener threads diff --git a/container-search/src/main/resources/configdefinitions/index-info.def b/container-search/src/main/resources/configdefinitions/index-info.def index c329b0de1cc..f3b905d4d0a 100644 --- a/container-search/src/main/resources/configdefinitions/index-info.def +++ b/container-search/src/main/resources/configdefinitions/index-info.def @@ -1,6 +1,5 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. ## Commands per search definition to be applied to query terms per index before searching -version=2 namespace=search.config ## The name of the search definition this index info applies to diff --git a/container-search/src/main/resources/configdefinitions/lowercasing.def b/container-search/src/main/resources/configdefinitions/lowercasing.def index 521b7624660..b656c451e11 100644 --- a/container-search/src/main/resources/configdefinitions/lowercasing.def +++ b/container-search/src/main/resources/configdefinitions/lowercasing.def @@ -1,5 +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=search.querytransform transform_weighted_sets bool default=true diff --git a/container-search/src/main/resources/configdefinitions/measure-qps.def b/container-search/src/main/resources/configdefinitions/measure-qps.def index b146002cab5..c8b38b9db6e 100644 --- a/container-search/src/main/resources/configdefinitions/measure-qps.def +++ b/container-search/src/main/resources/configdefinitions/measure-qps.def @@ -1,5 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=2 namespace=search.statistics ## Configure measurements of peak QPS rates. diff --git a/container-search/src/main/resources/configdefinitions/page-templates.def b/container-search/src/main/resources/configdefinitions/page-templates.def index e69bc9c223c..31ec7644d18 100644 --- a/container-search/src/main/resources/configdefinitions/page-templates.def +++ b/container-search/src/main/resources/configdefinitions/page-templates.def @@ -1,5 +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=search.pagetemplates # The xml content of a page template diff --git a/container-search/src/main/resources/configdefinitions/provider.def b/container-search/src/main/resources/configdefinitions/provider.def index 6b23d47427d..79b09913b49 100644 --- a/container-search/src/main/resources/configdefinitions/provider.def +++ b/container-search/src/main/resources/configdefinitions/provider.def @@ -1,5 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=16 namespace=search.federation node[].host string diff --git a/container-search/src/main/resources/configdefinitions/qr-binary-cache-region.def b/container-search/src/main/resources/configdefinitions/qr-binary-cache-region.def index eb7183bff40..ba2b6ed7802 100644 --- a/container-search/src/main/resources/configdefinitions/qr-binary-cache-region.def +++ b/container-search/src/main/resources/configdefinitions/qr-binary-cache-region.def @@ -1,7 +1,6 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. # TODO: Not in use - remove on Vespa 7 -version=4 namespace=search.cache # size of the region (in MB). Cache size (in qr-binary-cache.cfg) diff --git a/container-search/src/main/resources/configdefinitions/qr-binary-cache.def b/container-search/src/main/resources/configdefinitions/qr-binary-cache.def index 0df80d7e520..917832e86fe 100644 --- a/container-search/src/main/resources/configdefinitions/qr-binary-cache.def +++ b/container-search/src/main/resources/configdefinitions/qr-binary-cache.def @@ -1,7 +1,6 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. # TODO: Not in use - remove on Vespa 7 -version=3 namespace=search.cache # Size of a block in cache. A block is the smallest unit that would diff --git a/container-search/src/main/resources/configdefinitions/qr-monitor.def b/container-search/src/main/resources/configdefinitions/qr-monitor.def index 931e62049d2..2c4ff3c6167 100644 --- a/container-search/src/main/resources/configdefinitions/qr-monitor.def +++ b/container-search/src/main/resources/configdefinitions/qr-monitor.def @@ -1,5 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=4 namespace=prelude.cluster ## The number of milliseconds to attempt to complete a request before diff --git a/container-search/src/main/resources/configdefinitions/qr-quotetable.def b/container-search/src/main/resources/configdefinitions/qr-quotetable.def index e387d9dc732..40979ad2a35 100644 --- a/container-search/src/main/resources/configdefinitions/qr-quotetable.def +++ b/container-search/src/main/resources/configdefinitions/qr-quotetable.def @@ -1,5 +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=prelude.searcher ## The ordinal number of the character to quote in UNICODE. diff --git a/container-search/src/main/resources/configdefinitions/query-profiles.def b/container-search/src/main/resources/configdefinitions/query-profiles.def index 75b3f122b0a..20fcbda0d72 100644 --- a/container-search/src/main/resources/configdefinitions/query-profiles.def +++ b/container-search/src/main/resources/configdefinitions/query-profiles.def @@ -2,7 +2,6 @@ # Query profiles and their types - a query profile is a nested composite of query parameters with an id # A set of query parameters can be fetched from a query profile rather than being # submitted explicitly. -version=4 namespace=search.query.profile.config # The id of this query profile. The id has the form name(:version)? diff --git a/container-search/src/main/resources/configdefinitions/resolvers.def b/container-search/src/main/resources/configdefinitions/resolvers.def index 87b7a8b84df..6003fdf81f1 100644 --- a/container-search/src/main/resources/configdefinitions/resolvers.def +++ b/container-search/src/main/resources/configdefinitions/resolvers.def @@ -1,5 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=2 namespace=search.pagetemplates ## A list of resolver components used by com.yahoo.search.PageTemplateSearcher diff --git a/container-search/src/main/resources/configdefinitions/rewrites.def b/container-search/src/main/resources/configdefinitions/rewrites.def index 0179057029f..ecca422342a 100644 --- a/container-search/src/main/resources/configdefinitions/rewrites.def +++ b/container-search/src/main/resources/configdefinitions/rewrites.def @@ -1,5 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=2 namespace=search.query.rewrite fsaDict[].name string diff --git a/container-search/src/main/resources/configdefinitions/search-with-renderer-handler.def b/container-search/src/main/resources/configdefinitions/search-with-renderer-handler.def index 1c489f39ed9..a34e08a1c82 100644 --- a/container-search/src/main/resources/configdefinitions/search-with-renderer-handler.def +++ b/container-search/src/main/resources/configdefinitions/search-with-renderer-handler.def @@ -1,5 +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=search.handler rendererId string diff --git a/container-search/src/main/resources/configdefinitions/searchchain-forward.def b/container-search/src/main/resources/configdefinitions/searchchain-forward.def index dd66acb2e57..0e86490e120 100644 --- a/container-search/src/main/resources/configdefinitions/searchchain-forward.def +++ b/container-search/src/main/resources/configdefinitions/searchchain-forward.def @@ -1,5 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=2 namespace=search.federation ## A searcher forwarding the incoming query to a single search chain and diff --git a/container-search/src/main/resources/configdefinitions/semantic-rules.def b/container-search/src/main/resources/configdefinitions/semantic-rules.def index 4212e20fcc1..5ac0cca7ff6 100644 --- a/container-search/src/main/resources/configdefinitions/semantic-rules.def +++ b/container-search/src/main/resources/configdefinitions/semantic-rules.def @@ -1,6 +1,5 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. # Semantic production rules -version=2 namespace=prelude.semantics # Whether we should use these rule bases in pre-Vespa 2.2 compatibility mode diff --git a/container-search/src/main/resources/configdefinitions/strict-contracts.def b/container-search/src/main/resources/configdefinitions/strict-contracts.def index f7af59792ae..f9dd788c054 100644 --- a/container-search/src/main/resources/configdefinitions/strict-contracts.def +++ b/container-search/src/main/resources/configdefinitions/strict-contracts.def @@ -1,5 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=2 namespace=search.federation ## A config to control whether to activate strict adherence to public contracts diff --git a/container-search/src/main/resources/configdefinitions/timing-searcher.def b/container-search/src/main/resources/configdefinitions/timing-searcher.def index 254d7c5b5bb..7c2b698bdb0 100644 --- a/container-search/src/main/resources/configdefinitions/timing-searcher.def +++ b/container-search/src/main/resources/configdefinitions/timing-searcher.def @@ -1,5 +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=search.statistics timer[].name string diff --git a/container-search/src/test/vespa-configdef/int.def b/container-search/src/test/vespa-configdef/int.def index 895a5e0de68..b526a956b5c 100644 --- a/container-search/src/test/vespa-configdef/int.def +++ b/container-search/src/test/vespa-configdef/int.def @@ -1,5 +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=config.search diff --git a/container-search/src/test/vespa-configdef/string.def b/container-search/src/test/vespa-configdef/string.def index c3ee208f633..4b39de61e0a 100644 --- a/container-search/src/test/vespa-configdef/string.def +++ b/container-search/src/test/vespa-configdef/string.def @@ -1,5 +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=config.search diff --git a/docproc/src/main/resources/configdefinitions/docproc.def b/docproc/src/main/resources/configdefinitions/docproc.def index 76acfdfca8a..3b4c4fc5b16 100644 --- a/docproc/src/main/resources/configdefinitions/docproc.def +++ b/docproc/src/main/resources/configdefinitions/docproc.def @@ -1,5 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=12 namespace=config.docproc # Queue size (in milliseconds) for this node diff --git a/docproc/src/main/resources/configdefinitions/schemamapping.def b/docproc/src/main/resources/configdefinitions/schemamapping.def index 87afe204770..d70235fbfc0 100644 --- a/docproc/src/main/resources/configdefinitions/schemamapping.def +++ b/docproc/src/main/resources/configdefinitions/schemamapping.def @@ -1,7 +1,6 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. # Use when a docproc works on a generic set of field names and the actual names # in input doc may be different -version=1 namespace=config.docproc # The chain this mapping applies to diff --git a/docproc/src/main/resources/configdefinitions/splitter-joiner-document-processor.def b/docproc/src/main/resources/configdefinitions/splitter-joiner-document-processor.def index c96a6c63d3c..dea6141e6cc 100644 --- a/docproc/src/main/resources/configdefinitions/splitter-joiner-document-processor.def +++ b/docproc/src/main/resources/configdefinitions/splitter-joiner-document-processor.def @@ -1,5 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=2 namespace=config.docproc # The name of the enclosing (outer) document type diff --git a/docproc/src/test/vespa-configdef/string.def b/docproc/src/test/vespa-configdef/string.def index 9e59f7caec4..3e76855f1e8 100644 --- a/docproc/src/test/vespa-configdef/string.def +++ b/docproc/src/test/vespa-configdef/string.def @@ -1,5 +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=config.docproc stringVal string default="_default_" diff --git a/document/src/vespa/document/config/documentmanager.def b/document/src/vespa/document/config/documentmanager.def index 9fa8c82800b..1961f67d83c 100644 --- a/document/src/vespa/document/config/documentmanager.def +++ b/document/src/vespa/document/config/documentmanager.def @@ -1,5 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=15 namespace=document.config diff --git a/document/src/vespa/document/config/documenttypes.def b/document/src/vespa/document/config/documenttypes.def index 7501c5b0d5c..c0c4f50ab86 100644 --- a/document/src/vespa/document/config/documenttypes.def +++ b/document/src/vespa/document/config/documenttypes.def @@ -1,5 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=15 namespace=document diff --git a/documentapi/src/main/resources/configdefinitions/documentrouteselectorpolicy.def b/documentapi/src/main/resources/configdefinitions/documentrouteselectorpolicy.def index be5d14e96ca..f6f4461d220 100644 --- a/documentapi/src/main/resources/configdefinitions/documentrouteselectorpolicy.def +++ b/documentapi/src/main/resources/configdefinitions/documentrouteselectorpolicy.def @@ -1,5 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=2 namespace=documentapi.messagebus.protocol # The name of the route. diff --git a/messagebus/src/main/config/messagebus.def b/messagebus/src/main/config/messagebus.def index d0ddbcb8e62..b750530ec5f 100644 --- a/messagebus/src/main/config/messagebus.def +++ b/messagebus/src/main/config/messagebus.def @@ -1,5 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=2 namespace=messagebus # Name of the protocol that uses this routing table. All diff --git a/metrics/src/vespa/metrics/metricsmanager.def b/metrics/src/vespa/metrics/metricsmanager.def index 11e00eda286..80f03a8e9e8 100644 --- a/metrics/src/vespa/metrics/metricsmanager.def +++ b/metrics/src/vespa/metrics/metricsmanager.def @@ -1,5 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=4 namespace=metrics # If any snapshot periods is set, these override all the default ones. diff --git a/persistence/src/main/resources/configdefinitions/persistence-rpc.def b/persistence/src/main/resources/configdefinitions/persistence-rpc.def index 2400905e3b7..9cae5812760 100644 --- a/persistence/src/main/resources/configdefinitions/persistence-rpc.def +++ b/persistence/src/main/resources/configdefinitions/persistence-rpc.def @@ -1,5 +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=persistence port int default=3456 restart diff --git a/simplemetrics/src/main/resources/configdefinitions/manager.def b/simplemetrics/src/main/resources/configdefinitions/manager.def index 0ca1a93bda3..6446e0df8b6 100644 --- a/simplemetrics/src/main/resources/configdefinitions/manager.def +++ b/simplemetrics/src/main/resources/configdefinitions/manager.def @@ -1,5 +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=metrics reportPeriodSeconds int default=60 diff --git a/statistics/src/main/resources/configdefinitions/statistics.def b/statistics/src/main/resources/configdefinitions/statistics.def index 5a9bd30e50b..92da7704714 100644 --- a/statistics/src/main/resources/configdefinitions/statistics.def +++ b/statistics/src/main/resources/configdefinitions/statistics.def @@ -1,5 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=6 namespace=container ## Interval between internal sample points measured in seconds diff --git a/vespaclient-core/src/main/resources/configdefinitions/feeder.def b/vespaclient-core/src/main/resources/configdefinitions/feeder.def index f6997d005f6..a376a4807a7 100644 --- a/vespaclient-core/src/main/resources/configdefinitions/feeder.def +++ b/vespaclient-core/src/main/resources/configdefinitions/feeder.def @@ -1,5 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=16 namespace=vespaclient.config ## Whether or not to abort if there are document-related errors. |