You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by jh...@apache.org on 2014/08/01 01:41:23 UTC

[04/20] Change license headers from "Julian Hyde" to "ASF"; add headers where missing.

http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/bfa3daee/core/src/test/java/org/eigenbase/sql/test/SqlOperatorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/eigenbase/sql/test/SqlOperatorTest.java b/core/src/test/java/org/eigenbase/sql/test/SqlOperatorTest.java
index 5289386..0255406 100644
--- a/core/src/test/java/org/eigenbase/sql/test/SqlOperatorTest.java
+++ b/core/src/test/java/org/eigenbase/sql/test/SqlOperatorTest.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy of the License at
 //
 // http://www.apache.org/licenses/LICENSE-2.0
 //

http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/bfa3daee/core/src/test/java/org/eigenbase/sql/test/SqlPrettyWriterTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/eigenbase/sql/test/SqlPrettyWriterTest.java b/core/src/test/java/org/eigenbase/sql/test/SqlPrettyWriterTest.java
index 10997c1..27a07cc 100644
--- a/core/src/test/java/org/eigenbase/sql/test/SqlPrettyWriterTest.java
+++ b/core/src/test/java/org/eigenbase/sql/test/SqlPrettyWriterTest.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy of the License at
 //
 // http://www.apache.org/licenses/LICENSE-2.0
 //

http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/bfa3daee/core/src/test/java/org/eigenbase/sql/test/SqlTestFactory.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/eigenbase/sql/test/SqlTestFactory.java b/core/src/test/java/org/eigenbase/sql/test/SqlTestFactory.java
index d1f9c2b..03e41c7 100644
--- a/core/src/test/java/org/eigenbase/sql/test/SqlTestFactory.java
+++ b/core/src/test/java/org/eigenbase/sql/test/SqlTestFactory.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy of the License at
 //
 // http://www.apache.org/licenses/LICENSE-2.0
 //

http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/bfa3daee/core/src/test/java/org/eigenbase/sql/test/SqlTester.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/eigenbase/sql/test/SqlTester.java b/core/src/test/java/org/eigenbase/sql/test/SqlTester.java
index 753cd28..211c572 100644
--- a/core/src/test/java/org/eigenbase/sql/test/SqlTester.java
+++ b/core/src/test/java/org/eigenbase/sql/test/SqlTester.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy of the License at
 //
 // http://www.apache.org/licenses/LICENSE-2.0
 //

http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/bfa3daee/core/src/test/java/org/eigenbase/sql/test/SqlTesterImpl.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/eigenbase/sql/test/SqlTesterImpl.java b/core/src/test/java/org/eigenbase/sql/test/SqlTesterImpl.java
index 0ee3f44..4466b76 100644
--- a/core/src/test/java/org/eigenbase/sql/test/SqlTesterImpl.java
+++ b/core/src/test/java/org/eigenbase/sql/test/SqlTesterImpl.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy of the License at
 //
 // http://www.apache.org/licenses/LICENSE-2.0
 //

http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/bfa3daee/core/src/test/java/org/eigenbase/sql/test/SqlTests.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/eigenbase/sql/test/SqlTests.java b/core/src/test/java/org/eigenbase/sql/test/SqlTests.java
index 33fe445..93eed0a 100644
--- a/core/src/test/java/org/eigenbase/sql/test/SqlTests.java
+++ b/core/src/test/java/org/eigenbase/sql/test/SqlTests.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy of the License at
 //
 // http://www.apache.org/licenses/LICENSE-2.0
 //

http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/bfa3daee/core/src/test/java/org/eigenbase/sql/test/SqlTypeNameTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/eigenbase/sql/test/SqlTypeNameTest.java b/core/src/test/java/org/eigenbase/sql/test/SqlTypeNameTest.java
index 1f0ab45..ff71c9a 100644
--- a/core/src/test/java/org/eigenbase/sql/test/SqlTypeNameTest.java
+++ b/core/src/test/java/org/eigenbase/sql/test/SqlTypeNameTest.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy of the License at
 //
 // http://www.apache.org/licenses/LICENSE-2.0
 //

http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/bfa3daee/core/src/test/java/org/eigenbase/sql/test/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/eigenbase/sql/test/package-info.java b/core/src/test/java/org/eigenbase/sql/test/package-info.java
index 5439d9e..68ee5c7 100644
--- a/core/src/test/java/org/eigenbase/sql/test/package-info.java
+++ b/core/src/test/java/org/eigenbase/sql/test/package-info.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy of the License at
 //
 // http://www.apache.org/licenses/LICENSE-2.0
 //

