Merge pull request #20640 from vespa-engine/remove-servlet-remains

Remove servlet remains [run-systemtest]

10 files changed, 0 insertions, 165 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;
diff --git a/config-model/src/main/resources/schema/containercluster.rnc b/config-model/src/main/resources/schema/containercluster.rnc
index b06bf0897cf..e8ff1721397 100644
--- a/config-model/src/main/resources/schema/containercluster.rnc
+++ b/config-model/src/main/resources/schema/containercluster.rnc
@@ -12,7 +12,6 @@ ContainerCluster = element container | jdisc {
 }
 
 ContainerServices =
-    Servlet* &
     SearchInContainer? &
     DocprocInContainer? &
     ProcessingInContainer? &
@@ -136,18 +135,6 @@ Threadpool = element threadpool {
     element queue-size { xsd:nonNegativeInteger }
 }
 
-# Servlet:
-
-Servlet = element servlet {
-    ComponentDefinition &
-    ServletConfig? &
-    element path { xsd:string { pattern = "\w[\w_/\-\.]*(\*)?" } }
-}
-
-ServletConfig = element servlet-config {
-    anyElement+
-}
-
 # SEARCH:
 
 SearchInContainer = element search {
diff --git a/config-model/src/test/schema-test-files/services.xml b/config-model/src/test/schema-test-files/services.xml
index b477ceef169..9ccf50de906 100644
--- a/config-model/src/test/schema-test-files/services.xml
+++ b/config-model/src/test/schema-test-files/services.xml
@@ -58,20 +58,6 @@
       <group name="foo" environment="aws_stage" />
     </secret-store>
 
-    <servlet id="my-servlet" class="com.yahoo.MyServlet" bundle="my-bundle">
-      <path>p/a/t/h</path>
-    </servlet>
-
-    <servlet id="my-servlet" class="com.yahoo.MyServlet" bundle="my-bundle">
-      <path>Apps/app_1.3-4/*</path>
-      <config name="foo">
-        <intVal>0</intVal>
-      </config>
-      <servlet-config>
-        <foo>bar</foo>
-      </servlet-config>
-    </servlet>
-
     <http>
       <filtering strict-mode="true">
         <access-control domain="my.athens-domain" read="true">
diff --git a/config-model/src/test/schema-test-files/standalone-container.xml b/config-model/src/test/schema-test-files/standalone-container.xml
index 85f577882fb..cc34ae43712 100644
--- a/config-model/src/test/schema-test-files/standalone-container.xml
+++ b/config-model/src/test/schema-test-files/standalone-container.xml
@@ -2,20 +2,6 @@
 <!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
 <container id='qrsCluster_1' version='1.0'>
 
-  <servlet id="my-servlet" class="com.yahoo.MyServlet" bundle="my-bundle">
-    <path>p/a/t/h</path>
-  </servlet>
-
-  <servlet id="my-servlet" class="com.yahoo.MyServlet" bundle="my-bundle">
-    <path>Apps/app_1.3-4/*</path>
-    <config name="foo">
-      <intVal>0</intVal>
-    </config>
-    <servlet-config>
-      <foo>bar</foo>
-    </servlet-config>
-  </servlet>
-
   <http>
     <filtering>
       <filter id="com.yahoo.YcaFilter" bundle="mybundle">
diff --git a/container-core/abi-spec.json b/container-core/abi-spec.json
index 174febca9df..d5be3ab52f2 100644
--- a/container-core/abi-spec.json
+++ b/container-core/abi-spec.json
@@ -2090,100 +2090,6 @@
       "public static final java.lang.String[] CONFIG_DEF_SCHEMA"
     ]
   },
-  "com.yahoo.jdisc.http.ServletPathsConfig$Builder": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
-      "com.yahoo.config.ConfigInstance$Builder"
-    ],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public void <init>(com.yahoo.jdisc.http.ServletPathsConfig)",
-      "public com.yahoo.jdisc.http.ServletPathsConfig$Builder servlets(java.lang.String, com.yahoo.jdisc.http.ServletPathsConfig$Servlets$Builder)",
-      "public com.yahoo.jdisc.http.ServletPathsConfig$Builder servlets(java.util.Map)",
-      "public com.yahoo.jdisc.http.ServletPathsConfig$Builder servlets(java.lang.String, java.util.function.Consumer)",
-      "public final boolean dispatchGetConfig(com.yahoo.config.ConfigInstance$Producer)",
-      "public final java.lang.String getDefMd5()",
-      "public final java.lang.String getDefName()",
-      "public final java.lang.String getDefNamespace()",
-      "public final boolean getApplyOnRestart()",
-      "public final void setApplyOnRestart(boolean)",
-      "public com.yahoo.jdisc.http.ServletPathsConfig build()"
-    ],
-    "fields": [
-      "public java.util.Map servlets"
-    ]
-  },
-  "com.yahoo.jdisc.http.ServletPathsConfig$Producer": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
-      "com.yahoo.config.ConfigInstance$Producer"
-    ],
-    "attributes": [
-      "public",
-      "interface",
-      "abstract"
-    ],
-    "methods": [
-      "public abstract void getConfig(com.yahoo.jdisc.http.ServletPathsConfig$Builder)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.jdisc.http.ServletPathsConfig$Servlets$Builder": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
-      "com.yahoo.config.ConfigBuilder"
-    ],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public void <init>(com.yahoo.jdisc.http.ServletPathsConfig$Servlets)",
-      "public com.yahoo.jdisc.http.ServletPathsConfig$Servlets$Builder path(java.lang.String)",
-      "public com.yahoo.jdisc.http.ServletPathsConfig$Servlets build()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.jdisc.http.ServletPathsConfig$Servlets": {
-    "superClass": "com.yahoo.config.InnerNode",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "final"
-    ],
-    "methods": [
-      "public void <init>(com.yahoo.jdisc.http.ServletPathsConfig$Servlets$Builder)",
-      "public java.lang.String path()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.jdisc.http.ServletPathsConfig": {
-    "superClass": "com.yahoo.config.ConfigInstance",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "final"
-    ],
-    "methods": [
-      "public static java.lang.String getDefMd5()",
-      "public static java.lang.String getDefName()",
-      "public static java.lang.String getDefNamespace()",
-      "public static java.lang.String getDefVersion()",
-      "public void <init>(com.yahoo.jdisc.http.ServletPathsConfig$Builder)",
-      "public java.util.Map servlets()",
-      "public com.yahoo.jdisc.http.ServletPathsConfig$Servlets servlets(java.lang.String)"
-    ],
-    "fields": [
-      "public static final java.lang.String CONFIG_DEF_MD5",
-      "public static final java.lang.String CONFIG_DEF_NAME",
-      "public static final java.lang.String CONFIG_DEF_NAMESPACE",
-      "public static final java.lang.String CONFIG_DEF_VERSION",
-      "public static final java.lang.String[] CONFIG_DEF_SCHEMA"
-    ]
-  },
   "com.yahoo.jdisc.http.filter.DiscFilterRequest$ThreadLocalSimpleDateFormat": {
     "superClass": "java.lang.ThreadLocal",
     "interfaces": [],
diff --git a/container-core/src/main/java/com/yahoo/container/servlet/package-info.java b/container-core/src/main/java/com/yahoo/container/servlet/package-info.java
deleted file mode 100644
index 8ecb3cbe827..00000000000
--- a/container-core/src/main/java/com/yahoo/container/servlet/package-info.java
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-// TODO Vespa 8 Remove export package
-@ExportPackage
-package com.yahoo.container.servlet;
-
-import com.yahoo.osgi.annotation.ExportPackage;
-
diff --git a/container-core/src/main/resources/configdefinitions/container.servlet.servlet-config.def b/container-core/src/main/resources/configdefinitions/container.servlet.servlet-config.def
deleted file mode 100644
index 3cc65475913..00000000000
--- a/container-core/src/main/resources/configdefinitions/container.servlet.servlet-config.def
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-# TODO Vespa 8 Remove config definition
-namespace=container.servlet
-map{} string
-
diff --git a/container-core/src/main/resources/configdefinitions/jdisc.http.jdisc.http.servlet-paths.def b/container-core/src/main/resources/configdefinitions/jdisc.http.jdisc.http.servlet-paths.def
deleted file mode 100644
index af788764364..00000000000
--- a/container-core/src/main/resources/configdefinitions/jdisc.http.jdisc.http.servlet-paths.def
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-# TODO Vespa 8 Remove config definition
-namespace=jdisc.http
-
-# path by servlet componentId
-servlets{}.path string
diff --git a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/FilterTestCase.java b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/FilterTestCase.java
index d5229add01b..c975f7c17c3 100644
--- a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/FilterTestCase.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/FilterTestCase.java
@@ -22,7 +22,6 @@ import com.yahoo.jdisc.http.ConnectorConfig;
 import com.yahoo.jdisc.http.HttpRequest;
 import com.yahoo.jdisc.http.HttpResponse;
 import com.yahoo.jdisc.http.ServerConfig;
-import com.yahoo.jdisc.http.ServletPathsConfig;
 import com.yahoo.jdisc.http.filter.RequestFilter;
 import com.yahoo.jdisc.http.filter.ResponseFilter;
 import com.yahoo.jdisc.http.filter.ResponseHeaderFilter;
@@ -585,7 +584,6 @@ public class FilterTestCase {
                         bind(FilterBindings.class).toInstance(filterBindings);
                         bind(ServerConfig.class).toInstance(new ServerConfig(new ServerConfig.Builder().strictFiltering(strictFiltering)));
                         bind(ConnectorConfig.class).toInstance(new ConnectorConfig(new ConnectorConfig.Builder()));
-                        bind(ServletPathsConfig.class).toInstance(new ServletPathsConfig(new ServletPathsConfig.Builder()));
                         bind(ConnectionLog.class).toInstance(new VoidConnectionLog());
                         bind(RequestLog.class).toInstance(new VoidRequestLog());
                     }
diff --git a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerConformanceTest.java b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerConformanceTest.java
index 613c5e88cf2..baf198dde5d 100644
--- a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerConformanceTest.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerConformanceTest.java
@@ -7,7 +7,6 @@ import com.google.inject.util.Modules;
 import com.yahoo.container.logging.ConnectionLog;
 import com.yahoo.container.logging.RequestLog;
 import com.yahoo.jdisc.http.ServerConfig;
-import com.yahoo.jdisc.http.ServletPathsConfig;
 import com.yahoo.jdisc.http.server.jetty.testutils.ConnectorFactoryRegistryModule;
 import com.yahoo.jdisc.test.ServerProviderConformanceTest;
 import org.apache.http.HttpResponse;
@@ -773,8 +772,6 @@ public class HttpServerConformanceTest extends ServerProviderConformanceTest {
                                     .toInstance(new FilterBindings.Builder().build());
                             bind(ServerConfig.class)
                                     .toInstance(new ServerConfig(new ServerConfig.Builder()));
-                            bind(ServletPathsConfig.class)
-                                    .toInstance(new ServletPathsConfig(new ServletPathsConfig.Builder()));
                             bind(ConnectionLog.class)
                                     .toInstance(new VoidConnectionLog());
                             bind(RequestLog.class)