aboutsummaryrefslogtreecommitdiffstats
path: root/vespa-hadoop/src/test
diff options
context:
space:
mode:
authorJon Bratseth <jonbratseth@yahoo.com>2017-06-14 17:21:56 +0200
committerGitHub <noreply@github.com>2017-06-14 17:21:56 +0200
commitd7b09dc811c113279eeda75a131092e9175a01e7 (patch)
treec3bb3995db89a30b6b6145c1d8860043377faccc /vespa-hadoop/src/test
parent0b863030d8faf851dbaf6427b3cdb0d92d99b203 (diff)
parenta07d24f2484d4ca56bcd5a1ddd18438ced099ae7 (diff)
Merge pull request #2774 from yahoo/bratseth/update-copyright-headers
Update copyright headers
Diffstat (limited to 'vespa-hadoop/src/test')
-rw-r--r--vespa-hadoop/src/test/java/com/yahoo/vespa/hadoop/pig/MapReduceTest.java1
-rw-r--r--vespa-hadoop/src/test/java/com/yahoo/vespa/hadoop/pig/VespaDocumentOperationTest.java1
-rw-r--r--vespa-hadoop/src/test/java/com/yahoo/vespa/hadoop/pig/VespaQueryTest.java1
-rw-r--r--vespa-hadoop/src/test/java/com/yahoo/vespa/hadoop/pig/VespaStorageTest.java1
-rw-r--r--vespa-hadoop/src/test/java/com/yahoo/vespa/hadoop/util/MockQueryHandler.java1
-rw-r--r--vespa-hadoop/src/test/java/com/yahoo/vespa/hadoop/util/TupleToolsTest.java1
-rw-r--r--vespa-hadoop/src/test/pig/feed_create_operations.pig1
-rw-r--r--vespa-hadoop/src/test/pig/feed_create_operations_short_form.pig1
-rw-r--r--vespa-hadoop/src/test/pig/feed_multiline_operations.pig1
-rw-r--r--vespa-hadoop/src/test/pig/feed_operations.pig1
-rw-r--r--vespa-hadoop/src/test/pig/feed_operations_with_json_loader.pig1
-rw-r--r--vespa-hadoop/src/test/pig/feed_operations_xml.pig1
-rw-r--r--vespa-hadoop/src/test/pig/feed_visit_data.pig1
-rw-r--r--vespa-hadoop/src/test/pig/query.pig1
-rw-r--r--vespa-hadoop/src/test/pig/query_alt_root.pig1
-rw-r--r--vespa-hadoop/src/test/resources/operations_data.xml1
16 files changed, 16 insertions, 0 deletions
diff --git a/vespa-hadoop/src/test/java/com/yahoo/vespa/hadoop/pig/MapReduceTest.java b/vespa-hadoop/src/test/java/com/yahoo/vespa/hadoop/pig/MapReduceTest.java
index a79f63a77ce..ebb34dbc1b1 100644
--- a/vespa-hadoop/src/test/java/com/yahoo/vespa/hadoop/pig/MapReduceTest.java
+++ b/vespa-hadoop/src/test/java/com/yahoo/vespa/hadoop/pig/MapReduceTest.java
@@ -1,3 +1,4 @@
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.vespa.hadoop.pig;
import com.fasterxml.jackson.core.JsonEncoding;
diff --git a/vespa-hadoop/src/test/java/com/yahoo/vespa/hadoop/pig/VespaDocumentOperationTest.java b/vespa-hadoop/src/test/java/com/yahoo/vespa/hadoop/pig/VespaDocumentOperationTest.java
index 0e1a8fba17c..6ff13f5c4fa 100644
--- a/vespa-hadoop/src/test/java/com/yahoo/vespa/hadoop/pig/VespaDocumentOperationTest.java
+++ b/vespa-hadoop/src/test/java/com/yahoo/vespa/hadoop/pig/VespaDocumentOperationTest.java
@@ -1,3 +1,4 @@
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.vespa.hadoop.pig;
import org.apache.pig.data.*;
diff --git a/vespa-hadoop/src/test/java/com/yahoo/vespa/hadoop/pig/VespaQueryTest.java b/vespa-hadoop/src/test/java/com/yahoo/vespa/hadoop/pig/VespaQueryTest.java
index 0f123904cfb..2d55017b13e 100644
--- a/vespa-hadoop/src/test/java/com/yahoo/vespa/hadoop/pig/VespaQueryTest.java
+++ b/vespa-hadoop/src/test/java/com/yahoo/vespa/hadoop/pig/VespaQueryTest.java
@@ -1,3 +1,4 @@
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.vespa.hadoop.pig;
import com.sun.net.httpserver.HttpServer;
diff --git a/vespa-hadoop/src/test/java/com/yahoo/vespa/hadoop/pig/VespaStorageTest.java b/vespa-hadoop/src/test/java/com/yahoo/vespa/hadoop/pig/VespaStorageTest.java
index 322c729b8c5..7ca401a0cc8 100644
--- a/vespa-hadoop/src/test/java/com/yahoo/vespa/hadoop/pig/VespaStorageTest.java
+++ b/vespa-hadoop/src/test/java/com/yahoo/vespa/hadoop/pig/VespaStorageTest.java
@@ -1,3 +1,4 @@
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.vespa.hadoop.pig;
import static org.junit.Assert.assertEquals;
diff --git a/vespa-hadoop/src/test/java/com/yahoo/vespa/hadoop/util/MockQueryHandler.java b/vespa-hadoop/src/test/java/com/yahoo/vespa/hadoop/util/MockQueryHandler.java
index 0bf9f6b447e..ab571b284e9 100644
--- a/vespa-hadoop/src/test/java/com/yahoo/vespa/hadoop/util/MockQueryHandler.java
+++ b/vespa-hadoop/src/test/java/com/yahoo/vespa/hadoop/util/MockQueryHandler.java
@@ -1,3 +1,4 @@
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.vespa.hadoop.util;
import com.fasterxml.jackson.core.JsonEncoding;
diff --git a/vespa-hadoop/src/test/java/com/yahoo/vespa/hadoop/util/TupleToolsTest.java b/vespa-hadoop/src/test/java/com/yahoo/vespa/hadoop/util/TupleToolsTest.java
index c98e7b1c02c..27080a8b2af 100644
--- a/vespa-hadoop/src/test/java/com/yahoo/vespa/hadoop/util/TupleToolsTest.java
+++ b/vespa-hadoop/src/test/java/com/yahoo/vespa/hadoop/util/TupleToolsTest.java
@@ -1,3 +1,4 @@
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.vespa.hadoop.util;
import com.yahoo.vespa.hadoop.mapreduce.util.TupleTools;
diff --git a/vespa-hadoop/src/test/pig/feed_create_operations.pig b/vespa-hadoop/src/test/pig/feed_create_operations.pig
index 2186935b59a..53a5712d0f2 100644
--- a/vespa-hadoop/src/test/pig/feed_create_operations.pig
+++ b/vespa-hadoop/src/test/pig/feed_create_operations.pig
@@ -1,3 +1,4 @@
+-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-- REGISTER vespa-hadoop.jar -- Not needed in tests
-- Create valid Vespa put operations
diff --git a/vespa-hadoop/src/test/pig/feed_create_operations_short_form.pig b/vespa-hadoop/src/test/pig/feed_create_operations_short_form.pig
index 348616f00ad..ccede2a30b9 100644
--- a/vespa-hadoop/src/test/pig/feed_create_operations_short_form.pig
+++ b/vespa-hadoop/src/test/pig/feed_create_operations_short_form.pig
@@ -1,3 +1,4 @@
+-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-- REGISTER vespa-hadoop.jar -- Not needed in tests
-- Transform tabular data to a Vespa document operation JSON format
diff --git a/vespa-hadoop/src/test/pig/feed_multiline_operations.pig b/vespa-hadoop/src/test/pig/feed_multiline_operations.pig
index e9efb36858b..bd232c49cb3 100644
--- a/vespa-hadoop/src/test/pig/feed_multiline_operations.pig
+++ b/vespa-hadoop/src/test/pig/feed_multiline_operations.pig
@@ -1,3 +1,4 @@
+-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-- REGISTER vespa-hadoop.jar -- Not needed in tests
-- Define short name for VespaJsonLoader
diff --git a/vespa-hadoop/src/test/pig/feed_operations.pig b/vespa-hadoop/src/test/pig/feed_operations.pig
index 3939d43d68e..d2d1af4c417 100644
--- a/vespa-hadoop/src/test/pig/feed_operations.pig
+++ b/vespa-hadoop/src/test/pig/feed_operations.pig
@@ -1,3 +1,4 @@
+-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-- REGISTER vespa-hadoop.jar -- Not needed in tests
-- Define short name for VespaStorage
diff --git a/vespa-hadoop/src/test/pig/feed_operations_with_json_loader.pig b/vespa-hadoop/src/test/pig/feed_operations_with_json_loader.pig
index e6163591997..a1788db8570 100644
--- a/vespa-hadoop/src/test/pig/feed_operations_with_json_loader.pig
+++ b/vespa-hadoop/src/test/pig/feed_operations_with_json_loader.pig
@@ -1,3 +1,4 @@
+-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-- REGISTER vespa-hadoop.jar -- Not needed in tests
-- Define short name for VespaJsonLoader
diff --git a/vespa-hadoop/src/test/pig/feed_operations_xml.pig b/vespa-hadoop/src/test/pig/feed_operations_xml.pig
index 3b06753a045..835c2a033e3 100644
--- a/vespa-hadoop/src/test/pig/feed_operations_xml.pig
+++ b/vespa-hadoop/src/test/pig/feed_operations_xml.pig
@@ -1,3 +1,4 @@
+-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-- REGISTER vespa-hadoop.jar -- Not needed in tests
-- Define short name for VespaStorage
diff --git a/vespa-hadoop/src/test/pig/feed_visit_data.pig b/vespa-hadoop/src/test/pig/feed_visit_data.pig
index 14010c38336..28d7d4be353 100644
--- a/vespa-hadoop/src/test/pig/feed_visit_data.pig
+++ b/vespa-hadoop/src/test/pig/feed_visit_data.pig
@@ -1,3 +1,4 @@
+-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-- REGISTER vespa-hadoop.jar -- Not needed in tests
-- Define short name for VespaStorage
diff --git a/vespa-hadoop/src/test/pig/query.pig b/vespa-hadoop/src/test/pig/query.pig
index 70f53a992e2..ee8e0d3848e 100644
--- a/vespa-hadoop/src/test/pig/query.pig
+++ b/vespa-hadoop/src/test/pig/query.pig
@@ -1,3 +1,4 @@
+-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-- REGISTER vespa-hadoop.jar -- Not needed in tests
-- Define Vespa query for retrieving blog posts
diff --git a/vespa-hadoop/src/test/pig/query_alt_root.pig b/vespa-hadoop/src/test/pig/query_alt_root.pig
index 8995990e398..18ead97dde1 100644
--- a/vespa-hadoop/src/test/pig/query_alt_root.pig
+++ b/vespa-hadoop/src/test/pig/query_alt_root.pig
@@ -1,3 +1,4 @@
+-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-- REGISTER vespa-hadoop.jar -- Not needed in tests
-- Define Vespa query for retrieving blog posts
diff --git a/vespa-hadoop/src/test/resources/operations_data.xml b/vespa-hadoop/src/test/resources/operations_data.xml
index cdf1ca78c1d..d8399675211 100644
--- a/vespa-hadoop/src/test/resources/operations_data.xml
+++ b/vespa-hadoop/src/test/resources/operations_data.xml
@@ -1,4 +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. -->
<vespafeed>
<document documenttype="music" documentid="id:music:music::http://music.yahoo.com/a-ha/Scoundrel+Days"> <url>http://music.yahoo.com/a-ha/Scoundrel+Days</url> <title><![CDATA[Scoundrel Days]]></title> <artist><![CDATA[a-ha]]></artist> <year>0</year> <popularity>290</popularity> </document>
<document documenttype="music" documentid="id:music:music::http://music.yahoo.com/Accept/Restless+And+Wild"> <url>http://music.yahoo.com/Accept/Restless+And+Wild</url> <title><![CDATA[Restless And Wild]]></title> <artist><![CDATA[Accept]]></artist> <year>0</year> <popularity>75</popularity> </document>