summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgjoranv <gv@verizonmedia.com>2022-01-03 17:09:28 +0100
committergjoranv <gv@verizonmedia.com>2022-01-03 17:10:04 +0100
commitcb23280a8b73e2af78ce91b07f66d0a01ae00f38 (patch)
treed03e775e6bb39e345beadf4834c4c9c2b27d06c9
parenta7906f5a9a2f31f92fee7696443e90f885ba62c7 (diff)
Remove error handling for 'servlet' element in services.xml
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java7
1 files changed, 0 insertions, 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<ContainerModel> {
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<ContainerModel> {
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;