diff options
-rw-r--r-- | config/src/test/java/com/yahoo/config/subscription/CfgConfigPayloadBuilderTest.java | 2 | ||||
-rw-r--r-- | config/src/test/java/com/yahoo/config/subscription/ConfigInstancePayloadTest.java | 2 | ||||
-rw-r--r-- | config/src/test/java/com/yahoo/config/subscription/ConfigInstanceUtilTest.java | 2 | ||||
-rw-r--r-- | config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionBuilderTest.java | 2 | ||||
-rw-r--r-- | config/src/test/java/com/yahoo/vespa/config/util/ConfigUtilsTest.java | 8 | ||||
-rw-r--r-- | config/src/test/resources/configdefinitions/bar.def (renamed from config/src/test/resources/configdefinitions/config.bar.def) | 0 | ||||
-rw-r--r-- | config/src/test/resources/configdefinitions/baz.def (renamed from config/src/test/resources/configdefinitions/config.baz.def) | 0 | ||||
-rw-r--r-- | config/src/test/resources/configdefinitions/bootstrap.def (renamed from config/src/test/resources/configdefinitions/config.bootstrap.def) | 0 | ||||
-rw-r--r-- | config/src/test/resources/configdefinitions/foo.def (renamed from config/src/test/resources/configdefinitions/config.foo.def) | 0 | ||||
-rw-r--r-- | config/src/test/resources/configdefinitions/foobar.def (renamed from config/src/test/resources/configdefinitions/config.foobar.def) | 0 | ||||
-rw-r--r-- | config/src/test/resources/configdefinitions/foodefault.def (renamed from config/src/test/resources/configdefinitions/config.foodefault.def) | 0 | ||||
-rw-r--r-- | config/src/test/resources/configdefinitions/function-test.def (renamed from config/src/test/resources/configdefinitions/config.function-test.def) | 0 | ||||
-rw-r--r-- | config/src/test/resources/configdefinitions/motd.def (renamed from config/src/test/resources/configdefinitions/config.motd.def) | 0 | ||||
-rw-r--r-- | config/src/test/resources/configdefinitions/my.def (renamed from config/src/test/resources/configdefinitions/config.my.def) | 0 | ||||
-rw-r--r-- | config/src/test/resources/configs/def-files-nogen/app.def (renamed from config/src/test/resources/configs/def-files-nogen/foo.bar.app.def) | 0 | ||||
-rw-r--r-- | config/src/test/resources/configs/def-files/app.def (renamed from config/src/test/resources/configs/def-files/foo.app.def) | 0 | ||||
-rw-r--r-- | config/src/test/resources/configs/def-files/arraytypes.def (renamed from config/src/test/resources/configs/def-files/foo.arraytypes.def) | 0 | ||||
-rw-r--r-- | config/src/test/resources/configs/def-files/defaulttest.def (renamed from config/src/test/resources/configs/def-files/foo.defaulttest.def) | 0 | ||||
-rw-r--r-- | config/src/test/resources/configs/def-files/function-test.def (renamed from config/src/test/resources/configs/def-files/foo.function-test.def) | 0 | ||||
-rwxr-xr-x | config/src/test/resources/configs/def-files/int.def (renamed from config/src/test/resources/configs/def-files/foo.int.def) | 0 | ||||
-rw-r--r-- | config/src/test/resources/configs/def-files/maptypes.def (renamed from config/src/test/resources/configs/def-files/foo.maptypes.def) | 0 | ||||
-rw-r--r-- | config/src/test/resources/configs/def-files/namespace.def (renamed from config/src/test/resources/configs/def-files/myproject.config.namespace.def) | 0 | ||||
-rw-r--r-- | config/src/test/resources/configs/def-files/simpletypes.def (renamed from config/src/test/resources/configs/def-files/foo.simpletypes.def) | 0 | ||||
-rw-r--r-- | config/src/test/resources/configs/def-files/specialtypes.def (renamed from config/src/test/resources/configs/def-files/foo.specialtypes.def) | 0 | ||||
-rwxr-xr-x | config/src/test/resources/configs/def-files/string.def (renamed from config/src/test/resources/configs/def-files/foo.string.def) | 0 | ||||
-rw-r--r-- | config/src/test/resources/configs/def-files/structtypes.def (renamed from config/src/test/resources/configs/def-files/foo.structtypes.def) | 0 | ||||
-rw-r--r-- | config/src/test/resources/configs/def-files/test-nodefs.def (renamed from config/src/test/resources/configs/def-files/foo.test-nodefs.def) | 0 | ||||
-rw-r--r-- | config/src/test/resources/configs/def-files/test-nonstring.def (renamed from config/src/test/resources/configs/def-files/foo.test-nonstring.def) | 0 | ||||
-rw-r--r-- | config/src/test/resources/configs/def-files/test-reference.def (renamed from config/src/test/resources/configs/def-files/foo.test-reference.def) | 0 | ||||
-rw-r--r-- | config/src/test/resources/configs/def-files/testnamespace.def (renamed from config/src/test/resources/configs/def-files/foo.testnamespace.def) | 0 | ||||
-rw-r--r-- | config/src/test/resources/configs/def-files/unicode.def (renamed from config/src/test/resources/configs/def-files/foo.unicode.def) | 0 | ||||
-rw-r--r-- | documentapi/src/main/resources/configdefinitions/documentrouteselectorpolicy.def (renamed from documentapi/src/main/resources/configdefinitions/documentapi.messagebus.protocol.documentrouteselectorpolicy.def) | 0 | ||||
-rw-r--r-- | fileacquirer/src/main/resources/configdefinitions/filedistributorrpc.def (renamed from fileacquirer/src/main/resources/configdefinitions/cloud.config.filedistribution.filedistributorrpc.def) | 0 | ||||
-rw-r--r-- | logd/src/main/resources/configdefinitions/logd.def (renamed from logd/src/main/resources/configdefinitions/cloud.config.log.logd.def) | 0 | ||||
-rw-r--r-- | messagebus/src/main/config/messagebus.def (renamed from messagebus/src/main/config/messagebus.messagebus.def) | 0 |
35 files changed, 8 insertions, 8 deletions
diff --git a/config/src/test/java/com/yahoo/config/subscription/CfgConfigPayloadBuilderTest.java b/config/src/test/java/com/yahoo/config/subscription/CfgConfigPayloadBuilderTest.java index 1c36fdcfed3..c8693227920 100644 --- a/config/src/test/java/com/yahoo/config/subscription/CfgConfigPayloadBuilderTest.java +++ b/config/src/test/java/com/yahoo/config/subscription/CfgConfigPayloadBuilderTest.java @@ -33,7 +33,7 @@ public class CfgConfigPayloadBuilderTest { " ':parent',", " 'parent:'", " ],", - " 'pathVal': 'src/test/resources/configs/def-files/foo.function-test.def',", + " 'pathVal': 'src/test/resources/configs/def-files/function-test.def',", " 'string_val': 'foo',", " 'myStructMap': {", " 'one': {", diff --git a/config/src/test/java/com/yahoo/config/subscription/ConfigInstancePayloadTest.java b/config/src/test/java/com/yahoo/config/subscription/ConfigInstancePayloadTest.java index b031e3b985a..49fd25b6476 100644 --- a/config/src/test/java/com/yahoo/config/subscription/ConfigInstancePayloadTest.java +++ b/config/src/test/java/com/yahoo/config/subscription/ConfigInstancePayloadTest.java @@ -46,7 +46,7 @@ public class ConfigInstancePayloadTest { refval(":parent:"). refwithdef(":parent:"). fileVal("etc"). - pathVal(FileReference.mockFileReferenceForUnitTesting(new File("src/test/resources/configs/def-files/foo.function-test.def"))). + pathVal(FileReference.mockFileReferenceForUnitTesting(new File("src/test/resources/configs/def-files/function-test.def"))). boolarr(false). longarr(9223372036854775807L). longarr(-9223372036854775808L). diff --git a/config/src/test/java/com/yahoo/config/subscription/ConfigInstanceUtilTest.java b/config/src/test/java/com/yahoo/config/subscription/ConfigInstanceUtilTest.java index 8464a2a0067..fa24988709a 100644 --- a/config/src/test/java/com/yahoo/config/subscription/ConfigInstanceUtilTest.java +++ b/config/src/test/java/com/yahoo/config/subscription/ConfigInstanceUtilTest.java @@ -94,7 +94,7 @@ public class ConfigInstanceUtilTest { refval(":parent:"). refwithdef(":parent:"). fileVal("etc"). - pathVal(FileReference.mockFileReferenceForUnitTesting(new File("src/test/resources/configs/def-files/foo.function-test.def"))). + pathVal(FileReference.mockFileReferenceForUnitTesting(new File("src/test/resources/configs/def-files/function-test.def"))). boolarr(false). longarr(9223372036854775807L). longarr(-9223372036854775808L). diff --git a/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionBuilderTest.java b/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionBuilderTest.java index 42b7958161a..810b9f58829 100644 --- a/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionBuilderTest.java +++ b/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionBuilderTest.java @@ -20,7 +20,7 @@ import static org.junit.Assert.*; public class ConfigDefinitionBuilderTest { private static final String TEST_DIR = "src/test/resources/configs/def-files"; - private static final String DEF_NAME = TEST_DIR + "/foo.function-test.def"; + private static final String DEF_NAME = TEST_DIR + "/function-test.def"; @Test diff --git a/config/src/test/java/com/yahoo/vespa/config/util/ConfigUtilsTest.java b/config/src/test/java/com/yahoo/vespa/config/util/ConfigUtilsTest.java index 821a351dd89..0276f3c4f1c 100644 --- a/config/src/test/java/com/yahoo/vespa/config/util/ConfigUtilsTest.java +++ b/config/src/test/java/com/yahoo/vespa/config/util/ConfigUtilsTest.java @@ -187,7 +187,7 @@ public class ConfigUtilsTest { public void testCreateConfigDefinitionKeyFromDefFile() { ConfigDefinitionKey def = null; try { - def = ConfigUtils.createConfigDefinitionKeyFromDefFile(new File("src/test/resources/configs/def-files/foo.app.def")); + def = ConfigUtils.createConfigDefinitionKeyFromDefFile(new File("src/test/resources/configs/def-files/app.def")); } catch (IOException e) { e.printStackTrace(); fail(); @@ -196,7 +196,7 @@ public class ConfigUtilsTest { assertThat(def.getNamespace(), is("foo")); try { - def = ConfigUtils.createConfigDefinitionKeyFromDefFile(new File("src/test/resources/configs/def-files/foo.testnamespace.def")); + def = ConfigUtils.createConfigDefinitionKeyFromDefFile(new File("src/test/resources/configs/def-files/testnamespace.def")); } catch (IOException e) { e.printStackTrace(); fail(); @@ -205,7 +205,7 @@ public class ConfigUtilsTest { assertThat(def.getNamespace(), is("foo")); try { - byte[] content = IOUtils.readFileBytes(new File("src/test/resources/configs/def-files/foo.app.def")); + byte[] content = IOUtils.readFileBytes(new File("src/test/resources/configs/def-files/app.def")); def = ConfigUtils.createConfigDefinitionKeyFromDefContent("app", content); } catch (IOException e) { fail(); @@ -214,7 +214,7 @@ public class ConfigUtilsTest { assertThat(def.getNamespace(), is("foo")); try { - byte[] content = IOUtils.readFileBytes(new File("src/test/resources/configs/def-files-nogen/foo.bar.app.def")); + byte[] content = IOUtils.readFileBytes(new File("src/test/resources/configs/def-files-nogen/app.def")); def = ConfigUtils.createConfigDefinitionKeyFromDefContent("app", content); } catch (IOException e) { fail(); diff --git a/config/src/test/resources/configdefinitions/config.bar.def b/config/src/test/resources/configdefinitions/bar.def index 8e97154d3d5..8e97154d3d5 100644 --- a/config/src/test/resources/configdefinitions/config.bar.def +++ b/config/src/test/resources/configdefinitions/bar.def diff --git a/config/src/test/resources/configdefinitions/config.baz.def b/config/src/test/resources/configdefinitions/baz.def index ff3101e52a6..ff3101e52a6 100644 --- a/config/src/test/resources/configdefinitions/config.baz.def +++ b/config/src/test/resources/configdefinitions/baz.def diff --git a/config/src/test/resources/configdefinitions/config.bootstrap.def b/config/src/test/resources/configdefinitions/bootstrap.def index f0e5b3db71a..f0e5b3db71a 100644 --- a/config/src/test/resources/configdefinitions/config.bootstrap.def +++ b/config/src/test/resources/configdefinitions/bootstrap.def diff --git a/config/src/test/resources/configdefinitions/config.foo.def b/config/src/test/resources/configdefinitions/foo.def index d7357822e7e..d7357822e7e 100644 --- a/config/src/test/resources/configdefinitions/config.foo.def +++ b/config/src/test/resources/configdefinitions/foo.def diff --git a/config/src/test/resources/configdefinitions/config.foobar.def b/config/src/test/resources/configdefinitions/foobar.def index 59f0bbd9913..59f0bbd9913 100644 --- a/config/src/test/resources/configdefinitions/config.foobar.def +++ b/config/src/test/resources/configdefinitions/foobar.def diff --git a/config/src/test/resources/configdefinitions/config.foodefault.def b/config/src/test/resources/configdefinitions/foodefault.def index 4b9014b9274..4b9014b9274 100644 --- a/config/src/test/resources/configdefinitions/config.foodefault.def +++ b/config/src/test/resources/configdefinitions/foodefault.def diff --git a/config/src/test/resources/configdefinitions/config.function-test.def b/config/src/test/resources/configdefinitions/function-test.def index 2e18fb2ee8c..2e18fb2ee8c 100644 --- a/config/src/test/resources/configdefinitions/config.function-test.def +++ b/config/src/test/resources/configdefinitions/function-test.def diff --git a/config/src/test/resources/configdefinitions/config.motd.def b/config/src/test/resources/configdefinitions/motd.def index 95ac367560d..95ac367560d 100644 --- a/config/src/test/resources/configdefinitions/config.motd.def +++ b/config/src/test/resources/configdefinitions/motd.def diff --git a/config/src/test/resources/configdefinitions/config.my.def b/config/src/test/resources/configdefinitions/my.def index 3999cc46273..3999cc46273 100644 --- a/config/src/test/resources/configdefinitions/config.my.def +++ b/config/src/test/resources/configdefinitions/my.def diff --git a/config/src/test/resources/configs/def-files-nogen/foo.bar.app.def b/config/src/test/resources/configs/def-files-nogen/app.def index 6082072695a..6082072695a 100644 --- a/config/src/test/resources/configs/def-files-nogen/foo.bar.app.def +++ b/config/src/test/resources/configs/def-files-nogen/app.def diff --git a/config/src/test/resources/configs/def-files/foo.app.def b/config/src/test/resources/configs/def-files/app.def index 37c3dd75e26..37c3dd75e26 100644 --- a/config/src/test/resources/configs/def-files/foo.app.def +++ b/config/src/test/resources/configs/def-files/app.def diff --git a/config/src/test/resources/configs/def-files/foo.arraytypes.def b/config/src/test/resources/configs/def-files/arraytypes.def index ad18c4e5386..ad18c4e5386 100644 --- a/config/src/test/resources/configs/def-files/foo.arraytypes.def +++ b/config/src/test/resources/configs/def-files/arraytypes.def diff --git a/config/src/test/resources/configs/def-files/foo.defaulttest.def b/config/src/test/resources/configs/def-files/defaulttest.def index fa8005b77c3..fa8005b77c3 100644 --- a/config/src/test/resources/configs/def-files/foo.defaulttest.def +++ b/config/src/test/resources/configs/def-files/defaulttest.def diff --git a/config/src/test/resources/configs/def-files/foo.function-test.def b/config/src/test/resources/configs/def-files/function-test.def index 24eeb81ab7a..24eeb81ab7a 100644 --- a/config/src/test/resources/configs/def-files/foo.function-test.def +++ b/config/src/test/resources/configs/def-files/function-test.def diff --git a/config/src/test/resources/configs/def-files/foo.int.def b/config/src/test/resources/configs/def-files/int.def index c1a1241c413..c1a1241c413 100755 --- a/config/src/test/resources/configs/def-files/foo.int.def +++ b/config/src/test/resources/configs/def-files/int.def diff --git a/config/src/test/resources/configs/def-files/foo.maptypes.def b/config/src/test/resources/configs/def-files/maptypes.def index 0e39c7ccdb9..0e39c7ccdb9 100644 --- a/config/src/test/resources/configs/def-files/foo.maptypes.def +++ b/config/src/test/resources/configs/def-files/maptypes.def diff --git a/config/src/test/resources/configs/def-files/myproject.config.namespace.def b/config/src/test/resources/configs/def-files/namespace.def index a8b55fb315e..a8b55fb315e 100644 --- a/config/src/test/resources/configs/def-files/myproject.config.namespace.def +++ b/config/src/test/resources/configs/def-files/namespace.def diff --git a/config/src/test/resources/configs/def-files/foo.simpletypes.def b/config/src/test/resources/configs/def-files/simpletypes.def index 2603e2f4100..2603e2f4100 100644 --- a/config/src/test/resources/configs/def-files/foo.simpletypes.def +++ b/config/src/test/resources/configs/def-files/simpletypes.def diff --git a/config/src/test/resources/configs/def-files/foo.specialtypes.def b/config/src/test/resources/configs/def-files/specialtypes.def index 06fdd0d4348..06fdd0d4348 100644 --- a/config/src/test/resources/configs/def-files/foo.specialtypes.def +++ b/config/src/test/resources/configs/def-files/specialtypes.def diff --git a/config/src/test/resources/configs/def-files/foo.string.def b/config/src/test/resources/configs/def-files/string.def index 78596515b7c..78596515b7c 100755 --- a/config/src/test/resources/configs/def-files/foo.string.def +++ b/config/src/test/resources/configs/def-files/string.def diff --git a/config/src/test/resources/configs/def-files/foo.structtypes.def b/config/src/test/resources/configs/def-files/structtypes.def index fe9d879fb64..fe9d879fb64 100644 --- a/config/src/test/resources/configs/def-files/foo.structtypes.def +++ b/config/src/test/resources/configs/def-files/structtypes.def diff --git a/config/src/test/resources/configs/def-files/foo.test-nodefs.def b/config/src/test/resources/configs/def-files/test-nodefs.def index e3b700c5732..e3b700c5732 100644 --- a/config/src/test/resources/configs/def-files/foo.test-nodefs.def +++ b/config/src/test/resources/configs/def-files/test-nodefs.def diff --git a/config/src/test/resources/configs/def-files/foo.test-nonstring.def b/config/src/test/resources/configs/def-files/test-nonstring.def index eaa6fafe87d..eaa6fafe87d 100644 --- a/config/src/test/resources/configs/def-files/foo.test-nonstring.def +++ b/config/src/test/resources/configs/def-files/test-nonstring.def diff --git a/config/src/test/resources/configs/def-files/foo.test-reference.def b/config/src/test/resources/configs/def-files/test-reference.def index b5bbb5f4462..b5bbb5f4462 100644 --- a/config/src/test/resources/configs/def-files/foo.test-reference.def +++ b/config/src/test/resources/configs/def-files/test-reference.def diff --git a/config/src/test/resources/configs/def-files/foo.testnamespace.def b/config/src/test/resources/configs/def-files/testnamespace.def index 6e58c691097..6e58c691097 100644 --- a/config/src/test/resources/configs/def-files/foo.testnamespace.def +++ b/config/src/test/resources/configs/def-files/testnamespace.def diff --git a/config/src/test/resources/configs/def-files/foo.unicode.def b/config/src/test/resources/configs/def-files/unicode.def index 493e3e37630..493e3e37630 100644 --- a/config/src/test/resources/configs/def-files/foo.unicode.def +++ b/config/src/test/resources/configs/def-files/unicode.def diff --git a/documentapi/src/main/resources/configdefinitions/documentapi.messagebus.protocol.documentrouteselectorpolicy.def b/documentapi/src/main/resources/configdefinitions/documentrouteselectorpolicy.def index f6f4461d220..f6f4461d220 100644 --- a/documentapi/src/main/resources/configdefinitions/documentapi.messagebus.protocol.documentrouteselectorpolicy.def +++ b/documentapi/src/main/resources/configdefinitions/documentrouteselectorpolicy.def diff --git a/fileacquirer/src/main/resources/configdefinitions/cloud.config.filedistribution.filedistributorrpc.def b/fileacquirer/src/main/resources/configdefinitions/filedistributorrpc.def index 3de65e632ee..3de65e632ee 100644 --- a/fileacquirer/src/main/resources/configdefinitions/cloud.config.filedistribution.filedistributorrpc.def +++ b/fileacquirer/src/main/resources/configdefinitions/filedistributorrpc.def diff --git a/logd/src/main/resources/configdefinitions/cloud.config.log.logd.def b/logd/src/main/resources/configdefinitions/logd.def index bb5f487c47e..bb5f487c47e 100644 --- a/logd/src/main/resources/configdefinitions/cloud.config.log.logd.def +++ b/logd/src/main/resources/configdefinitions/logd.def diff --git a/messagebus/src/main/config/messagebus.messagebus.def b/messagebus/src/main/config/messagebus.def index b750530ec5f..b750530ec5f 100644 --- a/messagebus/src/main/config/messagebus.messagebus.def +++ b/messagebus/src/main/config/messagebus.def |