summaryrefslogtreecommitdiffstats
path: root/standalone-container/src
diff options
context:
space:
mode:
authorgjoranv <gv@verizonmedia.com>2019-07-11 13:13:15 +0200
committergjoranv <gv@verizonmedia.com>2019-07-11 13:13:15 +0200
commit30500e22e144b82ea547f73312cfd63ade630a35 (patch)
tree97a62750ec270eeea91c9d02be180f0dfe6ea7b2 /standalone-container/src
parentcc826c0323980fe0dac8cb60207ed0751a5a4d5c (diff)
Replace 'jdisc' with 'container' in standalone-conatainer
Diffstat (limited to 'standalone-container/src')
-rw-r--r--standalone-container/src/test/java/com/yahoo/container/standalone/StandaloneContainerActivatorTest.java4
-rw-r--r--standalone-container/src/test/java/com/yahoo/container/standalone/StandaloneContainerTest.java6
2 files changed, 5 insertions, 5 deletions
diff --git a/standalone-container/src/test/java/com/yahoo/container/standalone/StandaloneContainerActivatorTest.java b/standalone-container/src/test/java/com/yahoo/container/standalone/StandaloneContainerActivatorTest.java
index 71668b595a0..f1c02b0149f 100644
--- a/standalone-container/src/test/java/com/yahoo/container/standalone/StandaloneContainerActivatorTest.java
+++ b/standalone-container/src/test/java/com/yahoo/container/standalone/StandaloneContainerActivatorTest.java
@@ -31,9 +31,9 @@ public class StandaloneContainerActivatorTest {
private static String getJdiscXml(String contents) throws ParserConfigurationException, IOException, SAXException {
return "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +
"<services>\n" +
- " <jdisc version=\"1.0\" jetty=\"true\">\n" +
+ " <container version=\"1.0\" jetty=\"true\">\n" +
contents +
- " </jdisc>\n" +
+ " </container>\n" +
"</services>";
}
diff --git a/standalone-container/src/test/java/com/yahoo/container/standalone/StandaloneContainerTest.java b/standalone-container/src/test/java/com/yahoo/container/standalone/StandaloneContainerTest.java
index 6d4abc84dbc..006809c1111 100644
--- a/standalone-container/src/test/java/com/yahoo/container/standalone/StandaloneContainerTest.java
+++ b/standalone-container/src/test/java/com/yahoo/container/standalone/StandaloneContainerTest.java
@@ -57,14 +57,14 @@ public class StandaloneContainerTest {
@Test
public void no_default_ports_are_enabled_when_using_http() throws Exception {
- String xml = "<jdisc version=\"1.0\">" + //
+ String xml = "<container version=\"1.0\">" + //
"<http>" + //
"<server port=\"4000\" id=\"server1\" />" + //
"</http>" + //
- "</jdisc>";
+ "</container>";
StandaloneContainer.withContainerModel(xml, root -> {
- AbstractService container = (AbstractService) root.getConfigProducer("jdisc/standalone").get();
+ AbstractService container = (AbstractService) root.getConfigProducer("container/standalone").get();
System.out.println("portCnt: " + container.getPortCount());
System.out.println("numPorts: " + container.getNumPortsAllocated());
assertEquals(1, container.getNumPortsAllocated());