diff options
Diffstat (limited to 'sample-apps')
93 files changed, 33 insertions, 93 deletions
diff --git a/sample-apps/basic-search-java/pom.xml b/sample-apps/basic-search-java/pom.xml index d23671627d6..e7c5f8a658a 100644 --- a/sample-apps/basic-search-java/pom.xml +++ b/sample-apps/basic-search-java/pom.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!-- 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. --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 diff --git a/sample-apps/basic-search-java/src/main/application/hosts.xml b/sample-apps/basic-search-java/src/main/application/hosts.xml index 541d2f10304..3ab86a21aef 100644 --- a/sample-apps/basic-search-java/src/main/application/hosts.xml +++ b/sample-apps/basic-search-java/src/main/application/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/sample-apps/basic-search-java/src/main/application/services.xml b/sample-apps/basic-search-java/src/main/application/services.xml index 585b02e1d69..95c4ee15f7d 100644 --- a/sample-apps/basic-search-java/src/main/application/services.xml +++ b/sample-apps/basic-search-java/src/main/application/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"> <adminserver hostalias="node1"/> diff --git a/sample-apps/basic-search-java/src/main/java/com/yahoo/example/ExampleProcessor.java b/sample-apps/basic-search-java/src/main/java/com/yahoo/example/ExampleProcessor.java index ea79997bd46..228f6a71b77 100644 --- a/sample-apps/basic-search-java/src/main/java/com/yahoo/example/ExampleProcessor.java +++ b/sample-apps/basic-search-java/src/main/java/com/yahoo/example/ExampleProcessor.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.example; import com.google.inject.Inject; diff --git a/sample-apps/basic-search-java/src/main/java/com/yahoo/example/StringData.java b/sample-apps/basic-search-java/src/main/java/com/yahoo/example/StringData.java index 845f5906a5d..b177881035a 100644 --- a/sample-apps/basic-search-java/src/main/java/com/yahoo/example/StringData.java +++ b/sample-apps/basic-search-java/src/main/java/com/yahoo/example/StringData.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.example; import com.yahoo.processing.Request; diff --git a/sample-apps/basic-search-java/src/main/resources/configdefinitions/example-processor.def b/sample-apps/basic-search-java/src/main/resources/configdefinitions/example-processor.def index 7ac13fed3c4..1028451c312 100644 --- a/sample-apps/basic-search-java/src/main/resources/configdefinitions/example-processor.def +++ b/sample-apps/basic-search-java/src/main/resources/configdefinitions/example-processor.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=example message string default="" diff --git a/sample-apps/basic-search-java/src/test/java/com/yahoo/example/ApplicationMain.java b/sample-apps/basic-search-java/src/test/java/com/yahoo/example/ApplicationMain.java index 0fcc176620a..638df584f92 100644 --- a/sample-apps/basic-search-java/src/test/java/com/yahoo/example/ApplicationMain.java +++ b/sample-apps/basic-search-java/src/test/java/com/yahoo/example/ApplicationMain.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.example; import com.yahoo.application.Networking; diff --git a/sample-apps/basic-search-java/src/test/java/com/yahoo/example/ApplicationTest.java b/sample-apps/basic-search-java/src/test/java/com/yahoo/example/ApplicationTest.java index 65286bec0de..943a46c9f0b 100644 --- a/sample-apps/basic-search-java/src/test/java/com/yahoo/example/ApplicationTest.java +++ b/sample-apps/basic-search-java/src/test/java/com/yahoo/example/ApplicationTest.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.example; import com.yahoo.application.Application; diff --git a/sample-apps/basic-search-java/src/test/java/com/yahoo/example/ExampleProcessorTest.java b/sample-apps/basic-search-java/src/test/java/com/yahoo/example/ExampleProcessorTest.java index fd7928e3715..125cc5cbecc 100644 --- a/sample-apps/basic-search-java/src/test/java/com/yahoo/example/ExampleProcessorTest.java +++ b/sample-apps/basic-search-java/src/test/java/com/yahoo/example/ExampleProcessorTest.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.example; import com.yahoo.component.chain.Chain; diff --git a/sample-apps/basic-search-tensor/pom.xml b/sample-apps/basic-search-tensor/pom.xml index bc9554f9ef4..e0b821272fc 100644 --- a/sample-apps/basic-search-tensor/pom.xml +++ b/sample-apps/basic-search-tensor/pom.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!-- 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. --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 diff --git a/sample-apps/basic-search-tensor/src/main/application/hosts.xml b/sample-apps/basic-search-tensor/src/main/application/hosts.xml index 541d2f10304..3ab86a21aef 100644 --- a/sample-apps/basic-search-tensor/src/main/application/hosts.xml +++ b/sample-apps/basic-search-tensor/src/main/application/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/sample-apps/basic-search-tensor/src/main/application/search/query-profiles/types/root.xml b/sample-apps/basic-search-tensor/src/main/application/search/query-profiles/types/root.xml index bab072916e9..e06f16c1032 100644 --- a/sample-apps/basic-search-tensor/src/main/application/search/query-profiles/types/root.xml +++ b/sample-apps/basic-search-tensor/src/main/application/search/query-profiles/types/root.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. --> <query-profile-type id="root" inherits="native"> <field name="ranking.features.query(tensor)" type="tensor(x{})" /> </query-profile-type> diff --git a/sample-apps/basic-search-tensor/src/main/application/searchdefinitions/music.sd b/sample-apps/basic-search-tensor/src/main/application/searchdefinitions/music.sd index e9675b612cc..85d59504321 100644 --- a/sample-apps/basic-search-tensor/src/main/application/searchdefinitions/music.sd +++ b/sample-apps/basic-search-tensor/src/main/application/searchdefinitions/music.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 music { document music { field artist type string { diff --git a/sample-apps/basic-search-tensor/src/main/application/services.xml b/sample-apps/basic-search-tensor/src/main/application/services.xml index d422fb2ba2f..246ffff94de 100644 --- a/sample-apps/basic-search-tensor/src/main/application/services.xml +++ b/sample-apps/basic-search-tensor/src/main/application/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/sample-apps/basic-search-tensor/src/main/java/com/yahoo/example/ExampleTensorSearcher.java b/sample-apps/basic-search-tensor/src/main/java/com/yahoo/example/ExampleTensorSearcher.java index 426e6ee451e..375ad7c98cb 100644 --- a/sample-apps/basic-search-tensor/src/main/java/com/yahoo/example/ExampleTensorSearcher.java +++ b/sample-apps/basic-search-tensor/src/main/java/com/yahoo/example/ExampleTensorSearcher.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.example; import com.yahoo.processing.request.CompoundName; diff --git a/sample-apps/basic-search/src/main/application/hosts.xml b/sample-apps/basic-search/src/main/application/hosts.xml index 65c6373d70c..632e48db321 100644 --- a/sample-apps/basic-search/src/main/application/hosts.xml +++ b/sample-apps/basic-search/src/main/application/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/sample-apps/basic-search/src/main/application/searchdefinitions/music.sd b/sample-apps/basic-search/src/main/application/searchdefinitions/music.sd index 6bb7ce8cd94..c450c07d34b 100644 --- a/sample-apps/basic-search/src/main/application/searchdefinitions/music.sd +++ b/sample-apps/basic-search/src/main/application/searchdefinitions/music.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 music { document music { field artist type string { diff --git a/sample-apps/basic-search/src/main/application/services.xml b/sample-apps/basic-search/src/main/application/services.xml index 9ca75b536e2..69899bcd1c6 100644 --- a/sample-apps/basic-search/src/main/application/services.xml +++ b/sample-apps/basic-search/src/main/application/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"> <jdisc version="1.0" id="container"> diff --git a/sample-apps/blog-recommendation/pom.xml b/sample-apps/blog-recommendation/pom.xml index 2f1582d4fbe..d4afac565a7 100644 --- a/sample-apps/blog-recommendation/pom.xml +++ b/sample-apps/blog-recommendation/pom.xml @@ -1,5 +1,4 @@ <?xml version="1.0"?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>com.yahoo.example</groupId> diff --git a/sample-apps/blog-recommendation/src/main/application/deployment.xml b/sample-apps/blog-recommendation/src/main/application/deployment.xml index bb37f77412b..0a2397bbca9 100644 --- a/sample-apps/blog-recommendation/src/main/application/deployment.xml +++ b/sample-apps/blog-recommendation/src/main/application/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/sample-apps/blog-recommendation/src/main/application/hosts.xml b/sample-apps/blog-recommendation/src/main/application/hosts.xml index 65c6373d70c..632e48db321 100644 --- a/sample-apps/blog-recommendation/src/main/application/hosts.xml +++ b/sample-apps/blog-recommendation/src/main/application/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/sample-apps/blog-recommendation/src/main/application/search/query-profiles/types/root.xml b/sample-apps/blog-recommendation/src/main/application/search/query-profiles/types/root.xml index f034e2dc5e3..6362bbe48ce 100644 --- a/sample-apps/blog-recommendation/src/main/application/search/query-profiles/types/root.xml +++ b/sample-apps/blog-recommendation/src/main/application/search/query-profiles/types/root.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. --> <query-profile-type id="root" inherits="native"> <field name="ranking.features.query(user_item_cf)" type="tensor(user_item_cf[10])" /> </query-profile-type> diff --git a/sample-apps/blog-recommendation/src/main/application/searchdefinitions/blog_post.sd b/sample-apps/blog-recommendation/src/main/application/searchdefinitions/blog_post.sd index 6aec8961475..b0b53032216 100644 --- a/sample-apps/blog-recommendation/src/main/application/searchdefinitions/blog_post.sd +++ b/sample-apps/blog-recommendation/src/main/application/searchdefinitions/blog_post.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 blog_post { document blog_post { field date_gmt type string { diff --git a/sample-apps/blog-recommendation/src/main/application/searchdefinitions/user.sd b/sample-apps/blog-recommendation/src/main/application/searchdefinitions/user.sd index 3f545ef406c..0c2a6e50aa6 100644 --- a/sample-apps/blog-recommendation/src/main/application/searchdefinitions/user.sd +++ b/sample-apps/blog-recommendation/src/main/application/searchdefinitions/user.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 user { document user { diff --git a/sample-apps/blog-recommendation/src/main/application/services.xml b/sample-apps/blog-recommendation/src/main/application/services.xml index d58211bb8c9..c81cbde6027 100644 --- a/sample-apps/blog-recommendation/src/main/application/services.xml +++ b/sample-apps/blog-recommendation/src/main/application/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' xmlns:deploy="vespa" xmlns:preprocess="properties"> <jdisc id='default' version='1.0'> diff --git a/sample-apps/blog-recommendation/src/main/java/com/yahoo/example/BlogTensorSearcher.java b/sample-apps/blog-recommendation/src/main/java/com/yahoo/example/BlogTensorSearcher.java index 44fdcef583b..3a2a3df455f 100644 --- a/sample-apps/blog-recommendation/src/main/java/com/yahoo/example/BlogTensorSearcher.java +++ b/sample-apps/blog-recommendation/src/main/java/com/yahoo/example/BlogTensorSearcher.java @@ -1,4 +1,3 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.example; import com.yahoo.data.access.Inspectable; diff --git a/sample-apps/blog-recommendation/src/main/java/com/yahoo/example/UserProfileSearcher.java b/sample-apps/blog-recommendation/src/main/java/com/yahoo/example/UserProfileSearcher.java index aca2d2b9cce..eead82d7299 100644 --- a/sample-apps/blog-recommendation/src/main/java/com/yahoo/example/UserProfileSearcher.java +++ b/sample-apps/blog-recommendation/src/main/java/com/yahoo/example/UserProfileSearcher.java @@ -1,4 +1,3 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.example; import com.yahoo.data.access.Inspectable; diff --git a/sample-apps/blog-recommendation/src/pig/feed_content_and_tensor_vespa.pig b/sample-apps/blog-recommendation/src/pig/feed_content_and_tensor_vespa.pig index 70d14dc1cc1..9a536f38779 100644 --- a/sample-apps/blog-recommendation/src/pig/feed_content_and_tensor_vespa.pig +++ b/sample-apps/blog-recommendation/src/pig/feed_content_and_tensor_vespa.pig @@ -1,4 +1,3 @@ --- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. REGISTER vespa-hadoop.jar -- Create valid Vespa put operations diff --git a/sample-apps/blog-recommendation/src/pig/feed_content_vespa.pig b/sample-apps/blog-recommendation/src/pig/feed_content_vespa.pig index d6379649789..347958bfb84 100644 --- a/sample-apps/blog-recommendation/src/pig/feed_content_vespa.pig +++ b/sample-apps/blog-recommendation/src/pig/feed_content_vespa.pig @@ -1,4 +1,3 @@ --- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. REGISTER vespa-hadoop.jar -- UDF to create valid Vespa document operation in JSON format diff --git a/sample-apps/blog-recommendation/src/pig/feed_user_item_cf_vespa.pig b/sample-apps/blog-recommendation/src/pig/feed_user_item_cf_vespa.pig index 66cb6c5d5c6..fd06394c3af 100644 --- a/sample-apps/blog-recommendation/src/pig/feed_user_item_cf_vespa.pig +++ b/sample-apps/blog-recommendation/src/pig/feed_user_item_cf_vespa.pig @@ -1,4 +1,3 @@ --- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. REGISTER vespa-hadoop.jar -- Create valid Vespa put operations diff --git a/sample-apps/blog-recommendation/src/pig/generate_user_item_cf_dataset.pig b/sample-apps/blog-recommendation/src/pig/generate_user_item_cf_dataset.pig index feea22263d9..2e71dcbe9e3 100644 --- a/sample-apps/blog-recommendation/src/pig/generate_user_item_cf_dataset.pig +++ b/sample-apps/blog-recommendation/src/pig/generate_user_item_cf_dataset.pig @@ -1,4 +1,3 @@ --- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -- Load data from any source - here we load using PigStorage data = LOAD 'blog-recommendation/trainPostsFinal' USING JsonLoader('date_gmt:chararray, language:chararray, author:chararray, url:chararray, title:chararray, blog:chararray, post_id:chararray, tags:{T:(tag_name:chararray)}, blogname:chararray, date:chararray, content:chararray, categories:{T:(category_name:chararray)}, likes:{T:(dt:chararray, uid:chararray)}'); diff --git a/sample-apps/blog-recommendation/src/pig/get_recommendations.pig b/sample-apps/blog-recommendation/src/pig/get_recommendations.pig index ad97e8361a2..00b03b0f49a 100644 --- a/sample-apps/blog-recommendation/src/pig/get_recommendations.pig +++ b/sample-apps/blog-recommendation/src/pig/get_recommendations.pig @@ -1,4 +1,3 @@ --- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -- REGISTER $VESPA_HADOOP_JAR REGISTER vespa-hadoop.jar -- REGISTER parquet-pig-bundle-1.8.1.jar diff --git a/sample-apps/blog-recommendation/src/pig/tutorial_blog_popularity.pig b/sample-apps/blog-recommendation/src/pig/tutorial_blog_popularity.pig index 25c3b4ab711..4dac36a717f 100644 --- a/sample-apps/blog-recommendation/src/pig/tutorial_blog_popularity.pig +++ b/sample-apps/blog-recommendation/src/pig/tutorial_blog_popularity.pig @@ -1,4 +1,3 @@ --- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. REGISTER '$VESPA_HADOOP_JAR' -- UDF to create valid Vespa document operation in JSON format diff --git a/sample-apps/blog-recommendation/src/pig/tutorial_feed_content_and_tensor_vespa.pig b/sample-apps/blog-recommendation/src/pig/tutorial_feed_content_and_tensor_vespa.pig index b000037f25a..77943fd842a 100644 --- a/sample-apps/blog-recommendation/src/pig/tutorial_feed_content_and_tensor_vespa.pig +++ b/sample-apps/blog-recommendation/src/pig/tutorial_feed_content_and_tensor_vespa.pig @@ -1,4 +1,3 @@ --- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. REGISTER '$VESPA_HADOOP_JAR' -- Create valid Vespa put operations diff --git a/sample-apps/blog-recommendation/src/pig/tutorial_feed_content_vespa.pig b/sample-apps/blog-recommendation/src/pig/tutorial_feed_content_vespa.pig index 6fff700881a..d20ccf505a9 100644 --- a/sample-apps/blog-recommendation/src/pig/tutorial_feed_content_vespa.pig +++ b/sample-apps/blog-recommendation/src/pig/tutorial_feed_content_vespa.pig @@ -1,4 +1,3 @@ --- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. REGISTER '$VESPA_HADOOP_JAR' -- REGISTER vespa-hadoop.jar diff --git a/sample-apps/blog-recommendation/src/spark/collaborative_filtering_example.scala b/sample-apps/blog-recommendation/src/spark/collaborative_filtering_example.scala index 2118862f063..1a2c8f92730 100644 --- a/sample-apps/blog-recommendation/src/spark/collaborative_filtering_example.scala +++ b/sample-apps/blog-recommendation/src/spark/collaborative_filtering_example.scala @@ -1,4 +1,3 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. import org.apache.spark.mllib.recommendation.ALS import org.apache.spark.mllib.recommendation.MatrixFactorizationModel import org.apache.spark.mllib.recommendation.Rating diff --git a/sample-apps/blog-recommendation/src/spark/data_exploration.scala b/sample-apps/blog-recommendation/src/spark/data_exploration.scala index d9f3abc9cd8..228834cfb4b 100644 --- a/sample-apps/blog-recommendation/src/spark/data_exploration.scala +++ b/sample-apps/blog-recommendation/src/spark/data_exploration.scala @@ -1,4 +1,3 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. // sc is an existing SparkContext. val sqlContext = new org.apache.spark.sql.SQLContext(sc) diff --git a/sample-apps/blog-recommendation/src/spark/expected_percentile.scala b/sample-apps/blog-recommendation/src/spark/expected_percentile.scala index b1fd05f6f04..7236f8e8150 100644 --- a/sample-apps/blog-recommendation/src/spark/expected_percentile.scala +++ b/sample-apps/blog-recommendation/src/spark/expected_percentile.scala @@ -1,4 +1,3 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. val test_file_path = "data/cv/test_set_exploded" val blog_recom_file_path = "data/recommendations" val size_recommendation_list = 100 diff --git a/sample-apps/blog-recommendation/src/spark/full_dataset_cf.scala b/sample-apps/blog-recommendation/src/spark/full_dataset_cf.scala index 405105eb663..0b76e8b8b1c 100644 --- a/sample-apps/blog-recommendation/src/spark/full_dataset_cf.scala +++ b/sample-apps/blog-recommendation/src/spark/full_dataset_cf.scala @@ -1,4 +1,3 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. import org.apache.spark.mllib.recommendation.ALS import org.apache.spark.mllib.recommendation.MatrixFactorizationModel import org.apache.spark.mllib.recommendation.Rating diff --git a/sample-apps/blog-recommendation/src/spark/train_test_set_division.scala b/sample-apps/blog-recommendation/src/spark/train_test_set_division.scala index 224ea74cb4e..d21f96028bc 100644 --- a/sample-apps/blog-recommendation/src/spark/train_test_set_division.scala +++ b/sample-apps/blog-recommendation/src/spark/train_test_set_division.scala @@ -1,4 +1,3 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. import org.apache.spark.sql.functions.udf // Inputs diff --git a/sample-apps/blog-search-initial/pom.xml b/sample-apps/blog-search-initial/pom.xml index 71a02075a6b..cbe5967537a 100644 --- a/sample-apps/blog-search-initial/pom.xml +++ b/sample-apps/blog-search-initial/pom.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!-- 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. --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 diff --git a/sample-apps/blog-search-initial/src/main/application/deployment.xml b/sample-apps/blog-search-initial/src/main/application/deployment.xml index bb37f77412b..0a2397bbca9 100644 --- a/sample-apps/blog-search-initial/src/main/application/deployment.xml +++ b/sample-apps/blog-search-initial/src/main/application/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/sample-apps/blog-search-initial/src/main/application/hosts.xml b/sample-apps/blog-search-initial/src/main/application/hosts.xml index 541d2f10304..3ab86a21aef 100644 --- a/sample-apps/blog-search-initial/src/main/application/hosts.xml +++ b/sample-apps/blog-search-initial/src/main/application/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/sample-apps/blog-search-initial/src/main/application/searchdefinitions/blog_post.sd b/sample-apps/blog-search-initial/src/main/application/searchdefinitions/blog_post.sd index b3667c28168..8d94d0bf6ba 100644 --- a/sample-apps/blog-search-initial/src/main/application/searchdefinitions/blog_post.sd +++ b/sample-apps/blog-search-initial/src/main/application/searchdefinitions/blog_post.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 blog_post { document blog_post { field date_gmt type string { diff --git a/sample-apps/blog-search-initial/src/main/application/services.xml b/sample-apps/blog-search-initial/src/main/application/services.xml index 8cda4126afc..1cb90214e2b 100644 --- a/sample-apps/blog-search-initial/src/main/application/services.xml +++ b/sample-apps/blog-search-initial/src/main/application/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'> <jdisc id='default' version='1.0'> diff --git a/sample-apps/blog-search/pom.xml b/sample-apps/blog-search/pom.xml index fb457e109aa..33913190d92 100644 --- a/sample-apps/blog-search/pom.xml +++ b/sample-apps/blog-search/pom.xml @@ -1,5 +1,4 @@ <?xml version="1.0"?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>com.yahoo.example</groupId> diff --git a/sample-apps/blog-search/src/main/application/deployment.xml b/sample-apps/blog-search/src/main/application/deployment.xml index bb37f77412b..0a2397bbca9 100644 --- a/sample-apps/blog-search/src/main/application/deployment.xml +++ b/sample-apps/blog-search/src/main/application/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/sample-apps/blog-search/src/main/application/searchdefinitions/blog_post.sd b/sample-apps/blog-search/src/main/application/searchdefinitions/blog_post.sd index 8fc95109e78..0f3c21dffa9 100644 --- a/sample-apps/blog-search/src/main/application/searchdefinitions/blog_post.sd +++ b/sample-apps/blog-search/src/main/application/searchdefinitions/blog_post.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 blog_post { document blog_post { field date_gmt type string { diff --git a/sample-apps/blog-search/src/main/application/services.xml b/sample-apps/blog-search/src/main/application/services.xml index 161d0f732e3..e850f1fc456 100644 --- a/sample-apps/blog-search/src/main/application/services.xml +++ b/sample-apps/blog-search/src/main/application/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' xmlns:deploy="vespa" xmlns:preprocess="properties"> <jdisc id='default' version='1.0'> diff --git a/sample-apps/blog-tutorial-shared/build.sbt b/sample-apps/blog-tutorial-shared/build.sbt index a36a87205a4..4c94a7d15e0 100644 --- a/sample-apps/blog-tutorial-shared/build.sbt +++ b/sample-apps/blog-tutorial-shared/build.sbt @@ -1,4 +1,3 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. name := "blog-support" version := "0.1" diff --git a/sample-apps/blog-tutorial-shared/src/R/generateDataset.R b/sample-apps/blog-tutorial-shared/src/R/generateDataset.R index 461a75c6506..b410ad4094c 100644 --- a/sample-apps/blog-tutorial-shared/src/R/generateDataset.R +++ b/sample-apps/blog-tutorial-shared/src/R/generateDataset.R @@ -1,4 +1,3 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. library(jsonlite) library(dplyr) diff --git a/sample-apps/blog-tutorial-shared/src/main/pig/tutorial_compute_metric.pig b/sample-apps/blog-tutorial-shared/src/main/pig/tutorial_compute_metric.pig index 61ca9bc7cb2..7bde9b5c2b7 100644 --- a/sample-apps/blog-tutorial-shared/src/main/pig/tutorial_compute_metric.pig +++ b/sample-apps/blog-tutorial-shared/src/main/pig/tutorial_compute_metric.pig @@ -1,4 +1,3 @@ --- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. REGISTER $VESPA_HADOOP_JAR DEFINE BlogPostRecommendations diff --git a/sample-apps/blog-tutorial-shared/src/main/pig/tutorial_feed_content_and_tensor_vespa.pig b/sample-apps/blog-tutorial-shared/src/main/pig/tutorial_feed_content_and_tensor_vespa.pig index 50152318d04..a7863a6f78d 100644 --- a/sample-apps/blog-tutorial-shared/src/main/pig/tutorial_feed_content_and_tensor_vespa.pig +++ b/sample-apps/blog-tutorial-shared/src/main/pig/tutorial_feed_content_and_tensor_vespa.pig @@ -1,4 +1,3 @@ --- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. REGISTER '$VESPA_HADOOP_JAR' -- Create valid Vespa put operations diff --git a/sample-apps/blog-tutorial-shared/src/main/pig/tutorial_feed_content_vespa.pig b/sample-apps/blog-tutorial-shared/src/main/pig/tutorial_feed_content_vespa.pig index 62b8a676cfc..6150b38e80c 100644 --- a/sample-apps/blog-tutorial-shared/src/main/pig/tutorial_feed_content_vespa.pig +++ b/sample-apps/blog-tutorial-shared/src/main/pig/tutorial_feed_content_vespa.pig @@ -1,4 +1,3 @@ --- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. REGISTER '$VESPA_HADOOP_JAR' -- UDF to create valid Vespa document operation in JSON format diff --git a/sample-apps/blog-tutorial-shared/src/main/pig/tutorial_get_recommendation_list.pig b/sample-apps/blog-tutorial-shared/src/main/pig/tutorial_get_recommendation_list.pig index dcaffabba2d..ab4245eaa25 100644 --- a/sample-apps/blog-tutorial-shared/src/main/pig/tutorial_get_recommendation_list.pig +++ b/sample-apps/blog-tutorial-shared/src/main/pig/tutorial_get_recommendation_list.pig @@ -1,4 +1,3 @@ --- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. REGISTER $VESPA_HADOOP_JAR DEFINE BlogPostRecommendations diff --git a/sample-apps/blog-tutorial-shared/src/main/scala/com/yahoo/example/blog/BlogRecommendationApp.scala b/sample-apps/blog-tutorial-shared/src/main/scala/com/yahoo/example/blog/BlogRecommendationApp.scala index 30be7da2727..83d56718823 100644 --- a/sample-apps/blog-tutorial-shared/src/main/scala/com/yahoo/example/blog/BlogRecommendationApp.scala +++ b/sample-apps/blog-tutorial-shared/src/main/scala/com/yahoo/example/blog/BlogRecommendationApp.scala @@ -1,4 +1,3 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.example.blog import org.apache.spark.sql.SparkSession diff --git a/sample-apps/blog-tutorial-shared/src/main/scala/com/yahoo/example/blog/CollaborativeFiltering.scala b/sample-apps/blog-tutorial-shared/src/main/scala/com/yahoo/example/blog/CollaborativeFiltering.scala index 56828c828a5..f20e23321a1 100644 --- a/sample-apps/blog-tutorial-shared/src/main/scala/com/yahoo/example/blog/CollaborativeFiltering.scala +++ b/sample-apps/blog-tutorial-shared/src/main/scala/com/yahoo/example/blog/CollaborativeFiltering.scala @@ -1,4 +1,3 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.example.blog import org.apache.spark.ml.recommendation.{ALS, ALSModel} diff --git a/sample-apps/blog-tutorial-shared/src/main/scala/com/yahoo/example/blog/SplitFullSetIntoTrainAndTestSets.scala b/sample-apps/blog-tutorial-shared/src/main/scala/com/yahoo/example/blog/SplitFullSetIntoTrainAndTestSets.scala index feff388618e..41b9b2b2dd4 100644 --- a/sample-apps/blog-tutorial-shared/src/main/scala/com/yahoo/example/blog/SplitFullSetIntoTrainAndTestSets.scala +++ b/sample-apps/blog-tutorial-shared/src/main/scala/com/yahoo/example/blog/SplitFullSetIntoTrainAndTestSets.scala @@ -1,4 +1,3 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.example.blog import org.apache.spark.sql.{SparkSession, DataFrame} diff --git a/sample-apps/blog-tutorial-shared/src/python/parse.py b/sample-apps/blog-tutorial-shared/src/python/parse.py index 207f8a14740..0d5f892eebc 100644 --- a/sample-apps/blog-tutorial-shared/src/python/parse.py +++ b/sample-apps/blog-tutorial-shared/src/python/parse.py @@ -1,4 +1,3 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. import json import argparse diff --git a/sample-apps/blog-tutorial-shared/src/python/vespaModel.py b/sample-apps/blog-tutorial-shared/src/python/vespaModel.py index 7f2a0c06014..fd0718721eb 100755 --- a/sample-apps/blog-tutorial-shared/src/python/vespaModel.py +++ b/sample-apps/blog-tutorial-shared/src/python/vespaModel.py @@ -1,5 +1,4 @@ #! /Users/tmartins/anaconda/envs/tensorflow/bin/python -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. """ Train a 2 layers neural network to compute the probability of a user diff --git a/sample-apps/blog-tutorial-shared/src/test/python/parse-unittest.py b/sample-apps/blog-tutorial-shared/src/test/python/parse-unittest.py index 1a75994c740..d1fc725597d 100644 --- a/sample-apps/blog-tutorial-shared/src/test/python/parse-unittest.py +++ b/sample-apps/blog-tutorial-shared/src/test/python/parse-unittest.py @@ -1,4 +1,3 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. import os import sys import unittest diff --git a/sample-apps/blog-tutorial-shared/src/test/scala/com/yahoo/example/blog/BlogRecommendationAppTest.scala b/sample-apps/blog-tutorial-shared/src/test/scala/com/yahoo/example/blog/BlogRecommendationAppTest.scala index bd73c088e3e..7ae8b8a8b06 100644 --- a/sample-apps/blog-tutorial-shared/src/test/scala/com/yahoo/example/blog/BlogRecommendationAppTest.scala +++ b/sample-apps/blog-tutorial-shared/src/test/scala/com/yahoo/example/blog/BlogRecommendationAppTest.scala @@ -1,4 +1,3 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.example.blog import org.scalatest.FunSuite diff --git a/sample-apps/blog-tutorial-shared/src/test/scala/com/yahoo/example/blog/CollaborativeFilteringTest.scala b/sample-apps/blog-tutorial-shared/src/test/scala/com/yahoo/example/blog/CollaborativeFilteringTest.scala index 07df1ebf622..c660b45630a 100644 --- a/sample-apps/blog-tutorial-shared/src/test/scala/com/yahoo/example/blog/CollaborativeFilteringTest.scala +++ b/sample-apps/blog-tutorial-shared/src/test/scala/com/yahoo/example/blog/CollaborativeFilteringTest.scala @@ -1,4 +1,3 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.example.blog import org.apache.spark.ml.recommendation.ALSModel diff --git a/sample-apps/blog-tutorial-shared/src/test/scala/com/yahoo/example/blog/SplitFullSetIntoTrainAndTestSetsTest.scala b/sample-apps/blog-tutorial-shared/src/test/scala/com/yahoo/example/blog/SplitFullSetIntoTrainAndTestSetsTest.scala index 395cc99f8c5..43c08492c71 100644 --- a/sample-apps/blog-tutorial-shared/src/test/scala/com/yahoo/example/blog/SplitFullSetIntoTrainAndTestSetsTest.scala +++ b/sample-apps/blog-tutorial-shared/src/test/scala/com/yahoo/example/blog/SplitFullSetIntoTrainAndTestSetsTest.scala @@ -1,4 +1,3 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.example.blog import org.apache.spark.sql.{SparkSession, DataFrame} diff --git a/sample-apps/boolean-search/adsdata.xml b/sample-apps/boolean-search/adsdata.xml index e5992a9b1a0..70c7519d902 100644 --- a/sample-apps/boolean-search/adsdata.xml +++ b/sample-apps/boolean-search/adsdata.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. --> <vespafeed> <document type="ad" documentid="id:sampleapp:ad::http://example.com/sled"> diff --git a/sample-apps/boolean-search/pom.xml b/sample-apps/boolean-search/pom.xml index 944511e37b2..f3e6bcd14d2 100644 --- a/sample-apps/boolean-search/pom.xml +++ b/sample-apps/boolean-search/pom.xml @@ -1,5 +1,4 @@ <?xml version="1.0"?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>com.yahoo.example</groupId> diff --git a/sample-apps/boolean-search/src/main/application/deployment.xml b/sample-apps/boolean-search/src/main/application/deployment.xml index b36abba9d57..454e2cb861d 100644 --- a/sample-apps/boolean-search/src/main/application/deployment.xml +++ b/sample-apps/boolean-search/src/main/application/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/sample-apps/boolean-search/src/main/application/searchdefinitions/ad.sd b/sample-apps/boolean-search/src/main/application/searchdefinitions/ad.sd index 10724eb7b09..704c9712bcb 100644 --- a/sample-apps/boolean-search/src/main/application/searchdefinitions/ad.sd +++ b/sample-apps/boolean-search/src/main/application/searchdefinitions/ad.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 ad { document ad { diff --git a/sample-apps/boolean-search/src/main/application/services.xml b/sample-apps/boolean-search/src/main/application/services.xml index 2f2febd719f..e19a46b055a 100644 --- a/sample-apps/boolean-search/src/main/application/services.xml +++ b/sample-apps/boolean-search/src/main/application/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='3.0'> diff --git a/sample-apps/boolean-search/src/main/java/com/yahoo/example/SubqueriesSearcher.java b/sample-apps/boolean-search/src/main/java/com/yahoo/example/SubqueriesSearcher.java index f8107c33eb2..0243cd4e431 100644 --- a/sample-apps/boolean-search/src/main/java/com/yahoo/example/SubqueriesSearcher.java +++ b/sample-apps/boolean-search/src/main/java/com/yahoo/example/SubqueriesSearcher.java @@ -1,4 +1,3 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.example; import com.yahoo.data.access.Inspectable; diff --git a/sample-apps/boolean-search/src/test/application/services.xml b/sample-apps/boolean-search/src/test/application/services.xml index fcb7455d959..1444a26c59f 100644 --- a/sample-apps/boolean-search/src/test/application/services.xml +++ b/sample-apps/boolean-search/src/test/application/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='3.0'> <nodes count="1" /> diff --git a/sample-apps/boolean-search/src/test/java/com/yahoo/example/MockBackend.java b/sample-apps/boolean-search/src/test/java/com/yahoo/example/MockBackend.java index ca2dc924893..0c92eec1c2f 100644 --- a/sample-apps/boolean-search/src/test/java/com/yahoo/example/MockBackend.java +++ b/sample-apps/boolean-search/src/test/java/com/yahoo/example/MockBackend.java @@ -1,4 +1,3 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.example; import com.yahoo.data.access.simple.Value; diff --git a/sample-apps/boolean-search/src/test/java/com/yahoo/example/SubqueriesSearcherTest.java b/sample-apps/boolean-search/src/test/java/com/yahoo/example/SubqueriesSearcherTest.java index 3bef09454de..ea29533081a 100644 --- a/sample-apps/boolean-search/src/test/java/com/yahoo/example/SubqueriesSearcherTest.java +++ b/sample-apps/boolean-search/src/test/java/com/yahoo/example/SubqueriesSearcherTest.java @@ -1,4 +1,3 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.example; import com.yahoo.application.Application; diff --git a/sample-apps/boolean-search/src/test/resources/adsdata.xml b/sample-apps/boolean-search/src/test/resources/adsdata.xml index b5e49263cbd..e4c23ae983a 100644 --- a/sample-apps/boolean-search/src/test/resources/adsdata.xml +++ b/sample-apps/boolean-search/src/test/resources/adsdata.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. --> <vespafeed> <document type="ad" documentid="id:sampleapp:ad::http://example.com/sled"> diff --git a/sample-apps/http-api-using-request-handlers-and-processors/pom.xml b/sample-apps/http-api-using-request-handlers-and-processors/pom.xml index 6e7d0da75db..8141a0b91b1 100644 --- a/sample-apps/http-api-using-request-handlers-and-processors/pom.xml +++ b/sample-apps/http-api-using-request-handlers-and-processors/pom.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!-- 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. --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 diff --git a/sample-apps/http-api-using-request-handlers-and-processors/src/main/application/services.xml b/sample-apps/http-api-using-request-handlers-and-processors/src/main/application/services.xml index 70d20b52860..add155c2279 100644 --- a/sample-apps/http-api-using-request-handlers-and-processors/src/main/application/services.xml +++ b/sample-apps/http-api-using-request-handlers-and-processors/src/main/application/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"> <container id="default" version="1.0"> <processing> diff --git a/sample-apps/http-api-using-request-handlers-and-processors/src/main/java/com/yahoo/demo/AnnotatingProcessor.java b/sample-apps/http-api-using-request-handlers-and-processors/src/main/java/com/yahoo/demo/AnnotatingProcessor.java index 69418a47aa5..ec2080bad00 100644 --- a/sample-apps/http-api-using-request-handlers-and-processors/src/main/java/com/yahoo/demo/AnnotatingProcessor.java +++ b/sample-apps/http-api-using-request-handlers-and-processors/src/main/java/com/yahoo/demo/AnnotatingProcessor.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.demo; import com.google.common.base.Splitter; diff --git a/sample-apps/http-api-using-request-handlers-and-processors/src/main/java/com/yahoo/demo/DataProcessor.java b/sample-apps/http-api-using-request-handlers-and-processors/src/main/java/com/yahoo/demo/DataProcessor.java index 36e2609b6fa..d7f074d398f 100644 --- a/sample-apps/http-api-using-request-handlers-and-processors/src/main/java/com/yahoo/demo/DataProcessor.java +++ b/sample-apps/http-api-using-request-handlers-and-processors/src/main/java/com/yahoo/demo/DataProcessor.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.demo; import com.yahoo.component.provider.ListenableFreezableClass; diff --git a/sample-apps/http-api-using-request-handlers-and-processors/src/main/java/com/yahoo/demo/DemoComponent.java b/sample-apps/http-api-using-request-handlers-and-processors/src/main/java/com/yahoo/demo/DemoComponent.java index 17f08472db4..455784525e1 100644 --- a/sample-apps/http-api-using-request-handlers-and-processors/src/main/java/com/yahoo/demo/DemoComponent.java +++ b/sample-apps/http-api-using-request-handlers-and-processors/src/main/java/com/yahoo/demo/DemoComponent.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.demo; import com.yahoo.component.AbstractComponent; diff --git a/sample-apps/http-api-using-request-handlers-and-processors/src/main/java/com/yahoo/demo/DemoHandler.java b/sample-apps/http-api-using-request-handlers-and-processors/src/main/java/com/yahoo/demo/DemoHandler.java index 2f86cc4fb6f..b7ceab55609 100644 --- a/sample-apps/http-api-using-request-handlers-and-processors/src/main/java/com/yahoo/demo/DemoHandler.java +++ b/sample-apps/http-api-using-request-handlers-and-processors/src/main/java/com/yahoo/demo/DemoHandler.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.demo; import com.google.inject.Inject; diff --git a/sample-apps/http-api-using-request-handlers-and-processors/src/main/java/com/yahoo/demo/DemoRenderer.java b/sample-apps/http-api-using-request-handlers-and-processors/src/main/java/com/yahoo/demo/DemoRenderer.java index bb6642bf488..c30adbcf7aa 100644 --- a/sample-apps/http-api-using-request-handlers-and-processors/src/main/java/com/yahoo/demo/DemoRenderer.java +++ b/sample-apps/http-api-using-request-handlers-and-processors/src/main/java/com/yahoo/demo/DemoRenderer.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.demo; import com.yahoo.processing.Response; diff --git a/sample-apps/http-api-using-request-handlers-and-processors/src/main/resources/configdefinitions/demo.def b/sample-apps/http-api-using-request-handlers-and-processors/src/main/resources/configdefinitions/demo.def index 6b8d2782e1d..9a804089433 100644 --- a/sample-apps/http-api-using-request-handlers-and-processors/src/main/resources/configdefinitions/demo.def +++ b/sample-apps/http-api-using-request-handlers-and-processors/src/main/resources/configdefinitions/demo.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=demo demo[].term string diff --git a/sample-apps/http-api-using-request-handlers-and-processors/src/test/java/com/yahoo/example/ApplicationMain.java b/sample-apps/http-api-using-request-handlers-and-processors/src/test/java/com/yahoo/example/ApplicationMain.java index 0fcc176620a..638df584f92 100644 --- a/sample-apps/http-api-using-request-handlers-and-processors/src/test/java/com/yahoo/example/ApplicationMain.java +++ b/sample-apps/http-api-using-request-handlers-and-processors/src/test/java/com/yahoo/example/ApplicationMain.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.example; import com.yahoo.application.Networking; diff --git a/sample-apps/http-api-using-searcher/pom.xml b/sample-apps/http-api-using-searcher/pom.xml index c8e222fae4b..6dfee6026ee 100644 --- a/sample-apps/http-api-using-searcher/pom.xml +++ b/sample-apps/http-api-using-searcher/pom.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!-- 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. --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 diff --git a/sample-apps/http-api-using-searcher/src/main/application/searchdefinitions/basic.sd b/sample-apps/http-api-using-searcher/src/main/application/searchdefinitions/basic.sd index 8f132254d4a..3c4920a1912 100644 --- a/sample-apps/http-api-using-searcher/src/main/application/searchdefinitions/basic.sd +++ b/sample-apps/http-api-using-searcher/src/main/application/searchdefinitions/basic.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 basic { document basic { diff --git a/sample-apps/http-api-using-searcher/src/main/application/services.xml b/sample-apps/http-api-using-searcher/src/main/application/services.xml index e879c3d4595..c1d04daae8f 100644 --- a/sample-apps/http-api-using-searcher/src/main/application/services.xml +++ b/sample-apps/http-api-using-searcher/src/main/application/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"> <container id="default" version="1.0"> diff --git a/sample-apps/http-api-using-searcher/src/main/java/com/yahoo/demo/DemoComponent.java b/sample-apps/http-api-using-searcher/src/main/java/com/yahoo/demo/DemoComponent.java index d9761d95b48..2182cebecb9 100644 --- a/sample-apps/http-api-using-searcher/src/main/java/com/yahoo/demo/DemoComponent.java +++ b/sample-apps/http-api-using-searcher/src/main/java/com/yahoo/demo/DemoComponent.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.demo; import com.yahoo.component.AbstractComponent; diff --git a/sample-apps/http-api-using-searcher/src/main/java/com/yahoo/demo/DemoHandler.java b/sample-apps/http-api-using-searcher/src/main/java/com/yahoo/demo/DemoHandler.java index e5a293846cc..cf14f6d58cd 100644 --- a/sample-apps/http-api-using-searcher/src/main/java/com/yahoo/demo/DemoHandler.java +++ b/sample-apps/http-api-using-searcher/src/main/java/com/yahoo/demo/DemoHandler.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.demo; import com.google.inject.Inject; diff --git a/sample-apps/http-api-using-searcher/src/main/java/com/yahoo/demo/DemoRenderer.java b/sample-apps/http-api-using-searcher/src/main/java/com/yahoo/demo/DemoRenderer.java index dd5ea469620..979c50f7f8f 100644 --- a/sample-apps/http-api-using-searcher/src/main/java/com/yahoo/demo/DemoRenderer.java +++ b/sample-apps/http-api-using-searcher/src/main/java/com/yahoo/demo/DemoRenderer.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.demo; import com.yahoo.search.Result; diff --git a/sample-apps/http-api-using-searcher/src/main/java/com/yahoo/demo/DemoSearcher.java b/sample-apps/http-api-using-searcher/src/main/java/com/yahoo/demo/DemoSearcher.java index 8f57cba6c8b..e749a3c1556 100644 --- a/sample-apps/http-api-using-searcher/src/main/java/com/yahoo/demo/DemoSearcher.java +++ b/sample-apps/http-api-using-searcher/src/main/java/com/yahoo/demo/DemoSearcher.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.demo; import com.yahoo.component.chain.dependencies.After; diff --git a/sample-apps/http-api-using-searcher/src/main/resources/configdefinitions/demo.def b/sample-apps/http-api-using-searcher/src/main/resources/configdefinitions/demo.def index 6b8d2782e1d..9a804089433 100644 --- a/sample-apps/http-api-using-searcher/src/main/resources/configdefinitions/demo.def +++ b/sample-apps/http-api-using-searcher/src/main/resources/configdefinitions/demo.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=demo demo[].term string diff --git a/sample-apps/http-api-using-searcher/src/test/java/com/yahoo/example/ApplicationMain.java b/sample-apps/http-api-using-searcher/src/test/java/com/yahoo/example/ApplicationMain.java index 0fcc176620a..638df584f92 100644 --- a/sample-apps/http-api-using-searcher/src/test/java/com/yahoo/example/ApplicationMain.java +++ b/sample-apps/http-api-using-searcher/src/test/java/com/yahoo/example/ApplicationMain.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.example; import com.yahoo.application.Networking; diff --git a/sample-apps/pom.xml b/sample-apps/pom.xml index cd054953152..d39e3d1e13f 100644 --- a/sample-apps/pom.xml +++ b/sample-apps/pom.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. --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>com.yahoo.vespa</groupId> |