diff options
| author | Harald Musum <musum@yahooinc.com> | 2022-05-31 15:13:41 +0200 |
|---|---|---|
| committer | gjoranv <gv@verizonmedia.com> | 2022-06-08 11:45:22 +0200 |
| commit | 9d16dc15916b840813f7623d8b1e47e156a4c8d7 (patch) | |
| tree | 12fb182e7766b7297a03dadc5dee21e9fba12a87 /config-model/src | |
| parent | 506cc95a1a6964b57e348be704357a72773aed60 (diff) | |
Stop supporting top-level configserver element in services.xml
Diffstat (limited to 'config-model/src')
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2Builder.java | 9 | ||||
| -rw-r--r-- | config-model/src/main/resources/schema/admin.rnc | 2 |
2 files changed, 3 insertions, 8 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2Builder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2Builder.java index 8e7c543b67b..e081848d01c 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2Builder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2Builder.java @@ -107,13 +107,8 @@ public class DomAdminV2Builder extends DomAdminBuilderBase { SimpleConfigProducer<?> configServers = new SimpleConfigProducer<>(parent, "configservers"); Element configserversE = XML.getChild(adminE, "configservers"); if (configserversE == null) { - Element configserverE = XML.getChild(adminE, "configserver"); - if (configserverE == null) - configserverE = XML.getChild(adminE, "adminserver"); - else - deployState.getDeployLogger().logApplicationPackage(Level.INFO, - "Specifying configserver without parent element configservers in services.xml is deprecated and will be removed in Vespa 8"); - return List.of(new ConfigserverBuilder(0, configServerSpecs).build(deployState, configServers, configserverE)); + Element adminserver = XML.getChild(adminE, "adminserver"); + return List.of(new ConfigserverBuilder(0, configServerSpecs).build(deployState, configServers, adminserver)); } else { List<Configserver> configservers = new ArrayList<>(); diff --git a/config-model/src/main/resources/schema/admin.rnc b/config-model/src/main/resources/schema/admin.rnc index 2b9b414374c..4e916e0901f 100644 --- a/config-model/src/main/resources/schema/admin.rnc +++ b/config-model/src/main/resources/schema/admin.rnc @@ -7,7 +7,7 @@ AdminV2 = element adminserver { service.attlist } & GenericConfig* & LogServer? & - (ConfigServer | ConfigServers)? & + ConfigServers? & AdminSlobroks? & AdminMonitoring? & Metrics? & |