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

[jh...@apache.org]

http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/bfa3daee/core/src/main/java/org/eigenbase/rel/RelCollationImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/rel/RelCollationImpl.java b/core/src/main/java/org/eigenbase/rel/RelCollationImpl.java
index e2302c6..ed00e93 100644
--- a/core/src/main/java/org/eigenbase/rel/RelCollationImpl.java
+++ b/core/src/main/java/org/eigenbase/rel/RelCollationImpl.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/org/eigenbase/rel/RelCollationTraitDef.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/rel/RelCollationTraitDef.java b/core/src/main/java/org/eigenbase/rel/RelCollationTraitDef.java
index 563cc95..da2ae05 100644
--- a/core/src/main/java/org/eigenbase/rel/RelCollationTraitDef.java
+++ b/core/src/main/java/org/eigenbase/rel/RelCollationTraitDef.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/org/eigenbase/rel/RelFactories.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/rel/RelFactories.java b/core/src/main/java/org/eigenbase/rel/RelFactories.java
index 3fd947f..64954ff 100644
--- a/core/src/main/java/org/eigenbase/rel/RelFactories.java
+++ b/core/src/main/java/org/eigenbase/rel/RelFactories.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/org/eigenbase/rel/RelFieldCollation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/rel/RelFieldCollation.java b/core/src/main/java/org/eigenbase/rel/RelFieldCollation.java
index 1871c92..7547462 100644
--- a/core/src/main/java/org/eigenbase/rel/RelFieldCollation.java
+++ b/core/src/main/java/org/eigenbase/rel/RelFieldCollation.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/org/eigenbase/rel/RelImplementorImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/rel/RelImplementorImpl.java b/core/src/main/java/org/eigenbase/rel/RelImplementorImpl.java
index ac40c90..7597683 100644
--- a/core/src/main/java/org/eigenbase/rel/RelImplementorImpl.java
+++ b/core/src/main/java/org/eigenbase/rel/RelImplementorImpl.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/org/eigenbase/rel/RelInput.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/rel/RelInput.java b/core/src/main/java/org/eigenbase/rel/RelInput.java
index 77198b6..027950c 100644
--- a/core/src/main/java/org/eigenbase/rel/RelInput.java
+++ b/core/src/main/java/org/eigenbase/rel/RelInput.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/org/eigenbase/rel/RelJson.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/rel/RelJson.java b/core/src/main/java/org/eigenbase/rel/RelJson.java
index 25d8407..740dcee 100644
--- a/core/src/main/java/org/eigenbase/rel/RelJson.java
+++ b/core/src/main/java/org/eigenbase/rel/RelJson.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/org/eigenbase/rel/RelJsonReader.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/rel/RelJsonReader.java b/core/src/main/java/org/eigenbase/rel/RelJsonReader.java
index 3c433a3..cadd8c2 100644
--- a/core/src/main/java/org/eigenbase/rel/RelJsonReader.java
+++ b/core/src/main/java/org/eigenbase/rel/RelJsonReader.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/org/eigenbase/rel/RelJsonWriter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/rel/RelJsonWriter.java b/core/src/main/java/org/eigenbase/rel/RelJsonWriter.java
index 13f92d0..04e28f0 100644
--- a/core/src/main/java/org/eigenbase/rel/RelJsonWriter.java
+++ b/core/src/main/java/org/eigenbase/rel/RelJsonWriter.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/org/eigenbase/rel/RelNode.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/rel/RelNode.java b/core/src/main/java/org/eigenbase/rel/RelNode.java
index 75fe9b3..d7ebd65 100644
--- a/core/src/main/java/org/eigenbase/rel/RelNode.java
+++ b/core/src/main/java/org/eigenbase/rel/RelNode.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/org/eigenbase/rel/RelShuttle.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/rel/RelShuttle.java b/core/src/main/java/org/eigenbase/rel/RelShuttle.java
index 92a657b..e505ced 100644
--- a/core/src/main/java/org/eigenbase/rel/RelShuttle.java
+++ b/core/src/main/java/org/eigenbase/rel/RelShuttle.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/org/eigenbase/rel/RelShuttleImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/rel/RelShuttleImpl.java b/core/src/main/java/org/eigenbase/rel/RelShuttleImpl.java
index da0869f..c5c06ef 100644
--- a/core/src/main/java/org/eigenbase/rel/RelShuttleImpl.java
+++ b/core/src/main/java/org/eigenbase/rel/RelShuttleImpl.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/org/eigenbase/rel/RelVisitor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/rel/RelVisitor.java b/core/src/main/java/org/eigenbase/rel/RelVisitor.java
index f2d9200..12ba2ee 100644
--- a/core/src/main/java/org/eigenbase/rel/RelVisitor.java
+++ b/core/src/main/java/org/eigenbase/rel/RelVisitor.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/org/eigenbase/rel/RelWriter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/rel/RelWriter.java b/core/src/main/java/org/eigenbase/rel/RelWriter.java
index 9b50cbe..4e9a5c6 100644
--- a/core/src/main/java/org/eigenbase/rel/RelWriter.java
+++ b/core/src/main/java/org/eigenbase/rel/RelWriter.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/org/eigenbase/rel/RelWriterImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/rel/RelWriterImpl.java b/core/src/main/java/org/eigenbase/rel/RelWriterImpl.java
index 58e42d2..178f64c 100644
--- a/core/src/main/java/org/eigenbase/rel/RelWriterImpl.java
+++ b/core/src/main/java/org/eigenbase/rel/RelWriterImpl.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/org/eigenbase/rel/RelXmlWriter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/rel/RelXmlWriter.java b/core/src/main/java/org/eigenbase/rel/RelXmlWriter.java
index b110a0f..1fa0574 100644
--- a/core/src/main/java/org/eigenbase/rel/RelXmlWriter.java
+++ b/core/src/main/java/org/eigenbase/rel/RelXmlWriter.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/org/eigenbase/rel/SamplingRel.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/rel/SamplingRel.java b/core/src/main/java/org/eigenbase/rel/SamplingRel.java
index 1a870d6..41bbeee 100644
--- a/core/src/main/java/org/eigenbase/rel/SamplingRel.java
+++ b/core/src/main/java/org/eigenbase/rel/SamplingRel.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/org/eigenbase/rel/SetOpRel.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/rel/SetOpRel.java b/core/src/main/java/org/eigenbase/rel/SetOpRel.java
index 9a1c1c9..9c00638 100644
--- a/core/src/main/java/org/eigenbase/rel/SetOpRel.java
+++ b/core/src/main/java/org/eigenbase/rel/SetOpRel.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/org/eigenbase/rel/SingleRel.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/rel/SingleRel.java b/core/src/main/java/org/eigenbase/rel/SingleRel.java
index 09a8760..581a2d6 100644
--- a/core/src/main/java/org/eigenbase/rel/SingleRel.java
+++ b/core/src/main/java/org/eigenbase/rel/SingleRel.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/org/eigenbase/rel/SortRel.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/rel/SortRel.java b/core/src/main/java/org/eigenbase/rel/SortRel.java
index 256a6a5..8cfe9ed 100644
--- a/core/src/main/java/org/eigenbase/rel/SortRel.java
+++ b/core/src/main/java/org/eigenbase/rel/SortRel.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/org/eigenbase/rel/TableAccessRel.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/rel/TableAccessRel.java b/core/src/main/java/org/eigenbase/rel/TableAccessRel.java
index 0370149..a61ac29 100644
--- a/core/src/main/java/org/eigenbase/rel/TableAccessRel.java
+++ b/core/src/main/java/org/eigenbase/rel/TableAccessRel.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/org/eigenbase/rel/TableAccessRelBase.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/rel/TableAccessRelBase.java b/core/src/main/java/org/eigenbase/rel/TableAccessRelBase.java
index ff61a6e..a5f3745 100644
--- a/core/src/main/java/org/eigenbase/rel/TableAccessRelBase.java
+++ b/core/src/main/java/org/eigenbase/rel/TableAccessRelBase.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/org/eigenbase/rel/TableFunctionRel.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/rel/TableFunctionRel.java b/core/src/main/java/org/eigenbase/rel/TableFunctionRel.java
index db19bc2..68bedf7 100644
--- a/core/src/main/java/org/eigenbase/rel/TableFunctionRel.java
+++ b/core/src/main/java/org/eigenbase/rel/TableFunctionRel.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/org/eigenbase/rel/TableFunctionRelBase.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/rel/TableFunctionRelBase.java b/core/src/main/java/org/eigenbase/rel/TableFunctionRelBase.java
index 9556e75..dc805a7 100644
--- a/core/src/main/java/org/eigenbase/rel/TableFunctionRelBase.java
+++ b/core/src/main/java/org/eigenbase/rel/TableFunctionRelBase.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/org/eigenbase/rel/TableModificationRel.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/rel/TableModificationRel.java b/core/src/main/java/org/eigenbase/rel/TableModificationRel.java
index a9d3ecc..74675b9 100644
--- a/core/src/main/java/org/eigenbase/rel/TableModificationRel.java
+++ b/core/src/main/java/org/eigenbase/rel/TableModificationRel.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/org/eigenbase/rel/TableModificationRelBase.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/rel/TableModificationRelBase.java b/core/src/main/java/org/eigenbase/rel/TableModificationRelBase.java
index 440a65a..4a77a41 100644
--- a/core/src/main/java/org/eigenbase/rel/TableModificationRelBase.java
+++ b/core/src/main/java/org/eigenbase/rel/TableModificationRelBase.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/org/eigenbase/rel/UncollectRel.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/rel/UncollectRel.java b/core/src/main/java/org/eigenbase/rel/UncollectRel.java
index 4212704..b7fe95f 100644
--- a/core/src/main/java/org/eigenbase/rel/UncollectRel.java
+++ b/core/src/main/java/org/eigenbase/rel/UncollectRel.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/org/eigenbase/rel/UnionRel.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/rel/UnionRel.java b/core/src/main/java/org/eigenbase/rel/UnionRel.java
index f9f33a6..73ad133 100644
--- a/core/src/main/java/org/eigenbase/rel/UnionRel.java
+++ b/core/src/main/java/org/eigenbase/rel/UnionRel.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/org/eigenbase/rel/UnionRelBase.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/rel/UnionRelBase.java b/core/src/main/java/org/eigenbase/rel/UnionRelBase.java
index 2b98909..494a7ff 100644
--- a/core/src/main/java/org/eigenbase/rel/UnionRelBase.java
+++ b/core/src/main/java/org/eigenbase/rel/UnionRelBase.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/org/eigenbase/rel/ValuesRel.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/rel/ValuesRel.java b/core/src/main/java/org/eigenbase/rel/ValuesRel.java
index 9a79dc4..1cabe85 100644
--- a/core/src/main/java/org/eigenbase/rel/ValuesRel.java
+++ b/core/src/main/java/org/eigenbase/rel/ValuesRel.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/org/eigenbase/rel/ValuesRelBase.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/rel/ValuesRelBase.java b/core/src/main/java/org/eigenbase/rel/ValuesRelBase.java
index 4c28077..5a347fd 100644
--- a/core/src/main/java/org/eigenbase/rel/ValuesRelBase.java
+++ b/core/src/main/java/org/eigenbase/rel/ValuesRelBase.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/org/eigenbase/rel/WindowRel.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/rel/WindowRel.java b/core/src/main/java/org/eigenbase/rel/WindowRel.java
index 8fd65b0..e17bf39 100644
--- a/core/src/main/java/org/eigenbase/rel/WindowRel.java
+++ b/core/src/main/java/org/eigenbase/rel/WindowRel.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/org/eigenbase/rel/WindowRelBase.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/rel/WindowRelBase.java b/core/src/main/java/org/eigenbase/rel/WindowRelBase.java
index 23989a6..1e46ea1 100644
--- a/core/src/main/java/org/eigenbase/rel/WindowRelBase.java
+++ b/core/src/main/java/org/eigenbase/rel/WindowRelBase.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/org/eigenbase/rel/convert/ConverterRel.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/rel/convert/ConverterRel.java b/core/src/main/java/org/eigenbase/rel/convert/ConverterRel.java
index e7abdd4..240ccd2 100644
--- a/core/src/main/java/org/eigenbase/rel/convert/ConverterRel.java
+++ b/core/src/main/java/org/eigenbase/rel/convert/ConverterRel.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/org/eigenbase/rel/convert/ConverterRelImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/rel/convert/ConverterRelImpl.java b/core/src/main/java/org/eigenbase/rel/convert/ConverterRelImpl.java
index 2b73ac2..8f84bb5 100644
--- a/core/src/main/java/org/eigenbase/rel/convert/ConverterRelImpl.java
+++ b/core/src/main/java/org/eigenbase/rel/convert/ConverterRelImpl.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/org/eigenbase/rel/convert/ConverterRule.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/rel/convert/ConverterRule.java b/core/src/main/java/org/eigenbase/rel/convert/ConverterRule.java
index c7e2861..0de792a 100644
--- a/core/src/main/java/org/eigenbase/rel/convert/ConverterRule.java
+++ b/core/src/main/java/org/eigenbase/rel/convert/ConverterRule.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/org/eigenbase/rel/convert/NoneConverterRel.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/rel/convert/NoneConverterRel.java b/core/src/main/java/org/eigenbase/rel/convert/NoneConverterRel.java
index 211d43b..b28f75b 100644
--- a/core/src/main/java/org/eigenbase/rel/convert/NoneConverterRel.java
+++ b/core/src/main/java/org/eigenbase/rel/convert/NoneConverterRel.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/org/eigenbase/rel/convert/TraitMatchingRule.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/rel/convert/TraitMatchingRule.java b/core/src/main/java/org/eigenbase/rel/convert/TraitMatchingRule.java
index f5f07b0..152bbf8 100644
--- a/core/src/main/java/org/eigenbase/rel/convert/TraitMatchingRule.java
+++ b/core/src/main/java/org/eigenbase/rel/convert/TraitMatchingRule.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/org/eigenbase/rel/convert/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/rel/convert/package-info.java b/core/src/main/java/org/eigenbase/rel/convert/package-info.java
index 503d2ce..c87ede1 100644
--- a/core/src/main/java/org/eigenbase/rel/convert/package-info.java
+++ b/core/src/main/java/org/eigenbase/rel/convert/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/org/eigenbase/rel/jdbc/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/rel/jdbc/package-info.java b/core/src/main/java/org/eigenbase/rel/jdbc/package-info.java
index b870289..3252672 100644
--- a/core/src/main/java/org/eigenbase/rel/jdbc/package-info.java
+++ b/core/src/main/java/org/eigenbase/rel/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/org/eigenbase/rel/metadata/BuiltInMetadata.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/rel/metadata/BuiltInMetadata.java b/core/src/main/java/org/eigenbase/rel/metadata/BuiltInMetadata.java
index a1622ae..863a712 100644
--- a/core/src/main/java/org/eigenbase/rel/metadata/BuiltInMetadata.java
+++ b/core/src/main/java/org/eigenbase/rel/metadata/BuiltInMetadata.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/org/eigenbase/rel/metadata/CachingRelMetadataProvider.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/rel/metadata/CachingRelMetadataProvider.java b/core/src/main/java/org/eigenbase/rel/metadata/CachingRelMetadataProvider.java
index 3b221fd..fe16222 100644
--- a/core/src/main/java/org/eigenbase/rel/metadata/CachingRelMetadataProvider.java
+++ b/core/src/main/java/org/eigenbase/rel/metadata/CachingRelMetadataProvider.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/org/eigenbase/rel/metadata/ChainedRelMetadataProvider.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/rel/metadata/ChainedRelMetadataProvider.java b/core/src/main/java/org/eigenbase/rel/metadata/ChainedRelMetadataProvider.java
index de86db0..b420ecb 100644
--- a/core/src/main/java/org/eigenbase/rel/metadata/ChainedRelMetadataProvider.java
+++ b/core/src/main/java/org/eigenbase/rel/metadata/ChainedRelMetadataProvider.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/org/eigenbase/rel/metadata/DefaultRelMetadataProvider.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/rel/metadata/DefaultRelMetadataProvider.java b/core/src/main/java/org/eigenbase/rel/metadata/DefaultRelMetadataProvider.java
index ec840f2..8d58d88 100644
--- a/core/src/main/java/org/eigenbase/rel/metadata/DefaultRelMetadataProvider.java
+++ b/core/src/main/java/org/eigenbase/rel/metadata/DefaultRelMetadataProvider.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/org/eigenbase/rel/metadata/Metadata.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/rel/metadata/Metadata.java b/core/src/main/java/org/eigenbase/rel/metadata/Metadata.java
index 9619108..935fc1a 100644
--- a/core/src/main/java/org/eigenbase/rel/metadata/Metadata.java
+++ b/core/src/main/java/org/eigenbase/rel/metadata/Metadata.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/org/eigenbase/rel/metadata/MetadataFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/rel/metadata/MetadataFactory.java b/core/src/main/java/org/eigenbase/rel/metadata/MetadataFactory.java
index f503682..a6897a0 100644
--- a/core/src/main/java/org/eigenbase/rel/metadata/MetadataFactory.java
+++ b/core/src/main/java/org/eigenbase/rel/metadata/MetadataFactory.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/org/eigenbase/rel/metadata/MetadataFactoryImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/rel/metadata/MetadataFactoryImpl.java b/core/src/main/java/org/eigenbase/rel/metadata/MetadataFactoryImpl.java
index 20bc73e..b12ff5c 100644
--- a/core/src/main/java/org/eigenbase/rel/metadata/MetadataFactoryImpl.java
+++ b/core/src/main/java/org/eigenbase/rel/metadata/MetadataFactoryImpl.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/org/eigenbase/rel/metadata/ReflectiveRelMetadataProvider.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/rel/metadata/ReflectiveRelMetadataProvider.java b/core/src/main/java/org/eigenbase/rel/metadata/ReflectiveRelMetadataProvider.java
index 20e6ec2..01b395e 100644
--- a/core/src/main/java/org/eigenbase/rel/metadata/ReflectiveRelMetadataProvider.java
+++ b/core/src/main/java/org/eigenbase/rel/metadata/ReflectiveRelMetadataProvider.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/org/eigenbase/rel/metadata/RelColumnMapping.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/rel/metadata/RelColumnMapping.java b/core/src/main/java/org/eigenbase/rel/metadata/RelColumnMapping.java
index 0ed5872..7244e0c 100644
--- a/core/src/main/java/org/eigenbase/rel/metadata/RelColumnMapping.java
+++ b/core/src/main/java/org/eigenbase/rel/metadata/RelColumnMapping.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/org/eigenbase/rel/metadata/RelColumnOrigin.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/rel/metadata/RelColumnOrigin.java b/core/src/main/java/org/eigenbase/rel/metadata/RelColumnOrigin.java
index 4a27fc1..b5ed27f 100644
--- a/core/src/main/java/org/eigenbase/rel/metadata/RelColumnOrigin.java
+++ b/core/src/main/java/org/eigenbase/rel/metadata/RelColumnOrigin.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/org/eigenbase/rel/metadata/RelMdColumnOrigins.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/rel/metadata/RelMdColumnOrigins.java b/core/src/main/java/org/eigenbase/rel/metadata/RelMdColumnOrigins.java
index 8b7fb4d..d56028d 100644
--- a/core/src/main/java/org/eigenbase/rel/metadata/RelMdColumnOrigins.java
+++ b/core/src/main/java/org/eigenbase/rel/metadata/RelMdColumnOrigins.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/org/eigenbase/rel/metadata/RelMdColumnUniqueness.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/rel/metadata/RelMdColumnUniqueness.java b/core/src/main/java/org/eigenbase/rel/metadata/RelMdColumnUniqueness.java
index 3929348..fe1c18a 100644
--- a/core/src/main/java/org/eigenbase/rel/metadata/RelMdColumnUniqueness.java
+++ b/core/src/main/java/org/eigenbase/rel/metadata/RelMdColumnUniqueness.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/org/eigenbase/rel/metadata/RelMdDistinctRowCount.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/rel/metadata/RelMdDistinctRowCount.java b/core/src/main/java/org/eigenbase/rel/metadata/RelMdDistinctRowCount.java
index af09e6f..dec34a0 100644
--- a/core/src/main/java/org/eigenbase/rel/metadata/RelMdDistinctRowCount.java
+++ b/core/src/main/java/org/eigenbase/rel/metadata/RelMdDistinctRowCount.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/org/eigenbase/rel/metadata/RelMdExplainVisibility.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/rel/metadata/RelMdExplainVisibility.java b/core/src/main/java/org/eigenbase/rel/metadata/RelMdExplainVisibility.java
index edee8e9..ee3b1e6 100644
--- a/core/src/main/java/org/eigenbase/rel/metadata/RelMdExplainVisibility.java
+++ b/core/src/main/java/org/eigenbase/rel/metadata/RelMdExplainVisibility.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/org/eigenbase/rel/metadata/RelMdPercentageOriginalRows.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/rel/metadata/RelMdPercentageOriginalRows.java b/core/src/main/java/org/eigenbase/rel/metadata/RelMdPercentageOriginalRows.java
index d821d76..cc05e63 100644
--- a/core/src/main/java/org/eigenbase/rel/metadata/RelMdPercentageOriginalRows.java
+++ b/core/src/main/java/org/eigenbase/rel/metadata/RelMdPercentageOriginalRows.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/org/eigenbase/rel/metadata/RelMdPopulationSize.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/rel/metadata/RelMdPopulationSize.java b/core/src/main/java/org/eigenbase/rel/metadata/RelMdPopulationSize.java
index a1389a4..f56e617 100644
--- a/core/src/main/java/org/eigenbase/rel/metadata/RelMdPopulationSize.java
+++ b/core/src/main/java/org/eigenbase/rel/metadata/RelMdPopulationSize.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/org/eigenbase/rel/metadata/RelMdRowCount.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/rel/metadata/RelMdRowCount.java b/core/src/main/java/org/eigenbase/rel/metadata/RelMdRowCount.java
index 6d27ea4..8554ce2 100644
--- a/core/src/main/java/org/eigenbase/rel/metadata/RelMdRowCount.java
+++ b/core/src/main/java/org/eigenbase/rel/metadata/RelMdRowCount.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/org/eigenbase/rel/metadata/RelMdSelectivity.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/rel/metadata/RelMdSelectivity.java b/core/src/main/java/org/eigenbase/rel/metadata/RelMdSelectivity.java
index 026c2eb..883d6c7 100644
--- a/core/src/main/java/org/eigenbase/rel/metadata/RelMdSelectivity.java
+++ b/core/src/main/java/org/eigenbase/rel/metadata/RelMdSelectivity.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/org/eigenbase/rel/metadata/RelMdUniqueKeys.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/rel/metadata/RelMdUniqueKeys.java b/core/src/main/java/org/eigenbase/rel/metadata/RelMdUniqueKeys.java
index 7c1538c..53f4dbc 100644
--- a/core/src/main/java/org/eigenbase/rel/metadata/RelMdUniqueKeys.java
+++ b/core/src/main/java/org/eigenbase/rel/metadata/RelMdUniqueKeys.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/org/eigenbase/rel/metadata/RelMdUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/rel/metadata/RelMdUtil.java b/core/src/main/java/org/eigenbase/rel/metadata/RelMdUtil.java
index 84439b1..b409309 100644
--- a/core/src/main/java/org/eigenbase/rel/metadata/RelMdUtil.java
+++ b/core/src/main/java/org/eigenbase/rel/metadata/RelMdUtil.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/org/eigenbase/rel/metadata/RelMetadataProvider.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/rel/metadata/RelMetadataProvider.java b/core/src/main/java/org/eigenbase/rel/metadata/RelMetadataProvider.java
index 640251f..c21cf8a 100644
--- a/core/src/main/java/org/eigenbase/rel/metadata/RelMetadataProvider.java
+++ b/core/src/main/java/org/eigenbase/rel/metadata/RelMetadataProvider.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/org/eigenbase/rel/metadata/RelMetadataQuery.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/rel/metadata/RelMetadataQuery.java b/core/src/main/java/org/eigenbase/rel/metadata/RelMetadataQuery.java
index eeee1e6..5f6f3a4 100644
--- a/core/src/main/java/org/eigenbase/rel/metadata/RelMetadataQuery.java
+++ b/core/src/main/java/org/eigenbase/rel/metadata/RelMetadataQuery.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/org/eigenbase/rel/metadata/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/rel/metadata/package-info.java b/core/src/main/java/org/eigenbase/rel/metadata/package-info.java
index f92e916..610f1c2 100644
--- a/core/src/main/java/org/eigenbase/rel/metadata/package-info.java
+++ b/core/src/main/java/org/eigenbase/rel/metadata/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
 //