Replace 'jdisc' with 'container' in application.

7 files changed, 30 insertions, 30 deletions

diff --git a/application/src/main/java/com/yahoo/application/Application.java b/application/src/main/java/com/yahoo/application/Application.java
index dffe458c798..5f9b1f51863 100644
--- a/application/src/main/java/com/yahoo/application/Application.java
+++ b/application/src/main/java/com/yahoo/application/Application.java
@@ -524,7 +524,7 @@ public final class Application implements AutoCloseable {
 
             // generate services.xml based on this builder
             private void build(PrintWriter xml, String id, int port) throws Exception {
-                xml.println("<jdisc version=\"1.0\" id=\"" + id + "\">");
+                xml.println("<container version=\"1.0\" id=\"" + id + "\">");
 
                 if (port > 0) {
                     xml.println("<http>");
@@ -584,7 +584,7 @@ public final class Application implements AutoCloseable {
                     xml.println("</search>");
                 }
 
-                xml.println("</jdisc>");
+                xml.println("</container>");
             }
 
             private void generateComponent(PrintWriter xml, ComponentItem<?> componentItem, String elementName) throws Exception {
diff --git a/application/src/test/app-packages/filedistribution/services.xml b/application/src/test/app-packages/filedistribution/services.xml
index c5ec4aeb155..20172f88ac6 100644
--- a/application/src/test/app-packages/filedistribution/services.xml
+++ b/application/src/test/app-packages/filedistribution/services.xml
@@ -1,8 +1,8 @@
 <!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<jdisc version="1.0">
+<container version="1.0">
     <component id="com.yahoo.example.MyComponent" bundle="basic-application">
         <config name="example.my-component">
             <myFile>my-files/my-file.txt</myFile>
         </config>
     </component>
-</jdisc>
+</container>
diff --git a/application/src/test/app-packages/withcontent/services.xml b/application/src/test/app-packages/withcontent/services.xml
index 37c3fef017d..251f591b6b8 100644
--- a/application/src/test/app-packages/withcontent/services.xml
+++ b/application/src/test/app-packages/withcontent/services.xml
@@ -2,7 +2,7 @@
 <!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
 <services>
 
-  <jdisc version="1.0">
+  <container version="1.0">
 
     <search>
       <chain id="default" inherits="vespa"/>
@@ -23,7 +23,7 @@
       </document-processing>
       -->
 
-  </jdisc>
+  </container>
 
   <content version="1.0" id="foo">
     <redundancy>2</redundancy>
diff --git a/application/src/test/java/com/yahoo/application/ApplicationBuilderTest.java b/application/src/test/java/com/yahoo/application/ApplicationBuilderTest.java
index 42f3a7267d8..a4f566e2a71 100644
--- a/application/src/test/java/com/yahoo/application/ApplicationBuilderTest.java
+++ b/application/src/test/java/com/yahoo/application/ApplicationBuilderTest.java
@@ -58,7 +58,7 @@ public class ApplicationBuilderTest {
         expectedException.expectMessage(containsString("build method"));
 
         ApplicationBuilder builder = new ApplicationBuilder();
-        builder.servicesXml("<jdisc version=\"1.0\" />");
+        builder.servicesXml("<container version=\"1.0\" />");
         try (Application application = builder.build()) {
             // do nothing
         }
diff --git a/application/src/test/java/com/yahoo/application/ApplicationTest.java b/application/src/test/java/com/yahoo/application/ApplicationTest.java
index b6e59f7d4cd..24bac69e9cd 100644
--- a/application/src/test/java/com/yahoo/application/ApplicationTest.java
+++ b/application/src/test/java/com/yahoo/application/ApplicationTest.java
@@ -50,7 +50,7 @@ public class ApplicationTest {
 
     @Test
     public void minimal_application_can_be_constructed() {
-        try (Application application = Application.fromServicesXml("<jdisc version=\"1.0\"/>", Networking.disable)) {
+        try (Application application = Application.fromServicesXml("<container version=\"1.0\"/>", Networking.disable)) {
                 Application unused = application;
         }
     }
@@ -373,9 +373,9 @@ public class ApplicationTest {
     }
 
     private static String servicesXmlWithServer(int port) {
-        return "<jdisc version='1.0'>" +
+        return "<container version='1.0'>" +
                 "  <http> <server port='" + port +"' id='foo'/> </http>" +
-                "</jdisc>";
+                "</container>";
     }
 
     @Test
@@ -386,13 +386,13 @@ public class ApplicationTest {
     }
 
     private static String servicesXmlWithAccessControl() {
-        return "<jdisc version='1.0'>" +
+        return "<container version='1.0'>" +
                 "  <http> <server port='" + 0 +"' id='foo'/> " +
                 "    <filtering>" +
                 "      <access-control domain='foo' />" +
                 "    </filtering>" +
                 "  </http>" +
-                "</jdisc>";
+                "</container>";
     }
 
 }
diff --git a/application/src/test/java/com/yahoo/application/container/ContainerTest.java b/application/src/test/java/com/yahoo/application/container/ContainerTest.java
index e44916d2ec4..c284087243d 100644
--- a/application/src/test/java/com/yahoo/application/container/ContainerTest.java
+++ b/application/src/test/java/com/yahoo/application/container/ContainerTest.java
@@ -36,18 +36,18 @@ public class ContainerTest {
 
     @Test
     public void jdisc_can_be_used_as_top_level_element() {
-        try (JDisc container = fromServicesXml("<jdisc version=\"1.0\">" + //
+        try (JDisc container = fromServicesXml("<container version=\"1.0\">" + //
                 "<search />" + //
-                "</jdisc>", Networking.disable)) {
+                "</container>", Networking.disable)) {
             assertNotNull(container.search());
         }
     }
 
     @Test
     public void jdisc_id_can_be_set() {
-        try (JDisc container = fromServicesXml("<jdisc version=\"1.0\" id=\"my-service-id\">" + //
+        try (JDisc container = fromServicesXml("<container version=\"1.0\" id=\"my-service-id\">" + //
                 "<search />" + //
-                "</jdisc>", Networking.disable)) {
+                "</container>", Networking.disable)) {
             assertNotNull(container.search());
         }
     }
@@ -55,9 +55,9 @@ public class ContainerTest {
     @Test
     public void jdisc_can_be_embedded_in_services_tag() {
         try (JDisc container = fromServicesXml("<services>" + //
-                "<jdisc version=\"1.0\" id=\"my-service-id\">" + //
+                "<container version=\"1.0\" id=\"my-service-id\">" + //
                 "<search />" + //
-                "</jdisc>" + //
+                "</container>" + //
                 "</services>", Networking.disable)) {
             assertNotNull(container.search());
         }
@@ -67,13 +67,13 @@ public class ContainerTest {
     @SuppressWarnings("try") // container is unused inside the try block
     public void multiple_jdisc_elements_gives_exception() {
         try (JDisc container = fromServicesXml("<services>" + //
-                "<jdisc version=\"1.0\" id=\"id1\" />" + //
-                "<jdisc version=\"1.0\" />" + //
-                "<container version=\"1.0\"/>" + //
+                "<container version=\"1.0\" id=\"id1\" />" + //
+                "<container version=\"1.0\" />" + //
+                "<jdisc version=\"1.0\"/>" + //
                 "</services>", Networking.disable)) {
             fail("expected exception");
         } catch (Exception e) {
-            assertThat(e.getMessage(), containsString("container id='', jdisc id='id1', jdisc id=''"));
+            assertThat(e.getMessage(), containsString("container id='id1', container id='', jdisc id=''"));
         }
     }
 
@@ -108,7 +108,7 @@ public class ContainerTest {
     public void document_types_can_be_accessed() throws Exception {
         try (Application application = new ApplicationBuilder().documentType("example", EXAMPLE_DOCUMENT)
                 .servicesXml(CONTAINER_WITH_DOCUMENT_PROCESSING).build()) {
-            JDisc container = application.getJDisc("jdisc");
+            JDisc container = application.getJDisc("container");
             DocumentProcessing processing = container.documentProcessing();
             assertThat(processing.getDocumentTypes().keySet(), hasItem("example"));
         }
@@ -121,7 +121,7 @@ public class ContainerTest {
                 "  annotation exampleAnnotation {}\n" + //
                 "}\n").//
                 servicesXml(CONTAINER_WITH_DOCUMENT_PROCESSING).build()) {
-            JDisc container = application.getJDisc("jdisc");
+            JDisc container = application.getJDisc("container");
             DocumentProcessing processing = container.documentProcessing();
             assertThat(processing.getAnnotationTypes().keySet(), hasItem("exampleAnnotation"));
         }
@@ -142,10 +142,10 @@ public class ContainerTest {
     }
 
     public static final String CONTAINER_WITH_DOCUMENT_PROCESSING = //
-            "<jdisc version=\"1.0\">" + //
+            "<container version=\"1.0\">" + //
                     "<http />" + //
                     "<document-processing />" + //
-                    "</jdisc>";
+                    "</container>";
 
     public static final String EXAMPLE_DOCUMENT = //
             "document example {\n" + //
@@ -159,12 +159,12 @@ public class ContainerTest {
     protected JDisc jdiscWithHttp() {
         final String handlerId = TestHandler.class.getName();
         final String xml = //
-                "<jdisc version=\"1.0\">" + //
+                "<container version=\"1.0\">" + //
                         "<handler id=" + handlerId + " />" + //
                         "<http>\n" + //
                         "<server id=\"main\" port=\"9999\" />\n" + //
                         "</http>\n" + //
-                        "</jdisc>";
+                        "</container>";
         return JDisc.fromServicesXml(xml, Networking.disable);
     }
 
diff --git a/application/src/test/java/com/yahoo/application/container/jersey/JerseyTest.java b/application/src/test/java/com/yahoo/application/container/jersey/JerseyTest.java
index 89c23fe0001..b2d59dbe209 100644
--- a/application/src/test/java/com/yahoo/application/container/jersey/JerseyTest.java
+++ b/application/src/test/java/com/yahoo/application/container/jersey/JerseyTest.java
@@ -131,7 +131,7 @@ public class JerseyTest {
 
         try (JDisc jdisc = JDisc.fromServicesXml(
                 "<services>" + //
-                        "<jdisc version=\"1.0\" id=\"default\" jetty=\"true\">" + //
+                        "<container version=\"1.0\" id=\"default\" jetty=\"true\">" + //
                         "<rest-api path=\"rest-api\" jersey2=\"true\">" + //
                         "<components bundle=\"" + bundleSymbolicName + "\">" + //
                         packageElements + //
@@ -140,7 +140,7 @@ public class JerseyTest {
                         "<http>" + //
                         "<server id=\"mainServer\" port=\"0\" />" + //
                         "</http>" + //
-                        "</jdisc>" + //
+                        "</container>" + //
                         "</services>", //
                 Networking.enable)) {
             final int port = ContainerTest.getListenPort();