From 9b948718144e5d556cc6ea49d2ff6bbf05f00b0e Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Thu, 10 Sep 2020 19:54:48 +0200 Subject: Use full name in config definition file names --- .../src/test/cfg/application/configdeftest/configdefinitions/bar.def | 3 --- .../src/test/cfg/application/configdeftest/configdefinitions/baz.def | 3 --- .../cfg/application/configdeftest/configdefinitions/config.foo.def | 3 +++ .../cfg/application/configdeftest/configdefinitions/config.xyzzy.def | 3 +++ .../src/test/cfg/application/configdeftest/configdefinitions/foo.def | 3 --- .../test/cfg/application/configdeftest/configdefinitions/qux.foo.def | 4 ---- .../cfg/application/configdeftest/configdefinitions/qux.qux.foo.def | 4 ++++ .../cfg/application/configdeftest/configdefinitions/xyzzy.bar.def | 3 +-- .../cfg/application/configdeftest/configdefinitions/xyzzy.baz.def | 3 +++ .../test/cfg/application/configdeftest/configdefinitions/xyzzy.def | 3 --- .../application/configdeftest/configdefinitions/xyzzy.xyzzy.bar.def | 4 ++++ 11 files changed, 18 insertions(+), 18 deletions(-) delete mode 100644 config-model/src/test/cfg/application/configdeftest/configdefinitions/bar.def delete mode 100644 config-model/src/test/cfg/application/configdeftest/configdefinitions/baz.def create mode 100644 config-model/src/test/cfg/application/configdeftest/configdefinitions/config.foo.def create mode 100644 config-model/src/test/cfg/application/configdeftest/configdefinitions/config.xyzzy.def delete mode 100644 config-model/src/test/cfg/application/configdeftest/configdefinitions/foo.def delete mode 100644 config-model/src/test/cfg/application/configdeftest/configdefinitions/qux.foo.def create mode 100644 config-model/src/test/cfg/application/configdeftest/configdefinitions/qux.qux.foo.def create mode 100644 config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.baz.def delete mode 100644 config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.def create mode 100644 config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.xyzzy.bar.def (limited to 'config-model/src/test/cfg/application/configdeftest/configdefinitions') diff --git a/config-model/src/test/cfg/application/configdeftest/configdefinitions/bar.def b/config-model/src/test/cfg/application/configdeftest/configdefinitions/bar.def deleted file mode 100644 index e1d5e8341e7..00000000000 --- a/config-model/src/test/cfg/application/configdeftest/configdefinitions/bar.def +++ /dev/null @@ -1,3 +0,0 @@ -# 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" diff --git a/config-model/src/test/cfg/application/configdeftest/configdefinitions/baz.def b/config-model/src/test/cfg/application/configdeftest/configdefinitions/baz.def deleted file mode 100644 index c30d4b36ad3..00000000000 --- a/config-model/src/test/cfg/application/configdeftest/configdefinitions/baz.def +++ /dev/null @@ -1,3 +0,0 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -namespace=xyzzy -bar int diff --git a/config-model/src/test/cfg/application/configdeftest/configdefinitions/config.foo.def b/config-model/src/test/cfg/application/configdeftest/configdefinitions/config.foo.def new file mode 100644 index 00000000000..c37aafd6fc4 --- /dev/null +++ b/config-model/src/test/cfg/application/configdeftest/configdefinitions/config.foo.def @@ -0,0 +1,3 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +namespace=config +bar int default=1 diff --git a/config-model/src/test/cfg/application/configdeftest/configdefinitions/config.xyzzy.def b/config-model/src/test/cfg/application/configdeftest/configdefinitions/config.xyzzy.def new file mode 100644 index 00000000000..c37aafd6fc4 --- /dev/null +++ b/config-model/src/test/cfg/application/configdeftest/configdefinitions/config.xyzzy.def @@ -0,0 +1,3 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +namespace=config +bar int default=1 diff --git a/config-model/src/test/cfg/application/configdeftest/configdefinitions/foo.def b/config-model/src/test/cfg/application/configdeftest/configdefinitions/foo.def deleted file mode 100644 index c37aafd6fc4..00000000000 --- a/config-model/src/test/cfg/application/configdeftest/configdefinitions/foo.def +++ /dev/null @@ -1,3 +0,0 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -namespace=config -bar int default=1 diff --git a/config-model/src/test/cfg/application/configdeftest/configdefinitions/qux.foo.def b/config-model/src/test/cfg/application/configdeftest/configdefinitions/qux.foo.def deleted file mode 100644 index 1ff4daea194..00000000000 --- a/config-model/src/test/cfg/application/configdeftest/configdefinitions/qux.foo.def +++ /dev/null @@ -1,4 +0,0 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -namespace=qux -bar int default=2 -quux int default=3 diff --git a/config-model/src/test/cfg/application/configdeftest/configdefinitions/qux.qux.foo.def b/config-model/src/test/cfg/application/configdeftest/configdefinitions/qux.qux.foo.def new file mode 100644 index 00000000000..1ff4daea194 --- /dev/null +++ b/config-model/src/test/cfg/application/configdeftest/configdefinitions/qux.qux.foo.def @@ -0,0 +1,4 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +namespace=qux +bar int default=2 +quux int default=3 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/xyzzy.baz.def b/config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.baz.def new file mode 100644 index 00000000000..c30d4b36ad3 --- /dev/null +++ b/config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.baz.def @@ -0,0 +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 diff --git a/config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.def b/config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.def deleted file mode 100644 index c37aafd6fc4..00000000000 --- a/config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.def +++ /dev/null @@ -1,3 +0,0 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -namespace=config -bar int default=1 diff --git a/config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.xyzzy.bar.def b/config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.xyzzy.bar.def new file mode 100644 index 00000000000..d4ef225830a --- /dev/null +++ b/config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.xyzzy.bar.def @@ -0,0 +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="2" +foo int -- cgit v1.2.3