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:37 UTC
[18/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/avatica/src/main/java/net/hydromatic/avatica/ConnectionConfigImpl.java
----------------------------------------------------------------------
diff --git a/avatica/src/main/java/net/hydromatic/avatica/ConnectionConfigImpl.java b/avatica/src/main/java/net/hydromatic/avatica/ConnectionConfigImpl.java
index 8151c97..c9830b7 100644
--- a/avatica/src/main/java/net/hydromatic/avatica/ConnectionConfigImpl.java
+++ b/avatica/src/main/java/net/hydromatic/avatica/ConnectionConfigImpl.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/avatica/src/main/java/net/hydromatic/avatica/ConnectionProperty.java
----------------------------------------------------------------------
diff --git a/avatica/src/main/java/net/hydromatic/avatica/ConnectionProperty.java b/avatica/src/main/java/net/hydromatic/avatica/ConnectionProperty.java
index ae8d660..87a22ff 100644
--- a/avatica/src/main/java/net/hydromatic/avatica/ConnectionProperty.java
+++ b/avatica/src/main/java/net/hydromatic/avatica/ConnectionProperty.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/avatica/src/main/java/net/hydromatic/avatica/Cursor.java
----------------------------------------------------------------------
diff --git a/avatica/src/main/java/net/hydromatic/avatica/Cursor.java b/avatica/src/main/java/net/hydromatic/avatica/Cursor.java
index 44961b3..1978cc2 100644
--- a/avatica/src/main/java/net/hydromatic/avatica/Cursor.java
+++ b/avatica/src/main/java/net/hydromatic/avatica/Cursor.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/avatica/src/main/java/net/hydromatic/avatica/DriverVersion.java
----------------------------------------------------------------------
diff --git a/avatica/src/main/java/net/hydromatic/avatica/DriverVersion.java b/avatica/src/main/java/net/hydromatic/avatica/DriverVersion.java
index 63049c4..ef8da7f 100644
--- a/avatica/src/main/java/net/hydromatic/avatica/DriverVersion.java
+++ b/avatica/src/main/java/net/hydromatic/avatica/DriverVersion.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/avatica/src/main/java/net/hydromatic/avatica/Handler.java
----------------------------------------------------------------------
diff --git a/avatica/src/main/java/net/hydromatic/avatica/Handler.java b/avatica/src/main/java/net/hydromatic/avatica/Handler.java
index 17b11a7..8ad8f5b 100644
--- a/avatica/src/main/java/net/hydromatic/avatica/Handler.java
+++ b/avatica/src/main/java/net/hydromatic/avatica/Handler.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/avatica/src/main/java/net/hydromatic/avatica/HandlerImpl.java
----------------------------------------------------------------------
diff --git a/avatica/src/main/java/net/hydromatic/avatica/HandlerImpl.java b/avatica/src/main/java/net/hydromatic/avatica/HandlerImpl.java
index d79ec34..5648465 100644
--- a/avatica/src/main/java/net/hydromatic/avatica/HandlerImpl.java
+++ b/avatica/src/main/java/net/hydromatic/avatica/HandlerImpl.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/avatica/src/main/java/net/hydromatic/avatica/Helper.java
----------------------------------------------------------------------
diff --git a/avatica/src/main/java/net/hydromatic/avatica/Helper.java b/avatica/src/main/java/net/hydromatic/avatica/Helper.java
index caef3c1..5f050ab 100644
--- a/avatica/src/main/java/net/hydromatic/avatica/Helper.java
+++ b/avatica/src/main/java/net/hydromatic/avatica/Helper.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/avatica/src/main/java/net/hydromatic/avatica/InternalProperty.java
----------------------------------------------------------------------
diff --git a/avatica/src/main/java/net/hydromatic/avatica/InternalProperty.java b/avatica/src/main/java/net/hydromatic/avatica/InternalProperty.java
index a31730c..6c50a84 100644
--- a/avatica/src/main/java/net/hydromatic/avatica/InternalProperty.java
+++ b/avatica/src/main/java/net/hydromatic/avatica/InternalProperty.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/avatica/src/main/java/net/hydromatic/avatica/Meta.java
----------------------------------------------------------------------
diff --git a/avatica/src/main/java/net/hydromatic/avatica/Meta.java b/avatica/src/main/java/net/hydromatic/avatica/Meta.java
index 78cd56d..b6b76e4 100644
--- a/avatica/src/main/java/net/hydromatic/avatica/Meta.java
+++ b/avatica/src/main/java/net/hydromatic/avatica/Meta.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/avatica/src/main/java/net/hydromatic/avatica/Quoting.java
----------------------------------------------------------------------
diff --git a/avatica/src/main/java/net/hydromatic/avatica/Quoting.java b/avatica/src/main/java/net/hydromatic/avatica/Quoting.java
index 381847e..46ed509 100644
--- a/avatica/src/main/java/net/hydromatic/avatica/Quoting.java
+++ b/avatica/src/main/java/net/hydromatic/avatica/Quoting.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/avatica/src/main/java/net/hydromatic/avatica/UnregisteredDriver.java
----------------------------------------------------------------------
diff --git a/avatica/src/main/java/net/hydromatic/avatica/UnregisteredDriver.java b/avatica/src/main/java/net/hydromatic/avatica/UnregisteredDriver.java
index 666c918..aab532b 100644
--- a/avatica/src/main/java/net/hydromatic/avatica/UnregisteredDriver.java
+++ b/avatica/src/main/java/net/hydromatic/avatica/UnregisteredDriver.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/avatica/src/main/java/net/hydromatic/avatica/package-info.java
----------------------------------------------------------------------
diff --git a/avatica/src/main/java/net/hydromatic/avatica/package-info.java b/avatica/src/main/java/net/hydromatic/avatica/package-info.java
index 81af5a9..840ee0e 100644
--- a/avatica/src/main/java/net/hydromatic/avatica/package-info.java
+++ b/avatica/src/main/java/net/hydromatic/avatica/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/avatica/src/test/java/net/hydromatic/avatica/test/AvaticaSuite.java
----------------------------------------------------------------------
diff --git a/avatica/src/test/java/net/hydromatic/avatica/test/AvaticaSuite.java b/avatica/src/test/java/net/hydromatic/avatica/test/AvaticaSuite.java
index 912a6c6..35df023 100644
--- a/avatica/src/test/java/net/hydromatic/avatica/test/AvaticaSuite.java
+++ b/avatica/src/test/java/net/hydromatic/avatica/test/AvaticaSuite.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/avatica/src/test/java/net/hydromatic/avatica/test/ConnectStringParserTest.java
----------------------------------------------------------------------
diff --git a/avatica/src/test/java/net/hydromatic/avatica/test/ConnectStringParserTest.java b/avatica/src/test/java/net/hydromatic/avatica/test/ConnectStringParserTest.java
index 316a0a0..2d1d93c 100644
--- a/avatica/src/test/java/net/hydromatic/avatica/test/ConnectStringParserTest.java
+++ b/avatica/src/test/java/net/hydromatic/avatica/test/ConnectStringParserTest.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/avatica/src/test/java/net/hydromatic/avatica/test/package-info.java
----------------------------------------------------------------------
diff --git a/avatica/src/test/java/net/hydromatic/avatica/test/package-info.java b/avatica/src/test/java/net/hydromatic/avatica/test/package-info.java
index 345b3d8..90df564 100644
--- a/avatica/src/test/java/net/hydromatic/avatica/test/package-info.java
+++ b/avatica/src/test/java/net/hydromatic/avatica/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/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 7a735c3..fcf64fe 100644
--- a/core/pom.xml
+++ b/core/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/core/src/main/codegen/config.fmpp
----------------------------------------------------------------------
diff --git a/core/src/main/codegen/config.fmpp b/core/src/main/codegen/config.fmpp
index 862b502..b017684 100644
--- a/core/src/main/codegen/config.fmpp
+++ b/core/src/main/codegen/config.fmpp
@@ -1,10 +1,9 @@
-# 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
#
@@ -73,7 +72,7 @@ data: {
implementationFiles: [
"parserImpls.ftl"
]
-
+
includeCompoundIdentifier: true
}
}
http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/bfa3daee/core/src/main/codegen/includes/compoundIdentifier.ftl
----------------------------------------------------------------------
diff --git a/core/src/main/codegen/includes/compoundIdentifier.ftl b/core/src/main/codegen/includes/compoundIdentifier.ftl
index 3b830d7..70db3c2 100644
--- a/core/src/main/codegen/includes/compoundIdentifier.ftl
+++ b/core/src/main/codegen/includes/compoundIdentifier.ftl
@@ -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
//
@@ -19,7 +18,7 @@
<#--
Add implementations of additional parser statements, literals or
data types.
-
+
Example of SqlShowTables() implementation:
SqlNode SqlShowTables()
{
http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/bfa3daee/core/src/main/codegen/includes/parserImpls.ftl
----------------------------------------------------------------------
diff --git a/core/src/main/codegen/includes/parserImpls.ftl b/core/src/main/codegen/includes/parserImpls.ftl
index 3b830d7..70db3c2 100644
--- a/core/src/main/codegen/includes/parserImpls.ftl
+++ b/core/src/main/codegen/includes/parserImpls.ftl
@@ -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
//
@@ -19,7 +18,7 @@
<#--
Add implementations of additional parser statements, literals or
data types.
-
+
Example of SqlShowTables() implementation:
SqlNode SqlShowTables()
{
http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/bfa3daee/core/src/main/codegen/templates/CombinedParser.jj
----------------------------------------------------------------------
diff --git a/core/src/main/codegen/templates/CombinedParser.jj b/core/src/main/codegen/templates/CombinedParser.jj
index 56b1ff6..736e997 100644
--- a/core/src/main/codegen/templates/CombinedParser.jj
+++ b/core/src/main/codegen/templates/CombinedParser.jj
@@ -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
//
@@ -259,25 +258,6 @@ SqlNode FloorCeilOptions( SqlParserPos pos, boolean floorFlag) :
// End Parser.jj
/*
-// Licensed to DynamoBI Corporation (DynamoBI) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. DynamoBI licenses this file
-// to you under the Apache License, Version 2.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.
-*/
-
-/*
// This file contains the heart of a parser for SQL SELECT statements.
// code can be shared between various parsers (for example, a DDL parser and a
// DML parser) but is not a standalone JavaCC file. You need to prepend a
@@ -1435,7 +1415,7 @@ SqlNode JoinTable(SqlNode e) :
e,
natural,
joinType,
- e2,
+ e2,
JoinConditionType.ON.symbol(onPos),
condition);
}
http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/bfa3daee/core/src/main/java/net/hydromatic/optiq/AggregateFunction.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/AggregateFunction.java b/core/src/main/java/net/hydromatic/optiq/AggregateFunction.java
index 7949d2a..cb1f152 100644
--- a/core/src/main/java/net/hydromatic/optiq/AggregateFunction.java
+++ b/core/src/main/java/net/hydromatic/optiq/AggregateFunction.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/BuiltinMethod.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/BuiltinMethod.java b/core/src/main/java/net/hydromatic/optiq/BuiltinMethod.java
index 1aef089..e435f24 100644
--- a/core/src/main/java/net/hydromatic/optiq/BuiltinMethod.java
+++ b/core/src/main/java/net/hydromatic/optiq/BuiltinMethod.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/DataContext.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/DataContext.java b/core/src/main/java/net/hydromatic/optiq/DataContext.java
index 98ee503..5b7e420 100644
--- a/core/src/main/java/net/hydromatic/optiq/DataContext.java
+++ b/core/src/main/java/net/hydromatic/optiq/DataContext.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/Demo.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/Demo.java b/core/src/main/java/net/hydromatic/optiq/Demo.java
index daf8e85..b3c2c43 100644
--- a/core/src/main/java/net/hydromatic/optiq/Demo.java
+++ b/core/src/main/java/net/hydromatic/optiq/Demo.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/Function.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/Function.java b/core/src/main/java/net/hydromatic/optiq/Function.java
index 7356b52..cd42547 100644
--- a/core/src/main/java/net/hydromatic/optiq/Function.java
+++ b/core/src/main/java/net/hydromatic/optiq/Function.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/FunctionParameter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/FunctionParameter.java b/core/src/main/java/net/hydromatic/optiq/FunctionParameter.java
index 403dbdd..e527dce 100644
--- a/core/src/main/java/net/hydromatic/optiq/FunctionParameter.java
+++ b/core/src/main/java/net/hydromatic/optiq/FunctionParameter.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/ImplementableAggFunction.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/ImplementableAggFunction.java b/core/src/main/java/net/hydromatic/optiq/ImplementableAggFunction.java
index 88a88fd..660948b 100644
--- a/core/src/main/java/net/hydromatic/optiq/ImplementableAggFunction.java
+++ b/core/src/main/java/net/hydromatic/optiq/ImplementableAggFunction.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/ImplementableFunction.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/ImplementableFunction.java b/core/src/main/java/net/hydromatic/optiq/ImplementableFunction.java
index 91316f2..4f1a8a9 100644
--- a/core/src/main/java/net/hydromatic/optiq/ImplementableFunction.java
+++ b/core/src/main/java/net/hydromatic/optiq/ImplementableFunction.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/Member.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/Member.java b/core/src/main/java/net/hydromatic/optiq/Member.java
index 41eaa4f..94be956 100644
--- a/core/src/main/java/net/hydromatic/optiq/Member.java
+++ b/core/src/main/java/net/hydromatic/optiq/Member.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/ModifiableTable.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/ModifiableTable.java b/core/src/main/java/net/hydromatic/optiq/ModifiableTable.java
index 3c525f8..a0c288c 100644
--- a/core/src/main/java/net/hydromatic/optiq/ModifiableTable.java
+++ b/core/src/main/java/net/hydromatic/optiq/ModifiableTable.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/QueryableTable.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/QueryableTable.java b/core/src/main/java/net/hydromatic/optiq/QueryableTable.java
index 628de1e..591201f 100644
--- a/core/src/main/java/net/hydromatic/optiq/QueryableTable.java
+++ b/core/src/main/java/net/hydromatic/optiq/QueryableTable.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/ScalarFunction.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/ScalarFunction.java b/core/src/main/java/net/hydromatic/optiq/ScalarFunction.java
index 7821367..468cf68 100644
--- a/core/src/main/java/net/hydromatic/optiq/ScalarFunction.java
+++ b/core/src/main/java/net/hydromatic/optiq/ScalarFunction.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/Schema.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/Schema.java b/core/src/main/java/net/hydromatic/optiq/Schema.java
index 171971a..3d57d6f 100644
--- a/core/src/main/java/net/hydromatic/optiq/Schema.java
+++ b/core/src/main/java/net/hydromatic/optiq/Schema.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/SchemaFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/SchemaFactory.java b/core/src/main/java/net/hydromatic/optiq/SchemaFactory.java
index 0598d97..2b6dc63 100644
--- a/core/src/main/java/net/hydromatic/optiq/SchemaFactory.java
+++ b/core/src/main/java/net/hydromatic/optiq/SchemaFactory.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/SchemaPlus.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/SchemaPlus.java b/core/src/main/java/net/hydromatic/optiq/SchemaPlus.java
index 12f573e..84e5405 100644
--- a/core/src/main/java/net/hydromatic/optiq/SchemaPlus.java
+++ b/core/src/main/java/net/hydromatic/optiq/SchemaPlus.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/Schemas.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/Schemas.java b/core/src/main/java/net/hydromatic/optiq/Schemas.java
index eb6e78b..ba91c3c 100644
--- a/core/src/main/java/net/hydromatic/optiq/Schemas.java
+++ b/core/src/main/java/net/hydromatic/optiq/Schemas.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/SemiMutableSchema.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/SemiMutableSchema.java b/core/src/main/java/net/hydromatic/optiq/SemiMutableSchema.java
index c563d9b..5285069 100644
--- a/core/src/main/java/net/hydromatic/optiq/SemiMutableSchema.java
+++ b/core/src/main/java/net/hydromatic/optiq/SemiMutableSchema.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/Statistic.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/Statistic.java b/core/src/main/java/net/hydromatic/optiq/Statistic.java
index 5bb3170..9d25b41 100644
--- a/core/src/main/java/net/hydromatic/optiq/Statistic.java
+++ b/core/src/main/java/net/hydromatic/optiq/Statistic.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/Statistics.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/Statistics.java b/core/src/main/java/net/hydromatic/optiq/Statistics.java
index d4d7d44..d08430d 100644
--- a/core/src/main/java/net/hydromatic/optiq/Statistics.java
+++ b/core/src/main/java/net/hydromatic/optiq/Statistics.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/Table.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/Table.java b/core/src/main/java/net/hydromatic/optiq/Table.java
index 2773b29..126056c 100644
--- a/core/src/main/java/net/hydromatic/optiq/Table.java
+++ b/core/src/main/java/net/hydromatic/optiq/Table.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/TableFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/TableFactory.java b/core/src/main/java/net/hydromatic/optiq/TableFactory.java
index fa35ebc..cae1d42 100644
--- a/core/src/main/java/net/hydromatic/optiq/TableFactory.java
+++ b/core/src/main/java/net/hydromatic/optiq/TableFactory.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/TableFunction.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/TableFunction.java b/core/src/main/java/net/hydromatic/optiq/TableFunction.java
index 32d2de9..d2d0b81 100644
--- a/core/src/main/java/net/hydromatic/optiq/TableFunction.java
+++ b/core/src/main/java/net/hydromatic/optiq/TableFunction.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/TableMacro.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/TableMacro.java b/core/src/main/java/net/hydromatic/optiq/TableMacro.java
index 33cef78..33937c7 100644
--- a/core/src/main/java/net/hydromatic/optiq/TableMacro.java
+++ b/core/src/main/java/net/hydromatic/optiq/TableMacro.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/TranslatableTable.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/TranslatableTable.java b/core/src/main/java/net/hydromatic/optiq/TranslatableTable.java
index 5ad2432..20d9b68 100644
--- a/core/src/main/java/net/hydromatic/optiq/TranslatableTable.java
+++ b/core/src/main/java/net/hydromatic/optiq/TranslatableTable.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/config/Lex.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/config/Lex.java b/core/src/main/java/net/hydromatic/optiq/config/Lex.java
index 2582b49..f8426ee 100644
--- a/core/src/main/java/net/hydromatic/optiq/config/Lex.java
+++ b/core/src/main/java/net/hydromatic/optiq/config/Lex.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/config/OptiqConnectionConfig.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/config/OptiqConnectionConfig.java b/core/src/main/java/net/hydromatic/optiq/config/OptiqConnectionConfig.java
index 1be2d28..2d5f652 100644
--- a/core/src/main/java/net/hydromatic/optiq/config/OptiqConnectionConfig.java
+++ b/core/src/main/java/net/hydromatic/optiq/config/OptiqConnectionConfig.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/config/OptiqConnectionProperty.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/config/OptiqConnectionProperty.java b/core/src/main/java/net/hydromatic/optiq/config/OptiqConnectionProperty.java
index 25aded1..a1f76d3 100644
--- a/core/src/main/java/net/hydromatic/optiq/config/OptiqConnectionProperty.java
+++ b/core/src/main/java/net/hydromatic/optiq/config/OptiqConnectionProperty.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/config/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/config/package-info.java b/core/src/main/java/net/hydromatic/optiq/config/package-info.java
index f0ffdc0..6553e68 100644
--- a/core/src/main/java/net/hydromatic/optiq/config/package-info.java
+++ b/core/src/main/java/net/hydromatic/optiq/config/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/AbstractSchema.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/impl/AbstractSchema.java b/core/src/main/java/net/hydromatic/optiq/impl/AbstractSchema.java
index 9c06f0b..4470b00 100644
--- a/core/src/main/java/net/hydromatic/optiq/impl/AbstractSchema.java
+++ b/core/src/main/java/net/hydromatic/optiq/impl/AbstractSchema.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/AbstractTable.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/impl/AbstractTable.java b/core/src/main/java/net/hydromatic/optiq/impl/AbstractTable.java
index afbfe54..8aeb951 100644
--- a/core/src/main/java/net/hydromatic/optiq/impl/AbstractTable.java
+++ b/core/src/main/java/net/hydromatic/optiq/impl/AbstractTable.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/AbstractTableQueryable.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/impl/AbstractTableQueryable.java b/core/src/main/java/net/hydromatic/optiq/impl/AbstractTableQueryable.java
index 7c80780..0ce3bda 100644
--- a/core/src/main/java/net/hydromatic/optiq/impl/AbstractTableQueryable.java
+++ b/core/src/main/java/net/hydromatic/optiq/impl/AbstractTableQueryable.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/AggregateFunctionImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/impl/AggregateFunctionImpl.java b/core/src/main/java/net/hydromatic/optiq/impl/AggregateFunctionImpl.java
index 66d2bc5..5225174 100644
--- a/core/src/main/java/net/hydromatic/optiq/impl/AggregateFunctionImpl.java
+++ b/core/src/main/java/net/hydromatic/optiq/impl/AggregateFunctionImpl.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/DelegatingSchema.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/impl/DelegatingSchema.java b/core/src/main/java/net/hydromatic/optiq/impl/DelegatingSchema.java
index dd5a906..99d529f 100644
--- a/core/src/main/java/net/hydromatic/optiq/impl/DelegatingSchema.java
+++ b/core/src/main/java/net/hydromatic/optiq/impl/DelegatingSchema.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/MaterializedViewTable.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/impl/MaterializedViewTable.java b/core/src/main/java/net/hydromatic/optiq/impl/MaterializedViewTable.java
index 835065b..0e0699a 100644
--- a/core/src/main/java/net/hydromatic/optiq/impl/MaterializedViewTable.java
+++ b/core/src/main/java/net/hydromatic/optiq/impl/MaterializedViewTable.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/ReflectiveFunctionBase.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/impl/ReflectiveFunctionBase.java b/core/src/main/java/net/hydromatic/optiq/impl/ReflectiveFunctionBase.java
index 2981f62..bb526ae 100644
--- a/core/src/main/java/net/hydromatic/optiq/impl/ReflectiveFunctionBase.java
+++ b/core/src/main/java/net/hydromatic/optiq/impl/ReflectiveFunctionBase.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/ScalarFunctionImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/impl/ScalarFunctionImpl.java b/core/src/main/java/net/hydromatic/optiq/impl/ScalarFunctionImpl.java
index 0756f2f..7c66627 100644
--- a/core/src/main/java/net/hydromatic/optiq/impl/ScalarFunctionImpl.java
+++ b/core/src/main/java/net/hydromatic/optiq/impl/ScalarFunctionImpl.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/StarTable.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/impl/StarTable.java b/core/src/main/java/net/hydromatic/optiq/impl/StarTable.java
index bf1a4b6..b093051 100644
--- a/core/src/main/java/net/hydromatic/optiq/impl/StarTable.java
+++ b/core/src/main/java/net/hydromatic/optiq/impl/StarTable.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/TableFunctionImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/impl/TableFunctionImpl.java b/core/src/main/java/net/hydromatic/optiq/impl/TableFunctionImpl.java
index 96302f1..a42b426 100644
--- a/core/src/main/java/net/hydromatic/optiq/impl/TableFunctionImpl.java
+++ b/core/src/main/java/net/hydromatic/optiq/impl/TableFunctionImpl.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/TableMacroImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/impl/TableMacroImpl.java b/core/src/main/java/net/hydromatic/optiq/impl/TableMacroImpl.java
index e94fc0b..b82af70 100644
--- a/core/src/main/java/net/hydromatic/optiq/impl/TableMacroImpl.java
+++ b/core/src/main/java/net/hydromatic/optiq/impl/TableMacroImpl.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/ViewTable.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/impl/ViewTable.java b/core/src/main/java/net/hydromatic/optiq/impl/ViewTable.java
index f6cd347..0eaf530 100644
--- a/core/src/main/java/net/hydromatic/optiq/impl/ViewTable.java
+++ b/core/src/main/java/net/hydromatic/optiq/impl/ViewTable.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/ArrayTable.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/impl/clone/ArrayTable.java b/core/src/main/java/net/hydromatic/optiq/impl/clone/ArrayTable.java
index e913e17..44f42e7 100644
--- a/core/src/main/java/net/hydromatic/optiq/impl/clone/ArrayTable.java
+++ b/core/src/main/java/net/hydromatic/optiq/impl/clone/ArrayTable.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/CloneSchema.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/impl/clone/CloneSchema.java b/core/src/main/java/net/hydromatic/optiq/impl/clone/CloneSchema.java
index 6bba133..c29eb3c 100644
--- a/core/src/main/java/net/hydromatic/optiq/impl/clone/CloneSchema.java
+++ b/core/src/main/java/net/hydromatic/optiq/impl/clone/CloneSchema.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
//