From a84e7e88923c211d6bcdc56929ade99d86813bb6 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Wed, 14 Jun 2017 17:57:50 +0200 Subject: Revert "Update copyright headers" --- config-lib/src/test/java/com/yahoo/config/BooleanNodeTest.java | 2 +- .../src/test/java/com/yahoo/config/ConfigInstanceBuilderTest.java | 2 +- config-lib/src/test/java/com/yahoo/config/ConfigInstanceEqualsTest.java | 2 +- config-lib/src/test/java/com/yahoo/config/DoubleNodeTest.java | 2 +- config-lib/src/test/java/com/yahoo/config/EnumNodeTest.java | 2 +- config-lib/src/test/java/com/yahoo/config/FileNodeTest.java | 2 +- config-lib/src/test/java/com/yahoo/config/IntegerNodeTest.java | 2 +- config-lib/src/test/java/com/yahoo/config/LongNodeTest.java | 2 +- config-lib/src/test/java/com/yahoo/config/NodeVectorTest.java | 2 +- config-lib/src/test/java/com/yahoo/config/PathNodeTest.java | 2 +- config-lib/src/test/java/com/yahoo/config/StringNodeTest.java | 2 +- config-lib/src/test/resources/configdefinitions/app.def | 2 +- config-lib/src/test/resources/configdefinitions/arraytypes.def | 2 +- config-lib/src/test/resources/configdefinitions/chains-test.def | 2 +- config-lib/src/test/resources/configdefinitions/datastructures.def | 2 +- config-lib/src/test/resources/configdefinitions/defaulttest.def | 2 +- config-lib/src/test/resources/configdefinitions/function-test.def | 2 +- config-lib/src/test/resources/configdefinitions/int.def | 2 +- config-lib/src/test/resources/configdefinitions/maptypes.def | 2 +- config-lib/src/test/resources/configdefinitions/md5test.def | 2 +- config-lib/src/test/resources/configdefinitions/namespace.def | 2 +- config-lib/src/test/resources/configdefinitions/restart.def | 2 +- config-lib/src/test/resources/configdefinitions/simpletypes.def | 2 +- config-lib/src/test/resources/configdefinitions/specialtypes.def | 2 +- config-lib/src/test/resources/configdefinitions/standard.def | 2 +- config-lib/src/test/resources/configdefinitions/string.def | 2 +- config-lib/src/test/resources/configdefinitions/structtypes.def | 2 +- config-lib/src/test/resources/configdefinitions/test-nodefs.def | 2 +- config-lib/src/test/resources/configdefinitions/test-nonstring.def | 2 +- config-lib/src/test/resources/configdefinitions/test-reference.def | 2 +- config-lib/src/test/resources/configdefinitions/testnamespace.def | 2 +- config-lib/src/test/resources/configdefinitions/unicode.def | 2 +- 32 files changed, 32 insertions(+), 32 deletions(-) (limited to 'config-lib/src/test') diff --git a/config-lib/src/test/java/com/yahoo/config/BooleanNodeTest.java b/config-lib/src/test/java/com/yahoo/config/BooleanNodeTest.java index 3eb417deab4..f484c2080d1 100644 --- a/config-lib/src/test/java/com/yahoo/config/BooleanNodeTest.java +++ b/config-lib/src/test/java/com/yahoo/config/BooleanNodeTest.java @@ -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. package com.yahoo.config; import org.junit.Test; diff --git a/config-lib/src/test/java/com/yahoo/config/ConfigInstanceBuilderTest.java b/config-lib/src/test/java/com/yahoo/config/ConfigInstanceBuilderTest.java index cc3515f95db..78c97935d5a 100644 --- a/config-lib/src/test/java/com/yahoo/config/ConfigInstanceBuilderTest.java +++ b/config-lib/src/test/java/com/yahoo/config/ConfigInstanceBuilderTest.java @@ -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. package com.yahoo.config; import com.yahoo.foo.MaptypesConfig; diff --git a/config-lib/src/test/java/com/yahoo/config/ConfigInstanceEqualsTest.java b/config-lib/src/test/java/com/yahoo/config/ConfigInstanceEqualsTest.java index ca8b9aea2fe..86a141e5cab 100644 --- a/config-lib/src/test/java/com/yahoo/config/ConfigInstanceEqualsTest.java +++ b/config-lib/src/test/java/com/yahoo/config/ConfigInstanceEqualsTest.java @@ -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. package com.yahoo.config; import com.yahoo.test.AppConfig; diff --git a/config-lib/src/test/java/com/yahoo/config/DoubleNodeTest.java b/config-lib/src/test/java/com/yahoo/config/DoubleNodeTest.java index 6b69fa29663..0c0d85db951 100644 --- a/config-lib/src/test/java/com/yahoo/config/DoubleNodeTest.java +++ b/config-lib/src/test/java/com/yahoo/config/DoubleNodeTest.java @@ -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. package com.yahoo.config; import org.junit.Test; diff --git a/config-lib/src/test/java/com/yahoo/config/EnumNodeTest.java b/config-lib/src/test/java/com/yahoo/config/EnumNodeTest.java index 825c346ea47..c7801d3eecb 100644 --- a/config-lib/src/test/java/com/yahoo/config/EnumNodeTest.java +++ b/config-lib/src/test/java/com/yahoo/config/EnumNodeTest.java @@ -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. package com.yahoo.config; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/config-lib/src/test/java/com/yahoo/config/FileNodeTest.java b/config-lib/src/test/java/com/yahoo/config/FileNodeTest.java index f904aecb49a..2b0816a5b81 100644 --- a/config-lib/src/test/java/com/yahoo/config/FileNodeTest.java +++ b/config-lib/src/test/java/com/yahoo/config/FileNodeTest.java @@ -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. package com.yahoo.config; import org.junit.Test; diff --git a/config-lib/src/test/java/com/yahoo/config/IntegerNodeTest.java b/config-lib/src/test/java/com/yahoo/config/IntegerNodeTest.java index 68b2325eed1..bc675f63af8 100644 --- a/config-lib/src/test/java/com/yahoo/config/IntegerNodeTest.java +++ b/config-lib/src/test/java/com/yahoo/config/IntegerNodeTest.java @@ -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. package com.yahoo.config; import org.junit.Test; diff --git a/config-lib/src/test/java/com/yahoo/config/LongNodeTest.java b/config-lib/src/test/java/com/yahoo/config/LongNodeTest.java index 5a1a64048db..f403d075aca 100644 --- a/config-lib/src/test/java/com/yahoo/config/LongNodeTest.java +++ b/config-lib/src/test/java/com/yahoo/config/LongNodeTest.java @@ -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. package com.yahoo.config; import org.junit.Test; diff --git a/config-lib/src/test/java/com/yahoo/config/NodeVectorTest.java b/config-lib/src/test/java/com/yahoo/config/NodeVectorTest.java index c57e54b8084..4e869632335 100644 --- a/config-lib/src/test/java/com/yahoo/config/NodeVectorTest.java +++ b/config-lib/src/test/java/com/yahoo/config/NodeVectorTest.java @@ -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. package com.yahoo.config; import org.junit.Test; diff --git a/config-lib/src/test/java/com/yahoo/config/PathNodeTest.java b/config-lib/src/test/java/com/yahoo/config/PathNodeTest.java index ccada228b3a..d587834d3b2 100644 --- a/config-lib/src/test/java/com/yahoo/config/PathNodeTest.java +++ b/config-lib/src/test/java/com/yahoo/config/PathNodeTest.java @@ -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. package com.yahoo.config; import org.junit.Test; diff --git a/config-lib/src/test/java/com/yahoo/config/StringNodeTest.java b/config-lib/src/test/java/com/yahoo/config/StringNodeTest.java index 1f3cc470845..c843b0024e1 100644 --- a/config-lib/src/test/java/com/yahoo/config/StringNodeTest.java +++ b/config-lib/src/test/java/com/yahoo/config/StringNodeTest.java @@ -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. package com.yahoo.config; import org.junit.Test; diff --git a/config-lib/src/test/resources/configdefinitions/app.def b/config-lib/src/test/resources/configdefinitions/app.def index 78388998ef3..40db5310927 100644 --- a/config-lib/src/test/resources/configdefinitions/app.def +++ b/config-lib/src/test/resources/configdefinitions/app.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=test message string default="Hello!" diff --git a/config-lib/src/test/resources/configdefinitions/arraytypes.def b/config-lib/src/test/resources/configdefinitions/arraytypes.def index 8add790c6cb..3529b906c4a 100644 --- a/config-lib/src/test/resources/configdefinitions/arraytypes.def +++ b/config-lib/src/test/resources/configdefinitions/arraytypes.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. # Config containing only simple array types that can be used for testing # individual types in detail. namespace=test diff --git a/config-lib/src/test/resources/configdefinitions/chains-test.def b/config-lib/src/test/resources/configdefinitions/chains-test.def index 88921b96d8d..5cc593b1443 100644 --- a/config-lib/src/test/resources/configdefinitions/chains-test.def +++ b/config-lib/src/test/resources/configdefinitions/chains-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. # Chains configuration namespace=test diff --git a/config-lib/src/test/resources/configdefinitions/datastructures.def b/config-lib/src/test/resources/configdefinitions/datastructures.def index 7b0aa22c941..648fe569020 100644 --- a/config-lib/src/test/resources/configdefinitions/datastructures.def +++ b/config-lib/src/test/resources/configdefinitions/datastructures.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=test date[] string diff --git a/config-lib/src/test/resources/configdefinitions/defaulttest.def b/config-lib/src/test/resources/configdefinitions/defaulttest.def index d1210890184..eec012ffbb9 100644 --- a/config-lib/src/test/resources/configdefinitions/defaulttest.def +++ b/config-lib/src/test/resources/configdefinitions/defaulttest.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=test nondefaultstring string diff --git a/config-lib/src/test/resources/configdefinitions/function-test.def b/config-lib/src/test/resources/configdefinitions/function-test.def index 63206fa7c3b..935efe9ca21 100644 --- a/config-lib/src/test/resources/configdefinitions/function-test.def +++ b/config-lib/src/test/resources/configdefinitions/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-lib/src/test/resources/configdefinitions/int.def b/config-lib/src/test/resources/configdefinitions/int.def index ea29b911fc4..0bf82ed9987 100755 --- a/config-lib/src/test/resources/configdefinitions/int.def +++ b/config-lib/src/test/resources/configdefinitions/int.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=test intVal int default=1 diff --git a/config-lib/src/test/resources/configdefinitions/maptypes.def b/config-lib/src/test/resources/configdefinitions/maptypes.def index 0e39c7ccdb9..389a9b71012 100644 --- a/config-lib/src/test/resources/configdefinitions/maptypes.def +++ b/config-lib/src/test/resources/configdefinitions/maptypes.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. # Config containing only structs in various forms namespace=foo diff --git a/config-lib/src/test/resources/configdefinitions/md5test.def b/config-lib/src/test/resources/configdefinitions/md5test.def index b419bd975bb..86a199ea785 100644 --- a/config-lib/src/test/resources/configdefinitions/md5test.def +++ b/config-lib/src/test/resources/configdefinitions/md5test.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=4 , version in comment does not count. # Added empty line to see if we can confuse diff --git a/config-lib/src/test/resources/configdefinitions/namespace.def b/config-lib/src/test/resources/configdefinitions/namespace.def index d92dc656fe7..e51a06e87b8 100644 --- a/config-lib/src/test/resources/configdefinitions/namespace.def +++ b/config-lib/src/test/resources/configdefinitions/namespace.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=test namespace=myproject.config diff --git a/config-lib/src/test/resources/configdefinitions/restart.def b/config-lib/src/test/resources/configdefinitions/restart.def index 4b28e5a5d95..417a015a3d0 100755 --- a/config-lib/src/test/resources/configdefinitions/restart.def +++ b/config-lib/src/test/resources/configdefinitions/restart.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=test intVal int default=1 restart diff --git a/config-lib/src/test/resources/configdefinitions/simpletypes.def b/config-lib/src/test/resources/configdefinitions/simpletypes.def index b54ea43435d..314c67ae709 100644 --- a/config-lib/src/test/resources/configdefinitions/simpletypes.def +++ b/config-lib/src/test/resources/configdefinitions/simpletypes.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. # Config containing only simple leaf types with default values, that can be used # for testing individual types in detail. namespace=test diff --git a/config-lib/src/test/resources/configdefinitions/specialtypes.def b/config-lib/src/test/resources/configdefinitions/specialtypes.def index 3b129c810c0..3243288f0af 100644 --- a/config-lib/src/test/resources/configdefinitions/specialtypes.def +++ b/config-lib/src/test/resources/configdefinitions/specialtypes.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=test myfile file diff --git a/config-lib/src/test/resources/configdefinitions/standard.def b/config-lib/src/test/resources/configdefinitions/standard.def index 36c4c55f339..e065535f97d 100644 --- a/config-lib/src/test/resources/configdefinitions/standard.def +++ b/config-lib/src/test/resources/configdefinitions/standard.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. # Config containing only simple leaf types with default values, that can be used # for testing individual types in detail. namespace=test diff --git a/config-lib/src/test/resources/configdefinitions/string.def b/config-lib/src/test/resources/configdefinitions/string.def index 63d189c3a4e..80ac3f4b1e6 100755 --- a/config-lib/src/test/resources/configdefinitions/string.def +++ b/config-lib/src/test/resources/configdefinitions/string.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=test stringVal string default="_default_" diff --git a/config-lib/src/test/resources/configdefinitions/structtypes.def b/config-lib/src/test/resources/configdefinitions/structtypes.def index 5a646efc2c7..0a3c8e23a45 100644 --- a/config-lib/src/test/resources/configdefinitions/structtypes.def +++ b/config-lib/src/test/resources/configdefinitions/structtypes.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. # Config containing only structs in various forms namespace=test diff --git a/config-lib/src/test/resources/configdefinitions/test-nodefs.def b/config-lib/src/test/resources/configdefinitions/test-nodefs.def index b4c46a89695..4a80231d709 100644 --- a/config-lib/src/test/resources/configdefinitions/test-nodefs.def +++ b/config-lib/src/test/resources/configdefinitions/test-nodefs.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=test # test config vars with no defaults diff --git a/config-lib/src/test/resources/configdefinitions/test-nonstring.def b/config-lib/src/test/resources/configdefinitions/test-nonstring.def index 474c11770f1..3e54a3bb8bd 100644 --- a/config-lib/src/test/resources/configdefinitions/test-nonstring.def +++ b/config-lib/src/test/resources/configdefinitions/test-nonstring.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=test # Test non-string config vars with defaults diff --git a/config-lib/src/test/resources/configdefinitions/test-reference.def b/config-lib/src/test/resources/configdefinitions/test-reference.def index b5d82a7b4b6..96c5f62030a 100644 --- a/config-lib/src/test/resources/configdefinitions/test-reference.def +++ b/config-lib/src/test/resources/configdefinitions/test-reference.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=test configId reference default=":parent:" diff --git a/config-lib/src/test/resources/configdefinitions/testnamespace.def b/config-lib/src/test/resources/configdefinitions/testnamespace.def index 6e58c691097..b77eb5d81da 100644 --- a/config-lib/src/test/resources/configdefinitions/testnamespace.def +++ b/config-lib/src/test/resources/configdefinitions/testnamespace.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=foo basicStruct.stringVal string diff --git a/config-lib/src/test/resources/configdefinitions/unicode.def b/config-lib/src/test/resources/configdefinitions/unicode.def index 9a1ab170d92..52b2353e60e 100644 --- a/config-lib/src/test/resources/configdefinitions/unicode.def +++ b/config-lib/src/test/resources/configdefinitions/unicode.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=test unicodestring1 string -- cgit v1.2.3