Use full name in config definition file names

28 files changed, 3 insertions, 3 deletions

diff --git a/config-model/src/test/cfg/admin/userconfigs/function-test.def b/config-model/src/test/cfg/admin/userconfigs/test.function-test.def
index 86a110c3413..86a110c3413 100644
--- a/config-model/src/test/cfg/admin/userconfigs/function-test.def
+++ b/config-model/src/test/cfg/admin/userconfigs/test.function-test.def
diff --git a/config-model/src/test/cfg/application/classes/attributes.def b/config-model/src/test/cfg/application/classes/vespa.config.search.attributes.def
index c8e51c391f7..c8e51c391f7 100644
--- a/config-model/src/test/cfg/application/classes/attributes.def
+++ b/config-model/src/test/cfg/application/classes/vespa.config.search.attributes.def
diff --git a/config-model/src/test/cfg/application/configdeftest/configdefinitions/foo.def b/config-model/src/test/cfg/application/configdeftest/configdefinitions/config.foo.def
index c37aafd6fc4..c37aafd6fc4 100644
--- a/config-model/src/test/cfg/application/configdeftest/configdefinitions/foo.def
+++ b/config-model/src/test/cfg/application/configdeftest/configdefinitions/config.foo.def
diff --git a/config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.def b/config-model/src/test/cfg/application/configdeftest/configdefinitions/config.xyzzy.def
index c37aafd6fc4..c37aafd6fc4 100644
--- a/config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.def
+++ b/config-model/src/test/cfg/application/configdeftest/configdefinitions/config.xyzzy.def
diff --git a/config-model/src/test/cfg/application/configdeftest/configdefinitions/qux.foo.def b/config-model/src/test/cfg/application/configdeftest/configdefinitions/qux.qux.foo.def
index 1ff4daea194..1ff4daea194 100644
--- a/config-model/src/test/cfg/application/configdeftest/configdefinitions/qux.foo.def
+++ b/config-model/src/test/cfg/application/configdeftest/configdefinitions/qux.qux.foo.def
diff --git a/config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.bar.def b/config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.bar.def
index d4ef225830a..e1d5e8341e7 100644
--- a/config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.bar.def
+++ b/config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.bar.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.
 namespace=xyzzy
-bar int default="2"
-foo int
+bar int default="1"
diff --git a/config-model/src/test/cfg/application/configdeftest/configdefinitions/baz.def b/config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.baz.def
index c30d4b36ad3..c30d4b36ad3 100644
--- a/config-model/src/test/cfg/application/configdeftest/configdefinitions/baz.def
+++ b/config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.baz.def
diff --git a/config-model/src/test/cfg/application/configdeftest/configdefinitions/bar.def b/config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.xyzzy.bar.def
index e1d5e8341e7..d4ef225830a 100644
--- a/config-model/src/test/cfg/application/configdeftest/configdefinitions/bar.def
+++ b/config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.xyzzy.bar.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.
 namespace=xyzzy
