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:21 UTC

[02/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/test/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/eigenbase/test/package-info.java b/core/src/test/java/org/eigenbase/test/package-info.java
index b6127c5..c652c0d 100644
--- a/core/src/test/java/org/eigenbase/test/package-info.java
+++ b/core/src/test/java/org/eigenbase/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/util/ChunkListTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/eigenbase/util/ChunkListTest.java b/core/src/test/java/org/eigenbase/util/ChunkListTest.java
index ccb53ea..36ad527 100644
--- a/core/src/test/java/org/eigenbase/util/ChunkListTest.java
+++ b/core/src/test/java/org/eigenbase/util/ChunkListTest.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/util/PermutationTestCase.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/eigenbase/util/PermutationTestCase.java b/core/src/test/java/org/eigenbase/util/PermutationTestCase.java
index eca6fa9..b081376 100644
--- a/core/src/test/java/org/eigenbase/util/PermutationTestCase.java
+++ b/core/src/test/java/org/eigenbase/util/PermutationTestCase.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/util/ReflectVisitorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/eigenbase/util/ReflectVisitorTest.java b/core/src/test/java/org/eigenbase/util/ReflectVisitorTest.java
index 41f7dbf..0dac465 100644
--- a/core/src/test/java/org/eigenbase/util/ReflectVisitorTest.java
+++ b/core/src/test/java/org/eigenbase/util/ReflectVisitorTest.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/util/TestUtil.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/eigenbase/util/TestUtil.java b/core/src/test/java/org/eigenbase/util/TestUtil.java
index 8fa1859..79ec2ae 100644
--- a/core/src/test/java/org/eigenbase/util/TestUtil.java
+++ b/core/src/test/java/org/eigenbase/util/TestUtil.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/util/UtilTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/eigenbase/util/UtilTest.java b/core/src/test/java/org/eigenbase/util/UtilTest.java
index c621791..c9c19b1 100644
--- a/core/src/test/java/org/eigenbase/util/UtilTest.java
+++ b/core/src/test/java/org/eigenbase/util/UtilTest.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/util/mapping/MappingTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/eigenbase/util/mapping/MappingTest.java b/core/src/test/java/org/eigenbase/util/mapping/MappingTest.java
index 4304b9a..040756c 100644
--- a/core/src/test/java/org/eigenbase/util/mapping/MappingTest.java
+++ b/core/src/test/java/org/eigenbase/util/mapping/MappingTest.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/resources/org/eigenbase/sql/test/SqlPrettyWriterTest.xml
----------------------------------------------------------------------
diff --git a/core/src/test/resources/org/eigenbase/sql/test/SqlPrettyWriterTest.xml b/core/src/test/resources/org/eigenbase/sql/test/SqlPrettyWriterTest.xml
index 572447b..38d4240 100644
--- a/core/src/test/resources/org/eigenbase/sql/test/SqlPrettyWriterTest.xml
+++ b/core/src/test/resources/org/eigenbase/sql/test/SqlPrettyWriterTest.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" ?>
+<!--
+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
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
 <Root>
   <TestCase name="testDefault">
     <Resource name="desc"/>

http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/bfa3daee/core/src/test/resources/org/eigenbase/test/HepPlannerTest.xml
----------------------------------------------------------------------
diff --git a/core/src/test/resources/org/eigenbase/test/HepPlannerTest.xml b/core/src/test/resources/org/eigenbase/test/HepPlannerTest.xml
index 15bbd98..bf758ad 100644
--- a/core/src/test/resources/org/eigenbase/test/HepPlannerTest.xml
+++ b/core/src/test/resources/org/eigenbase/test/HepPlannerTest.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" ?>
+<!--
+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
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
 <Root>
   <TestCase name="testReplaceCommonSubexpression">
     <Resource name="sql">

http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/bfa3daee/core/src/test/resources/org/eigenbase/test/RelOptRulesTest.xml
----------------------------------------------------------------------
diff --git a/core/src/test/resources/org/eigenbase/test/RelOptRulesTest.xml b/core/src/test/resources/org/eigenbase/test/RelOptRulesTest.xml
index 68ba466..f783941 100644
--- a/core/src/test/resources/org/eigenbase/test/RelOptRulesTest.xml
+++ b/core/src/test/resources/org/eigenbase/test/RelOptRulesTest.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" ?>
+<!--
+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
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
 <Root>
     <TestCase name="testUnionToDistinctRule">
         <Resource name="sql">

http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/bfa3daee/core/src/test/resources/org/eigenbase/test/SqlLimitsTest.xml
----------------------------------------------------------------------
diff --git a/core/src/test/resources/org/eigenbase/test/SqlLimitsTest.xml b/core/src/test/resources/org/eigenbase/test/SqlLimitsTest.xml
index 940cf2e..0ea34eb 100644
--- a/core/src/test/resources/org/eigenbase/test/SqlLimitsTest.xml
+++ b/core/src/test/resources/org/eigenbase/test/SqlLimitsTest.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" ?>
+<!--
+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
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
 <Root>
   <TestCase name="testPrintLimits">
     <Resource name="output">

http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/bfa3daee/core/src/test/resources/org/eigenbase/test/SqlToRelConverterTest.xml
----------------------------------------------------------------------
diff --git a/core/src/test/resources/org/eigenbase/test/SqlToRelConverterTest.xml b/core/src/test/resources/org/eigenbase/test/SqlToRelConverterTest.xml
index c2cc97d..ae448bc 100644
--- a/core/src/test/resources/org/eigenbase/test/SqlToRelConverterTest.xml
+++ b/core/src/test/resources/org/eigenbase/test/SqlToRelConverterTest.xml
@@ -1,5 +1,20 @@
 <?xml version="1.0" ?>
-<!--    $Id: //open/dev/farrago/src/org/eigenbase/test/SqlToRelConverterTest.ref.xml#31 $    -->
+<!--
+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
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
 <Root>
     <TestCase name="testCase">
         <Resource name="plan">
@@ -599,7 +614,7 @@ ProjectRel(DEPTNO=[$7])
         </Resource>
         <Resource name="sql">
             <![CDATA[select deptno from emp as emp0 cross join
- (select empno from emp union all 
+ (select empno from emp union all
   select deptno from dept where deptno > 20 union all
   values (45), (67))]]>
         </Resource>

http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/bfa3daee/core/src/test/resources/sql/agg.oq
----------------------------------------------------------------------
diff --git a/core/src/test/resources/sql/agg.oq b/core/src/test/resources/sql/agg.oq
index e9aef88..51bed8b 100644
--- a/core/src/test/resources/sql/agg.oq
+++ b/core/src/test/resources/sql/agg.oq
@@ -1,4 +1,20 @@
 # agg.oq - Aggregate functions
+#
+# 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
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 !use post
 !set outputformat mysql
 

http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/bfa3daee/core/src/test/resources/sql/misc.oq
----------------------------------------------------------------------
diff --git a/core/src/test/resources/sql/misc.oq b/core/src/test/resources/sql/misc.oq
index aaa7f83..b4924cc 100644
--- a/core/src/test/resources/sql/misc.oq
+++ b/core/src/test/resources/sql/misc.oq
@@ -1,4 +1,20 @@
 # misc.oq - Miscellaneous queries
+#
+# 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
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 !use post
 !set outputformat mysql
 

http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/bfa3daee/core/src/test/resources/sql/outer.oq
----------------------------------------------------------------------
diff --git a/core/src/test/resources/sql/outer.oq b/core/src/test/resources/sql/outer.oq
index b718949..7936692 100644
--- a/core/src/test/resources/sql/outer.oq
+++ b/core/src/test/resources/sql/outer.oq
@@ -1,4 +1,20 @@
 # outer.oq - Various kinds of outer join
+#
+# 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
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 !use post
 !set outputformat mysql
 

http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/bfa3daee/core/src/test/resources/sql/winagg.oq
----------------------------------------------------------------------
diff --git a/core/src/test/resources/sql/winagg.oq b/core/src/test/resources/sql/winagg.oq
index 15ec494..8fd7d10 100644
--- a/core/src/test/resources/sql/winagg.oq
+++ b/core/src/test/resources/sql/winagg.oq
@@ -1,4 +1,20 @@
 # winagg.oq - Unit tests for windowed aggregation, verified on Postgres
+#
+# 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
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 !use post
 !set outputformat psql
 !if (false) {

http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/bfa3daee/mongodb/pom.xml
----------------------------------------------------------------------
diff --git a/mongodb/pom.xml b/mongodb/pom.xml
index 114cb08..6242cf1 100644
--- a/mongodb/pom.xml
+++ b/mongodb/pom.xml
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
 <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>
   <parent>

http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/bfa3daee/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoAggregateRel.java
----------------------------------------------------------------------
diff --git a/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoAggregateRel.java b/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoAggregateRel.java
index 1e753bc..9144e39 100644
--- a/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoAggregateRel.java
+++ b/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoAggregateRel.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/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoEnumerator.java
----------------------------------------------------------------------
diff --git a/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoEnumerator.java b/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoEnumerator.java
index 9ca45d8..1462005 100644
--- a/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoEnumerator.java
+++ b/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoEnumerator.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/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoFilterRel.java
----------------------------------------------------------------------
diff --git a/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoFilterRel.java b/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoFilterRel.java
index 0212754..ad20562 100644
--- a/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoFilterRel.java
+++ b/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoFilterRel.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/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoMethod.java
----------------------------------------------------------------------
diff --git a/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoMethod.java b/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoMethod.java
index cadf5d5..318e118 100644
--- a/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoMethod.java
+++ b/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoMethod.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/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoProjectRel.java
----------------------------------------------------------------------
diff --git a/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoProjectRel.java b/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoProjectRel.java
index 2034da3..74689f6 100644
--- a/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoProjectRel.java
+++ b/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoProjectRel.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/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoRel.java
----------------------------------------------------------------------
diff --git a/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoRel.java b/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoRel.java
index 6b320e9..0c0c8a2 100644
--- a/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoRel.java
+++ b/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoRel.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/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoRules.java
----------------------------------------------------------------------
diff --git a/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoRules.java b/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoRules.java
index a3576f4..1d43b1f 100644
--- a/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoRules.java
+++ b/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoRules.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/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoSchema.java
----------------------------------------------------------------------
diff --git a/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoSchema.java b/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoSchema.java
index abfd492..b0600d6 100644
--- a/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoSchema.java
+++ b/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoSchema.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/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoSchemaFactory.java
----------------------------------------------------------------------
diff --git a/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoSchemaFactory.java b/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoSchemaFactory.java
index f650ace..660ff27 100644
--- a/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoSchemaFactory.java
+++ b/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoSchemaFactory.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/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoSortRel.java
----------------------------------------------------------------------
diff --git a/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoSortRel.java b/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoSortRel.java
index f34382d..cc470fd 100644
--- a/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoSortRel.java
+++ b/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoSortRel.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/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoTable.java
----------------------------------------------------------------------
diff --git a/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoTable.java b/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoTable.java
index 2f938fe..f1d81d1 100644
--- a/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoTable.java
+++ b/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoTable.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/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoTableScan.java
----------------------------------------------------------------------
diff --git a/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoTableScan.java b/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoTableScan.java
index 8530e90..abe19db 100644
--- a/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoTableScan.java
+++ b/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoTableScan.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/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoToEnumerableConverter.java
----------------------------------------------------------------------
diff --git a/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoToEnumerableConverter.java b/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoToEnumerableConverter.java
index 35b9aa8..a1bf278 100644
--- a/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoToEnumerableConverter.java
+++ b/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoToEnumerableConverter.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/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoToEnumerableConverterRule.java
----------------------------------------------------------------------
diff --git a/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoToEnumerableConverterRule.java b/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoToEnumerableConverterRule.java
index c297681..5634deb 100644
--- a/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoToEnumerableConverterRule.java
+++ b/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/MongoToEnumerableConverterRule.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/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/package-info.java
----------------------------------------------------------------------
diff --git a/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/package-info.java b/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/package-info.java
index edaf09b..236b657 100644
--- a/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/package-info.java
+++ b/mongodb/src/main/java/net/hydromatic/optiq/impl/mongodb/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/mongodb/src/test/java/net/hydromatic/optiq/test/MongoAdapterTest.java
----------------------------------------------------------------------
diff --git a/mongodb/src/test/java/net/hydromatic/optiq/test/MongoAdapterTest.java b/mongodb/src/test/java/net/hydromatic/optiq/test/MongoAdapterTest.java
index 9d53112..0185a98 100644
--- a/mongodb/src/test/java/net/hydromatic/optiq/test/MongoAdapterTest.java
+++ b/mongodb/src/test/java/net/hydromatic/optiq/test/MongoAdapterTest.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/mongodb/src/test/java/net/hydromatic/optiq/test/package-info.java
----------------------------------------------------------------------
diff --git a/mongodb/src/test/java/net/hydromatic/optiq/test/package-info.java b/mongodb/src/test/java/net/hydromatic/optiq/test/package-info.java
index 345b3d8..90df564 100644
--- a/mongodb/src/test/java/net/hydromatic/optiq/test/package-info.java
+++ b/mongodb/src/test/java/net/hydromatic/optiq/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/mongodb/src/test/resources/mongo-foodmart-model.json
----------------------------------------------------------------------
diff --git a/mongodb/src/test/resources/mongo-foodmart-model.json b/mongodb/src/test/resources/mongo-foodmart-model.json
index 6850b17..9e302da 100644
--- a/mongodb/src/test/resources/mongo-foodmart-model.json
+++ b/mongodb/src/test/resources/mongo-foodmart-model.json
@@ -1,3 +1,19 @@
+/*
+// 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
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+*/
 {
   version: '1.0',
   defaultSchema: 'foodmart',

http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/bfa3daee/mongodb/src/test/resources/mongo-zips-model.json
----------------------------------------------------------------------
diff --git a/mongodb/src/test/resources/mongo-zips-model.json b/mongodb/src/test/resources/mongo-zips-model.json
index b9ae9e9..f6d2f6a 100644
--- a/mongodb/src/test/resources/mongo-zips-model.json
+++ b/mongodb/src/test/resources/mongo-zips-model.json
@@ -1,3 +1,19 @@
+/*
+// 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
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+*/
 {
   version: '1.0',
   defaultSchema: 'mongo',

http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/bfa3daee/plus/pom.xml
----------------------------------------------------------------------
diff --git a/plus/pom.xml b/plus/pom.xml
index e1222b8..03f05dd 100644
--- a/plus/pom.xml
+++ b/plus/pom.xml
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
 <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>
   <parent>

http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/bfa3daee/plus/src/main/java/net/hydromatic/optiq/impl/tpcds/TpcdsSchema.java
----------------------------------------------------------------------
diff --git a/plus/src/main/java/net/hydromatic/optiq/impl/tpcds/TpcdsSchema.java b/plus/src/main/java/net/hydromatic/optiq/impl/tpcds/TpcdsSchema.java
index 9a3d35f..23b1e06 100644
--- a/plus/src/main/java/net/hydromatic/optiq/impl/tpcds/TpcdsSchema.java
+++ b/plus/src/main/java/net/hydromatic/optiq/impl/tpcds/TpcdsSchema.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/plus/src/main/java/net/hydromatic/optiq/impl/tpcds/TpcdsSchemaFactory.java
----------------------------------------------------------------------
diff --git a/plus/src/main/java/net/hydromatic/optiq/impl/tpcds/TpcdsSchemaFactory.java b/plus/src/main/java/net/hydromatic/optiq/impl/tpcds/TpcdsSchemaFactory.java
index 385ad23..a428f26 100644
--- a/plus/src/main/java/net/hydromatic/optiq/impl/tpcds/TpcdsSchemaFactory.java
+++ b/plus/src/main/java/net/hydromatic/optiq/impl/tpcds/TpcdsSchemaFactory.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/plus/src/main/java/net/hydromatic/optiq/impl/tpcds/package-info.java
----------------------------------------------------------------------
diff --git a/plus/src/main/java/net/hydromatic/optiq/impl/tpcds/package-info.java b/plus/src/main/java/net/hydromatic/optiq/impl/tpcds/package-info.java
index bdb334d..814c99a 100644
--- a/plus/src/main/java/net/hydromatic/optiq/impl/tpcds/package-info.java
+++ b/plus/src/main/java/net/hydromatic/optiq/impl/tpcds/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/plus/src/main/java/net/hydromatic/optiq/impl/tpch/TpchSchema.java
----------------------------------------------------------------------
diff --git a/plus/src/main/java/net/hydromatic/optiq/impl/tpch/TpchSchema.java b/plus/src/main/java/net/hydromatic/optiq/impl/tpch/TpchSchema.java
index c449bfe..d408eae 100644
--- a/plus/src/main/java/net/hydromatic/optiq/impl/tpch/TpchSchema.java
+++ b/plus/src/main/java/net/hydromatic/optiq/impl/tpch/TpchSchema.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/plus/src/main/java/net/hydromatic/optiq/impl/tpch/TpchSchemaFactory.java
----------------------------------------------------------------------
diff --git a/plus/src/main/java/net/hydromatic/optiq/impl/tpch/TpchSchemaFactory.java b/plus/src/main/java/net/hydromatic/optiq/impl/tpch/TpchSchemaFactory.java
index 03a8490..5d5225a 100644
--- a/plus/src/main/java/net/hydromatic/optiq/impl/tpch/TpchSchemaFactory.java
+++ b/plus/src/main/java/net/hydromatic/optiq/impl/tpch/TpchSchemaFactory.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/plus/src/main/java/net/hydromatic/optiq/impl/tpch/package-info.java
----------------------------------------------------------------------
diff --git a/plus/src/main/java/net/hydromatic/optiq/impl/tpch/package-info.java b/plus/src/main/java/net/hydromatic/optiq/impl/tpch/package-info.java
index b1143fe..36973bd 100644
--- a/plus/src/main/java/net/hydromatic/optiq/impl/tpch/package-info.java
+++ b/plus/src/main/java/net/hydromatic/optiq/impl/tpch/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/plus/src/test/java/net/hydromatic/optiq/impl/tpcds/TpcdsTest.java
----------------------------------------------------------------------
diff --git a/plus/src/test/java/net/hydromatic/optiq/impl/tpcds/TpcdsTest.java b/plus/src/test/java/net/hydromatic/optiq/impl/tpcds/TpcdsTest.java
index 38e2005..0897aa7 100644
--- a/plus/src/test/java/net/hydromatic/optiq/impl/tpcds/TpcdsTest.java
+++ b/plus/src/test/java/net/hydromatic/optiq/impl/tpcds/TpcdsTest.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/plus/src/test/java/net/hydromatic/optiq/impl/tpch/TpchTest.java
----------------------------------------------------------------------
diff --git a/plus/src/test/java/net/hydromatic/optiq/impl/tpch/TpchTest.java b/plus/src/test/java/net/hydromatic/optiq/impl/tpch/TpchTest.java
index daa4174..1acd7d2 100644
--- a/plus/src/test/java/net/hydromatic/optiq/impl/tpch/TpchTest.java
+++ b/plus/src/test/java/net/hydromatic/optiq/impl/tpch/TpchTest.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/plus/src/test/java/net/hydromatic/optiq/test/PlusSuite.java
----------------------------------------------------------------------
diff --git a/plus/src/test/java/net/hydromatic/optiq/test/PlusSuite.java b/plus/src/test/java/net/hydromatic/optiq/test/PlusSuite.java
index d829063..72f7553 100644
--- a/plus/src/test/java/net/hydromatic/optiq/test/PlusSuite.java
+++ b/plus/src/test/java/net/hydromatic/optiq/test/PlusSuite.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/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a367bc4..7759ddc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
 <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>
   <parent>

http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/bfa3daee/spark/pom.xml
----------------------------------------------------------------------
diff --git a/spark/pom.xml b/spark/pom.xml
index ee42215..1e46364 100644
--- a/spark/pom.xml
+++ b/spark/pom.xml
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
 <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>
   <parent>

http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/bfa3daee/spark/src/main/java/net/hydromatic/optiq/impl/spark/EnumerableToSparkConverter.java
----------------------------------------------------------------------
diff --git a/spark/src/main/java/net/hydromatic/optiq/impl/spark/EnumerableToSparkConverter.java b/spark/src/main/java/net/hydromatic/optiq/impl/spark/EnumerableToSparkConverter.java
index 823b09c..942fa8d 100644
--- a/spark/src/main/java/net/hydromatic/optiq/impl/spark/EnumerableToSparkConverter.java
+++ b/spark/src/main/java/net/hydromatic/optiq/impl/spark/EnumerableToSparkConverter.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/spark/src/main/java/net/hydromatic/optiq/impl/spark/EnumerableToSparkConverterRule.java
----------------------------------------------------------------------
diff --git a/spark/src/main/java/net/hydromatic/optiq/impl/spark/EnumerableToSparkConverterRule.java b/spark/src/main/java/net/hydromatic/optiq/impl/spark/EnumerableToSparkConverterRule.java
index 8c5bb6c..a79b08f 100644
--- a/spark/src/main/java/net/hydromatic/optiq/impl/spark/EnumerableToSparkConverterRule.java
+++ b/spark/src/main/java/net/hydromatic/optiq/impl/spark/EnumerableToSparkConverterRule.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/spark/src/main/java/net/hydromatic/optiq/impl/spark/HttpServer.java
----------------------------------------------------------------------
diff --git a/spark/src/main/java/net/hydromatic/optiq/impl/spark/HttpServer.java b/spark/src/main/java/net/hydromatic/optiq/impl/spark/HttpServer.java
index 0bbdb1a..a364f4c 100644
--- a/spark/src/main/java/net/hydromatic/optiq/impl/spark/HttpServer.java
+++ b/spark/src/main/java/net/hydromatic/optiq/impl/spark/HttpServer.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/spark/src/main/java/net/hydromatic/optiq/impl/spark/JdbcToSparkConverter.java
----------------------------------------------------------------------
diff --git a/spark/src/main/java/net/hydromatic/optiq/impl/spark/JdbcToSparkConverter.java b/spark/src/main/java/net/hydromatic/optiq/impl/spark/JdbcToSparkConverter.java
index 1a74d95..8e6fe2f 100644
--- a/spark/src/main/java/net/hydromatic/optiq/impl/spark/JdbcToSparkConverter.java
+++ b/spark/src/main/java/net/hydromatic/optiq/impl/spark/JdbcToSparkConverter.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/spark/src/main/java/net/hydromatic/optiq/impl/spark/JdbcToSparkConverterRule.java
----------------------------------------------------------------------
diff --git a/spark/src/main/java/net/hydromatic/optiq/impl/spark/JdbcToSparkConverterRule.java b/spark/src/main/java/net/hydromatic/optiq/impl/spark/JdbcToSparkConverterRule.java
index 18e25ff..91034c2 100644
--- a/spark/src/main/java/net/hydromatic/optiq/impl/spark/JdbcToSparkConverterRule.java
+++ b/spark/src/main/java/net/hydromatic/optiq/impl/spark/JdbcToSparkConverterRule.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/spark/src/main/java/net/hydromatic/optiq/impl/spark/SparkHandlerImpl.java
----------------------------------------------------------------------
diff --git a/spark/src/main/java/net/hydromatic/optiq/impl/spark/SparkHandlerImpl.java b/spark/src/main/java/net/hydromatic/optiq/impl/spark/SparkHandlerImpl.java
index b2c0c5a..c0ec489 100644
--- a/spark/src/main/java/net/hydromatic/optiq/impl/spark/SparkHandlerImpl.java
+++ b/spark/src/main/java/net/hydromatic/optiq/impl/spark/SparkHandlerImpl.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/spark/src/main/java/net/hydromatic/optiq/impl/spark/SparkMethod.java
----------------------------------------------------------------------
diff --git a/spark/src/main/java/net/hydromatic/optiq/impl/spark/SparkMethod.java b/spark/src/main/java/net/hydromatic/optiq/impl/spark/SparkMethod.java
index 56e57a9..bf54a72 100644
--- a/spark/src/main/java/net/hydromatic/optiq/impl/spark/SparkMethod.java
+++ b/spark/src/main/java/net/hydromatic/optiq/impl/spark/SparkMethod.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/spark/src/main/java/net/hydromatic/optiq/impl/spark/SparkRel.java
----------------------------------------------------------------------
diff --git a/spark/src/main/java/net/hydromatic/optiq/impl/spark/SparkRel.java b/spark/src/main/java/net/hydromatic/optiq/impl/spark/SparkRel.java
index 1bd7553..445d301 100644
--- a/spark/src/main/java/net/hydromatic/optiq/impl/spark/SparkRel.java
+++ b/spark/src/main/java/net/hydromatic/optiq/impl/spark/SparkRel.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/spark/src/main/java/net/hydromatic/optiq/impl/spark/SparkRules.java
----------------------------------------------------------------------
diff --git a/spark/src/main/java/net/hydromatic/optiq/impl/spark/SparkRules.java b/spark/src/main/java/net/hydromatic/optiq/impl/spark/SparkRules.java
index fbeecf2..c43b6be 100644
--- a/spark/src/main/java/net/hydromatic/optiq/impl/spark/SparkRules.java
+++ b/spark/src/main/java/net/hydromatic/optiq/impl/spark/SparkRules.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/spark/src/main/java/net/hydromatic/optiq/impl/spark/SparkRuntime.java
----------------------------------------------------------------------
diff --git a/spark/src/main/java/net/hydromatic/optiq/impl/spark/SparkRuntime.java b/spark/src/main/java/net/hydromatic/optiq/impl/spark/SparkRuntime.java
index 71d112c..1f5c22f 100644
--- a/spark/src/main/java/net/hydromatic/optiq/impl/spark/SparkRuntime.java
+++ b/spark/src/main/java/net/hydromatic/optiq/impl/spark/SparkRuntime.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/spark/src/main/java/net/hydromatic/optiq/impl/spark/SparkToEnumerableConverter.java
----------------------------------------------------------------------
diff --git a/spark/src/main/java/net/hydromatic/optiq/impl/spark/SparkToEnumerableConverter.java b/spark/src/main/java/net/hydromatic/optiq/impl/spark/SparkToEnumerableConverter.java
index c021889..3a68b91 100644
--- a/spark/src/main/java/net/hydromatic/optiq/impl/spark/SparkToEnumerableConverter.java
+++ b/spark/src/main/java/net/hydromatic/optiq/impl/spark/SparkToEnumerableConverter.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/spark/src/main/java/net/hydromatic/optiq/impl/spark/package-info.java
----------------------------------------------------------------------
diff --git a/spark/src/main/java/net/hydromatic/optiq/impl/spark/package-info.java b/spark/src/main/java/net/hydromatic/optiq/impl/spark/package-info.java
index a94d684..87a1382 100644
--- a/spark/src/main/java/net/hydromatic/optiq/impl/spark/package-info.java
+++ b/spark/src/main/java/net/hydromatic/optiq/impl/spark/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/spark/src/test/java/net/hydromatic/optiq/test/SparkAdapterTest.java
----------------------------------------------------------------------
diff --git a/spark/src/test/java/net/hydromatic/optiq/test/SparkAdapterTest.java b/spark/src/test/java/net/hydromatic/optiq/test/SparkAdapterTest.java
index c21b7fe..2a3aa5f 100644
--- a/spark/src/test/java/net/hydromatic/optiq/test/SparkAdapterTest.java
+++ b/spark/src/test/java/net/hydromatic/optiq/test/SparkAdapterTest.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/spark/src/test/java/net/hydromatic/optiq/test/package-info.java
----------------------------------------------------------------------
diff --git a/spark/src/test/java/net/hydromatic/optiq/test/package-info.java b/spark/src/test/java/net/hydromatic/optiq/test/package-info.java
index 655130a..efa92d2 100644
--- a/spark/src/test/java/net/hydromatic/optiq/test/package-info.java
+++ b/spark/src/test/java/net/hydromatic/optiq/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
 //