http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/bfa3daee/core/src/test/java/org/eigenbase/test/DiffRepository.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/eigenbase/test/DiffRepository.java b/core/src/test/java/org/eigenbase/test/DiffRepository.java
index a608aa2..358482c 100644
--- a/core/src/test/java/org/eigenbase/test/DiffRepository.java
+++ b/core/src/test/java/org/eigenbase/test/DiffRepository.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy of the License at
 //
 // http://www.apache.org/licenses/LICENSE-2.0
 //

http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/bfa3daee/core/src/test/java/org/eigenbase/test/DiffTestCase.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/eigenbase/test/DiffTestCase.java b/core/src/test/java/org/eigenbase/test/DiffTestCase.java
index db932a3..5decf51 100644
--- a/core/src/test/java/org/eigenbase/test/DiffTestCase.java
+++ b/core/src/test/java/org/eigenbase/test/DiffTestCase.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy of the License at
 //
 // http://www.apache.org/licenses/LICENSE-2.0
 //

http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/bfa3daee/core/src/test/java/org/eigenbase/test/EigenbaseResourceTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/eigenbase/test/EigenbaseResourceTest.java b/core/src/test/java/org/eigenbase/test/EigenbaseResourceTest.java
index 64defb7..81ea0ac 100644
--- a/core/src/test/java/org/eigenbase/test/EigenbaseResourceTest.java
+++ b/core/src/test/java/org/eigenbase/test/EigenbaseResourceTest.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy of the License at
 //
 // http://www.apache.org/licenses/LICENSE-2.0
 //

http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/bfa3daee/core/src/test/java/org/eigenbase/test/EigenbaseTestCase.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/eigenbase/test/EigenbaseTestCase.java b/core/src/test/java/org/eigenbase/test/EigenbaseTestCase.java
index 5bfadb8..ded1d9c 100644
--- a/core/src/test/java/org/eigenbase/test/EigenbaseTestCase.java
+++ b/core/src/test/java/org/eigenbase/test/EigenbaseTestCase.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy of the License at
 //
 // http://www.apache.org/licenses/LICENSE-2.0
 //

http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/bfa3daee/core/src/test/java/org/eigenbase/test/FilteratorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/eigenbase/test/FilteratorTest.java b/core/src/test/java/org/eigenbase/test/FilteratorTest.java
index d5deb53..d16650f 100644
--- a/core/src/test/java/org/eigenbase/test/FilteratorTest.java
+++ b/core/src/test/java/org/eigenbase/test/FilteratorTest.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy of the License at
 //
 // http://www.apache.org/licenses/LICENSE-2.0
 //

http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/bfa3daee/core/src/test/java/org/eigenbase/test/HepPlannerTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/eigenbase/test/HepPlannerTest.java b/core/src/test/java/org/eigenbase/test/HepPlannerTest.java
index cc9c965..8508bd5 100644
--- a/core/src/test/java/org/eigenbase/test/HepPlannerTest.java
+++ b/core/src/test/java/org/eigenbase/test/HepPlannerTest.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy of the License at
 //
 // http://www.apache.org/licenses/LICENSE-2.0
 //

http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/bfa3daee/core/src/test/java/org/eigenbase/test/MockCatalogReader.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/eigenbase/test/MockCatalogReader.java b/core/src/test/java/org/eigenbase/test/MockCatalogReader.java
index 4038dc9..365a171 100644
--- a/core/src/test/java/org/eigenbase/test/MockCatalogReader.java
+++ b/core/src/test/java/org/eigenbase/test/MockCatalogReader.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy of the License at
 //
 // http://www.apache.org/licenses/LICENSE-2.0
 //

http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/bfa3daee/core/src/test/java/org/eigenbase/test/MockRelOptCost.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/eigenbase/test/MockRelOptCost.java b/core/src/test/java/org/eigenbase/test/MockRelOptCost.java
index 8a9eafe..d413d69 100644
--- a/core/src/test/java/org/eigenbase/test/MockRelOptCost.java
+++ b/core/src/test/java/org/eigenbase/test/MockRelOptCost.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy of the License at
 //
 // http://www.apache.org/licenses/LICENSE-2.0
 //

