diff options
Diffstat (limited to 'config-model/src/test/cfg')
201 files changed, 194 insertions, 202 deletions
diff --git a/config-model/src/test/cfg/admin/adminconfig20/hosts.xml b/config-model/src/test/cfg/admin/adminconfig20/hosts.xml index cd73cbd3126..0cc1fdf13bf 100644 --- a/config-model/src/test/cfg/admin/adminconfig20/hosts.xml +++ b/config-model/src/test/cfg/admin/adminconfig20/hosts.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <hosts> <host name="localhost"> <alias>adminserver</alias> diff --git a/config-model/src/test/cfg/admin/adminconfig20/services.xml b/config-model/src/test/cfg/admin/adminconfig20/services.xml index f9135d5378e..b3a6f3daa7a 100644 --- a/config-model/src/test/cfg/admin/adminconfig20/services.xml +++ b/config-model/src/test/cfg/admin/adminconfig20/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services> <admin version="2.0"> diff --git a/config-model/src/test/cfg/admin/adminconfigbaseport/hosts.xml b/config-model/src/test/cfg/admin/adminconfigbaseport/hosts.xml index 12f1365b8e3..8c8d8b7233a 100644 --- a/config-model/src/test/cfg/admin/adminconfigbaseport/hosts.xml +++ b/config-model/src/test/cfg/admin/adminconfigbaseport/hosts.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <hosts> <host name="localhost"> <alias>adminserver</alias> diff --git a/config-model/src/test/cfg/admin/adminconfigbaseport/services.xml b/config-model/src/test/cfg/admin/adminconfigbaseport/services.xml index 1e9cb866f19..6a44e5f2fe9 100644 --- a/config-model/src/test/cfg/admin/adminconfigbaseport/services.xml +++ b/config-model/src/test/cfg/admin/adminconfigbaseport/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services> <admin version="2.0"> diff --git a/config-model/src/test/cfg/admin/metricconfig/hosts.xml b/config-model/src/test/cfg/admin/metricconfig/hosts.xml index 0d6fa515417..6d48a020e93 100644 --- a/config-model/src/test/cfg/admin/metricconfig/hosts.xml +++ b/config-model/src/test/cfg/admin/metricconfig/hosts.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <hosts> <host name="foo1"> <alias>node1</alias> diff --git a/config-model/src/test/cfg/admin/metricconfig/searchdefinitions/music.sd b/config-model/src/test/cfg/admin/metricconfig/searchdefinitions/music.sd index f7b182f66ea..3323357cc2f 100644 --- a/config-model/src/test/cfg/admin/metricconfig/searchdefinitions/music.sd +++ b/config-model/src/test/cfg/admin/metricconfig/searchdefinitions/music.sd @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. search music { document music { field f1 type string { diff --git a/config-model/src/test/cfg/admin/metricconfig/services.xml b/config-model/src/test/cfg/admin/metricconfig/services.xml index 1e4c9e6e549..cf102f94307 100644 --- a/config-model/src/test/cfg/admin/metricconfig/services.xml +++ b/config-model/src/test/cfg/admin/metricconfig/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services> <admin version="2.0"> <adminserver hostalias="node1"/> diff --git a/config-model/src/test/cfg/admin/multipleconfigservers/hosts.xml b/config-model/src/test/cfg/admin/multipleconfigservers/hosts.xml index be1e48af7a4..76b26c00009 100644 --- a/config-model/src/test/cfg/admin/multipleconfigservers/hosts.xml +++ b/config-model/src/test/cfg/admin/multipleconfigservers/hosts.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <hosts> <host name="localhost"> <alias>node1</alias> diff --git a/config-model/src/test/cfg/admin/multipleconfigservers/services.xml b/config-model/src/test/cfg/admin/multipleconfigservers/services.xml index 11fe4321d82..07e3f407d0f 100644 --- a/config-model/src/test/cfg/admin/multipleconfigservers/services.xml +++ b/config-model/src/test/cfg/admin/multipleconfigservers/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services> <admin version="2.0"> diff --git a/config-model/src/test/cfg/admin/simpleadminconfig20/hosts.xml b/config-model/src/test/cfg/admin/simpleadminconfig20/hosts.xml index 12f1365b8e3..8c8d8b7233a 100644 --- a/config-model/src/test/cfg/admin/simpleadminconfig20/hosts.xml +++ b/config-model/src/test/cfg/admin/simpleadminconfig20/hosts.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <hosts> <host name="localhost"> <alias>adminserver</alias> diff --git a/config-model/src/test/cfg/admin/simpleadminconfig20/services.xml b/config-model/src/test/cfg/admin/simpleadminconfig20/services.xml index 9ebe733c1c8..bb77f05086d 100644 --- a/config-model/src/test/cfg/admin/simpleadminconfig20/services.xml +++ b/config-model/src/test/cfg/admin/simpleadminconfig20/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services> <admin version="2.0"> diff --git a/config-model/src/test/cfg/admin/userconfigs/function-test.def b/config-model/src/test/cfg/admin/userconfigs/function-test.def index 86a110c3413..5391ee1dc3c 100644 --- a/config-model/src/test/cfg/admin/userconfigs/function-test.def +++ b/config-model/src/test/cfg/admin/userconfigs/function-test.def @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. # # This def file should test most aspects of def files that makes a difference # for the autogenerated config classes. The goal is to trigger all blocks of diff --git a/config-model/src/test/cfg/admin/userconfigs/functiontest-defaultvalues.xml b/config-model/src/test/cfg/admin/userconfigs/functiontest-defaultvalues.xml index 7da7d788ca1..8dc033c7d79 100644 --- a/config-model/src/test/cfg/admin/userconfigs/functiontest-defaultvalues.xml +++ b/config-model/src/test/cfg/admin/userconfigs/functiontest-defaultvalues.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <config name="function-test"> <bool_val>false</bool_val> <int_val>5</int_val> diff --git a/config-model/src/test/cfg/admin/userconfigs/whitespace-test.xml b/config-model/src/test/cfg/admin/userconfigs/whitespace-test.xml index 68576786376..c51dc001626 100644 --- a/config-model/src/test/cfg/admin/userconfigs/whitespace-test.xml +++ b/config-model/src/test/cfg/admin/userconfigs/whitespace-test.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <config name="function-test"> <stringVal> This is a string that contains different kinds of whitespace </stringVal> diff --git a/config-model/src/test/cfg/application/app1/deployment.xml b/config-model/src/test/cfg/application/app1/deployment.xml index ea255b207f3..34d2036c1a5 100644 --- a/config-model/src/test/cfg/application/app1/deployment.xml +++ b/config-model/src/test/cfg/application/app1/deployment.xml @@ -1,4 +1,3 @@ -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <deployment version="1.0"> <test/> <staging/> diff --git a/config-model/src/test/cfg/application/app1/hosts.xml b/config-model/src/test/cfg/application/app1/hosts.xml index 9cbdd000786..fc545b34f6f 100644 --- a/config-model/src/test/cfg/application/app1/hosts.xml +++ b/config-model/src/test/cfg/application/app1/hosts.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <hosts> <host name="localhost"> <alias>node1</alias> diff --git a/config-model/src/test/cfg/application/app1/searchdefinitions/laptop.sd b/config-model/src/test/cfg/application/app1/searchdefinitions/laptop.sd index 21a76ad605c..147e128df16 100644 --- a/config-model/src/test/cfg/application/app1/searchdefinitions/laptop.sd +++ b/config-model/src/test/cfg/application/app1/searchdefinitions/laptop.sd @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. search laptop { document laptop inherits product { diff --git a/config-model/src/test/cfg/application/app1/searchdefinitions/music.sd b/config-model/src/test/cfg/application/app1/searchdefinitions/music.sd index dda729d6a35..d0eec200b90 100644 --- a/config-model/src/test/cfg/application/app1/searchdefinitions/music.sd +++ b/config-model/src/test/cfg/application/app1/searchdefinitions/music.sd @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. # A basic search definition - called music, should be saved to music.sd search music { diff --git a/config-model/src/test/cfg/application/app1/searchdefinitions/pc.sd b/config-model/src/test/cfg/application/app1/searchdefinitions/pc.sd index bdc90328cdb..89f9ffe530d 100644 --- a/config-model/src/test/cfg/application/app1/searchdefinitions/pc.sd +++ b/config-model/src/test/cfg/application/app1/searchdefinitions/pc.sd @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. search pc { document pc inherits product { diff --git a/config-model/src/test/cfg/application/app1/searchdefinitions/product.sd b/config-model/src/test/cfg/application/app1/searchdefinitions/product.sd index 588a1d544c6..d8b1d725d1c 100644 --- a/config-model/src/test/cfg/application/app1/searchdefinitions/product.sd +++ b/config-model/src/test/cfg/application/app1/searchdefinitions/product.sd @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. document product { field title type string { diff --git a/config-model/src/test/cfg/application/app1/searchdefinitions/sock.sd b/config-model/src/test/cfg/application/app1/searchdefinitions/sock.sd index 9331c0caf54..1620d790b65 100644 --- a/config-model/src/test/cfg/application/app1/searchdefinitions/sock.sd +++ b/config-model/src/test/cfg/application/app1/searchdefinitions/sock.sd @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. search sock { document sock inherits product { diff --git a/config-model/src/test/cfg/application/app1/services.xml b/config-model/src/test/cfg/application/app1/services.xml index 6b59d13844a..537ec488537 100644 --- a/config-model/src/test/cfg/application/app1/services.xml +++ b/config-model/src/test/cfg/application/app1/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services version="1.0"> <admin version="2.0"> diff --git a/config-model/src/test/cfg/application/app_genericservices/hosts.xml b/config-model/src/test/cfg/application/app_genericservices/hosts.xml index a7fc725d377..7a41bc218cd 100644 --- a/config-model/src/test/cfg/application/app_genericservices/hosts.xml +++ b/config-model/src/test/cfg/application/app_genericservices/hosts.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <hosts> <host name="bogusname1"> <alias>node1</alias> diff --git a/config-model/src/test/cfg/application/app_genericservices/searchdefinitions/music.sd b/config-model/src/test/cfg/application/app_genericservices/searchdefinitions/music.sd index dda729d6a35..d0eec200b90 100644 --- a/config-model/src/test/cfg/application/app_genericservices/searchdefinitions/music.sd +++ b/config-model/src/test/cfg/application/app_genericservices/searchdefinitions/music.sd @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. # A basic search definition - called music, should be saved to music.sd search music { diff --git a/config-model/src/test/cfg/application/app_genericservices/services.xml b/config-model/src/test/cfg/application/app_genericservices/services.xml index 6c7cad10e5d..67169253bba 100644 --- a/config-model/src/test/cfg/application/app_genericservices/services.xml +++ b/config-model/src/test/cfg/application/app_genericservices/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services version="1.0"> <service version="1.0" name="myservice" command="mycmd1.sh"> diff --git a/config-model/src/test/cfg/application/app_invalid_deployment_xml/deployment.xml b/config-model/src/test/cfg/application/app_invalid_deployment_xml/deployment.xml index 489e7e56628..7a1089a6c1e 100644 --- a/config-model/src/test/cfg/application/app_invalid_deployment_xml/deployment.xml +++ b/config-model/src/test/cfg/application/app_invalid_deployment_xml/deployment.xml @@ -1,4 +1,3 @@ -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <deployment version="1.0"> <test/> <staging/> diff --git a/config-model/src/test/cfg/application/app_invalid_deployment_xml/hosts.xml b/config-model/src/test/cfg/application/app_invalid_deployment_xml/hosts.xml index 115efd488d0..132169097cf 100644 --- a/config-model/src/test/cfg/application/app_invalid_deployment_xml/hosts.xml +++ b/config-model/src/test/cfg/application/app_invalid_deployment_xml/hosts.xml @@ -1,5 +1,4 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <hosts> <host name="localhost"> <alias>node1</alias> diff --git a/config-model/src/test/cfg/application/app_invalid_deployment_xml/services.xml b/config-model/src/test/cfg/application/app_invalid_deployment_xml/services.xml index 03d8fc012ac..a1702af234f 100644 --- a/config-model/src/test/cfg/application/app_invalid_deployment_xml/services.xml +++ b/config-model/src/test/cfg/application/app_invalid_deployment_xml/services.xml @@ -1,5 +1,4 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services version="1.0"> <admin version="2.0"> diff --git a/config-model/src/test/cfg/application/app_nohosts/searchdefinitions/mail.sd b/config-model/src/test/cfg/application/app_nohosts/searchdefinitions/mail.sd index 8b6a6c44bf1..6ce2f4164e8 100644 --- a/config-model/src/test/cfg/application/app_nohosts/searchdefinitions/mail.sd +++ b/config-model/src/test/cfg/application/app_nohosts/searchdefinitions/mail.sd @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. search mail { document mail { diff --git a/config-model/src/test/cfg/application/app_nohosts/searchdefinitions/mailbox.sd b/config-model/src/test/cfg/application/app_nohosts/searchdefinitions/mailbox.sd index f98017f401e..fac4abe46a8 100644 --- a/config-model/src/test/cfg/application/app_nohosts/searchdefinitions/mailbox.sd +++ b/config-model/src/test/cfg/application/app_nohosts/searchdefinitions/mailbox.sd @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. search mailbox { document mailbox { diff --git a/config-model/src/test/cfg/application/app_nohosts/searchdefinitions/message.sd b/config-model/src/test/cfg/application/app_nohosts/searchdefinitions/message.sd index 6c27917c656..b31b2055dd5 100644 --- a/config-model/src/test/cfg/application/app_nohosts/searchdefinitions/message.sd +++ b/config-model/src/test/cfg/application/app_nohosts/searchdefinitions/message.sd @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. search message { document message { diff --git a/config-model/src/test/cfg/application/app_nohosts/services.xml b/config-model/src/test/cfg/application/app_nohosts/services.xml index 5ce2d8ecd63..3169394f9d4 100644 --- a/config-model/src/test/cfg/application/app_nohosts/services.xml +++ b/config-model/src/test/cfg/application/app_nohosts/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services version="1.0"> diff --git a/config-model/src/test/cfg/application/app_permanent/permanent-services.xml b/config-model/src/test/cfg/application/app_permanent/permanent-services.xml index c8a89775d27..85ae636d206 100644 --- a/config-model/src/test/cfg/application/app_permanent/permanent-services.xml +++ b/config-model/src/test/cfg/application/app_permanent/permanent-services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services version="1.0"> <jdisc version="1.0"> <search /> diff --git a/config-model/src/test/cfg/application/app_qrserverandgw/hosts.xml b/config-model/src/test/cfg/application/app_qrserverandgw/hosts.xml index 3be2fd994d9..346dc5c7652 100644 --- a/config-model/src/test/cfg/application/app_qrserverandgw/hosts.xml +++ b/config-model/src/test/cfg/application/app_qrserverandgw/hosts.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <hosts> <host name="localhost"> <alias>node0</alias> diff --git a/config-model/src/test/cfg/application/app_qrserverandgw/searchdefinitions/message.sd b/config-model/src/test/cfg/application/app_qrserverandgw/searchdefinitions/message.sd index c09b2fb2da2..fdc220aef3d 100644 --- a/config-model/src/test/cfg/application/app_qrserverandgw/searchdefinitions/message.sd +++ b/config-model/src/test/cfg/application/app_qrserverandgw/searchdefinitions/message.sd @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. search message { document message { diff --git a/config-model/src/test/cfg/application/app_qrserverandgw/services.xml b/config-model/src/test/cfg/application/app_qrserverandgw/services.xml index a70c3c152f5..5136b06b892 100644 --- a/config-model/src/test/cfg/application/app_qrserverandgw/services.xml +++ b/config-model/src/test/cfg/application/app_qrserverandgw/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services version="1.0"> diff --git a/config-model/src/test/cfg/application/app_sdbundles/hosts.xml b/config-model/src/test/cfg/application/app_sdbundles/hosts.xml index 9cbdd000786..fc545b34f6f 100644 --- a/config-model/src/test/cfg/application/app_sdbundles/hosts.xml +++ b/config-model/src/test/cfg/application/app_sdbundles/hosts.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <hosts> <host name="localhost"> <alias>node1</alias> diff --git a/config-model/src/test/cfg/application/app_sdbundles/services.xml b/config-model/src/test/cfg/application/app_sdbundles/services.xml index 6b59d13844a..537ec488537 100644 --- a/config-model/src/test/cfg/application/app_sdbundles/services.xml +++ b/config-model/src/test/cfg/application/app_sdbundles/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services version="1.0"> <admin version="2.0"> diff --git a/config-model/src/test/cfg/application/classes/attributes.def b/config-model/src/test/cfg/application/classes/attributes.def index c8e51c391f7..bb3a0df6299 100644 --- a/config-model/src/test/cfg/application/classes/attributes.def +++ b/config-model/src/test/cfg/application/classes/attributes.def @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=vespa.config.search attribute[].name string attribute[].datatype string diff --git a/config-model/src/test/cfg/application/configdeftest/configdefinitions/bar.def b/config-model/src/test/cfg/application/configdeftest/configdefinitions/bar.def index e1d5e8341e7..5ba447b9f7d 100644 --- a/config-model/src/test/cfg/application/configdeftest/configdefinitions/bar.def +++ b/config-model/src/test/cfg/application/configdeftest/configdefinitions/bar.def @@ -1,3 +1,3 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=xyzzy bar int default="1" diff --git a/config-model/src/test/cfg/application/configdeftest/configdefinitions/baz.def b/config-model/src/test/cfg/application/configdeftest/configdefinitions/baz.def index c30d4b36ad3..d9649a64203 100644 --- a/config-model/src/test/cfg/application/configdeftest/configdefinitions/baz.def +++ b/config-model/src/test/cfg/application/configdeftest/configdefinitions/baz.def @@ -1,3 +1,3 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=xyzzy bar int diff --git a/config-model/src/test/cfg/application/configdeftest/configdefinitions/foo.def b/config-model/src/test/cfg/application/configdeftest/configdefinitions/foo.def index 89ce911ce10..f1cb7a75c8a 100644 --- a/config-model/src/test/cfg/application/configdeftest/configdefinitions/foo.def +++ b/config-model/src/test/cfg/application/configdeftest/configdefinitions/foo.def @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. version=2 namespace=config bar int default=1 diff --git a/config-model/src/test/cfg/application/configdeftest/configdefinitions/qux.foo.def b/config-model/src/test/cfg/application/configdeftest/configdefinitions/qux.foo.def index 1ff4daea194..5fa36afc8e4 100644 --- a/config-model/src/test/cfg/application/configdeftest/configdefinitions/qux.foo.def +++ b/config-model/src/test/cfg/application/configdeftest/configdefinitions/qux.foo.def @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=qux bar int default=2 quux int default=3 diff --git a/config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.bar.def b/config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.bar.def index d4ef225830a..aae291ec190 100644 --- a/config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.bar.def +++ b/config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.bar.def @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=xyzzy bar int default="2" foo int diff --git a/config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.def b/config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.def index e94d98b448e..e078d9cf77a 100644 --- a/config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.def +++ b/config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.def @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. version=1 namespace=config bar int default=1 diff --git a/config-model/src/test/cfg/application/configuredportconfig/hosts.xml b/config-model/src/test/cfg/application/configuredportconfig/hosts.xml index ca6d75d5e7e..f3b3ad44df1 100644 --- a/config-model/src/test/cfg/application/configuredportconfig/hosts.xml +++ b/config-model/src/test/cfg/application/configuredportconfig/hosts.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <hosts> <host name="localhost"> <alias>host1</alias> diff --git a/config-model/src/test/cfg/application/configuredportconfig/services.xml b/config-model/src/test/cfg/application/configuredportconfig/services.xml index 93d491a8fac..1b85de210df 100644 --- a/config-model/src/test/cfg/application/configuredportconfig/services.xml +++ b/config-model/src/test/cfg/application/configuredportconfig/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services> <com.yahoo.vespa.model.test.SimplePlugin version="1.0"> diff --git a/config-model/src/test/cfg/application/custompropconfig/hosts.xml b/config-model/src/test/cfg/application/custompropconfig/hosts.xml index c329ffc0844..02dc37701cf 100644 --- a/config-model/src/test/cfg/application/custompropconfig/hosts.xml +++ b/config-model/src/test/cfg/application/custompropconfig/hosts.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <hosts> <host name="localhost"> <alias>host1</alias> diff --git a/config-model/src/test/cfg/application/custompropconfig/services.xml b/config-model/src/test/cfg/application/custompropconfig/services.xml index 37ebac8db4b..229dfdf7f06 100644 --- a/config-model/src/test/cfg/application/custompropconfig/services.xml +++ b/config-model/src/test/cfg/application/custompropconfig/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services> <com.yahoo.vespa.model.test.SimpleCustomPropPlugin version="1.0"> <simplecustompropservice hostalias="host1" /> diff --git a/config-model/src/test/cfg/application/doubleconfig/hosts.xml b/config-model/src/test/cfg/application/doubleconfig/hosts.xml index c329ffc0844..02dc37701cf 100644 --- a/config-model/src/test/cfg/application/doubleconfig/hosts.xml +++ b/config-model/src/test/cfg/application/doubleconfig/hosts.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <hosts> <host name="localhost"> <alias>host1</alias> diff --git a/config-model/src/test/cfg/application/doubleconfig/services.xml b/config-model/src/test/cfg/application/doubleconfig/services.xml index 1e70eeb0ad2..74efd598d01 100644 --- a/config-model/src/test/cfg/application/doubleconfig/services.xml +++ b/config-model/src/test/cfg/application/doubleconfig/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services> <simpleplugin version="1.0"> diff --git a/config-model/src/test/cfg/application/empty_prod_region_in_deployment_xml/deployment.xml b/config-model/src/test/cfg/application/empty_prod_region_in_deployment_xml/deployment.xml index 11d4eb39676..d04cc5dfd65 100644 --- a/config-model/src/test/cfg/application/empty_prod_region_in_deployment_xml/deployment.xml +++ b/config-model/src/test/cfg/application/empty_prod_region_in_deployment_xml/deployment.xml @@ -1,4 +1,3 @@ -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <deployment version="1.0"> <test/> <staging/> diff --git a/config-model/src/test/cfg/application/empty_prod_region_in_deployment_xml/hosts.xml b/config-model/src/test/cfg/application/empty_prod_region_in_deployment_xml/hosts.xml index 115efd488d0..132169097cf 100644 --- a/config-model/src/test/cfg/application/empty_prod_region_in_deployment_xml/hosts.xml +++ b/config-model/src/test/cfg/application/empty_prod_region_in_deployment_xml/hosts.xml @@ -1,5 +1,4 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <hosts> <host name="localhost"> <alias>node1</alias> diff --git a/config-model/src/test/cfg/application/empty_prod_region_in_deployment_xml/services.xml b/config-model/src/test/cfg/application/empty_prod_region_in_deployment_xml/services.xml index 03d8fc012ac..a1702af234f 100644 --- a/config-model/src/test/cfg/application/empty_prod_region_in_deployment_xml/services.xml +++ b/config-model/src/test/cfg/application/empty_prod_region_in_deployment_xml/services.xml @@ -1,5 +1,4 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services version="1.0"> <admin version="2.0"> diff --git a/config-model/src/test/cfg/application/include_dirs/dir1/default.xml b/config-model/src/test/cfg/application/include_dirs/dir1/default.xml index 57d9b3f650b..f1e16333fc1 100644 --- a/config-model/src/test/cfg/application/include_dirs/dir1/default.xml +++ b/config-model/src/test/cfg/application/include_dirs/dir1/default.xml @@ -1,4 +1,4 @@ -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <search> <chain id="default"> <searcher id="com.yahoo.search.example.SimpleSearcher" bundle="mybundle"/> diff --git a/config-model/src/test/cfg/application/include_dirs/dir2/chain2.xml b/config-model/src/test/cfg/application/include_dirs/dir2/chain2.xml index c1e8320c5e7..9d297be5212 100644 --- a/config-model/src/test/cfg/application/include_dirs/dir2/chain2.xml +++ b/config-model/src/test/cfg/application/include_dirs/dir2/chain2.xml @@ -1,4 +1,4 @@ -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <search> <searcher class="com.yahoo.search.example.SimpleSearcher" id="s1" bundle="mybundle"/> <chain id="chain2"> diff --git a/config-model/src/test/cfg/application/include_dirs/dir2/chain3.xml b/config-model/src/test/cfg/application/include_dirs/dir2/chain3.xml index ba6755a454a..0e019ba9d02 100644 --- a/config-model/src/test/cfg/application/include_dirs/dir2/chain3.xml +++ b/config-model/src/test/cfg/application/include_dirs/dir2/chain3.xml @@ -1,4 +1,4 @@ -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <search> <chain id="chain3_1"> <searcher id="com.yahoo.search.example.SimpleSearcher" bundle="mybundle"/> diff --git a/config-model/src/test/cfg/application/include_dirs/jdisc_dir/jdisc1.xml b/config-model/src/test/cfg/application/include_dirs/jdisc_dir/jdisc1.xml index 37b6284afdb..629fc830372 100644 --- a/config-model/src/test/cfg/application/include_dirs/jdisc_dir/jdisc1.xml +++ b/config-model/src/test/cfg/application/include_dirs/jdisc_dir/jdisc1.xml @@ -1,4 +1,4 @@ -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <components> <component id="test.Exampledocproc"/> </components> diff --git a/config-model/src/test/cfg/application/include_dirs/services.xml b/config-model/src/test/cfg/application/include_dirs/services.xml index dbd41cec43a..c7349881aed 100644 --- a/config-model/src/test/cfg/application/include_dirs/services.xml +++ b/config-model/src/test/cfg/application/include_dirs/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services version="1.0"> <admin version="2.0"> diff --git a/config-model/src/test/cfg/application/invalid_legacy_user_config/services.xml b/config-model/src/test/cfg/application/invalid_legacy_user_config/services.xml index 9a13d936e46..2cfe35d8893 100644 --- a/config-model/src/test/cfg/application/invalid_legacy_user_config/services.xml +++ b/config-model/src/test/cfg/application/invalid_legacy_user_config/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services version="1.0"> diff --git a/config-model/src/test/cfg/application/metricsconfig/hosts.xml b/config-model/src/test/cfg/application/metricsconfig/hosts.xml index c329ffc0844..02dc37701cf 100644 --- a/config-model/src/test/cfg/application/metricsconfig/hosts.xml +++ b/config-model/src/test/cfg/application/metricsconfig/hosts.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <hosts> <host name="localhost"> <alias>host1</alias> diff --git a/config-model/src/test/cfg/application/metricsconfig/services.xml b/config-model/src/test/cfg/application/metricsconfig/services.xml index 868173bc00e..dd6005f1e74 100644 --- a/config-model/src/test/cfg/application/metricsconfig/services.xml +++ b/config-model/src/test/cfg/application/metricsconfig/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services> <simple version="1.0"> diff --git a/config-model/src/test/cfg/application/newfilenames/hosts.xml b/config-model/src/test/cfg/application/newfilenames/hosts.xml index c329ffc0844..02dc37701cf 100644 --- a/config-model/src/test/cfg/application/newfilenames/hosts.xml +++ b/config-model/src/test/cfg/application/newfilenames/hosts.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <hosts> <host name="localhost"> <alias>host1</alias> diff --git a/config-model/src/test/cfg/application/newfilenames/services.xml b/config-model/src/test/cfg/application/newfilenames/services.xml index 94698535fb9..f76ab8eba78 100644 --- a/config-model/src/test/cfg/application/newfilenames/services.xml +++ b/config-model/src/test/cfg/application/newfilenames/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services> <simpleplugin version="1.0"> diff --git a/config-model/src/test/cfg/application/plugins/hosts.xml b/config-model/src/test/cfg/application/plugins/hosts.xml index ca6d75d5e7e..f3b3ad44df1 100644 --- a/config-model/src/test/cfg/application/plugins/hosts.xml +++ b/config-model/src/test/cfg/application/plugins/hosts.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <hosts> <host name="localhost"> <alias>host1</alias> diff --git a/config-model/src/test/cfg/application/plugins/services.xml b/config-model/src/test/cfg/application/plugins/services.xml index 3fe3b117cbc..79aa2ab9740 100644 --- a/config-model/src/test/cfg/application/plugins/services.xml +++ b/config-model/src/test/cfg/application/plugins/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services> <admin version="2.0"> diff --git a/config-model/src/test/cfg/application/sdfilenametest/searchdefinitions/notmusic.sd b/config-model/src/test/cfg/application/sdfilenametest/searchdefinitions/notmusic.sd index 77307c04843..a70236a7d6f 100644 --- a/config-model/src/test/cfg/application/sdfilenametest/searchdefinitions/notmusic.sd +++ b/config-model/src/test/cfg/application/sdfilenametest/searchdefinitions/notmusic.sd @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. search music { document music { diff --git a/config-model/src/test/cfg/application/sdfilenametest/services.xml b/config-model/src/test/cfg/application/sdfilenametest/services.xml index b135bf4fd2c..1052e27430f 100644 --- a/config-model/src/test/cfg/application/sdfilenametest/services.xml +++ b/config-model/src/test/cfg/application/sdfilenametest/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services version="1.0"> <admin version="2.0"> diff --git a/config-model/src/test/cfg/application/serverdefs/attributes.def b/config-model/src/test/cfg/application/serverdefs/attributes.def index 0bb16fb8079..aa9bce983ab 100644 --- a/config-model/src/test/cfg/application/serverdefs/attributes.def +++ b/config-model/src/test/cfg/application/serverdefs/attributes.def @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=vespa.config.search attribute[].name string diff --git a/config-model/src/test/cfg/application/simpleconfig/hosts.xml b/config-model/src/test/cfg/application/simpleconfig/hosts.xml index c329ffc0844..02dc37701cf 100644 --- a/config-model/src/test/cfg/application/simpleconfig/hosts.xml +++ b/config-model/src/test/cfg/application/simpleconfig/hosts.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <hosts> <host name="localhost"> <alias>host1</alias> diff --git a/config-model/src/test/cfg/application/simpleconfig/services.xml b/config-model/src/test/cfg/application/simpleconfig/services.xml index 2716e65d780..25b5057fe8b 100644 --- a/config-model/src/test/cfg/application/simpleconfig/services.xml +++ b/config-model/src/test/cfg/application/simpleconfig/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services> <simple version="1.0"> diff --git a/config-model/src/test/cfg/application/treeconfig/hosts.xml b/config-model/src/test/cfg/application/treeconfig/hosts.xml index ca6d75d5e7e..f3b3ad44df1 100644 --- a/config-model/src/test/cfg/application/treeconfig/hosts.xml +++ b/config-model/src/test/cfg/application/treeconfig/hosts.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <hosts> <host name="localhost"> <alias>host1</alias> diff --git a/config-model/src/test/cfg/application/treeconfig/services.xml b/config-model/src/test/cfg/application/treeconfig/services.xml index 720d62be2f0..cee45284c2e 100644 --- a/config-model/src/test/cfg/application/treeconfig/services.xml +++ b/config-model/src/test/cfg/application/treeconfig/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services> <com.yahoo.vespa.model.test.SimplePlugin version="1.0"> diff --git a/config-model/src/test/cfg/application/validation/document_references_validation/hosts.xml b/config-model/src/test/cfg/application/validation/document_references_validation/hosts.xml index 9eafb2106cb..c8cbda0509d 100644 --- a/config-model/src/test/cfg/application/validation/document_references_validation/hosts.xml +++ b/config-model/src/test/cfg/application/validation/document_references_validation/hosts.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2017 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <hosts> <host name="localhost"> <alias>node1</alias> diff --git a/config-model/src/test/cfg/application/validation/document_references_validation/searchdefinitions/ad.sd b/config-model/src/test/cfg/application/validation/document_references_validation/searchdefinitions/ad.sd index 1e85ab70357..608c04594b5 100644 --- a/config-model/src/test/cfg/application/validation/document_references_validation/searchdefinitions/ad.sd +++ b/config-model/src/test/cfg/application/validation/document_references_validation/searchdefinitions/ad.sd @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. search ad { document ad { field campaign_ref type reference<campaign> { diff --git a/config-model/src/test/cfg/application/validation/document_references_validation/searchdefinitions/campaign.sd b/config-model/src/test/cfg/application/validation/document_references_validation/searchdefinitions/campaign.sd index 9e208e397b9..cab17fa666d 100644 --- a/config-model/src/test/cfg/application/validation/document_references_validation/searchdefinitions/campaign.sd +++ b/config-model/src/test/cfg/application/validation/document_references_validation/searchdefinitions/campaign.sd @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. search campaign { document campaign { field budget type int { diff --git a/config-model/src/test/cfg/application/validation/document_references_validation/services.xml b/config-model/src/test/cfg/application/validation/document_references_validation/services.xml index 3f1c0083c4a..088949c15c2 100644 --- a/config-model/src/test/cfg/application/validation/document_references_validation/services.xml +++ b/config-model/src/test/cfg/application/validation/document_references_validation/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2017 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services> <admin version="2.0"> <adminserver hostalias="node1" /> diff --git a/config-model/src/test/cfg/application/validation/global_distribution_validation/hosts.xml b/config-model/src/test/cfg/application/validation/global_distribution_validation/hosts.xml index 9eafb2106cb..c8cbda0509d 100644 --- a/config-model/src/test/cfg/application/validation/global_distribution_validation/hosts.xml +++ b/config-model/src/test/cfg/application/validation/global_distribution_validation/hosts.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2017 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <hosts> <host name="localhost"> <alias>node1</alias> diff --git a/config-model/src/test/cfg/application/validation/global_distribution_validation/searchdefinitions/parent.sd b/config-model/src/test/cfg/application/validation/global_distribution_validation/searchdefinitions/parent.sd index 8decebc6680..a772cc87710 100644 --- a/config-model/src/test/cfg/application/validation/global_distribution_validation/searchdefinitions/parent.sd +++ b/config-model/src/test/cfg/application/validation/global_distribution_validation/searchdefinitions/parent.sd @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. search parent { document parent { } diff --git a/config-model/src/test/cfg/application/validation/global_distribution_validation/searchdefinitions/simple.sd b/config-model/src/test/cfg/application/validation/global_distribution_validation/searchdefinitions/simple.sd index b901fa6e82a..49223fabb76 100644 --- a/config-model/src/test/cfg/application/validation/global_distribution_validation/searchdefinitions/simple.sd +++ b/config-model/src/test/cfg/application/validation/global_distribution_validation/searchdefinitions/simple.sd @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. search simple { document simple { field my_reference type reference<parent> { indexing: summary | attribute } diff --git a/config-model/src/test/cfg/application/validation/global_distribution_validation/services.xml b/config-model/src/test/cfg/application/validation/global_distribution_validation/services.xml index 0364b68c00e..df3a3e8f3d7 100644 --- a/config-model/src/test/cfg/application/validation/global_distribution_validation/services.xml +++ b/config-model/src/test/cfg/application/validation/global_distribution_validation/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2017 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services> <admin version="2.0"> <adminserver hostalias="node1" /> diff --git a/config-model/src/test/cfg/application/validation/index_struct/searchdefinitions/simple.sd b/config-model/src/test/cfg/application/validation/index_struct/searchdefinitions/simple.sd index a27a2d074d2..d13477732d8 100644 --- a/config-model/src/test/cfg/application/validation/index_struct/searchdefinitions/simple.sd +++ b/config-model/src/test/cfg/application/validation/index_struct/searchdefinitions/simple.sd @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. search simple { document simple { field foo type map<string, string> { } diff --git a/config-model/src/test/cfg/application/validation/index_struct/services.xml b/config-model/src/test/cfg/application/validation/index_struct/services.xml index 9db7ea324bf..be6672f415f 100644 --- a/config-model/src/test/cfg/application/validation/index_struct/services.xml +++ b/config-model/src/test/cfg/application/validation/index_struct/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services> <admin version="2.0"> <adminserver hostalias="node1" /> diff --git a/config-model/src/test/cfg/application/validation/prefix/searchdefinitions/simple.sd b/config-model/src/test/cfg/application/validation/prefix/searchdefinitions/simple.sd index 60ce940fd7d..65f0502a8f7 100644 --- a/config-model/src/test/cfg/application/validation/prefix/searchdefinitions/simple.sd +++ b/config-model/src/test/cfg/application/validation/prefix/searchdefinitions/simple.sd @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. search simple { document simple { field artist type string { diff --git a/config-model/src/test/cfg/application/validation/prefix/services.xml b/config-model/src/test/cfg/application/validation/prefix/services.xml index 0764af6df23..2518a2cc4f0 100644 --- a/config-model/src/test/cfg/application/validation/prefix/services.xml +++ b/config-model/src/test/cfg/application/validation/prefix/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services> <admin version="2.0"> <adminserver hostalias="node1" /> diff --git a/config-model/src/test/cfg/application/validation/prefix_index/searchdefinitions/simple.sd b/config-model/src/test/cfg/application/validation/prefix_index/searchdefinitions/simple.sd index bf70a1662c6..7dc6b88c037 100644 --- a/config-model/src/test/cfg/application/validation/prefix_index/searchdefinitions/simple.sd +++ b/config-model/src/test/cfg/application/validation/prefix_index/searchdefinitions/simple.sd @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. search simple { document simple { field artist type string { diff --git a/config-model/src/test/cfg/application/validation/prefix_index/services.xml b/config-model/src/test/cfg/application/validation/prefix_index/services.xml index 0764af6df23..2518a2cc4f0 100644 --- a/config-model/src/test/cfg/application/validation/prefix_index/services.xml +++ b/config-model/src/test/cfg/application/validation/prefix_index/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services> <admin version="2.0"> <adminserver hostalias="node1" /> diff --git a/config-model/src/test/cfg/application/validation/prefix_index_and_attribute/searchdefinitions/simple.sd b/config-model/src/test/cfg/application/validation/prefix_index_and_attribute/searchdefinitions/simple.sd index 41412f4ef4f..4fea7a5c3a4 100644 --- a/config-model/src/test/cfg/application/validation/prefix_index_and_attribute/searchdefinitions/simple.sd +++ b/config-model/src/test/cfg/application/validation/prefix_index_and_attribute/searchdefinitions/simple.sd @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. search simple { document simple { field artist type string { diff --git a/config-model/src/test/cfg/application/validation/prefix_index_and_attribute/services.xml b/config-model/src/test/cfg/application/validation/prefix_index_and_attribute/services.xml index 0764af6df23..2518a2cc4f0 100644 --- a/config-model/src/test/cfg/application/validation/prefix_index_and_attribute/services.xml +++ b/config-model/src/test/cfg/application/validation/prefix_index_and_attribute/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services> <admin version="2.0"> <adminserver hostalias="node1" /> diff --git a/config-model/src/test/cfg/application/validation/prefix_streaming/searchdefinitions/simple.sd b/config-model/src/test/cfg/application/validation/prefix_streaming/searchdefinitions/simple.sd index bf70a1662c6..7dc6b88c037 100644 --- a/config-model/src/test/cfg/application/validation/prefix_streaming/searchdefinitions/simple.sd +++ b/config-model/src/test/cfg/application/validation/prefix_streaming/searchdefinitions/simple.sd @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. search simple { document simple { field artist type string { diff --git a/config-model/src/test/cfg/application/validation/prefix_streaming/services.xml b/config-model/src/test/cfg/application/validation/prefix_streaming/services.xml index 2468d14981a..4700fa75612 100644 --- a/config-model/src/test/cfg/application/validation/prefix_streaming/services.xml +++ b/config-model/src/test/cfg/application/validation/prefix_streaming/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services> <admin version="2.0"> <adminserver hostalias="node1" /> diff --git a/config-model/src/test/cfg/application/validation/ranking_constants_fail/searchdefinitions/simple.sd b/config-model/src/test/cfg/application/validation/ranking_constants_fail/searchdefinitions/simple.sd index 126f8d00724..4b0c4e297a6 100644 --- a/config-model/src/test/cfg/application/validation/ranking_constants_fail/searchdefinitions/simple.sd +++ b/config-model/src/test/cfg/application/validation/ranking_constants_fail/searchdefinitions/simple.sd @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. search simple { document simple {} diff --git a/config-model/src/test/cfg/application/validation/ranking_constants_fail/services.xml b/config-model/src/test/cfg/application/validation/ranking_constants_fail/services.xml index 9db7ea324bf..66af18ed7bc 100644 --- a/config-model/src/test/cfg/application/validation/ranking_constants_fail/services.xml +++ b/config-model/src/test/cfg/application/validation/ranking_constants_fail/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services> <admin version="2.0"> <adminserver hostalias="node1" /> @@ -14,4 +14,4 @@ <node hostalias='node1' distribution-key='0'/> </nodes> </content> -</services> +</services>
\ No newline at end of file diff --git a/config-model/src/test/cfg/application/validation/ranking_constants_ok/searchdefinitions/simple.sd b/config-model/src/test/cfg/application/validation/ranking_constants_ok/searchdefinitions/simple.sd index 126f8d00724..4b0c4e297a6 100644 --- a/config-model/src/test/cfg/application/validation/ranking_constants_ok/searchdefinitions/simple.sd +++ b/config-model/src/test/cfg/application/validation/ranking_constants_ok/searchdefinitions/simple.sd @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. search simple { document simple {} diff --git a/config-model/src/test/cfg/application/validation/ranking_constants_ok/services.xml b/config-model/src/test/cfg/application/validation/ranking_constants_ok/services.xml index 9db7ea324bf..be6672f415f 100644 --- a/config-model/src/test/cfg/application/validation/ranking_constants_ok/services.xml +++ b/config-model/src/test/cfg/application/validation/ranking_constants_ok/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services> <admin version="2.0"> <adminserver hostalias="node1" /> diff --git a/config-model/src/test/cfg/application/validation/search_alltypes/hosts.xml b/config-model/src/test/cfg/application/validation/search_alltypes/hosts.xml index 9eafb2106cb..e2b97e374e6 100644 --- a/config-model/src/test/cfg/application/validation/search_alltypes/hosts.xml +++ b/config-model/src/test/cfg/application/validation/search_alltypes/hosts.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <hosts> <host name="localhost"> <alias>node1</alias> diff --git a/config-model/src/test/cfg/application/validation/search_alltypes/searchdefinitions/parent.sd b/config-model/src/test/cfg/application/validation/search_alltypes/searchdefinitions/parent.sd index 8decebc6680..4815d91413c 100644 --- a/config-model/src/test/cfg/application/validation/search_alltypes/searchdefinitions/parent.sd +++ b/config-model/src/test/cfg/application/validation/search_alltypes/searchdefinitions/parent.sd @@ -1,4 +1,3 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. search parent { document parent { } diff --git a/config-model/src/test/cfg/application/validation/search_alltypes/searchdefinitions/simple.sd b/config-model/src/test/cfg/application/validation/search_alltypes/searchdefinitions/simple.sd index 2a4c4a68576..36d8012b38e 100644 --- a/config-model/src/test/cfg/application/validation/search_alltypes/searchdefinitions/simple.sd +++ b/config-model/src/test/cfg/application/validation/search_alltypes/searchdefinitions/simple.sd @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. search simple { document simple { field my_pos type position { indexing: summary } diff --git a/config-model/src/test/cfg/application/validation/search_alltypes/services.xml b/config-model/src/test/cfg/application/validation/search_alltypes/services.xml index 68a231dec44..ffe39f2a695 100644 --- a/config-model/src/test/cfg/application/validation/search_alltypes/services.xml +++ b/config-model/src/test/cfg/application/validation/search_alltypes/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services> <admin version="2.0"> <adminserver hostalias="node1" /> diff --git a/config-model/src/test/cfg/application/validation/search_empty_content/hosts.xml b/config-model/src/test/cfg/application/validation/search_empty_content/hosts.xml index 9eafb2106cb..e2b97e374e6 100644 --- a/config-model/src/test/cfg/application/validation/search_empty_content/hosts.xml +++ b/config-model/src/test/cfg/application/validation/search_empty_content/hosts.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <hosts> <host name="localhost"> <alias>node1</alias> diff --git a/config-model/src/test/cfg/application/validation/search_empty_content/searchdefinitions/simple.sd b/config-model/src/test/cfg/application/validation/search_empty_content/searchdefinitions/simple.sd index 51512363fbc..023943fd3b1 100644 --- a/config-model/src/test/cfg/application/validation/search_empty_content/searchdefinitions/simple.sd +++ b/config-model/src/test/cfg/application/validation/search_empty_content/searchdefinitions/simple.sd @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. search simple { document simple { field foo type raw { } diff --git a/config-model/src/test/cfg/application/validation/search_empty_content/services.xml b/config-model/src/test/cfg/application/validation/search_empty_content/services.xml index 9db7ea324bf..be6672f415f 100644 --- a/config-model/src/test/cfg/application/validation/search_empty_content/services.xml +++ b/config-model/src/test/cfg/application/validation/search_empty_content/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services> <admin version="2.0"> <adminserver hostalias="node1" /> diff --git a/config-model/src/test/cfg/application/validation/search_struct/hosts.xml b/config-model/src/test/cfg/application/validation/search_struct/hosts.xml index 9eafb2106cb..e2b97e374e6 100644 --- a/config-model/src/test/cfg/application/validation/search_struct/hosts.xml +++ b/config-model/src/test/cfg/application/validation/search_struct/hosts.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <hosts> <host name="localhost"> <alias>node1</alias> diff --git a/config-model/src/test/cfg/application/validation/search_struct/searchdefinitions/simple.sd b/config-model/src/test/cfg/application/validation/search_struct/searchdefinitions/simple.sd index 0ab072111c5..e8d3d37906d 100644 --- a/config-model/src/test/cfg/application/validation/search_struct/searchdefinitions/simple.sd +++ b/config-model/src/test/cfg/application/validation/search_struct/searchdefinitions/simple.sd @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. search simple { document simple { field foo type my_struct { } diff --git a/config-model/src/test/cfg/application/validation/search_struct/services.xml b/config-model/src/test/cfg/application/validation/search_struct/services.xml index 9db7ea324bf..be6672f415f 100644 --- a/config-model/src/test/cfg/application/validation/search_struct/services.xml +++ b/config-model/src/test/cfg/application/validation/search_struct/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services> <admin version="2.0"> <adminserver hostalias="node1" /> diff --git a/config-model/src/test/cfg/clients/advancedconfig.v2/hosts.xml b/config-model/src/test/cfg/clients/advancedconfig.v2/hosts.xml index 9eafb2106cb..e2b97e374e6 100644 --- a/config-model/src/test/cfg/clients/advancedconfig.v2/hosts.xml +++ b/config-model/src/test/cfg/clients/advancedconfig.v2/hosts.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <hosts> <host name="localhost"> <alias>node1</alias> diff --git a/config-model/src/test/cfg/clients/advancedconfig.v2/searchdefinitions/music.sd b/config-model/src/test/cfg/clients/advancedconfig.v2/searchdefinitions/music.sd index da9e2d14c55..136efeafaf6 100644 --- a/config-model/src/test/cfg/clients/advancedconfig.v2/searchdefinitions/music.sd +++ b/config-model/src/test/cfg/clients/advancedconfig.v2/searchdefinitions/music.sd @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. search music { document music { field f1 type string { diff --git a/config-model/src/test/cfg/clients/advancedconfig.v2/services.xml b/config-model/src/test/cfg/clients/advancedconfig.v2/services.xml index e6102b6f8fd..5147b1b546f 100644 --- a/config-model/src/test/cfg/clients/advancedconfig.v2/services.xml +++ b/config-model/src/test/cfg/clients/advancedconfig.v2/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services xmlns=""> <admin version="2.0"> <adminserver hostalias="node1" /> diff --git a/config-model/src/test/cfg/clients/simpleconfig.v2.docprocv3/hosts.xml b/config-model/src/test/cfg/clients/simpleconfig.v2.docprocv3/hosts.xml index 9eafb2106cb..e2b97e374e6 100644 --- a/config-model/src/test/cfg/clients/simpleconfig.v2.docprocv3/hosts.xml +++ b/config-model/src/test/cfg/clients/simpleconfig.v2.docprocv3/hosts.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <hosts> <host name="localhost"> <alias>node1</alias> diff --git a/config-model/src/test/cfg/clients/simpleconfig.v2.docprocv3/searchdefinitions/music.sd b/config-model/src/test/cfg/clients/simpleconfig.v2.docprocv3/searchdefinitions/music.sd index da9e2d14c55..136efeafaf6 100644 --- a/config-model/src/test/cfg/clients/simpleconfig.v2.docprocv3/searchdefinitions/music.sd +++ b/config-model/src/test/cfg/clients/simpleconfig.v2.docprocv3/searchdefinitions/music.sd @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. search music { document music { field f1 type string { diff --git a/config-model/src/test/cfg/clients/simpleconfig.v2.docprocv3/services.xml b/config-model/src/test/cfg/clients/simpleconfig.v2.docprocv3/services.xml index ded66571026..955256618a4 100644 --- a/config-model/src/test/cfg/clients/simpleconfig.v2.docprocv3/services.xml +++ b/config-model/src/test/cfg/clients/simpleconfig.v2.docprocv3/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services> <admin version="2.0"> diff --git a/config-model/src/test/cfg/container/data/configserverinclude/hosted-vespa/hosted.xml b/config-model/src/test/cfg/container/data/configserverinclude/hosted-vespa/hosted.xml index 47f25d86d58..fe4942d7c97 100644 --- a/config-model/src/test/cfg/container/data/configserverinclude/hosted-vespa/hosted.xml +++ b/config-model/src/test/cfg/container/data/configserverinclude/hosted-vespa/hosted.xml @@ -1,3 +1,3 @@ -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <jdisc> </jdisc> diff --git a/config-model/src/test/cfg/container/data/configserverinclude/services.xml b/config-model/src/test/cfg/container/data/configserverinclude/services.xml index 73d924f762d..1cd2633c5e0 100644 --- a/config-model/src/test/cfg/container/data/configserverinclude/services.xml +++ b/config-model/src/test/cfg/container/data/configserverinclude/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services version="1.0"> <jdisc id='configserver' version="1.0"> diff --git a/config-model/src/test/cfg/container/data/containerinclude/docprocinclude1/foo/bar/docprocinclude1.xml b/config-model/src/test/cfg/container/data/containerinclude/docprocinclude1/foo/bar/docprocinclude1.xml index e6a3146e528..80a49949581 100644 --- a/config-model/src/test/cfg/container/data/containerinclude/docprocinclude1/foo/bar/docprocinclude1.xml +++ b/config-model/src/test/cfg/container/data/containerinclude/docprocinclude1/foo/bar/docprocinclude1.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <document-processing> <chain id="docprocchain2"> <documentprocessor id="com.yahoo.DocumentProcessor2"/> diff --git a/config-model/src/test/cfg/container/data/containerinclude/hosts.xml b/config-model/src/test/cfg/container/data/containerinclude/hosts.xml index 541d2f10304..3ab86a21aef 100644 --- a/config-model/src/test/cfg/container/data/containerinclude/hosts.xml +++ b/config-model/src/test/cfg/container/data/containerinclude/hosts.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <hosts> <host name="localhost"> <alias>node1</alias> diff --git a/config-model/src/test/cfg/container/data/containerinclude/processinginclude1/processinginclude1.xml b/config-model/src/test/cfg/container/data/containerinclude/processinginclude1/processinginclude1.xml index 885c865d5ec..8ae46c0c9c7 100644 --- a/config-model/src/test/cfg/container/data/containerinclude/processinginclude1/processinginclude1.xml +++ b/config-model/src/test/cfg/container/data/containerinclude/processinginclude1/processinginclude1.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <processing> <chain id="processingchain2"> <processor id="com.yahoo.Processor2"/> diff --git a/config-model/src/test/cfg/container/data/containerinclude/searchinclude1/contents/includedsearch1.xml b/config-model/src/test/cfg/container/data/containerinclude/searchinclude1/contents/includedsearch1.xml index c838fce7d91..9cdf3e767fe 100644 --- a/config-model/src/test/cfg/container/data/containerinclude/searchinclude1/contents/includedsearch1.xml +++ b/config-model/src/test/cfg/container/data/containerinclude/searchinclude1/contents/includedsearch1.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <search> <chain id="searchchain2"> <searcher id="com.yahoo.Searcher2"/> diff --git a/config-model/src/test/cfg/container/data/containerinclude/searchinclude1/contents/includedsearch2.xml b/config-model/src/test/cfg/container/data/containerinclude/searchinclude1/contents/includedsearch2.xml index 82dddbaff6b..2cbe93a2cd1 100644 --- a/config-model/src/test/cfg/container/data/containerinclude/searchinclude1/contents/includedsearch2.xml +++ b/config-model/src/test/cfg/container/data/containerinclude/searchinclude1/contents/includedsearch2.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <search> <chain id="searchchain3"> <searcher id="com.yahoo.Searcher3"/> diff --git a/config-model/src/test/cfg/container/data/containerinclude/searchinclude2/includedsearch3.xml b/config-model/src/test/cfg/container/data/containerinclude/searchinclude2/includedsearch3.xml index 2a064aac80a..fbc0b5eb98b 100644 --- a/config-model/src/test/cfg/container/data/containerinclude/searchinclude2/includedsearch3.xml +++ b/config-model/src/test/cfg/container/data/containerinclude/searchinclude2/includedsearch3.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <search> <chain id="searchchain4"> <searcher id="com.yahoo.Searcher4"/> diff --git a/config-model/src/test/cfg/container/data/containerinclude/services.xml b/config-model/src/test/cfg/container/data/containerinclude/services.xml index 218d475a691..172587ad8f8 100644 --- a/config-model/src/test/cfg/container/data/containerinclude/services.xml +++ b/config-model/src/test/cfg/container/data/containerinclude/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services version="1.0"> <admin version="2.0"> diff --git a/config-model/src/test/cfg/container/data/containerinclude2/hosts.xml b/config-model/src/test/cfg/container/data/containerinclude2/hosts.xml index 541d2f10304..3ab86a21aef 100644 --- a/config-model/src/test/cfg/container/data/containerinclude2/hosts.xml +++ b/config-model/src/test/cfg/container/data/containerinclude2/hosts.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <hosts> <host name="localhost"> <alias>node1</alias> diff --git a/config-model/src/test/cfg/container/data/containerinclude2/services.xml b/config-model/src/test/cfg/container/data/containerinclude2/services.xml index c69aafbf057..517e562d9d3 100644 --- a/config-model/src/test/cfg/container/data/containerinclude2/services.xml +++ b/config-model/src/test/cfg/container/data/containerinclude2/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services version="1.0"> <admin version="2.0"> diff --git a/config-model/src/test/cfg/container/data/containerinclude3/hosts.xml b/config-model/src/test/cfg/container/data/containerinclude3/hosts.xml index 541d2f10304..3ab86a21aef 100644 --- a/config-model/src/test/cfg/container/data/containerinclude3/hosts.xml +++ b/config-model/src/test/cfg/container/data/containerinclude3/hosts.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <hosts> <host name="localhost"> <alias>node1</alias> diff --git a/config-model/src/test/cfg/container/data/containerinclude3/services.xml b/config-model/src/test/cfg/container/data/containerinclude3/services.xml index 3f443b87d97..40121832467 100644 --- a/config-model/src/test/cfg/container/data/containerinclude3/services.xml +++ b/config-model/src/test/cfg/container/data/containerinclude3/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services version="1.0"> <admin version="2.0"> diff --git a/config-model/src/test/cfg/container/data/containerinclude4/hosts.xml b/config-model/src/test/cfg/container/data/containerinclude4/hosts.xml index 541d2f10304..3ab86a21aef 100644 --- a/config-model/src/test/cfg/container/data/containerinclude4/hosts.xml +++ b/config-model/src/test/cfg/container/data/containerinclude4/hosts.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <hosts> <host name="localhost"> <alias>node1</alias> diff --git a/config-model/src/test/cfg/container/data/containerinclude4/services.xml b/config-model/src/test/cfg/container/data/containerinclude4/services.xml index a78c2c9935a..69b3dba40c0 100644 --- a/config-model/src/test/cfg/container/data/containerinclude4/services.xml +++ b/config-model/src/test/cfg/container/data/containerinclude4/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services version="1.0"> <admin version="2.0"> diff --git a/config-model/src/test/cfg/container/data/containerinclude5/searchinclude/processing.xml b/config-model/src/test/cfg/container/data/containerinclude5/searchinclude/processing.xml index 136193f7dc6..98045c7bb0a 100644 --- a/config-model/src/test/cfg/container/data/containerinclude5/searchinclude/processing.xml +++ b/config-model/src/test/cfg/container/data/containerinclude5/searchinclude/processing.xml @@ -1,4 +1,4 @@ -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <processing> <chain id="processingchain2"> <processor id="com.yahoo.Processor2"/> diff --git a/config-model/src/test/cfg/container/data/containerinclude5/services.xml b/config-model/src/test/cfg/container/data/containerinclude5/services.xml index 24e6c8ce575..cf19fcd0b98 100644 --- a/config-model/src/test/cfg/container/data/containerinclude5/services.xml +++ b/config-model/src/test/cfg/container/data/containerinclude5/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services version="1.0"> <admin version="2.0"> diff --git a/config-model/src/test/cfg/container/data/containerinclude6/services.xml b/config-model/src/test/cfg/container/data/containerinclude6/services.xml index 15cf525fe39..603e474c5f0 100644 --- a/config-model/src/test/cfg/container/data/containerinclude6/services.xml +++ b/config-model/src/test/cfg/container/data/containerinclude6/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services version="1.0"> <admin version="2.0"> diff --git a/config-model/src/test/cfg/container/data/include_xml_error/dir1/default.xml b/config-model/src/test/cfg/container/data/include_xml_error/dir1/default.xml index 5a55f07fc53..8e0472b4547 100644 --- a/config-model/src/test/cfg/container/data/include_xml_error/dir1/default.xml +++ b/config-model/src/test/cfg/container/data/include_xml_error/dir1/default.xml @@ -1,4 +1,4 @@ -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <search> <chain id="default"> <zearcer id="com.yahoo.search.example.SimpleSearcher" bundle="mybundle"/> diff --git a/config-model/src/test/cfg/container/data/include_xml_error/services.xml b/config-model/src/test/cfg/container/data/include_xml_error/services.xml index 4e703c7e40c..a5a3cda10e4 100644 --- a/config-model/src/test/cfg/container/data/include_xml_error/services.xml +++ b/config-model/src/test/cfg/container/data/include_xml_error/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services version="1.0"> <admin version="2.0"> diff --git a/config-model/src/test/cfg/routing/content_two_clusters/hosts.xml b/config-model/src/test/cfg/routing/content_two_clusters/hosts.xml index 9eafb2106cb..e2b97e374e6 100644 --- a/config-model/src/test/cfg/routing/content_two_clusters/hosts.xml +++ b/config-model/src/test/cfg/routing/content_two_clusters/hosts.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <hosts> <host name="localhost"> <alias>node1</alias> diff --git a/config-model/src/test/cfg/routing/content_two_clusters/searchdefinitions/mobile.sd b/config-model/src/test/cfg/routing/content_two_clusters/searchdefinitions/mobile.sd index feae86fe966..ee52751f137 100644 --- a/config-model/src/test/cfg/routing/content_two_clusters/searchdefinitions/mobile.sd +++ b/config-model/src/test/cfg/routing/content_two_clusters/searchdefinitions/mobile.sd @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. search mobile { document mobile { field f1 type string { diff --git a/config-model/src/test/cfg/routing/content_two_clusters/searchdefinitions/music.sd b/config-model/src/test/cfg/routing/content_two_clusters/searchdefinitions/music.sd index da9e2d14c55..136efeafaf6 100644 --- a/config-model/src/test/cfg/routing/content_two_clusters/searchdefinitions/music.sd +++ b/config-model/src/test/cfg/routing/content_two_clusters/searchdefinitions/music.sd @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. search music { document music { field f1 type string { diff --git a/config-model/src/test/cfg/routing/content_two_clusters/services.xml b/config-model/src/test/cfg/routing/content_two_clusters/services.xml index 8c97f5f7081..df9717c4980 100644 --- a/config-model/src/test/cfg/routing/content_two_clusters/services.xml +++ b/config-model/src/test/cfg/routing/content_two_clusters/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services> <admin version="2.0"> <adminserver hostalias="node1" /> diff --git a/config-model/src/test/cfg/routing/contentsimpleconfig/hosts.xml b/config-model/src/test/cfg/routing/contentsimpleconfig/hosts.xml index 9eafb2106cb..e2b97e374e6 100644 --- a/config-model/src/test/cfg/routing/contentsimpleconfig/hosts.xml +++ b/config-model/src/test/cfg/routing/contentsimpleconfig/hosts.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <hosts> <host name="localhost"> <alias>node1</alias> diff --git a/config-model/src/test/cfg/routing/contentsimpleconfig/searchdefinitions/music.sd b/config-model/src/test/cfg/routing/contentsimpleconfig/searchdefinitions/music.sd index da9e2d14c55..136efeafaf6 100644 --- a/config-model/src/test/cfg/routing/contentsimpleconfig/searchdefinitions/music.sd +++ b/config-model/src/test/cfg/routing/contentsimpleconfig/searchdefinitions/music.sd @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. search music { document music { field f1 type string { diff --git a/config-model/src/test/cfg/routing/contentsimpleconfig/services.xml b/config-model/src/test/cfg/routing/contentsimpleconfig/services.xml index f0657c0ceec..b46e126444f 100644 --- a/config-model/src/test/cfg/routing/contentsimpleconfig/services.xml +++ b/config-model/src/test/cfg/routing/contentsimpleconfig/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services> <admin version="2.0"> <adminserver hostalias="node1" /> diff --git a/config-model/src/test/cfg/routing/defaultconfig/hosts.xml b/config-model/src/test/cfg/routing/defaultconfig/hosts.xml index 9eafb2106cb..e2b97e374e6 100755 --- a/config-model/src/test/cfg/routing/defaultconfig/hosts.xml +++ b/config-model/src/test/cfg/routing/defaultconfig/hosts.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <hosts> <host name="localhost"> <alias>node1</alias> diff --git a/config-model/src/test/cfg/routing/defaultconfig/services.xml b/config-model/src/test/cfg/routing/defaultconfig/services.xml index c1270e6385b..03e6ac9ae9c 100755 --- a/config-model/src/test/cfg/routing/defaultconfig/services.xml +++ b/config-model/src/test/cfg/routing/defaultconfig/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services> <admin version="2.0"> <adminserver hostalias="node1" /> diff --git a/config-model/src/test/cfg/routing/duplicatehop/hosts.xml b/config-model/src/test/cfg/routing/duplicatehop/hosts.xml index 9eafb2106cb..e2b97e374e6 100644 --- a/config-model/src/test/cfg/routing/duplicatehop/hosts.xml +++ b/config-model/src/test/cfg/routing/duplicatehop/hosts.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <hosts> <host name="localhost"> <alias>node1</alias> diff --git a/config-model/src/test/cfg/routing/duplicatehop/services.xml b/config-model/src/test/cfg/routing/duplicatehop/services.xml index 4c7136f3d7c..e69f2bf5798 100755 --- a/config-model/src/test/cfg/routing/duplicatehop/services.xml +++ b/config-model/src/test/cfg/routing/duplicatehop/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services> <admin version="2.0"> <adminserver hostalias="node1" /> diff --git a/config-model/src/test/cfg/routing/duplicateroute/hosts.xml b/config-model/src/test/cfg/routing/duplicateroute/hosts.xml index 9eafb2106cb..e2b97e374e6 100644 --- a/config-model/src/test/cfg/routing/duplicateroute/hosts.xml +++ b/config-model/src/test/cfg/routing/duplicateroute/hosts.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <hosts> <host name="localhost"> <alias>node1</alias> diff --git a/config-model/src/test/cfg/routing/duplicateroute/services.xml b/config-model/src/test/cfg/routing/duplicateroute/services.xml index 350f16dea3b..33fc9a12717 100755 --- a/config-model/src/test/cfg/routing/duplicateroute/services.xml +++ b/config-model/src/test/cfg/routing/duplicateroute/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services> <admin version="2.0"> <adminserver hostalias="node1" /> diff --git a/config-model/src/test/cfg/routing/emptyhop/hosts.xml b/config-model/src/test/cfg/routing/emptyhop/hosts.xml index 9eafb2106cb..e2b97e374e6 100644 --- a/config-model/src/test/cfg/routing/emptyhop/hosts.xml +++ b/config-model/src/test/cfg/routing/emptyhop/hosts.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <hosts> <host name="localhost"> <alias>node1</alias> diff --git a/config-model/src/test/cfg/routing/emptyhop/services.xml b/config-model/src/test/cfg/routing/emptyhop/services.xml index 22220996ca5..1cb8136219b 100644 --- a/config-model/src/test/cfg/routing/emptyhop/services.xml +++ b/config-model/src/test/cfg/routing/emptyhop/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services> <admin version="2.0"> <adminserver hostalias="node1" /> diff --git a/config-model/src/test/cfg/routing/emptyroute/hosts.xml b/config-model/src/test/cfg/routing/emptyroute/hosts.xml index 9eafb2106cb..e2b97e374e6 100644 --- a/config-model/src/test/cfg/routing/emptyroute/hosts.xml +++ b/config-model/src/test/cfg/routing/emptyroute/hosts.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <hosts> <host name="localhost"> <alias>node1</alias> diff --git a/config-model/src/test/cfg/routing/emptyroute/services.xml b/config-model/src/test/cfg/routing/emptyroute/services.xml index 30987319589..4112fdf2062 100644 --- a/config-model/src/test/cfg/routing/emptyroute/services.xml +++ b/config-model/src/test/cfg/routing/emptyroute/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services> <admin version="2.0"> <adminserver hostalias="node1" /> diff --git a/config-model/src/test/cfg/routing/hopconfig/hosts.xml b/config-model/src/test/cfg/routing/hopconfig/hosts.xml index 9eafb2106cb..e2b97e374e6 100755 --- a/config-model/src/test/cfg/routing/hopconfig/hosts.xml +++ b/config-model/src/test/cfg/routing/hopconfig/hosts.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <hosts> <host name="localhost"> <alias>node1</alias> diff --git a/config-model/src/test/cfg/routing/hopconfig/services.xml b/config-model/src/test/cfg/routing/hopconfig/services.xml index f28cd12277f..87b18f4ceda 100755 --- a/config-model/src/test/cfg/routing/hopconfig/services.xml +++ b/config-model/src/test/cfg/routing/hopconfig/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services> <admin version="2.0"> <adminserver hostalias="node1" /> diff --git a/config-model/src/test/cfg/routing/hoperror/hosts.xml b/config-model/src/test/cfg/routing/hoperror/hosts.xml index 9eafb2106cb..e2b97e374e6 100644 --- a/config-model/src/test/cfg/routing/hoperror/hosts.xml +++ b/config-model/src/test/cfg/routing/hoperror/hosts.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <hosts> <host name="localhost"> <alias>node1</alias> diff --git a/config-model/src/test/cfg/routing/hoperror/services.xml b/config-model/src/test/cfg/routing/hoperror/services.xml index e019cd1e863..f31a60d03d7 100644 --- a/config-model/src/test/cfg/routing/hoperror/services.xml +++ b/config-model/src/test/cfg/routing/hoperror/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services> <admin version="2.0"> <adminserver hostalias="node1" /> diff --git a/config-model/src/test/cfg/routing/hoperrorinrecipient/hosts.xml b/config-model/src/test/cfg/routing/hoperrorinrecipient/hosts.xml index 9eafb2106cb..e2b97e374e6 100644 --- a/config-model/src/test/cfg/routing/hoperrorinrecipient/hosts.xml +++ b/config-model/src/test/cfg/routing/hoperrorinrecipient/hosts.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <hosts> <host name="localhost"> <alias>node1</alias> diff --git a/config-model/src/test/cfg/routing/hoperrorinrecipient/services.xml b/config-model/src/test/cfg/routing/hoperrorinrecipient/services.xml index 0c978cd1fd3..e2a0a5827be 100644 --- a/config-model/src/test/cfg/routing/hoperrorinrecipient/services.xml +++ b/config-model/src/test/cfg/routing/hoperrorinrecipient/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services> <admin version="2.0"> <adminserver hostalias="node1" /> diff --git a/config-model/src/test/cfg/routing/hoperrorinroute/hosts.xml b/config-model/src/test/cfg/routing/hoperrorinroute/hosts.xml index 9eafb2106cb..e2b97e374e6 100644 --- a/config-model/src/test/cfg/routing/hoperrorinroute/hosts.xml +++ b/config-model/src/test/cfg/routing/hoperrorinroute/hosts.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <hosts> <host name="localhost"> <alias>node1</alias> diff --git a/config-model/src/test/cfg/routing/hoperrorinroute/services.xml b/config-model/src/test/cfg/routing/hoperrorinroute/services.xml index 1be5c85b4e3..61a334440fc 100644 --- a/config-model/src/test/cfg/routing/hoperrorinroute/services.xml +++ b/config-model/src/test/cfg/routing/hoperrorinroute/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services> <admin version="2.0"> <adminserver hostalias="node1" /> diff --git a/config-model/src/test/cfg/routing/hopnotfound/hosts.xml b/config-model/src/test/cfg/routing/hopnotfound/hosts.xml index 9eafb2106cb..e2b97e374e6 100644 --- a/config-model/src/test/cfg/routing/hopnotfound/hosts.xml +++ b/config-model/src/test/cfg/routing/hopnotfound/hosts.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <hosts> <host name="localhost"> <alias>node1</alias> diff --git a/config-model/src/test/cfg/routing/hopnotfound/services.xml b/config-model/src/test/cfg/routing/hopnotfound/services.xml index 08883a41e47..ed859c34a8f 100644 --- a/config-model/src/test/cfg/routing/hopnotfound/services.xml +++ b/config-model/src/test/cfg/routing/hopnotfound/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services> <admin version="2.0"> <adminserver hostalias="node1" /> diff --git a/config-model/src/test/cfg/routing/invalidstoragepolicy/hosts.xml b/config-model/src/test/cfg/routing/invalidstoragepolicy/hosts.xml index 9eafb2106cb..e2b97e374e6 100644 --- a/config-model/src/test/cfg/routing/invalidstoragepolicy/hosts.xml +++ b/config-model/src/test/cfg/routing/invalidstoragepolicy/hosts.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <hosts> <host name="localhost"> <alias>node1</alias> diff --git a/config-model/src/test/cfg/routing/invalidstoragepolicy/services.xml b/config-model/src/test/cfg/routing/invalidstoragepolicy/services.xml index 181912161ef..806e1cde02c 100644 --- a/config-model/src/test/cfg/routing/invalidstoragepolicy/services.xml +++ b/config-model/src/test/cfg/routing/invalidstoragepolicy/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services> <admin version="2.0"> <adminserver hostalias="node1" /> diff --git a/config-model/src/test/cfg/routing/mismatchedrecipient/hosts.xml b/config-model/src/test/cfg/routing/mismatchedrecipient/hosts.xml index 9eafb2106cb..e2b97e374e6 100644 --- a/config-model/src/test/cfg/routing/mismatchedrecipient/hosts.xml +++ b/config-model/src/test/cfg/routing/mismatchedrecipient/hosts.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <hosts> <host name="localhost"> <alias>node1</alias> diff --git a/config-model/src/test/cfg/routing/mismatchedrecipient/services.xml b/config-model/src/test/cfg/routing/mismatchedrecipient/services.xml index 16054677eef..32a4c99066e 100644 --- a/config-model/src/test/cfg/routing/mismatchedrecipient/services.xml +++ b/config-model/src/test/cfg/routing/mismatchedrecipient/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services> <admin version="2.0"> <adminserver hostalias="node1" /> diff --git a/config-model/src/test/cfg/routing/replacehop/hosts.xml b/config-model/src/test/cfg/routing/replacehop/hosts.xml index 9eafb2106cb..e2b97e374e6 100755 --- a/config-model/src/test/cfg/routing/replacehop/hosts.xml +++ b/config-model/src/test/cfg/routing/replacehop/hosts.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <hosts> <host name="localhost"> <alias>node1</alias> diff --git a/config-model/src/test/cfg/routing/replacehop/searchdefinitions/music.sd b/config-model/src/test/cfg/routing/replacehop/searchdefinitions/music.sd index f9816d0d392..6c6c3e15783 100755 --- a/config-model/src/test/cfg/routing/replacehop/searchdefinitions/music.sd +++ b/config-model/src/test/cfg/routing/replacehop/searchdefinitions/music.sd @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. search music { document music { field f1 type string { diff --git a/config-model/src/test/cfg/routing/replacehop/services.xml b/config-model/src/test/cfg/routing/replacehop/services.xml index a125fef7641..1baaf6a9af0 100755 --- a/config-model/src/test/cfg/routing/replacehop/services.xml +++ b/config-model/src/test/cfg/routing/replacehop/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services> <admin version="2.0"> diff --git a/config-model/src/test/cfg/routing/replaceroute/hosts.xml b/config-model/src/test/cfg/routing/replaceroute/hosts.xml index 9eafb2106cb..e2b97e374e6 100755 --- a/config-model/src/test/cfg/routing/replaceroute/hosts.xml +++ b/config-model/src/test/cfg/routing/replaceroute/hosts.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <hosts> <host name="localhost"> <alias>node1</alias> diff --git a/config-model/src/test/cfg/routing/replaceroute/searchdefinitions/music.sd b/config-model/src/test/cfg/routing/replaceroute/searchdefinitions/music.sd index f9816d0d392..6c6c3e15783 100755 --- a/config-model/src/test/cfg/routing/replaceroute/searchdefinitions/music.sd +++ b/config-model/src/test/cfg/routing/replaceroute/searchdefinitions/music.sd @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. search music { document music { field f1 type string { diff --git a/config-model/src/test/cfg/routing/replaceroute/services.xml b/config-model/src/test/cfg/routing/replaceroute/services.xml index ff0cb1e91b9..7c39e37e002 100755 --- a/config-model/src/test/cfg/routing/replaceroute/services.xml +++ b/config-model/src/test/cfg/routing/replaceroute/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services> <admin version="2.0"> <adminserver hostalias="node1" /> diff --git a/config-model/src/test/cfg/routing/routeconfig/hosts.xml b/config-model/src/test/cfg/routing/routeconfig/hosts.xml index 9eafb2106cb..e2b97e374e6 100755 --- a/config-model/src/test/cfg/routing/routeconfig/hosts.xml +++ b/config-model/src/test/cfg/routing/routeconfig/hosts.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <hosts> <host name="localhost"> <alias>node1</alias> diff --git a/config-model/src/test/cfg/routing/routeconfig/services.xml b/config-model/src/test/cfg/routing/routeconfig/services.xml index 08b5a178924..bf004ab0cf9 100755 --- a/config-model/src/test/cfg/routing/routeconfig/services.xml +++ b/config-model/src/test/cfg/routing/routeconfig/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services> <admin version="2.0"> <adminserver hostalias="node1" /> diff --git a/config-model/src/test/cfg/routing/routenotfound/hosts.xml b/config-model/src/test/cfg/routing/routenotfound/hosts.xml index 9eafb2106cb..e2b97e374e6 100644 --- a/config-model/src/test/cfg/routing/routenotfound/hosts.xml +++ b/config-model/src/test/cfg/routing/routenotfound/hosts.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <hosts> <host name="localhost"> <alias>node1</alias> diff --git a/config-model/src/test/cfg/routing/routenotfound/services.xml b/config-model/src/test/cfg/routing/routenotfound/services.xml index ae389a34966..72267cf394d 100644 --- a/config-model/src/test/cfg/routing/routenotfound/services.xml +++ b/config-model/src/test/cfg/routing/routenotfound/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services> <admin version="2.0"> <adminserver hostalias="node1" /> diff --git a/config-model/src/test/cfg/routing/routenotfoundinroute/hosts.xml b/config-model/src/test/cfg/routing/routenotfoundinroute/hosts.xml index 9eafb2106cb..e2b97e374e6 100644 --- a/config-model/src/test/cfg/routing/routenotfoundinroute/hosts.xml +++ b/config-model/src/test/cfg/routing/routenotfoundinroute/hosts.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <hosts> <host name="localhost"> <alias>node1</alias> diff --git a/config-model/src/test/cfg/routing/routenotfoundinroute/services.xml b/config-model/src/test/cfg/routing/routenotfoundinroute/services.xml index 442f48186e5..0083d36933f 100644 --- a/config-model/src/test/cfg/routing/routenotfoundinroute/services.xml +++ b/config-model/src/test/cfg/routing/routenotfoundinroute/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services> <admin version="2.0"> <adminserver hostalias="node1" /> diff --git a/config-model/src/test/cfg/routing/servicenotfound/hosts.xml b/config-model/src/test/cfg/routing/servicenotfound/hosts.xml index 9eafb2106cb..e2b97e374e6 100644 --- a/config-model/src/test/cfg/routing/servicenotfound/hosts.xml +++ b/config-model/src/test/cfg/routing/servicenotfound/hosts.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <hosts> <host name="localhost"> <alias>node1</alias> diff --git a/config-model/src/test/cfg/routing/servicenotfound/services.xml b/config-model/src/test/cfg/routing/servicenotfound/services.xml index 4e53a38c1a2..9f3822eb89d 100644 --- a/config-model/src/test/cfg/routing/servicenotfound/services.xml +++ b/config-model/src/test/cfg/routing/servicenotfound/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services> <admin version="2.0"> diff --git a/config-model/src/test/cfg/routing/unexpectedrecipient/hosts.xml b/config-model/src/test/cfg/routing/unexpectedrecipient/hosts.xml index 9eafb2106cb..e2b97e374e6 100644 --- a/config-model/src/test/cfg/routing/unexpectedrecipient/hosts.xml +++ b/config-model/src/test/cfg/routing/unexpectedrecipient/hosts.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <hosts> <host name="localhost"> <alias>node1</alias> diff --git a/config-model/src/test/cfg/routing/unexpectedrecipient/services.xml b/config-model/src/test/cfg/routing/unexpectedrecipient/services.xml index 19ddb2d3526..aa0ac5c896a 100644 --- a/config-model/src/test/cfg/routing/unexpectedrecipient/services.xml +++ b/config-model/src/test/cfg/routing/unexpectedrecipient/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services> <admin version="2.0"> <adminserver hostalias="node1" /> diff --git a/config-model/src/test/cfg/search/data/travel/searchdefinitions/TTData.sd b/config-model/src/test/cfg/search/data/travel/searchdefinitions/TTData.sd index 67013239499..274b03f247a 100644 --- a/config-model/src/test/cfg/search/data/travel/searchdefinitions/TTData.sd +++ b/config-model/src/test/cfg/search/data/travel/searchdefinitions/TTData.sd @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. # Basic search definition for Travel Attraction (self) facet search TTData { diff --git a/config-model/src/test/cfg/search/data/travel/searchdefinitions/TTEdge.sd b/config-model/src/test/cfg/search/data/travel/searchdefinitions/TTEdge.sd index 8cc6d05584c..ce22f2f77ec 100644 --- a/config-model/src/test/cfg/search/data/travel/searchdefinitions/TTEdge.sd +++ b/config-model/src/test/cfg/search/data/travel/searchdefinitions/TTEdge.sd @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. document TTEdge { # This field will contain a colon separate map for travel times per transport mode diff --git a/config-model/src/test/cfg/search/data/travel/searchdefinitions/TTPOI.sd b/config-model/src/test/cfg/search/data/travel/searchdefinitions/TTPOI.sd index 0cb0596b31c..d8308df4c7f 100644 --- a/config-model/src/test/cfg/search/data/travel/searchdefinitions/TTPOI.sd +++ b/config-model/src/test/cfg/search/data/travel/searchdefinitions/TTPOI.sd @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. document TTPOI { # categories associated with the POI diff --git a/config-model/src/test/cfg/search/data/v2/inherited_rankprofiles/searchdefinitions/base.sd b/config-model/src/test/cfg/search/data/v2/inherited_rankprofiles/searchdefinitions/base.sd index 22944f61997..5de7b537439 100644 --- a/config-model/src/test/cfg/search/data/v2/inherited_rankprofiles/searchdefinitions/base.sd +++ b/config-model/src/test/cfg/search/data/v2/inherited_rankprofiles/searchdefinitions/base.sd @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. search base { document base { field fbase type string { diff --git a/config-model/src/test/cfg/search/data/v2/inherited_rankprofiles/searchdefinitions/left.sd b/config-model/src/test/cfg/search/data/v2/inherited_rankprofiles/searchdefinitions/left.sd index c72b349bb4c..ebb0a8e4631 100644 --- a/config-model/src/test/cfg/search/data/v2/inherited_rankprofiles/searchdefinitions/left.sd +++ b/config-model/src/test/cfg/search/data/v2/inherited_rankprofiles/searchdefinitions/left.sd @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. search left { document left { field fleft type string { diff --git a/config-model/src/test/cfg/search/data/v2/inherited_rankprofiles/searchdefinitions/music.sd b/config-model/src/test/cfg/search/data/v2/inherited_rankprofiles/searchdefinitions/music.sd index 0d3859b65a0..4b78eeae4ab 100644 --- a/config-model/src/test/cfg/search/data/v2/inherited_rankprofiles/searchdefinitions/music.sd +++ b/config-model/src/test/cfg/search/data/v2/inherited_rankprofiles/searchdefinitions/music.sd @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. search music { document music { field f1 type string { diff --git a/config-model/src/test/cfg/search/data/v2/inherited_rankprofiles/searchdefinitions/right.sd b/config-model/src/test/cfg/search/data/v2/inherited_rankprofiles/searchdefinitions/right.sd index eb0a4cf8021..cf824ad102f 100644 --- a/config-model/src/test/cfg/search/data/v2/inherited_rankprofiles/searchdefinitions/right.sd +++ b/config-model/src/test/cfg/search/data/v2/inherited_rankprofiles/searchdefinitions/right.sd @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. search right { document right { field fright type string { diff --git a/config-model/src/test/cfg/search/data/v2/inherited_rankprofiles/services.xml b/config-model/src/test/cfg/search/data/v2/inherited_rankprofiles/services.xml index 95a5cd6236b..c5cfd7f7d79 100644 --- a/config-model/src/test/cfg/search/data/v2/inherited_rankprofiles/services.xml +++ b/config-model/src/test/cfg/search/data/v2/inherited_rankprofiles/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services> <content version="1.0" id="inherit"> <redundancy>1</redundancy> diff --git a/config-model/src/test/cfg/search/data/v2/modularsearchchains/hosts.xml b/config-model/src/test/cfg/search/data/v2/modularsearchchains/hosts.xml index 9eafb2106cb..e2b97e374e6 100644 --- a/config-model/src/test/cfg/search/data/v2/modularsearchchains/hosts.xml +++ b/config-model/src/test/cfg/search/data/v2/modularsearchchains/hosts.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <hosts> <host name="localhost"> <alias>node1</alias> diff --git a/config-model/src/test/cfg/search/data/v2/modularsearchchains/search/chains/chain2.xml b/config-model/src/test/cfg/search/data/v2/modularsearchchains/search/chains/chain2.xml index 7153eb71816..cbb43e26ec7 100644 --- a/config-model/src/test/cfg/search/data/v2/modularsearchchains/search/chains/chain2.xml +++ b/config-model/src/test/cfg/search/data/v2/modularsearchchains/search/chains/chain2.xml @@ -1,4 +1,4 @@ -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <searchchains> <searcher class="com.yahoo.search.example.outsidechain2.SimpleSearcher" id="s1" bundle="mybundle"/> diff --git a/config-model/src/test/cfg/search/data/v2/modularsearchchains/search/chains/chain3.xml b/config-model/src/test/cfg/search/data/v2/modularsearchchains/search/chains/chain3.xml index 9eefecb9c28..c17a84407a1 100644 --- a/config-model/src/test/cfg/search/data/v2/modularsearchchains/search/chains/chain3.xml +++ b/config-model/src/test/cfg/search/data/v2/modularsearchchains/search/chains/chain3.xml @@ -1,4 +1,4 @@ -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <searchchains> <searchchain id="chain3_1"> <searcher id="com.yahoo.search.example.chain3_1.SimpleSearcher" bundle="mybundle"/> diff --git a/config-model/src/test/cfg/search/data/v2/modularsearchchains/search/chains/default.xml b/config-model/src/test/cfg/search/data/v2/modularsearchchains/search/chains/default.xml index e030f3f43cc..65c59939c49 100644 --- a/config-model/src/test/cfg/search/data/v2/modularsearchchains/search/chains/default.xml +++ b/config-model/src/test/cfg/search/data/v2/modularsearchchains/search/chains/default.xml @@ -1,4 +1,4 @@ -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <searchchains> <searchchain id="default"> <searcher id="com.yahoo.search.example.default.SimpleSearcher" bundle="mybundle"/> diff --git a/config-model/src/test/cfg/search/data/v2/modularsearchchains/services.xml b/config-model/src/test/cfg/search/data/v2/modularsearchchains/services.xml index 85a05c10eb3..15cc4eca2ec 100644 --- a/config-model/src/test/cfg/search/data/v2/modularsearchchains/services.xml +++ b/config-model/src/test/cfg/search/data/v2/modularsearchchains/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services version="1.0"> <admin version="2.0"> diff --git a/config-model/src/test/cfg/search/data/v2/proton-yamas/hosts.xml b/config-model/src/test/cfg/search/data/v2/proton-yamas/hosts.xml index 42ac3751853..9215f81ad98 100644 --- a/config-model/src/test/cfg/search/data/v2/proton-yamas/hosts.xml +++ b/config-model/src/test/cfg/search/data/v2/proton-yamas/hosts.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <hosts> <host name="zarya"> <alias>node1</alias> diff --git a/config-model/src/test/cfg/search/data/v2/proton-yamas/searchdefinitions/music.sd b/config-model/src/test/cfg/search/data/v2/proton-yamas/searchdefinitions/music.sd index da9e2d14c55..136efeafaf6 100644 --- a/config-model/src/test/cfg/search/data/v2/proton-yamas/searchdefinitions/music.sd +++ b/config-model/src/test/cfg/search/data/v2/proton-yamas/searchdefinitions/music.sd @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. search music { document music { field f1 type string { diff --git a/config-model/src/test/cfg/search/data/v2/proton-yamas/services.xml b/config-model/src/test/cfg/search/data/v2/proton-yamas/services.xml index ffcef775844..226589e9835 100644 --- a/config-model/src/test/cfg/search/data/v2/proton-yamas/services.xml +++ b/config-model/src/test/cfg/search/data/v2/proton-yamas/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services> <admin version="2.0"> <adminserver hostalias="node1"/> diff --git a/config-model/src/test/cfg/search/data/v2/stripped/services.xml b/config-model/src/test/cfg/search/data/v2/stripped/services.xml index 427ef0d2cbb..ba7ab8a052a 100644 --- a/config-model/src/test/cfg/search/data/v2/stripped/services.xml +++ b/config-model/src/test/cfg/search/data/v2/stripped/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services> <admin version="2.0"> <adminserver hostalias="node1"/> diff --git a/config-model/src/test/cfg/storage/app_index_higher_than_num_nodes/hosts.xml b/config-model/src/test/cfg/storage/app_index_higher_than_num_nodes/hosts.xml index 156ffea79ab..20665c8bbd1 100644 --- a/config-model/src/test/cfg/storage/app_index_higher_than_num_nodes/hosts.xml +++ b/config-model/src/test/cfg/storage/app_index_higher_than_num_nodes/hosts.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <hosts> <host name="mynode1"> <alias>node0</alias> diff --git a/config-model/src/test/cfg/storage/app_index_higher_than_num_nodes/searchdefinitions/music.sd b/config-model/src/test/cfg/storage/app_index_higher_than_num_nodes/searchdefinitions/music.sd index 0d3859b65a0..4b78eeae4ab 100644 --- a/config-model/src/test/cfg/storage/app_index_higher_than_num_nodes/searchdefinitions/music.sd +++ b/config-model/src/test/cfg/storage/app_index_higher_than_num_nodes/searchdefinitions/music.sd @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. search music { document music { field f1 type string { diff --git a/config-model/src/test/cfg/storage/app_index_higher_than_num_nodes/services.xml b/config-model/src/test/cfg/storage/app_index_higher_than_num_nodes/services.xml index 535537e0498..e0202dc124a 100644 --- a/config-model/src/test/cfg/storage/app_index_higher_than_num_nodes/services.xml +++ b/config-model/src/test/cfg/storage/app_index_higher_than_num_nodes/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services> <admin version="2.0"> diff --git a/config-model/src/test/cfg/storage/clustercontroller_advanced/hosts.xml b/config-model/src/test/cfg/storage/clustercontroller_advanced/hosts.xml index b238865f78e..29e61b6abc6 100644 --- a/config-model/src/test/cfg/storage/clustercontroller_advanced/hosts.xml +++ b/config-model/src/test/cfg/storage/clustercontroller_advanced/hosts.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <hosts> <host name="mynode1"> <alias>node0</alias> diff --git a/config-model/src/test/cfg/storage/clustercontroller_advanced/searchdefinitions/music.sd b/config-model/src/test/cfg/storage/clustercontroller_advanced/searchdefinitions/music.sd index 0d3859b65a0..4b78eeae4ab 100644 --- a/config-model/src/test/cfg/storage/clustercontroller_advanced/searchdefinitions/music.sd +++ b/config-model/src/test/cfg/storage/clustercontroller_advanced/searchdefinitions/music.sd @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. search music { document music { field f1 type string { diff --git a/config-model/src/test/cfg/storage/clustercontroller_advanced/services.xml b/config-model/src/test/cfg/storage/clustercontroller_advanced/services.xml index 2a8c30844dd..9a07e1c3e87 100644 --- a/config-model/src/test/cfg/storage/clustercontroller_advanced/services.xml +++ b/config-model/src/test/cfg/storage/clustercontroller_advanced/services.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services> <admin version="2.0"> |