diff options
Diffstat (limited to 'config-model/src/main/resources/schema')
17 files changed, 19 insertions, 18 deletions
diff --git a/config-model/src/main/resources/schema/admin.rnc b/config-model/src/main/resources/schema/admin.rnc index 98ab2e61783..72764060e06 100644 --- a/config-model/src/main/resources/schema/admin.rnc +++ b/config-model/src/main/resources/schema/admin.rnc @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. Admin = AdminV2 | AdminV3 | AdminV4 AdminV2 = diff --git a/config-model/src/main/resources/schema/common.rnc b/config-model/src/main/resources/schema/common.rnc index e0d5e6a3344..2f3b10742f3 100644 --- a/config-model/src/main/resources/schema/common.rnc +++ b/config-model/src/main/resources/schema/common.rnc @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. service.attlist &= attribute hostalias { xsd:NCName } service.attlist &= attribute baseport { xsd:unsignedShort }? service.attlist &= attribute jvm-options { text }? # Remove in Vespa 9 @@ -142,4 +142,4 @@ OnnxModelExecutionParams = EmbedderPoolingStrategy = element pooling-strategy { "cls" | "mean" }? StartOfSequence = element transformer-start-sequence-token { xsd:integer }? -EndOfSequence = element transformer-end-sequence-token { xsd:integer }?
\ No newline at end of file +EndOfSequence = element transformer-end-sequence-token { xsd:integer }? diff --git a/config-model/src/main/resources/schema/container-include.rnc b/config-model/src/main/resources/schema/container-include.rnc index b0cd9baab32..e2e3b60e0f9 100644 --- a/config-model/src/main/resources/schema/container-include.rnc +++ b/config-model/src/main/resources/schema/container-include.rnc @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. include "containercluster.rnc" include "common.rnc" include "container.rnc" diff --git a/config-model/src/main/resources/schema/container.rnc b/config-model/src/main/resources/schema/container.rnc index 2d145e170db..f8d48965383 100644 --- a/config-model/src/main/resources/schema/container.rnc +++ b/config-model/src/main/resources/schema/container.rnc @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. # Schema for common container options include "processing.rnc" diff --git a/config-model/src/main/resources/schema/containercluster.rnc b/config-model/src/main/resources/schema/containercluster.rnc index c10b5a66e06..f24a1511318 100644 --- a/config-model/src/main/resources/schema/containercluster.rnc +++ b/config-model/src/main/resources/schema/containercluster.rnc @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. ContainerCluster = element container { attribute version { "1.0" } & attribute id { xsd:NCName }? & diff --git a/config-model/src/main/resources/schema/content.rnc b/config-model/src/main/resources/schema/content.rnc index dff24745778..5382e27e0b2 100644 --- a/config-model/src/main/resources/schema/content.rnc +++ b/config-model/src/main/resources/schema/content.rnc @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0" include "container.rnc" diff --git a/config-model/src/main/resources/schema/deployment.rnc b/config-model/src/main/resources/schema/deployment.rnc index 87783c1ee20..3491d868f20 100644 --- a/config-model/src/main/resources/schema/deployment.rnc +++ b/config-model/src/main/resources/schema/deployment.rnc @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. # RELAX NG Compact Syntax # Vespa Deployment file @@ -133,6 +133,7 @@ Prod = element prod { } ProdTest = element test { + attribute empty-host-ttl { xsd:string }? & text } diff --git a/config-model/src/main/resources/schema/federation.rnc b/config-model/src/main/resources/schema/federation.rnc index 4a0d34149ea..a2ddff55efc 100644 --- a/config-model/src/main/resources/schema/federation.rnc +++ b/config-model/src/main/resources/schema/federation.rnc @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. # Schema for federation configuration inside the searchchains section. GenericSource = diff --git a/config-model/src/main/resources/schema/hosts.rnc b/config-model/src/main/resources/schema/hosts.rnc index d089b23804e..414e4ba6506 100644 --- a/config-model/src/main/resources/schema/hosts.rnc +++ b/config-model/src/main/resources/schema/hosts.rnc @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. # RELAX NG Compact Syntax # Vespa Hosts file diff --git a/config-model/src/main/resources/schema/legacygenericmodule.rnc b/config-model/src/main/resources/schema/legacygenericmodule.rnc index a54f7fd9afc..a3b7527a81a 100644 --- a/config-model/src/main/resources/schema/legacygenericmodule.rnc +++ b/config-model/src/main/resources/schema/legacygenericmodule.rnc @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. # Generic, nestable module LegacyGenericModule = element module { diff --git a/config-model/src/main/resources/schema/processing.rnc b/config-model/src/main/resources/schema/processing.rnc index a753de70265..c48d66e9c3d 100644 --- a/config-model/src/main/resources/schema/processing.rnc +++ b/config-model/src/main/resources/schema/processing.rnc @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. # Schema for processing components and chains ProcessingRenderer = element renderer { diff --git a/config-model/src/main/resources/schema/routing-standalone.rnc b/config-model/src/main/resources/schema/routing-standalone.rnc index e95369fd192..5228015c7ba 100644 --- a/config-model/src/main/resources/schema/routing-standalone.rnc +++ b/config-model/src/main/resources/schema/routing-standalone.rnc @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. include "common.rnc" include "routing.rnc" start = Routing diff --git a/config-model/src/main/resources/schema/routing.rnc b/config-model/src/main/resources/schema/routing.rnc index 5ca033b2fd7..1a631d89631 100644 --- a/config-model/src/main/resources/schema/routing.rnc +++ b/config-model/src/main/resources/schema/routing.rnc @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. # RELAX NG compact syntax pattern # for Vespa MessageBus explicit routing config Routing = element routing { diff --git a/config-model/src/main/resources/schema/schemas.xml b/config-model/src/main/resources/schema/schemas.xml index c3f8e2be448..3e881ff62a5 100644 --- a/config-model/src/main/resources/schema/schemas.xml +++ b/config-model/src/main/resources/schema/schemas.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <locatingRules xmlns="http://thaiopensource.com/ns/locating-rules/1.0"> <documentElement localName="hosts" uri="hosts.rnc"/> <documentElement localName="services" uri="services.rnc"/> diff --git a/config-model/src/main/resources/schema/searchchains.rnc b/config-model/src/main/resources/schema/searchchains.rnc index 993a2088859..b13dc14248d 100644 --- a/config-model/src/main/resources/schema/searchchains.rnc +++ b/config-model/src/main/resources/schema/searchchains.rnc @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #Schema for search chains and searchers inside the searchchains section. include "federation.rnc" diff --git a/config-model/src/main/resources/schema/services.rnc b/config-model/src/main/resources/schema/services.rnc index aed627203a0..1c30b2d91f9 100644 --- a/config-model/src/main/resources/schema/services.rnc +++ b/config-model/src/main/resources/schema/services.rnc @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. include "common.rnc" include "admin.rnc" include "content.rnc" diff --git a/config-model/src/main/resources/schema/validation-overrides.rnc b/config-model/src/main/resources/schema/validation-overrides.rnc index a0caa10fc60..b1ac7978b22 100644 --- a/config-model/src/main/resources/schema/validation-overrides.rnc +++ b/config-model/src/main/resources/schema/validation-overrides.rnc @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. # RELAX NG Compact Syntax # Vespa validation overrides |