-bar int default="1"
+bar int default="2"
+foo int
diff --git a/config-model/src/test/cfg/application/serverdefs/attributes.def b/config-model/src/test/cfg/application/serverdefs/vespa.config.search.attributes.def
index 0bb16fb8079..0bb16fb8079 100644
--- a/config-model/src/test/cfg/application/serverdefs/attributes.def
+++ b/config-model/src/test/cfg/application/serverdefs/vespa.config.search.attributes.def
diff --git a/config-model/src/test/derived/music/defs/documentmanager.def b/config-model/src/test/derived/music/defs/document.config.documentmanager.def
index fa52e08a1de..fa52e08a1de 100644
--- a/config-model/src/test/derived/music/defs/documentmanager.def
+++ b/config-model/src/test/derived/music/defs/document.config.documentmanager.def
diff --git a/config-model/src/test/derived/music/defs/extra.def b/config-model/src/test/derived/music/defs/test.extra.def
index 3c3eaa51ab5..3c3eaa51ab5 100644
--- a/config-model/src/test/derived/music/defs/extra.def
+++ b/config-model/src/test/derived/music/defs/test.extra.def
diff --git a/config-model/src/test/derived/music/defs/attributes.def b/config-model/src/test/derived/music/defs/vespa.config.search.attributes.def
index c8e51c391f7..c8e51c391f7 100644
--- a/config-model/src/test/derived/music/defs/attributes.def
+++ b/config-model/src/test/derived/music/defs/vespa.config.search.attributes.def
diff --git a/config-model/src/test/derived/music/defs/rank-profiles.def b/config-model/src/test/derived/music/defs/vespa.config.search.rank-profiles.def
index 03037865bb9..03037865bb9 100644
--- a/config-model/src/test/derived/music/defs/rank-profiles.def
+++ b/config-model/src/test/derived/music/defs/vespa.config.search.rank-profiles.def
diff --git a/config-model/src/test/derived/music/defs/summarymap.def b/config-model/src/test/derived/music/defs/vespa.config.search.summarymap.def
index a994309e207..a994309e207 100644
--- a/config-model/src/test/derived/music/defs/summarymap.def
+++ b/config-model/src/test/derived/music/defs/vespa.config.search.summarymap.def
diff --git a/config-model/src/test/derived/music/defs/ilscripts.def b/config-model/src/test/derived/music/defs/vespa.configdefinition.ilscripts.def
index 1147fd6469d..1147fd6469d 100644
--- a/config-model/src/test/derived/music/defs/ilscripts.def
+++ b/config-model/src/test/derived/music/defs/vespa.configdefinition.ilscripts.def
diff --git a/config-model/src/test/derived/newrank/defs/documentmanager.def b/config-model/src/test/derived/newrank/defs/document.config.documentmanager.def
index fa52e08a1de..fa52e08a1de 100644
--- a/config-model/src/test/derived/newrank/defs/documentmanager.def
+++ b/config-model/src/test/derived/newrank/defs/document.config.documentmanager.def
diff --git a/config-model/src/test/derived/newrank/defs/extra.def b/config-model/src/test/derived/newrank/defs/test.extra.def
index 3c3eaa51ab5..3c3eaa51ab5 100644
--- a/config-model/src/test/derived/newrank/defs/extra.def
+++ b/config-model/src/test/derived/newrank/defs/test.extra.def
diff --git a/config-model/src/test/derived/newrank/defs/attributes.def b/config-model/src/test/derived/newrank/defs/vespa.config.search.attributes.def
index c8e51c391f7..c8e51c391f7 100644
--- a/config-model/src/test/derived/newrank/defs/attributes.def
+++ b/config-model/src/test/derived/newrank/defs/vespa.config.search.attributes.def
diff --git a/config-model/src/test/derived/newrank/defs/rank-profiles.def b/config-model/src/test/derived/newrank/defs/vespa.config.search.rank-profiles.def
index 03037865bb9..03037865bb9 100644
--- a/config-model/src/test/derived/newrank/defs/rank-profiles.def
+++ b/config-model/src/test/derived/newrank/defs/vespa.config.search.rank-profiles.def
diff --git a/config-model/src/test/derived/newrank/defs/summarymap.def b/config-model/src/test/derived/newrank/defs/vespa.config.search.summarymap.def
index 3f98c2b40eb..3f98c2b40eb 100644
--- a/config-model/src/test/derived/newrank/defs/summarymap.def
+++ b/config-model/src/test/derived/newrank/defs/vespa.config.search.summarymap.def
diff --git a/config-model/src/test/derived/newrank/defs/ilscripts.def b/config-model/src/test/derived/newrank/defs/vespa.configdefinition.ilscripts.def
index 1147fd6469d..1147fd6469d 100644
--- a/config-model/src/test/derived/newrank/defs/ilscripts.def
+++ b/config-model/src/test/derived/newrank/defs/vespa.configdefinition.ilscripts.def
diff --git a/config-model/src/test/resources/configdefinitions/anotherrestart.def b/config-model/src/test/resources/configdefinitions/test.anotherrestart.def
index 01da11e7c45..01da11e7c45 100644
--- a/config-model/src/test/resources/configdefinitions/anotherrestart.def
+++ b/config-model/src/test/resources/configdefinitions/test.anotherrestart.def
diff --git a/config-model/src/test/resources/configdefinitions/arraytypes.def b/config-model/src/test/resources/configdefinitions/test.arraytypes.def
index 8add790c6cb..8add790c6cb 100644
--- a/config-model/src/test/resources/configdefinitions/arraytypes.def
+++ b/config-model/src/test/resources/configdefinitions/test.arraytypes.def
diff --git a/config-model/src/test/resources/configdefinitions/function-test.def b/config-model/src/test/resources/configdefinitions/test.function-test.def
index 4208f7ab906..4208f7ab906 100644
--- a/config-model/src/test/resources/configdefinitions/function-test.def
+++ b/config-model/src/test/resources/configdefinitions/test.function-test.def
diff --git a/config-model/src/test/resources/configdefinitions/nonrestart.def b/config-model/src/test/resources/configdefinitions/test.nonrestart.def
index b9b1227349a..b9b1227349a 100644
--- a/config-model/src/test/resources/configdefinitions/nonrestart.def
+++ b/config-model/src/test/resources/configdefinitions/test.nonrestart.def
diff --git a/config-model/src/test/resources/configdefinitions/restart.def b/config-model/src/test/resources/configdefinitions/test.restart.def
index a0826edf881..a0826edf881 100644
--- a/config-model/src/test/resources/configdefinitions/restart.def
+++ b/config-model/src/test/resources/configdefinitions/test.restart.def
diff --git a/config-model/src/test/resources/configdefinitions/simpletypes.def b/config-model/src/test/resources/configdefinitions/test.simpletypes.def
index b54ea43435d..b54ea43435d 100644
--- a/config-model/src/test/resources/configdefinitions/simpletypes.def
+++ b/config-model/src/test/resources/configdefinitions/test.simpletypes.def
diff --git a/config-model/src/test/resources/configdefinitions/standard.def b/config-model/src/test/resources/configdefinitions/test.standard.def
index b06e858d391..b06e858d391 100644
--- a/config-model/src/test/resources/configdefinitions/standard.def
+++ b/config-model/src/test/resources/configdefinitions/test.standard.def