diff options
author | gjoranv <gv@verizonmedia.com> | 2019-07-11 12:20:09 +0200 |
---|---|---|
committer | gjoranv <gv@verizonmedia.com> | 2019-07-11 12:20:09 +0200 |
commit | 1b841ef30600393ad8ef6fea2e6a736ea0685ed3 (patch) | |
tree | 40deeb5eb4fea4ffd7aef09831b978e784f9cb9f /config-application-package/src | |
parent | d1cbcd9ab867638f241c74d243c1206de32b7988 (diff) |
Replace 'jdisc' with 'container' in config-application-package
Diffstat (limited to 'config-application-package/src')
5 files changed, 32 insertions, 32 deletions
diff --git a/config-application-package/src/test/java/com/yahoo/config/application/IncludeProcessorTest.java b/config-application-package/src/test/java/com/yahoo/config/application/IncludeProcessorTest.java index a456924673d..562970c266f 100644 --- a/config-application-package/src/test/java/com/yahoo/config/application/IncludeProcessorTest.java +++ b/config-application-package/src/test/java/com/yahoo/config/application/IncludeProcessorTest.java @@ -55,7 +55,7 @@ public class IncludeProcessorTest { " <node distribution-key=\"2\" hostalias=\"node2\"/>\n" + " </nodes>" + "</content>\n" + - "<jdisc id=\"stateless\" version=\"1.0\">\n" + + "<container id=\"stateless\" version=\"1.0\">\n" + " <search deploy:environment=\"prod\">\n" + " <chain id=\"common\">\n" + " <searcher id=\"MySearcher1\" />\n" + @@ -70,7 +70,7 @@ public class IncludeProcessorTest { " <nodes>\n" + " <node baseport=\"${qrs.port}\" hostalias=\"node0\"/>\n" + " </nodes>\n" + - "</jdisc></services>"; + "</container></services>"; Document doc = new IncludeProcessor(app).process(docBuilder.parse(Xml.getServices(app))); // System.out.println(Xml.documentAsString(doc)); diff --git a/config-application-package/src/test/java/com/yahoo/config/application/OverrideProcessorTest.java b/config-application-package/src/test/java/com/yahoo/config/application/OverrideProcessorTest.java index 57213efcd0d..9113ce7f016 100644 --- a/config-application-package/src/test/java/com/yahoo/config/application/OverrideProcessorTest.java +++ b/config-application-package/src/test/java/com/yahoo/config/application/OverrideProcessorTest.java @@ -64,7 +64,7 @@ public class OverrideProcessorTest { " <node distribution-key=\"2\" hostalias=\"node2\"/>" + " </nodes>" + " </content>" + - " <jdisc id=\"stateless\" version=\"1.0\">" + + " <container id=\"stateless\" version=\"1.0\">" + " <search/>" + " <component id=\"foo\" class=\"MyFoo\" bundle=\"foobundle\" />" + " <component id=\"bar\" class=\"TestBar\" bundle=\"foobundle\" deploy:environment=\"staging\" />" + @@ -73,7 +73,7 @@ public class OverrideProcessorTest { " <nodes>" + " <node hostalias=\"node0\"/>" + " </nodes>" + - " </jdisc>" + + " </container>" + "</services>"; @@ -94,13 +94,13 @@ public class OverrideProcessorTest { " <node distribution-key=\"0\" hostalias=\"node0\"/>" + " </nodes>" + " </content>" + - " <jdisc id=\"stateless\" version=\"1.0\">" + + " <container id=\"stateless\" version=\"1.0\">" + " <search/>" + " <component id=\"foo\" class=\"MyFoo\" bundle=\"foobundle\" />" + " <nodes>" + " <node hostalias=\"node0\"/>" + " </nodes>" + - " </jdisc>" + + " </container>" + "</services>"; assertOverride(Environment.test, RegionName.defaultName(), expected); } @@ -124,7 +124,7 @@ public class OverrideProcessorTest { " <node distribution-key=\"2\" hostalias=\"node2\"/>" + " </nodes>" + " </content>" + - " <jdisc id=\"stateless\" version=\"1.0\">" + + " <container id=\"stateless\" version=\"1.0\">" + " <search/>" + " <component id=\"foo\" class=\"MyFoo\" bundle=\"foobundle\" />" + " <component id=\"bar\" class=\"ProdBar\" bundle=\"foobundle\" />" + @@ -132,7 +132,7 @@ public class OverrideProcessorTest { " <nodes>" + " <node hostalias=\"node0\"/>" + " </nodes>" + - " </jdisc>" + + " </container>" + "</services>"; assertOverride(Environment.from("prod"), RegionName.from("us-west"), expected); } @@ -157,7 +157,7 @@ public class OverrideProcessorTest { " <node distribution-key=\"1\" hostalias=\"node1\"/>" + " </nodes>" + " </content>" + - " <jdisc id=\"stateless\" version=\"1.0\">" + + " <container id=\"stateless\" version=\"1.0\">" + " <search/>" + " <component id=\"foo\" class=\"MyFoo\" bundle=\"foobundle\" />" + " <component id=\"bar\" class=\"ProdBar\" bundle=\"foobundle\" />" + @@ -165,7 +165,7 @@ public class OverrideProcessorTest { " <nodes>" + " <node hostalias=\"node0\"/>" + " </nodes>" + - " </jdisc>" + + " </container>" + "</services>"; assertOverride(Environment.valueOf("prod"), RegionName.from("unknown"), expected); } @@ -190,7 +190,7 @@ public class OverrideProcessorTest { " <node distribution-key=\"1\" hostalias=\"node1\"/>" + " </nodes>" + " </content>" + - " <jdisc id=\"stateless\" version=\"1.0\">" + + " <container id=\"stateless\" version=\"1.0\">" + " <search/>" + " <component id=\"foo\" class=\"MyFoo\" bundle=\"foobundle\" />" + " <component id=\"bar\" class=\"ProdBar\" bundle=\"foobundle\" />" + @@ -198,7 +198,7 @@ public class OverrideProcessorTest { " <nodes>" + " <node hostalias=\"node0\"/>" + " </nodes>" + - " </jdisc>" + + " </container>" + "</services>"; assertOverride(Environment.from("prod"), RegionName.defaultName(), expected); } @@ -221,13 +221,13 @@ public class OverrideProcessorTest { " <node distribution-key=\"0\" hostalias=\"node0\"/>" + " </nodes>" + " </content>" + - " <jdisc id=\"stateless\" version=\"1.0\">" + + " <container id=\"stateless\" version=\"1.0\">" + " <search/>" + " <component id=\"foo\" class=\"MyFoo\" bundle=\"foobundle\" />" + " <nodes>" + " <node hostalias=\"node0\"/>" + " </nodes>" + - " </jdisc>" + + " </container>" + "</services>"; assertOverride(Environment.from("dev"), RegionName.defaultName(), expected); } @@ -249,13 +249,13 @@ public class OverrideProcessorTest { " <node distribution-key=\"0\" hostalias=\"node0\"/>" + " </nodes>" + " </content>" + - " <jdisc id=\"stateless\" version=\"1.0\">" + + " <container id=\"stateless\" version=\"1.0\">" + " <search/>" + " <component id=\"foo\" class=\"MyFoo\" bundle=\"foobundle\" />" + " <nodes>" + " <node hostalias=\"node0\"/>" + " </nodes>" + - " </jdisc>" + + " </container>" + "</services>"; assertOverride(Environment.from("dev"), RegionName.from("us-east-1"), expected); @@ -279,13 +279,13 @@ public class OverrideProcessorTest { " <node distribution-key=\"0\" hostalias=\"node0\"/>" + " </nodes>" + " </content>" + - " <jdisc id=\"stateless\" version=\"1.0\">" + + " <container id=\"stateless\" version=\"1.0\">" + " <search/>" + " <component id=\"foo\" class=\"MyFoo\" bundle=\"foobundle\" />" + " <nodes>" + " <node hostalias=\"node0\"/>" + " </nodes>" + - " </jdisc>" + + " </container>" + "</services>"; assertOverride(Environment.from("test"), RegionName.from("us-west"), expected); } @@ -310,14 +310,14 @@ public class OverrideProcessorTest { " <node distribution-key=\"0\" hostalias=\"node0\"/>" + " </nodes>" + " </content>" + - " <jdisc id=\"stateless\" version=\"1.0\">" + + " <container id=\"stateless\" version=\"1.0\">" + " <search/>" + " <component id=\"foo\" class=\"MyFoo\" bundle=\"foobundle\" />" + " <component id=\"bar\" class=\"TestBar\" bundle=\"foobundle\" />" + " <nodes>" + " <node hostalias=\"node0\"/>" + " </nodes>" + - " </jdisc>" + + " </container>" + "</services>"; assertOverride(Environment.from("staging"), RegionName.from("us-west"), expected); } diff --git a/config-application-package/src/test/java/com/yahoo/config/application/XmlPreprocessorTest.java b/config-application-package/src/test/java/com/yahoo/config/application/XmlPreprocessorTest.java index 3827fe2ad42..eacaa4a881a 100644 --- a/config-application-package/src/test/java/com/yahoo/config/application/XmlPreprocessorTest.java +++ b/config-application-package/src/test/java/com/yahoo/config/application/XmlPreprocessorTest.java @@ -39,14 +39,14 @@ public class XmlPreprocessorTest { " <node distribution-key=\"0\" hostalias=\"node0\"/>\n" + " </nodes>\n" + " </content>\n" + - " <jdisc id=\"stateless\" version=\"1.0\">\n" + + " <container id=\"stateless\" version=\"1.0\">\n" + " <search/>\n" + " <component bundle=\"foobundle\" class=\"MyFoo\" id=\"foo\"/>\n" + " <component bundle=\"foobundle\" class=\"TestBar\" id=\"bar\"/>\n" + " <nodes>\n" + " <node hostalias=\"node0\" baseport=\"5000\"/>\n" + " </nodes>\n" + - " </jdisc>\n" + + " </container>\n" + "</services>"; TestBase.assertDocument(expectedDev, new XmlPreProcessor(appDir, services, Environment.dev, RegionName.from("default")).run()); @@ -65,14 +65,14 @@ public class XmlPreprocessorTest { " <node distribution-key=\"0\" hostalias=\"node0\"/>\n" + " </nodes>\n" + " </content>\n" + - " <jdisc id=\"stateless\" version=\"1.0\">\n" + + " <container id=\"stateless\" version=\"1.0\">\n" + " <search/>\n" + " <component bundle=\"foobundle\" class=\"MyFoo\" id=\"foo\"/>\n" + "" + // Difference from dev: no TestBar " <nodes>\n" + " <node hostalias=\"node0\" baseport=\"5000\"/>\n" + " </nodes>\n" + - " </jdisc>\n" + + " </container>\n" + "</services>"; // System.out.println(Xml.documentAsString(new XmlPreProcessor(appDir, services, Environment.staging, RegionName.from("default")).run())); TestBase.assertDocument(expectedStaging, new XmlPreProcessor(appDir, services, Environment.staging, RegionName.from("default")).run()); @@ -94,7 +94,7 @@ public class XmlPreprocessorTest { " <node distribution-key=\"2\" hostalias=\"node2\"/>\n" + " </nodes>\n" + " </content>\n" + - " <jdisc id=\"stateless\" version=\"1.0\">\n" + + " <container id=\"stateless\" version=\"1.0\">\n" + " <search>\n" + " <chain id=\"common\">\n" + " <searcher id=\"MySearcher1\"/>\n" + @@ -107,7 +107,7 @@ public class XmlPreprocessorTest { " <nodes>\n" + " <node hostalias=\"node0\" baseport=\"5001\"/>\n" + " </nodes>\n" + - " </jdisc>\n" + + " </container>\n" + "</services>"; TestBase.assertDocument(expectedUsWest, new XmlPreProcessor(appDir, services, Environment.prod, RegionName.from("us-west")).run()); @@ -127,7 +127,7 @@ public class XmlPreprocessorTest { " <node distribution-key=\"1\" hostalias=\"node1\"/>\n" + " </nodes>\n" + " </content>\n" + - " <jdisc id=\"stateless\" version=\"1.0\">\n" + + " <container id=\"stateless\" version=\"1.0\">\n" + " <search>\n" + " <chain id=\"common\">\n" + " <searcher id=\"MySearcher1\"/>\n" + @@ -140,7 +140,7 @@ public class XmlPreprocessorTest { " <nodes>\n" + " <node hostalias=\"node0\" baseport=\"5002\"/>\n" + " </nodes>\n" + - " </jdisc>\n" + + " </container>\n" + "</services>"; TestBase.assertDocument(expectedUsEastAndCentral, new XmlPreProcessor(appDir, services, Environment.prod, RegionName.from("us-east")).run()); diff --git a/config-application-package/src/test/java/com/yahoo/config/model/application/provider/FilesApplicationPackageTest.java b/config-application-package/src/test/java/com/yahoo/config/model/application/provider/FilesApplicationPackageTest.java index 0f783b00438..44656f8f534 100644 --- a/config-application-package/src/test/java/com/yahoo/config/model/application/provider/FilesApplicationPackageTest.java +++ b/config-application-package/src/test/java/com/yahoo/config/model/application/provider/FilesApplicationPackageTest.java @@ -58,14 +58,14 @@ public class FilesApplicationPackageTest { " <node distribution-key=\"0\" hostalias=\"node0\"/>\n" + " </nodes>\n" + " </content>\n" + - " <jdisc id=\"stateless\" version=\"1.0\">\n" + + " <container id=\"stateless\" version=\"1.0\">\n" + " <search/>\n" + " <component bundle=\"foobundle\" class=\"MyFoo\" id=\"foo\"/>\n" + " <component bundle=\"foobundle\" class=\"TestBar\" id=\"bar\"/>\n" + " <nodes>\n" + " <node hostalias=\"node0\" baseport=\"5000\"/>\n" + " </nodes>\n" + - " </jdisc>\n" + + " </container>\n" + "</services>"; TestBase.assertDocument(expectedServices, processed.getServices()); String expectedHosts = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?><hosts xmlns:deploy=\"vespa\" xmlns:preprocess=\"properties\">\n" + diff --git a/config-application-package/src/test/resources/multienvapp/jdisc.xml b/config-application-package/src/test/resources/multienvapp/jdisc.xml index 9f91a5473ac..5e69ea98533 100644 --- a/config-application-package/src/test/resources/multienvapp/jdisc.xml +++ b/config-application-package/src/test/resources/multienvapp/jdisc.xml @@ -1,5 +1,5 @@ <!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> -<jdisc id='stateless' version='1.0'> +<container id='stateless' version='1.0'> <search deploy:environment="prod"> <chain id="common"> <searcher id="MySearcher1" /> @@ -14,4 +14,4 @@ <nodes> <node hostalias='node0' baseport="${qrs.port}"/> </nodes> -</jdisc> +</container> |