From cb23280a8b73e2af78ce91b07f66d0a01ae00f38 Mon Sep 17 00:00:00 2001 From: gjoranv Date: Mon, 3 Jan 2022 17:09:28 +0100 Subject: Remove error handling for 'servlet' element in services.xml --- .../com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java index d5c64689648..7f0948cccda 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java @@ -187,7 +187,6 @@ public class ContainerModelBuilder extends ConfigModelBuilder { addConfiguredComponents(deployState, cluster, spec); addSecretStore(cluster, spec, deployState); - addServlets(deployState, spec, cluster); addModelEvaluation(spec, cluster, context); addModelEvaluationBundles(cluster); @@ -527,12 +526,6 @@ public class ContainerModelBuilder extends ConfigModelBuilder { return http; } - // TODO Vespa 8: Remove - private void addServlets(DeployState deployState, Element spec, ApplicationContainerCluster cluster) { - if (XML.getChildren(spec, "servlet").size() > 0) - throw new IllegalArgumentException("The 'servlet' tag is no longer supported in services.xml. Please use a handler instead."); - } - private void addDocumentApi(Element spec, ApplicationContainerCluster cluster) { ContainerDocumentApi containerDocumentApi = buildDocumentApi(cluster, spec); if (containerDocumentApi == null) return; -- cgit v1.2.3