diff options
| author | gjoranv <gv@verizonmedia.com> | 2019-07-11 13:15:00 +0200 |
|---|---|---|
| committer | gjoranv <gv@verizonmedia.com> | 2019-07-11 13:15:00 +0200 |
| commit | f6c6b8a282cc1a53623ad2ee060b4e32f5f45bdc (patch) | |
| tree | 3b31f6f66859cf8abf10351d6e8910a44ccbb6b4 /vespaclient-container-plugin | |
| parent | 30500e22e144b82ea547f73312cfd63ade630a35 (diff) | |
Replace 'jdisc' with 'container' in vespaclient-container-plugin
Diffstat (limited to 'vespaclient-container-plugin')
| -rw-r--r-- | vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/DocumentApiApplicationTest.java | 4 | ||||
| -rw-r--r-- | vespaclient-container-plugin/src/test/rest-api-application/services.xml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/DocumentApiApplicationTest.java b/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/DocumentApiApplicationTest.java index 6bca3637297..b303e663f32 100644 --- a/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/DocumentApiApplicationTest.java +++ b/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/DocumentApiApplicationTest.java @@ -17,10 +17,10 @@ public class DocumentApiApplicationTest { @Test public void application_with_document_api() throws IOException { String services = - "<jdisc version='1.0'>" + + "<container version='1.0'>" + " <http><server port=\"" + findRandomOpenPortOnAllLocalInterfaces() + "\" id=\"foobar\"/></http>" + " <document-api/>" + - "</jdisc>"; + "</container>"; try (Application application = Application.fromServicesXml(services, Networking.enable)) { } } diff --git a/vespaclient-container-plugin/src/test/rest-api-application/services.xml b/vespaclient-container-plugin/src/test/rest-api-application/services.xml index aa90fe82314..346740bc815 100644 --- a/vespaclient-container-plugin/src/test/rest-api-application/services.xml +++ b/vespaclient-container-plugin/src/test/rest-api-application/services.xml @@ -1,6 +1,6 @@ <?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. --> -<jdisc version="1.0" jetty="true"> +<container version="1.0" jetty="true"> <handler id="com.yahoo.document.restapi.resource.RestApiWithTestDocumentHandler" bundle="integration-test"> <binding>http://*/document/v1/*</binding> @@ -14,4 +14,4 @@ <!-- This indicates that we want JDisc to allocate a port for us --> <server id="mainServer" port="0" /> </http> -</jdisc> +</container> |