diff options
| author | gjoranv <gv@verizonmedia.com> | 2019-07-11 12:26:09 +0200 |
|---|---|---|
| committer | gjoranv <gv@verizonmedia.com> | 2019-07-11 12:26:09 +0200 |
| commit | 65c9f5c8c4324be4ab3126fa90c0048d1f8efd9f (patch) | |
| tree | d626e43687490ca93069cb994c147688bf257ce4 /configserver/src/test/apps | |
| parent | 1b841ef30600393ad8ef6fea2e6a736ea0685ed3 (diff) | |
Replace 'jdisc' with 'container' in configserver
Diffstat (limited to 'configserver/src/test/apps')
8 files changed, 16 insertions, 16 deletions
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> |