summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgjoranv <gv@verizonmedia.com>2022-01-03 16:49:06 +0100
committergjoranv <gv@verizonmedia.com>2022-01-03 16:59:52 +0100
commit3a3c8c75bda8889303f12ff5a09cbf44fc2d18b6 (patch)
tree3a668cba78063bed9648721fbdd0f202925e13d6
parent6b0b7873034952a28263f744500c532724982957 (diff)
Remove servlet related config defs.
-rw-r--r--container-core/abi-spec.json94
-rw-r--r--container-core/src/main/resources/configdefinitions/container.servlet.servlet-config.def5
-rw-r--r--container-core/src/main/resources/configdefinitions/jdisc.http.jdisc.http.servlet-paths.def6
3 files changed, 0 insertions, 105 deletions
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/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