Replace 'jdisc' with 'container' in configserver

13 files changed, 28 insertions, 28 deletions

diff --git a/configserver/src/main/resources/configserver-app/services.xml b/configserver/src/main/resources/configserver-app/services.xml
index 1a0efc59b16..cfacd6ff8c9 100644
--- a/configserver/src/main/resources/configserver-app/services.xml
+++ b/configserver/src/main/resources/configserver-app/services.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
 <services version="1.0" xmlns:preprocess="properties">
-  <jdisc id="configserver" jetty="true" version="1.0">
+  <container id="configserver" jetty="true" version="1.0">
     <config name="container.jdisc.config.health-monitor">
       <initialStatus>initializing</initialStatus>
     </config>
@@ -166,5 +166,5 @@
     <preprocess:include file='configserver-components.xml' required='false' />
 
     <preprocess:include file='zookeeper-server-config.xml' required='false' />
-  </jdisc>
+  </container>
 </services>
diff --git a/configserver/src/test/apps/app-jdisc-only-restart/services.xml b/configserver/src/test/apps/app-jdisc-only-restart/services.xml
index b864ea206ef..5af96111f25 100644
--- a/configserver/src/test/apps/app-jdisc-only-restart/services.xml
+++ b/configserver/src/test/apps/app-jdisc-only-restart/services.xml
@@ -9,7 +9,7 @@
         </slobroks>
     </admin>
 
-    <jdisc version="1.0">
+    <container version="1.0">
         <document-processing compressdocuments="true">
             <chain id="ContainerWrapperTest">
                 <documentprocessor id="com.yahoo.vespa.config.AppleDocProc"/>
@@ -24,6 +24,6 @@
             <node hostalias="node1" />
         </nodes>
 
-    </jdisc>
+    </container>
 
 </services>
diff --git a/configserver/src/test/apps/app-jdisc-only/services.xml b/configserver/src/test/apps/app-jdisc-only/services.xml
index 755ca1fd585..92a2c0d249e 100644
--- a/configserver/src/test/apps/app-jdisc-only/services.xml
+++ b/configserver/src/test/apps/app-jdisc-only/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 version="1.0">
 
-    <jdisc version="1.0">
+    <container version="1.0">
         <document-processing compressdocuments="true">
             <chain id="ContainerWrapperTest">
                 <documentprocessor id="com.yahoo.vespa.config.AppleDocProc"/>
@@ -17,6 +17,6 @@
             <node hostalias="node1" />
         </nodes>
 
-    </jdisc>
+    </container>
 
 </services>
diff --git a/configserver/src/test/apps/app/services.xml b/configserver/src/test/apps/app/services.xml
index 457a3fad397..509d7786be0 100644
--- a/configserver/src/test/apps/app/services.xml
+++ b/configserver/src/test/apps/app/services.xml
@@ -18,7 +18,7 @@
 
     </content>
 
-    <jdisc version="1.0">
+    <container version="1.0">
         <document-processing compressdocuments="true">
             <chain id="ContainerWrapperTest">
                 <documentprocessor id="com.yahoo.vespa.config.AppleDocProc"/>
@@ -33,6 +33,6 @@
             <node hostalias="node1" />
         </nodes>
 
-    </jdisc>
+    </container>
 
 </services>
diff --git a/configserver/src/test/apps/hosted-no-write-access-control/services.xml b/configserver/src/test/apps/hosted-no-write-access-control/services.xml
index c2257ab34f7..e3262f6eeec 100644
--- a/configserver/src/test/apps/hosted-no-write-access-control/services.xml
+++ b/configserver/src/test/apps/hosted-no-write-access-control/services.xml
@@ -6,13 +6,13 @@
     <nodes count='1'/>
   </admin>
 
-  <jdisc version="1.0">
+  <container version="1.0">
     <http>
       <server id="foo" port="4080" />
     </http>
     <search/>
     <nodes count='1'/>
-  </jdisc>
+  </container>
 
   <content id="music" version="1.0">
     <redundancy>1</redundancy>
diff --git a/configserver/src/test/apps/hosted-routing-app/services.xml b/configserver/src/test/apps/hosted-routing-app/services.xml
index 3d6680b8165..7eaf810ad25 100644
--- a/configserver/src/test/apps/hosted-routing-app/services.xml
+++ b/configserver/src/test/apps/hosted-routing-app/services.xml
@@ -6,7 +6,7 @@
     <nodes count='1'/>
   </admin>
 
-  <jdisc version="1.0">
+  <container version="1.0">
     <http>
       <filtering>
         <access-control domain="foo" write="true" />
@@ -15,7 +15,7 @@
     </http>
     <search/>
     <nodes type='host'/>
-  </jdisc>
+  </container>
 
 
 </services>
diff --git a/configserver/src/test/apps/validationOverride/services.xml b/configserver/src/test/apps/validationOverride/services.xml
index 8dab1acf74c..bec088d3922 100644
--- a/configserver/src/test/apps/validationOverride/services.xml
+++ b/configserver/src/test/apps/validationOverride/services.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 version="1.0">
+<container version="1.0">
     <http>
         <filtering>
             <access-control domain="foo" write="true" />
@@ -8,4 +8,4 @@
     </http>
     <search/>
     <nodes count="2"/>
-</jdisc>
+</container>
diff --git a/configserver/src/test/apps/zkapp/services.xml b/configserver/src/test/apps/zkapp/services.xml
index cdbd6166c12..672f058bc0a 100644
--- a/configserver/src/test/apps/zkapp/services.xml
+++ b/configserver/src/test/apps/zkapp/services.xml
@@ -10,13 +10,13 @@
     </slobroks>
   </admin>
 