http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/bfa3daee/core/src/test/java/org/eigenbase/test/MockRelOptPlanner.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/eigenbase/test/MockRelOptPlanner.java b/core/src/test/java/org/eigenbase/test/MockRelOptPlanner.java
index 72919dc..c518fd2 100644
--- a/core/src/test/java/org/eigenbase/test/MockRelOptPlanner.java
+++ b/core/src/test/java/org/eigenbase/test/MockRelOptPlanner.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy of the License at
 //
 // http://www.apache.org/licenses/LICENSE-2.0
 //

http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/bfa3daee/core/src/test/java/org/eigenbase/test/MockSqlOperatorTable.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/eigenbase/test/MockSqlOperatorTable.java b/core/src/test/java/org/eigenbase/test/MockSqlOperatorTable.java
index 671a1da..5a4bd79 100644
--- a/core/src/test/java/org/eigenbase/test/MockSqlOperatorTable.java
+++ b/core/src/test/java/org/eigenbase/test/MockSqlOperatorTable.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy of the License at
 //
 // http://www.apache.org/licenses/LICENSE-2.0
 //

http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/bfa3daee/core/src/test/java/org/eigenbase/test/RelMetadataTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/eigenbase/test/RelMetadataTest.java b/core/src/test/java/org/eigenbase/test/RelMetadataTest.java
index 63be2f9..646ed09 100644
--- a/core/src/test/java/org/eigenbase/test/RelMetadataTest.java
+++ b/core/src/test/java/org/eigenbase/test/RelMetadataTest.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy of the License at
 //
 // http://www.apache.org/licenses/LICENSE-2.0
 //

http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/bfa3daee/core/src/test/java/org/eigenbase/test/RelOptRulesTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/eigenbase/test/RelOptRulesTest.java b/core/src/test/java/org/eigenbase/test/RelOptRulesTest.java
index 8378563..fa982fc 100644
--- a/core/src/test/java/org/eigenbase/test/RelOptRulesTest.java
+++ b/core/src/test/java/org/eigenbase/test/RelOptRulesTest.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy of the License at
 //
 // http://www.apache.org/licenses/LICENSE-2.0
 //

http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/bfa3daee/core/src/test/java/org/eigenbase/test/RelOptTestBase.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/eigenbase/test/RelOptTestBase.java b/core/src/test/java/org/eigenbase/test/RelOptTestBase.java
index 6f5f612..93e05b0 100644
--- a/core/src/test/java/org/eigenbase/test/RelOptTestBase.java
+++ b/core/src/test/java/org/eigenbase/test/RelOptTestBase.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy of the License at
 //
 // http://www.apache.org/licenses/LICENSE-2.0
 //

http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/bfa3daee/core/src/test/java/org/eigenbase/test/RexProgramTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/eigenbase/test/RexProgramTest.java b/core/src/test/java/org/eigenbase/test/RexProgramTest.java
index 3a65eae..cd9e6d2 100644
--- a/core/src/test/java/org/eigenbase/test/RexProgramTest.java
+++ b/core/src/test/java/org/eigenbase/test/RexProgramTest.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy of the License at
 //
 // http://www.apache.org/licenses/LICENSE-2.0
 //

http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/bfa3daee/core/src/test/java/org/eigenbase/test/RexTransformerTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/eigenbase/test/RexTransformerTest.java b/core/src/test/java/org/eigenbase/test/RexTransformerTest.java
index 0549e30..8654b1a 100644
--- a/core/src/test/java/org/eigenbase/test/RexTransformerTest.java
+++ b/core/src/test/java/org/eigenbase/test/RexTransformerTest.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy of the License at
 //
 // http://www.apache.org/licenses/LICENSE-2.0
 //

http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/bfa3daee/core/src/test/java/org/eigenbase/test/SargTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/eigenbase/test/SargTest.java b/core/src/test/java/org/eigenbase/test/SargTest.java
index 3c0467b..18104a7 100644
--- a/core/src/test/java/org/eigenbase/test/SargTest.java
+++ b/core/src/test/java/org/eigenbase/test/SargTest.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy of the License at
 //
 // http://www.apache.org/licenses/LICENSE-2.0
 //

http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/bfa3daee/core/src/test/java/org/eigenbase/test/SqlLimitsTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/eigenbase/test/SqlLimitsTest.java b/core/src/test/java/org/eigenbase/test/SqlLimitsTest.java
index b2219ae..7efe2d9 100644
--- a/core/src/test/java/org/eigenbase/test/SqlLimitsTest.java
+++ b/core/src/test/java/org/eigenbase/test/SqlLimitsTest.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy of the License at
 //
 // http://www.apache.org/licenses/LICENSE-2.0
 //

