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:36 UTC
[17/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/main/java/net/hydromatic/optiq/impl/clone/ColumnLoader.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/impl/clone/ColumnLoader.java b/core/src/main/java/net/hydromatic/optiq/impl/clone/ColumnLoader.java
index 41f7e9c..085a893 100644
--- a/core/src/main/java/net/hydromatic/optiq/impl/clone/ColumnLoader.java
+++ b/core/src/main/java/net/hydromatic/optiq/impl/clone/ColumnLoader.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/main/java/net/hydromatic/optiq/impl/clone/ListTable.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/impl/clone/ListTable.java b/core/src/main/java/net/hydromatic/optiq/impl/clone/ListTable.java
index 1267197..1c3309d 100644
--- a/core/src/main/java/net/hydromatic/optiq/impl/clone/ListTable.java
+++ b/core/src/main/java/net/hydromatic/optiq/impl/clone/ListTable.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/main/java/net/hydromatic/optiq/impl/clone/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/impl/clone/package-info.java b/core/src/main/java/net/hydromatic/optiq/impl/clone/package-info.java
index 6227ab4..6597841 100644
--- a/core/src/main/java/net/hydromatic/optiq/impl/clone/package-info.java
+++ b/core/src/main/java/net/hydromatic/optiq/impl/clone/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/main/java/net/hydromatic/optiq/impl/java/AbstractQueryableTable.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/impl/java/AbstractQueryableTable.java b/core/src/main/java/net/hydromatic/optiq/impl/java/AbstractQueryableTable.java
index a27b00f..95b0094 100644
--- a/core/src/main/java/net/hydromatic/optiq/impl/java/AbstractQueryableTable.java
+++ b/core/src/main/java/net/hydromatic/optiq/impl/java/AbstractQueryableTable.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/main/java/net/hydromatic/optiq/impl/java/JavaTypeFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/impl/java/JavaTypeFactory.java b/core/src/main/java/net/hydromatic/optiq/impl/java/JavaTypeFactory.java
index 5b68e8b..3ff19cd 100644
--- a/core/src/main/java/net/hydromatic/optiq/impl/java/JavaTypeFactory.java
+++ b/core/src/main/java/net/hydromatic/optiq/impl/java/JavaTypeFactory.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/main/java/net/hydromatic/optiq/impl/java/ReflectiveSchema.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/impl/java/ReflectiveSchema.java b/core/src/main/java/net/hydromatic/optiq/impl/java/ReflectiveSchema.java
index f464124..eab7c04 100644
--- a/core/src/main/java/net/hydromatic/optiq/impl/java/ReflectiveSchema.java
+++ b/core/src/main/java/net/hydromatic/optiq/impl/java/ReflectiveSchema.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/main/java/net/hydromatic/optiq/impl/java/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/impl/java/package-info.java b/core/src/main/java/net/hydromatic/optiq/impl/java/package-info.java
index cd8e79f..d299328 100644
--- a/core/src/main/java/net/hydromatic/optiq/impl/java/package-info.java
+++ b/core/src/main/java/net/hydromatic/optiq/impl/java/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/main/java/net/hydromatic/optiq/impl/jdbc/JdbcConvention.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/impl/jdbc/JdbcConvention.java b/core/src/main/java/net/hydromatic/optiq/impl/jdbc/JdbcConvention.java
index c48baad..5cceaa2 100644
--- a/core/src/main/java/net/hydromatic/optiq/impl/jdbc/JdbcConvention.java
+++ b/core/src/main/java/net/hydromatic/optiq/impl/jdbc/JdbcConvention.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/main/java/net/hydromatic/optiq/impl/jdbc/JdbcImplementor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/impl/jdbc/JdbcImplementor.java b/core/src/main/java/net/hydromatic/optiq/impl/jdbc/JdbcImplementor.java
index b588fdf..5375911 100644
--- a/core/src/main/java/net/hydromatic/optiq/impl/jdbc/JdbcImplementor.java
+++ b/core/src/main/java/net/hydromatic/optiq/impl/jdbc/JdbcImplementor.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/main/java/net/hydromatic/optiq/impl/jdbc/JdbcQueryProvider.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/impl/jdbc/JdbcQueryProvider.java b/core/src/main/java/net/hydromatic/optiq/impl/jdbc/JdbcQueryProvider.java
index 064feb4..a88504d 100644
--- a/core/src/main/java/net/hydromatic/optiq/impl/jdbc/JdbcQueryProvider.java
+++ b/core/src/main/java/net/hydromatic/optiq/impl/jdbc/JdbcQueryProvider.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/main/java/net/hydromatic/optiq/impl/jdbc/JdbcRel.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/impl/jdbc/JdbcRel.java b/core/src/main/java/net/hydromatic/optiq/impl/jdbc/JdbcRel.java
index 01fcde7..de13513 100644
--- a/core/src/main/java/net/hydromatic/optiq/impl/jdbc/JdbcRel.java
+++ b/core/src/main/java/net/hydromatic/optiq/impl/jdbc/JdbcRel.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/main/java/net/hydromatic/optiq/impl/jdbc/JdbcRules.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/impl/jdbc/JdbcRules.java b/core/src/main/java/net/hydromatic/optiq/impl/jdbc/JdbcRules.java
index 9009dad..9165e2a 100644
--- a/core/src/main/java/net/hydromatic/optiq/impl/jdbc/JdbcRules.java
+++ b/core/src/main/java/net/hydromatic/optiq/impl/jdbc/JdbcRules.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/main/java/net/hydromatic/optiq/impl/jdbc/JdbcSchema.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/impl/jdbc/JdbcSchema.java b/core/src/main/java/net/hydromatic/optiq/impl/jdbc/JdbcSchema.java
index 460be5a..d1360b5 100644
--- a/core/src/main/java/net/hydromatic/optiq/impl/jdbc/JdbcSchema.java
+++ b/core/src/main/java/net/hydromatic/optiq/impl/jdbc/JdbcSchema.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/main/java/net/hydromatic/optiq/impl/jdbc/JdbcTable.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/impl/jdbc/JdbcTable.java b/core/src/main/java/net/hydromatic/optiq/impl/jdbc/JdbcTable.java
index b750076..68e13a0 100644
--- a/core/src/main/java/net/hydromatic/optiq/impl/jdbc/JdbcTable.java
+++ b/core/src/main/java/net/hydromatic/optiq/impl/jdbc/JdbcTable.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/main/java/net/hydromatic/optiq/impl/jdbc/JdbcTableScan.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/impl/jdbc/JdbcTableScan.java b/core/src/main/java/net/hydromatic/optiq/impl/jdbc/JdbcTableScan.java
index 2bc5941..6c1769a 100644
--- a/core/src/main/java/net/hydromatic/optiq/impl/jdbc/JdbcTableScan.java
+++ b/core/src/main/java/net/hydromatic/optiq/impl/jdbc/JdbcTableScan.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/main/java/net/hydromatic/optiq/impl/jdbc/JdbcToEnumerableConverter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/impl/jdbc/JdbcToEnumerableConverter.java b/core/src/main/java/net/hydromatic/optiq/impl/jdbc/JdbcToEnumerableConverter.java
index d2302f9..02551af 100644
--- a/core/src/main/java/net/hydromatic/optiq/impl/jdbc/JdbcToEnumerableConverter.java
+++ b/core/src/main/java/net/hydromatic/optiq/impl/jdbc/JdbcToEnumerableConverter.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/main/java/net/hydromatic/optiq/impl/jdbc/JdbcToEnumerableConverterRule.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/impl/jdbc/JdbcToEnumerableConverterRule.java b/core/src/main/java/net/hydromatic/optiq/impl/jdbc/JdbcToEnumerableConverterRule.java
index 3e096b7..7f7c427 100644
--- a/core/src/main/java/net/hydromatic/optiq/impl/jdbc/JdbcToEnumerableConverterRule.java
+++ b/core/src/main/java/net/hydromatic/optiq/impl/jdbc/JdbcToEnumerableConverterRule.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/main/java/net/hydromatic/optiq/impl/jdbc/JdbcUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/impl/jdbc/JdbcUtils.java b/core/src/main/java/net/hydromatic/optiq/impl/jdbc/JdbcUtils.java
index f4140f2..27c30e1 100644
--- a/core/src/main/java/net/hydromatic/optiq/impl/jdbc/JdbcUtils.java
+++ b/core/src/main/java/net/hydromatic/optiq/impl/jdbc/JdbcUtils.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/main/java/net/hydromatic/optiq/impl/jdbc/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/impl/jdbc/package-info.java b/core/src/main/java/net/hydromatic/optiq/impl/jdbc/package-info.java
index da5b968..2c2ffe2 100644
--- a/core/src/main/java/net/hydromatic/optiq/impl/jdbc/package-info.java
+++ b/core/src/main/java/net/hydromatic/optiq/impl/jdbc/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/main/java/net/hydromatic/optiq/impl/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/impl/package-info.java b/core/src/main/java/net/hydromatic/optiq/impl/package-info.java
index 4f647f9..09688e6 100644
--- a/core/src/main/java/net/hydromatic/optiq/impl/package-info.java
+++ b/core/src/main/java/net/hydromatic/optiq/impl/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/main/java/net/hydromatic/optiq/jdbc/Driver.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/jdbc/Driver.java b/core/src/main/java/net/hydromatic/optiq/jdbc/Driver.java
index 6998f4e..22e921f 100644
--- a/core/src/main/java/net/hydromatic/optiq/jdbc/Driver.java
+++ b/core/src/main/java/net/hydromatic/optiq/jdbc/Driver.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/main/java/net/hydromatic/optiq/jdbc/JavaRecordType.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/jdbc/JavaRecordType.java b/core/src/main/java/net/hydromatic/optiq/jdbc/JavaRecordType.java
index ed1e22f..6963643 100644
--- a/core/src/main/java/net/hydromatic/optiq/jdbc/JavaRecordType.java
+++ b/core/src/main/java/net/hydromatic/optiq/jdbc/JavaRecordType.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/main/java/net/hydromatic/optiq/jdbc/JavaTypeFactoryImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/jdbc/JavaTypeFactoryImpl.java b/core/src/main/java/net/hydromatic/optiq/jdbc/JavaTypeFactoryImpl.java
index a0d1db6..4aa8d4f 100644
--- a/core/src/main/java/net/hydromatic/optiq/jdbc/JavaTypeFactoryImpl.java
+++ b/core/src/main/java/net/hydromatic/optiq/jdbc/JavaTypeFactoryImpl.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/main/java/net/hydromatic/optiq/jdbc/MetaImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/jdbc/MetaImpl.java b/core/src/main/java/net/hydromatic/optiq/jdbc/MetaImpl.java
index 8d55458..53ae3b2 100644
--- a/core/src/main/java/net/hydromatic/optiq/jdbc/MetaImpl.java
+++ b/core/src/main/java/net/hydromatic/optiq/jdbc/MetaImpl.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/main/java/net/hydromatic/optiq/jdbc/MetadataSchema.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/jdbc/MetadataSchema.java b/core/src/main/java/net/hydromatic/optiq/jdbc/MetadataSchema.java
index 9c40f63..2c1f2a1 100644
--- a/core/src/main/java/net/hydromatic/optiq/jdbc/MetadataSchema.java
+++ b/core/src/main/java/net/hydromatic/optiq/jdbc/MetadataSchema.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/main/java/net/hydromatic/optiq/jdbc/OptiqConnection.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/jdbc/OptiqConnection.java b/core/src/main/java/net/hydromatic/optiq/jdbc/OptiqConnection.java
index 449c14a..f696ef2 100644
--- a/core/src/main/java/net/hydromatic/optiq/jdbc/OptiqConnection.java
+++ b/core/src/main/java/net/hydromatic/optiq/jdbc/OptiqConnection.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/main/java/net/hydromatic/optiq/jdbc/OptiqConnectionImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/jdbc/OptiqConnectionImpl.java b/core/src/main/java/net/hydromatic/optiq/jdbc/OptiqConnectionImpl.java
index f05eca6..f4bac67 100644
--- a/core/src/main/java/net/hydromatic/optiq/jdbc/OptiqConnectionImpl.java
+++ b/core/src/main/java/net/hydromatic/optiq/jdbc/OptiqConnectionImpl.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/main/java/net/hydromatic/optiq/jdbc/OptiqFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/jdbc/OptiqFactory.java b/core/src/main/java/net/hydromatic/optiq/jdbc/OptiqFactory.java
index 8de0898..952c4da 100644
--- a/core/src/main/java/net/hydromatic/optiq/jdbc/OptiqFactory.java
+++ b/core/src/main/java/net/hydromatic/optiq/jdbc/OptiqFactory.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/main/java/net/hydromatic/optiq/jdbc/OptiqJdbc40Factory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/jdbc/OptiqJdbc40Factory.java b/core/src/main/java/net/hydromatic/optiq/jdbc/OptiqJdbc40Factory.java
index 378466a..6f4f2c8 100644
--- a/core/src/main/java/net/hydromatic/optiq/jdbc/OptiqJdbc40Factory.java
+++ b/core/src/main/java/net/hydromatic/optiq/jdbc/OptiqJdbc40Factory.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/main/java/net/hydromatic/optiq/jdbc/OptiqJdbc41Factory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/jdbc/OptiqJdbc41Factory.java b/core/src/main/java/net/hydromatic/optiq/jdbc/OptiqJdbc41Factory.java
index ba65a35..545027d 100644
--- a/core/src/main/java/net/hydromatic/optiq/jdbc/OptiqJdbc41Factory.java
+++ b/core/src/main/java/net/hydromatic/optiq/jdbc/OptiqJdbc41Factory.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/main/java/net/hydromatic/optiq/jdbc/OptiqPrepare.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/jdbc/OptiqPrepare.java b/core/src/main/java/net/hydromatic/optiq/jdbc/OptiqPrepare.java
index 41f44f6..bd7197c 100644
--- a/core/src/main/java/net/hydromatic/optiq/jdbc/OptiqPrepare.java
+++ b/core/src/main/java/net/hydromatic/optiq/jdbc/OptiqPrepare.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/main/java/net/hydromatic/optiq/jdbc/OptiqPreparedStatement.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/jdbc/OptiqPreparedStatement.java b/core/src/main/java/net/hydromatic/optiq/jdbc/OptiqPreparedStatement.java
index f127f3a..05f362d 100644
--- a/core/src/main/java/net/hydromatic/optiq/jdbc/OptiqPreparedStatement.java
+++ b/core/src/main/java/net/hydromatic/optiq/jdbc/OptiqPreparedStatement.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/main/java/net/hydromatic/optiq/jdbc/OptiqResultSet.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/jdbc/OptiqResultSet.java b/core/src/main/java/net/hydromatic/optiq/jdbc/OptiqResultSet.java
index 0b89447..7e32922 100644
--- a/core/src/main/java/net/hydromatic/optiq/jdbc/OptiqResultSet.java
+++ b/core/src/main/java/net/hydromatic/optiq/jdbc/OptiqResultSet.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/main/java/net/hydromatic/optiq/jdbc/OptiqRootSchema.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/jdbc/OptiqRootSchema.java b/core/src/main/java/net/hydromatic/optiq/jdbc/OptiqRootSchema.java
index 6b1532a..ddaac17 100644
--- a/core/src/main/java/net/hydromatic/optiq/jdbc/OptiqRootSchema.java
+++ b/core/src/main/java/net/hydromatic/optiq/jdbc/OptiqRootSchema.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/main/java/net/hydromatic/optiq/jdbc/OptiqSchema.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/jdbc/OptiqSchema.java b/core/src/main/java/net/hydromatic/optiq/jdbc/OptiqSchema.java
index d3d2ea9..591d9c1 100644
--- a/core/src/main/java/net/hydromatic/optiq/jdbc/OptiqSchema.java
+++ b/core/src/main/java/net/hydromatic/optiq/jdbc/OptiqSchema.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/main/java/net/hydromatic/optiq/jdbc/OptiqStatement.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/jdbc/OptiqStatement.java b/core/src/main/java/net/hydromatic/optiq/jdbc/OptiqStatement.java
index 28361e1..af8258e 100644
--- a/core/src/main/java/net/hydromatic/optiq/jdbc/OptiqStatement.java
+++ b/core/src/main/java/net/hydromatic/optiq/jdbc/OptiqStatement.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/main/java/net/hydromatic/optiq/jdbc/SqlTimeoutException.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/jdbc/SqlTimeoutException.java b/core/src/main/java/net/hydromatic/optiq/jdbc/SqlTimeoutException.java
index e59d421..3223d3d 100644
--- a/core/src/main/java/net/hydromatic/optiq/jdbc/SqlTimeoutException.java
+++ b/core/src/main/java/net/hydromatic/optiq/jdbc/SqlTimeoutException.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/main/java/net/hydromatic/optiq/jdbc/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/jdbc/package-info.java b/core/src/main/java/net/hydromatic/optiq/jdbc/package-info.java
index 86e6f23..2196ca0 100644
--- a/core/src/main/java/net/hydromatic/optiq/jdbc/package-info.java
+++ b/core/src/main/java/net/hydromatic/optiq/jdbc/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/main/java/net/hydromatic/optiq/materialize/MaterializationActor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/materialize/MaterializationActor.java b/core/src/main/java/net/hydromatic/optiq/materialize/MaterializationActor.java
index 30a1e89..1f33279 100644
--- a/core/src/main/java/net/hydromatic/optiq/materialize/MaterializationActor.java
+++ b/core/src/main/java/net/hydromatic/optiq/materialize/MaterializationActor.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/main/java/net/hydromatic/optiq/materialize/MaterializationKey.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/materialize/MaterializationKey.java b/core/src/main/java/net/hydromatic/optiq/materialize/MaterializationKey.java
index 13e1052..f2e3c27 100644
--- a/core/src/main/java/net/hydromatic/optiq/materialize/MaterializationKey.java
+++ b/core/src/main/java/net/hydromatic/optiq/materialize/MaterializationKey.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/main/java/net/hydromatic/optiq/materialize/MaterializationService.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/materialize/MaterializationService.java b/core/src/main/java/net/hydromatic/optiq/materialize/MaterializationService.java
index f6f432a..8fd4040 100644
--- a/core/src/main/java/net/hydromatic/optiq/materialize/MaterializationService.java
+++ b/core/src/main/java/net/hydromatic/optiq/materialize/MaterializationService.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/main/java/net/hydromatic/optiq/materialize/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/materialize/package-info.java b/core/src/main/java/net/hydromatic/optiq/materialize/package-info.java
index 501b0c9..a79d08d 100644
--- a/core/src/main/java/net/hydromatic/optiq/materialize/package-info.java
+++ b/core/src/main/java/net/hydromatic/optiq/materialize/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/main/java/net/hydromatic/optiq/model/JsonColumn.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/model/JsonColumn.java b/core/src/main/java/net/hydromatic/optiq/model/JsonColumn.java
index ec62bba..04f793c 100644
--- a/core/src/main/java/net/hydromatic/optiq/model/JsonColumn.java
+++ b/core/src/main/java/net/hydromatic/optiq/model/JsonColumn.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/main/java/net/hydromatic/optiq/model/JsonCustomSchema.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/model/JsonCustomSchema.java b/core/src/main/java/net/hydromatic/optiq/model/JsonCustomSchema.java
index c182843..e1683c2 100644
--- a/core/src/main/java/net/hydromatic/optiq/model/JsonCustomSchema.java
+++ b/core/src/main/java/net/hydromatic/optiq/model/JsonCustomSchema.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/main/java/net/hydromatic/optiq/model/JsonCustomTable.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/model/JsonCustomTable.java b/core/src/main/java/net/hydromatic/optiq/model/JsonCustomTable.java
index 05d0c87..a84ddf9 100644
--- a/core/src/main/java/net/hydromatic/optiq/model/JsonCustomTable.java
+++ b/core/src/main/java/net/hydromatic/optiq/model/JsonCustomTable.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/main/java/net/hydromatic/optiq/model/JsonFunction.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/model/JsonFunction.java b/core/src/main/java/net/hydromatic/optiq/model/JsonFunction.java
index 6fd4d88..2fc0276 100644
--- a/core/src/main/java/net/hydromatic/optiq/model/JsonFunction.java
+++ b/core/src/main/java/net/hydromatic/optiq/model/JsonFunction.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/main/java/net/hydromatic/optiq/model/JsonJdbcSchema.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/model/JsonJdbcSchema.java b/core/src/main/java/net/hydromatic/optiq/model/JsonJdbcSchema.java
index 27382f1..143174a 100644
--- a/core/src/main/java/net/hydromatic/optiq/model/JsonJdbcSchema.java
+++ b/core/src/main/java/net/hydromatic/optiq/model/JsonJdbcSchema.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/main/java/net/hydromatic/optiq/model/JsonMapSchema.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/model/JsonMapSchema.java b/core/src/main/java/net/hydromatic/optiq/model/JsonMapSchema.java
index b4e6f20..5f7797b 100644
--- a/core/src/main/java/net/hydromatic/optiq/model/JsonMapSchema.java
+++ b/core/src/main/java/net/hydromatic/optiq/model/JsonMapSchema.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/main/java/net/hydromatic/optiq/model/JsonMaterialization.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/model/JsonMaterialization.java b/core/src/main/java/net/hydromatic/optiq/model/JsonMaterialization.java
index 2627a43..316541e 100644
--- a/core/src/main/java/net/hydromatic/optiq/model/JsonMaterialization.java
+++ b/core/src/main/java/net/hydromatic/optiq/model/JsonMaterialization.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/main/java/net/hydromatic/optiq/model/JsonRoot.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/model/JsonRoot.java b/core/src/main/java/net/hydromatic/optiq/model/JsonRoot.java
index 2fe86d6..db8a93b 100644
--- a/core/src/main/java/net/hydromatic/optiq/model/JsonRoot.java
+++ b/core/src/main/java/net/hydromatic/optiq/model/JsonRoot.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/main/java/net/hydromatic/optiq/model/JsonSchema.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/model/JsonSchema.java b/core/src/main/java/net/hydromatic/optiq/model/JsonSchema.java
index ae3b282..8bfb468 100644
--- a/core/src/main/java/net/hydromatic/optiq/model/JsonSchema.java
+++ b/core/src/main/java/net/hydromatic/optiq/model/JsonSchema.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/main/java/net/hydromatic/optiq/model/JsonTable.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/model/JsonTable.java b/core/src/main/java/net/hydromatic/optiq/model/JsonTable.java
index 76afeb8..a8c0391 100644
--- a/core/src/main/java/net/hydromatic/optiq/model/JsonTable.java
+++ b/core/src/main/java/net/hydromatic/optiq/model/JsonTable.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/main/java/net/hydromatic/optiq/model/JsonView.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/model/JsonView.java b/core/src/main/java/net/hydromatic/optiq/model/JsonView.java
index 7a96474..afa8a9f 100644
--- a/core/src/main/java/net/hydromatic/optiq/model/JsonView.java
+++ b/core/src/main/java/net/hydromatic/optiq/model/JsonView.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/main/java/net/hydromatic/optiq/model/ModelHandler.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/model/ModelHandler.java b/core/src/main/java/net/hydromatic/optiq/model/ModelHandler.java
index 61dbec4..efef49d 100644
--- a/core/src/main/java/net/hydromatic/optiq/model/ModelHandler.java
+++ b/core/src/main/java/net/hydromatic/optiq/model/ModelHandler.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/main/java/net/hydromatic/optiq/model/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/model/package-info.java b/core/src/main/java/net/hydromatic/optiq/model/package-info.java
index d018c73..794ce99 100644
--- a/core/src/main/java/net/hydromatic/optiq/model/package-info.java
+++ b/core/src/main/java/net/hydromatic/optiq/model/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/main/java/net/hydromatic/optiq/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/package-info.java b/core/src/main/java/net/hydromatic/optiq/package-info.java
index c62ec0b..ad30085 100644
--- a/core/src/main/java/net/hydromatic/optiq/package-info.java
+++ b/core/src/main/java/net/hydromatic/optiq/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/main/java/net/hydromatic/optiq/prepare/LixToRelTranslator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/prepare/LixToRelTranslator.java b/core/src/main/java/net/hydromatic/optiq/prepare/LixToRelTranslator.java
index f67500b..406f465 100644
--- a/core/src/main/java/net/hydromatic/optiq/prepare/LixToRelTranslator.java
+++ b/core/src/main/java/net/hydromatic/optiq/prepare/LixToRelTranslator.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/main/java/net/hydromatic/optiq/prepare/OptiqCatalogReader.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/prepare/OptiqCatalogReader.java b/core/src/main/java/net/hydromatic/optiq/prepare/OptiqCatalogReader.java
index 73d385d..13e6a69 100644
--- a/core/src/main/java/net/hydromatic/optiq/prepare/OptiqCatalogReader.java
+++ b/core/src/main/java/net/hydromatic/optiq/prepare/OptiqCatalogReader.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/main/java/net/hydromatic/optiq/prepare/OptiqMaterializer.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/prepare/OptiqMaterializer.java b/core/src/main/java/net/hydromatic/optiq/prepare/OptiqMaterializer.java
index 0036e84..c00f307 100644
--- a/core/src/main/java/net/hydromatic/optiq/prepare/OptiqMaterializer.java
+++ b/core/src/main/java/net/hydromatic/optiq/prepare/OptiqMaterializer.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/main/java/net/hydromatic/optiq/prepare/OptiqPrepareImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/prepare/OptiqPrepareImpl.java b/core/src/main/java/net/hydromatic/optiq/prepare/OptiqPrepareImpl.java
index e73550c..12b9a0a 100644
--- a/core/src/main/java/net/hydromatic/optiq/prepare/OptiqPrepareImpl.java
+++ b/core/src/main/java/net/hydromatic/optiq/prepare/OptiqPrepareImpl.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/main/java/net/hydromatic/optiq/prepare/OptiqSqlValidator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/prepare/OptiqSqlValidator.java b/core/src/main/java/net/hydromatic/optiq/prepare/OptiqSqlValidator.java
index 6dcd7c0..b91d322 100644
--- a/core/src/main/java/net/hydromatic/optiq/prepare/OptiqSqlValidator.java
+++ b/core/src/main/java/net/hydromatic/optiq/prepare/OptiqSqlValidator.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/main/java/net/hydromatic/optiq/prepare/PlannerImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/prepare/PlannerImpl.java b/core/src/main/java/net/hydromatic/optiq/prepare/PlannerImpl.java
index c87102d..4d5f436 100644
--- a/core/src/main/java/net/hydromatic/optiq/prepare/PlannerImpl.java
+++ b/core/src/main/java/net/hydromatic/optiq/prepare/PlannerImpl.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
 //