-  <jdisc version="1.0">
+  <container version="1.0">
     <documentapi/>
     <search/>
     <nodes>
       <node hostalias="node1"/>
     </nodes>
-  </jdisc>
+  </container>
 
   <content version="1.0">
     <redundancy>1</redundancy>
diff --git a/configserver/src/test/apps/zkfeed/services.xml b/configserver/src/test/apps/zkfeed/services.xml
index 943adc4b5a5..243d4e15d57 100644
--- a/configserver/src/test/apps/zkfeed/services.xml
+++ b/configserver/src/test/apps/zkfeed/services.xml
@@ -7,7 +7,7 @@
     <logserver hostalias="node1" />
   </admin>
 
-  <jdisc version="1.0">
+  <container version="1.0">
     <search>
       <include dir='dir1'/>
       <include dir='nested/dir2'/>
@@ -16,6 +16,6 @@
     <nodes>
       <node hostalias="node1" />
     </nodes>
-  </jdisc>
+  </container>
 
 </services>
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java
index 1f99f59eb8e..34a4074c7cf 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java
@@ -221,7 +221,7 @@ public class LbServicesProducerTest {
     private ApplicationPackage createApplicationPackage(String host1, String host2) {
         String hosts = "<hosts><host name='" + host1 + "'><alias>node1</alias></host><host name='" + host2 + "'><alias>node2</alias></host></hosts>";
         String services = "<services><admin version='2.0'><adminserver hostalias='node1' /><logserver hostalias='node1' /><slobroks><slobrok hostalias='node1' /><slobrok hostalias='node2' /></slobroks></admin>"
-                + "<jdisc id='mydisc' version='1.0'>" +
+                + "<container id='mydisc' version='1.0'>" +
                 "  <aliases>" +
                 "      <endpoint-alias>foo2.bar2.com</endpoint-alias>" +
                 "      <service-alias>service1</service-alias>" +
@@ -231,7 +231,7 @@ public class LbServicesProducerTest {
                 "    <node hostalias='node1' />" +
                 "  </nodes>" +
                 "  <search/>" +
-                "</jdisc>" +
+                "</container>" +
                 "</services>";
 
         String deploymentInfo;
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/model/RoutingProducerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/model/RoutingProducerTest.java
index c6a607f81b1..7ce2c39c6a4 100755
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/model/RoutingProducerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/model/RoutingProducerTest.java
@@ -77,7 +77,7 @@ public class RoutingProducerTest {
     private ApplicationPackage createApplicationPackage(String host1, String host2) {
         String hosts = "<hosts><host name='" + host1 + "'><alias>node1</alias></host><host name='" + host2 + "'><alias>node2</alias></host></hosts>";
         String services = "<services><admin version='2.0'><adminserver hostalias='node1' /><logserver hostalias='node1' /><slobroks><slobrok hostalias='node1' /><slobrok hostalias='node2' /></slobroks></admin>"
-                + "<jdisc id='mydisc' version='1.0'>" +
+                + "<container id='mydisc' version='1.0'>" +
                 "  <aliases>" +
                 "      <endpoint-alias>foo2.bar2.com</endpoint-alias>" +
                 "      <service-alias>service1</service-alias>" +
@@ -87,7 +87,7 @@ public class RoutingProducerTest {
                 "    <node hostalias='node1' />" +
                 "  </nodes>" +
                 "  <search/>" +
-                "</jdisc>" +
+                "</container>" +
                 "</services>";
         String deploymentInfo ="<?xml version='1.0' encoding='UTF-8'?>" +
                 "<deployment version='1.0'>" +
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRequestHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRequestHandlerTest.java
index 4275dc7e16a..36bb7a926b5 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRequestHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRequestHandlerTest.java
@@ -357,12 +357,12 @@ public class TenantRequestHandlerTest {
 
         configNames = server.listConfigs(ApplicationId.defaultId(), Optional.of(vespaVersion), true);
         System.out.println(configNames);
-        assertTrue(configNames.contains(new ConfigKey<>("documentmanager", "jdisc", "document.config")));
+        assertTrue(configNames.contains(new ConfigKey<>("documentmanager", "container", "document.config")));
         assertTrue(configNames.contains(new ConfigKey<>("documentmanager", "", "document.config")));
         assertTrue(configNames.contains(new ConfigKey<>("documenttypes", "", "document")));
-        assertTrue(configNames.contains(new ConfigKey<>("documentmanager", "jdisc", "document.config")));
-        assertTrue(configNames.contains(new ConfigKey<>("health-monitor", "jdisc", "container.jdisc.config")));
-        assertTrue(configNames.contains(new ConfigKey<>("specific", "jdisc", "project")));
+        assertTrue(configNames.contains(new ConfigKey<>("documentmanager", "container", "document.config")));
+        assertTrue(configNames.contains(new ConfigKey<>("health-monitor", "container", "container.jdisc.config")));
+        assertTrue(configNames.contains(new ConfigKey<>("specific", "container", "project")));
     }
 
     @Test
diff --git a/configserver/src/test/resources/deploy/advancedapp/services.xml b/configserver/src/test/resources/deploy/advancedapp/services.xml
index e9b301bea52..e3d5aea585b 100644
--- a/configserver/src/test/resources/deploy/advancedapp/services.xml
+++ b/configserver/src/test/resources/deploy/advancedapp/services.xml
@@ -10,12 +10,12 @@
         </slobroks>
     </admin>
 
-    <jdisc version="1.0">
+    <container version="1.0">
         <search />
         <nodes>
             <node hostalias="node1" baseport='8000'/>
         </nodes>
-    </jdisc>
+    </container>
 
     <content version="1.0">
         <redundancy>1</redundancy>