diff options
author | Tor Brede Vekterli <vekterli@yahooinc.com> | 2022-05-16 13:20:56 +0200 |
---|---|---|
committer | gjoranv <gv@verizonmedia.com> | 2022-06-08 11:45:22 +0200 |
commit | 4639be4f03d58a0b8df7b1ecb573e7d344a53ed5 (patch) | |
tree | 236d8b271e2e51c5e15df08bc19c4c97860ca16a /config-model/src/main/resources/schema | |
parent | 1e03a00cd6f69cf63d942885e97ff7582778c7f5 (diff) |
Remove top-level <clients> element and LoadType concept
Load types have not been properly supported for some time, so remove
the remaining API surfaces exposing them. Since load type config was
the last remaining use of <clients> in services.xml, remove that one
as well.
Diffstat (limited to 'config-model/src/main/resources/schema')
-rw-r--r-- | config-model/src/main/resources/schema/clients-v2.rnc | 31 | ||||
-rw-r--r-- | config-model/src/main/resources/schema/clients.rnc | 6 | ||||
-rw-r--r-- | config-model/src/main/resources/schema/services.rnc | 3 |
3 files changed, 0 insertions, 40 deletions
diff --git a/config-model/src/main/resources/schema/clients-v2.rnc b/config-model/src/main/resources/schema/clients-v2.rnc deleted file mode 100644 index 5a9353321c8..00000000000 --- a/config-model/src/main/resources/schema/clients-v2.rnc +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -Clients20 = - attribute version { "2.0" } & - LoadTypes? - -LoadTypes = element load-types { - element type { - attribute name { text } & - attribute default-priority { text }? - }* -} - -FeederOptions20 = element feederoptions { - FeederOptionsOpts20 & - DocProcChain? -} - -FeederOptionsOpts20 = element abortondocumenterror { xsd:boolean }? & - element retryenabled { text }? & - element route { text }? & - element maxpendingdocs { xsd:positiveInteger }? & - element maxpendingbytes { xsd:positiveInteger }? & - element retrydelay { xsd:double { minInclusive = "0.0" } }? & - element timeout { xsd:double { minInclusive = "0.0" } }? & - element tracelevel { xsd:positiveInteger }? & - element mbusport { xsd:positiveInteger }? - - -DocProcChain = element docprocchain { - text -} diff --git a/config-model/src/main/resources/schema/clients.rnc b/config-model/src/main/resources/schema/clients.rnc deleted file mode 100644 index 1e1dffc90b9..00000000000 --- a/config-model/src/main/resources/schema/clients.rnc +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -include "clients-v2.rnc" - -Clients = element clients { - Clients20 -} diff --git a/config-model/src/main/resources/schema/services.rnc b/config-model/src/main/resources/schema/services.rnc index 3a8ffe30563..e8bb1c0c6c2 100644 --- a/config-model/src/main/resources/schema/services.rnc +++ b/config-model/src/main/resources/schema/services.rnc @@ -1,7 +1,6 @@ # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. include "common.rnc" include "admin.rnc" -include "clients.rnc" include "content.rnc" include "docproc.rnc" include "routing.rnc" @@ -15,14 +14,12 @@ start = element services { GenericCluster* & GenericConfig* & Admin? & - Clients? & Content* & ContainerCluster* & Routing? } | GenericCluster | Admin -| Clients | Content | ContainerCluster |