Remove unused configs and their usage.

4 files changed, 0 insertions, 99 deletions

diff --git a/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java b/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java
index 07500789863..cca3c5c4610 100644
--- a/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java
+++ b/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java
@@ -9,7 +9,6 @@ import com.yahoo.component.ComponentSpecification;
 import com.yahoo.component.provider.ComponentRegistry;
 import com.yahoo.concurrent.ThreadFactoryFactory;
 import com.yahoo.config.FileReference;
-import com.yahoo.container.core.DiagnosticsConfig;
 import com.yahoo.container.di.ComponentDeconstructor;
 import com.yahoo.container.di.Container;
 import com.yahoo.container.di.componentgraph.core.ComponentGraph;
diff --git a/container-core/src/main/resources/configdefinitions/diagnostics.def b/container-core/src/main/resources/configdefinitions/diagnostics.def
deleted file mode 100644
index 33f733d4386..00000000000
--- a/container-core/src/main/resources/configdefinitions/diagnostics.def
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-namespace=container.core
-
-## The fraction of queries to time out over a period of 10s to consider
-## the system in breakdown.
-timeoutfraction double default=0.1
-
-## Minimum QPS to consider the system in breakdown.
-minimumqps int default=1
-
-## Whether to shut down process if in a deadlock situation
-shutdown bool default=false
-
-## Whether to totally disable the detector. Alternative to system property
-## which works better in tests.
-disabled bool default=false
diff --git a/container-core/src/main/resources/configdefinitions/qr-searchers.def b/container-core/src/main/resources/configdefinitions/qr-searchers.def
index e2b4836c081..faf91f31aff 100644
--- a/container-core/src/main/resources/configdefinitions/qr-searchers.def
+++ b/container-core/src/main/resources/configdefinitions/qr-searchers.def
@@ -74,8 +74,5 @@ searchcluster[].storagecluster.routespec string default=""
 searchcluster[].dispatcher[].host string
 searchcluster[].dispatcher[].port int
 
-## Not used. TODO: Remove on Vespa 7
-searchcluster[].rowbits int default=0
-
 # Per dispatcher config-id might be nice to have, remove it until needed.
 # searchcluster[].dispatcher[].configid reference
diff --git a/container-core/src/main/resources/configdefinitions/qr-templates.def b/container-core/src/main/resources/configdefinitions/qr-templates.def
deleted file mode 100644
index 46b1a5cbd65..00000000000
--- a/container-core/src/main/resources/configdefinitions/qr-templates.def
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-# Not used
-# TODO: Remove on Vespa 7
-namespace=container.core
-
-## Prefix to use in queries to choose a given template
-templateset[].urlprefix string
-
-## The id of the Java class which the given templateset
-## should be an instance of. This is only used for implementing
-## templates in the Java API instead of Velocity.
-templateset[].classid string default=""
-
-## The symbolic name of the Osgi bundle this template is located in.
-## Assumed to be the same as the classid if not set, and is only used
-## when classid is used.
-templateset[].bundle string default=""
-
-## The MIME type of a given template
-templateset[].mimetype string default="text/html"
-
-## The character set of a given template
-templateset[].encoding string default="iso-8859-1"
-
-## Not used
-templateset[].rankprofile int default=0
-
-
-## Not used in 1.0
-templateset[].keepalive bool default=false
-
-## Header template. Always rendered.
-templateset[].headertemplate string default=""
-
-## Footer template. Always rendered.
-templateset[].footertemplate string default=""
-
-## Nohits template. Rendered if there are no hits in the result.
-templateset[].nohitstemplate string default=""
-
-## Hit template. Rendered if there are hits in the result.
-templateset[].hittemplate string default=""
-
-## Error template. Rendered if there is an error condition. This is
-## not mutually exclusive with the (no)hit templates as such.
-templateset[].errortemplate string default=""
-
-## Aggregated groups header template.
-## Default rendering is used if missing
-templateset[].groupsheadertemplate string default="[DEFAULT]"
-
-## Aggregated range group template.
-## Default rendering is used if missing
-templateset[].rangegrouptemplate string default="[DEFAULT]"
-
-## Aggregated exact group template
-## Default rendering is used if missing
-templateset[].exactgrouptemplate string default="[DEFAULT]"
-
-## Aggregated groups footer template.
-## Default rendering is used if missing
-templateset[].groupsfootertemplate string default="[DEFAULT]"
-
-## Tags used to highlight results, starting a bolded section.
-## An empty string means the template should no override what
-## was inserted by the search chain.
-templateset[].highlightstarttag  string default=""
-## Tags used to highlight results, ending a bolded section
-## An empty string means the template should no override what
-## was inserted by the search chain.
-templateset[].highlightendtag  string default=""
-## Tags used to highlight results, separating dynamic snippets
-## An empty string means the template should no override what
-## was inserted by the search chain.
-templateset[].highlightseptag  string default=""
-
-## The summary class to use for this template if there is none
-## defined in the query.
-templateset[].defaultsummaryclass string default=""