http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/bfa3daee/core/src/test/java/org/eigenbase/test/SqlTestGen.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/eigenbase/test/SqlTestGen.java b/core/src/test/java/org/eigenbase/test/SqlTestGen.java
index 8e1d1fe..2c4bf41 100644
--- a/core/src/test/java/org/eigenbase/test/SqlTestGen.java
+++ b/core/src/test/java/org/eigenbase/test/SqlTestGen.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy of the License at
 //
 // http://www.apache.org/licenses/LICENSE-2.0
 //

http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/bfa3daee/core/src/test/java/org/eigenbase/test/SqlToRelConverterTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/eigenbase/test/SqlToRelConverterTest.java b/core/src/test/java/org/eigenbase/test/SqlToRelConverterTest.java
index aae14db..39927bc 100644
--- a/core/src/test/java/org/eigenbase/test/SqlToRelConverterTest.java
+++ b/core/src/test/java/org/eigenbase/test/SqlToRelConverterTest.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy of the License at
 //
 // http://www.apache.org/licenses/LICENSE-2.0
 //
@@ -713,7 +712,7 @@ public class SqlToRelConverterTest extends SqlToRelTestBase {
     // union of subquery, inside from list, also values
     check(
         "select deptno from emp as emp0 cross join\n"
-        + " (select empno from emp union all \n"
+        + " (select empno from emp union all\n"
         + "  select deptno from dept where deptno > 20 union all\n"
         + "  values (45), (67))",
         "${plan}");

http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/bfa3daee/core/src/test/java/org/eigenbase/test/SqlToRelTestBase.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/eigenbase/test/SqlToRelTestBase.java b/core/src/test/java/org/eigenbase/test/SqlToRelTestBase.java
index b18a0ee..d8b78a8 100644
--- a/core/src/test/java/org/eigenbase/test/SqlToRelTestBase.java
+++ b/core/src/test/java/org/eigenbase/test/SqlToRelTestBase.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy of the License at
 //
 // http://www.apache.org/licenses/LICENSE-2.0
 //

http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/bfa3daee/core/src/test/java/org/eigenbase/test/SqlValidatorFeatureTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/eigenbase/test/SqlValidatorFeatureTest.java b/core/src/test/java/org/eigenbase/test/SqlValidatorFeatureTest.java
index c346ccb..9b8981b 100644
--- a/core/src/test/java/org/eigenbase/test/SqlValidatorFeatureTest.java
+++ b/core/src/test/java/org/eigenbase/test/SqlValidatorFeatureTest.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy of the License at
 //
 // http://www.apache.org/licenses/LICENSE-2.0
 //

http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/bfa3daee/core/src/test/java/org/eigenbase/test/SqlValidatorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/eigenbase/test/SqlValidatorTest.java b/core/src/test/java/org/eigenbase/test/SqlValidatorTest.java
index f3e2819..a64f32b 100644
--- a/core/src/test/java/org/eigenbase/test/SqlValidatorTest.java
+++ b/core/src/test/java/org/eigenbase/test/SqlValidatorTest.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy of the License at
 //
 // http://www.apache.org/licenses/LICENSE-2.0
 //

http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/bfa3daee/core/src/test/java/org/eigenbase/test/SqlValidatorTestCase.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/eigenbase/test/SqlValidatorTestCase.java b/core/src/test/java/org/eigenbase/test/SqlValidatorTestCase.java
index 3a8ac56..49b59ec 100644
--- a/core/src/test/java/org/eigenbase/test/SqlValidatorTestCase.java
+++ b/core/src/test/java/org/eigenbase/test/SqlValidatorTestCase.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy of the License at
 //
 // http://www.apache.org/licenses/LICENSE-2.0
 //

http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/bfa3daee/core/src/test/java/org/eigenbase/test/concurrent/ConcurrentTestCommand.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/eigenbase/test/concurrent/ConcurrentTestCommand.java b/core/src/test/java/org/eigenbase/test/concurrent/ConcurrentTestCommand.java
index fa48bf2..ec4ab18 100644
--- a/core/src/test/java/org/eigenbase/test/concurrent/ConcurrentTestCommand.java
+++ b/core/src/test/java/org/eigenbase/test/concurrent/ConcurrentTestCommand.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy of the License at
 //
 // http://www.apache.org/licenses/LICENSE-2.0
 //

http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/bfa3daee/core/src/test/java/org/eigenbase/test/concurrent/ConcurrentTestCommandExecutor.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/eigenbase/test/concurrent/ConcurrentTestCommandExecutor.java b/core/src/test/java/org/eigenbase/test/concurrent/ConcurrentTestCommandExecutor.java
index b876d32..7515b01 100644
--- a/core/src/test/java/org/eigenbase/test/concurrent/ConcurrentTestCommandExecutor.java
+++ b/core/src/test/java/org/eigenbase/test/concurrent/ConcurrentTestCommandExecutor.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy of the License at
 //
 // http://www.apache.org/licenses/LICENSE-2.0
 //

http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/bfa3daee/core/src/test/java/org/eigenbase/test/concurrent/ConcurrentTestCommandGenerator.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/eigenbase/test/concurrent/ConcurrentTestCommandGenerator.java b/core/src/test/java/org/eigenbase/test/concurrent/ConcurrentTestCommandGenerator.java
index 443ce08..e3e151a 100644
--- a/core/src/test/java/org/eigenbase/test/concurrent/ConcurrentTestCommandGenerator.java
+++ b/core/src/test/java/org/eigenbase/test/concurrent/ConcurrentTestCommandGenerator.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy of the License at
 //
 // http://www.apache.org/licenses/LICENSE-2.0
 //

http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/bfa3daee/core/src/test/java/org/eigenbase/test/concurrent/ConcurrentTestCommandScript.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/eigenbase/test/concurrent/ConcurrentTestCommandScript.java b/core/src/test/java/org/eigenbase/test/concurrent/ConcurrentTestCommandScript.java
index 6717eea..b6a3a5d 100644
--- a/core/src/test/java/org/eigenbase/test/concurrent/ConcurrentTestCommandScript.java
+++ b/core/src/test/java/org/eigenbase/test/concurrent/ConcurrentTestCommandScript.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy of the License at
 //
 // http://www.apache.org/licenses/LICENSE-2.0
 //

http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/bfa3daee/core/src/test/java/org/eigenbase/test/concurrent/ConcurrentTestPlugin.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/eigenbase/test/concurrent/ConcurrentTestPlugin.java b/core/src/test/java/org/eigenbase/test/concurrent/ConcurrentTestPlugin.java
index 68cd31f..3786c7a 100644
--- a/core/src/test/java/org/eigenbase/test/concurrent/ConcurrentTestPlugin.java
+++ b/core/src/test/java/org/eigenbase/test/concurrent/ConcurrentTestPlugin.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy of the License at
 //
 // http://www.apache.org/licenses/LICENSE-2.0
 //

http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/bfa3daee/core/src/test/java/org/eigenbase/test/concurrent/ConcurrentTestPluginCommand.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/eigenbase/test/concurrent/ConcurrentTestPluginCommand.java b/core/src/test/java/org/eigenbase/test/concurrent/ConcurrentTestPluginCommand.java
index 8301b72..9f25e40 100644
--- a/core/src/test/java/org/eigenbase/test/concurrent/ConcurrentTestPluginCommand.java
+++ b/core/src/test/java/org/eigenbase/test/concurrent/ConcurrentTestPluginCommand.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy of the License at
 //
 // http://www.apache.org/licenses/LICENSE-2.0
 //

http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/bfa3daee/core/src/test/java/org/eigenbase/test/concurrent/ConcurrentTestTimedCommandGenerator.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/eigenbase/test/concurrent/ConcurrentTestTimedCommandGenerator.java b/core/src/test/java/org/eigenbase/test/concurrent/ConcurrentTestTimedCommandGenerator.java
index 64454d0..263d3f2 100644
--- a/core/src/test/java/org/eigenbase/test/concurrent/ConcurrentTestTimedCommandGenerator.java
+++ b/core/src/test/java/org/eigenbase/test/concurrent/ConcurrentTestTimedCommandGenerator.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy of the License at
 //
 // http://www.apache.org/licenses/LICENSE-2.0
 //

http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/bfa3daee/core/src/test/java/org/eigenbase/test/concurrent/SamplePlugin.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/eigenbase/test/concurrent/SamplePlugin.java b/core/src/test/java/org/eigenbase/test/concurrent/SamplePlugin.java
index 6479b1a..52db132 100644
--- a/core/src/test/java/org/eigenbase/test/concurrent/SamplePlugin.java
+++ b/core/src/test/java/org/eigenbase/test/concurrent/SamplePlugin.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy of the License at
 //
 // http://www.apache.org/licenses/LICENSE-2.0
 //

http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/bfa3daee/core/src/test/java/org/eigenbase/test/concurrent/mtsql
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/eigenbase/test/concurrent/mtsql b/core/src/test/java/org/eigenbase/test/concurrent/mtsql
deleted file mode 100755
index 4bcaabe..0000000
--- a/core/src/test/java/org/eigenbase/test/concurrent/mtsql
+++ /dev/null
@@ -1,14 +0,0 @@
-#! /bin/bash
-# $Id$
-# Command-line tool to run an mtsql script.
-# Usage: mtlsql [-vg] -u URL -d DRIVER [-n USER] [-p PASSWORD] SCRIPT [SCRIPT]...
-#   -u URL : sets the server connected to; argument is a jdbc URL. Required.
-#   -d DRIVER : specifies the jdbc driver class. Required.
-#   -v : print sql results to stdout
-#   -g : print some trace messages to stderr
-
-# TODO: handle -g and -d here, not in java code.
-
-JFLAGS="-client -ea -esa -Djava.util.logging.config.file=$(dirname $0)/mtsql.loggers"
-java $JFLAGS -cp $CLASSPATH org.eigenbase.test.concurrent.ConcurrentTestCommandScript "$@"
-exit $?

http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/bfa3daee/core/src/test/java/org/eigenbase/test/concurrent/mtsql.loggers
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/eigenbase/test/concurrent/mtsql.loggers b/core/src/test/java/org/eigenbase/test/concurrent/mtsql.loggers
deleted file mode 100644
index a3277b5..0000000
--- a/core/src/test/java/org/eigenbase/test/concurrent/mtsql.loggers
+++ /dev/null
@@ -1,3 +0,0 @@
-handlers=java.util.logging.ConsoleHandler
-.level=WARNING
-

http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/bfa3daee/core/src/test/java/org/eigenbase/test/concurrent/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/eigenbase/test/concurrent/package-info.java b/core/src/test/java/org/eigenbase/test/concurrent/package-info.java
index 87522b7..df06aad 100644
--- a/core/src/test/java/org/eigenbase/test/concurrent/package-info.java
+++ b/core/src/test/java/org/eigenbase/test/concurrent/package-info.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy of the License at
 //
 // http://www.apache.org/licenses/LICENSE-2.0
 //

http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/bfa3daee/core/src/test/java/org/eigenbase/test/concurrent/test.mtsql
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/eigenbase/test/concurrent/test.mtsql b/core/src/test/java/org/eigenbase/test/concurrent/test.mtsql
deleted file mode 100644
index f73f302..0000000
--- a/core/src/test/java/org/eigenbase/test/concurrent/test.mtsql
+++ /dev/null
@@ -1,71 +0,0 @@
--- for manual testing of the tool 'mtsql'
--- expects to connect to farrago
--- $Id$
-
-@var N=7
-@var S=bagel bag
-@var HOSTNAME
-@var USER
-@var WHO=$USER@$HOSTNAME
-@var RecursiveVar=$N $S $HOSTNAME $WHO
-
-@setup
- create schema foo;
- create view foo.crossview as (
-   select * from sales.depts x 
-   cross join sales.emps y
-   cross join sales.emps z
- );
-@end
-
-@cleanup
-  drop schema foo cascade;
-@end
-
-@thread reader
-  @shell pwd
-  @shell echo mtsql*
-  @shell hostname; whoami
-  @shell head -1 < package.html | cat | cat > foo; cat foo
-  @echo $$N is $N and $$S is $S.
-  @echo The $$HOSTNAME is $HOSTNAME.
-  @echo The $$HOSTNAME is $HOSTNAME, ${HOSTNAME}, "$HOSTNAME", "${HOSTNAME}", '$HOSTNAME', '${HOSTNAME}'.
-  @echo The $$HOSTNAME is "$HOSTNAME, ${HOSTNAME}".
-  @echo $$WHO is $WHO
-  @echo $$RecursiveVar is $RecursiveVar
-
-  values (1,2,3);
-  values (4, '$HOSTNAME', '$USER@$HOSTNAME');
-  values ($N, '$S');
-  select * from sales.depts;
-  @sync
-@end
-
-@thread printer
-  @prepare select * from foo.crossview;
-  @sync
-
-  @echo printing all
-  @print all
-  @fetch 
-
-  @echo printing none
-  @print none
-  @fetch 
-
-  @echo printing every 5th row
-  @print count every 5
-  @fetch 
-
-  @echo printing every ${N}th row
-  @print count every $N
-  @fetch 
-
-  @echo printing every other row
-  @print count every 2
-  @fetch 
-  
-  @close
-@end
-
-