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

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

http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/bfa3daee/core/src/main/java/org/eigenbase/sql/validate/WithItemNamespace.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/sql/validate/WithItemNamespace.java b/core/src/main/java/org/eigenbase/sql/validate/WithItemNamespace.java
index b7b0246..e0b0b91 100644
--- a/core/src/main/java/org/eigenbase/sql/validate/WithItemNamespace.java
+++ b/core/src/main/java/org/eigenbase/sql/validate/WithItemNamespace.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy 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/sql/validate/WithNamespace.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/sql/validate/WithNamespace.java b/core/src/main/java/org/eigenbase/sql/validate/WithNamespace.java
index b5126f6..00d6870 100644
--- a/core/src/main/java/org/eigenbase/sql/validate/WithNamespace.java
+++ b/core/src/main/java/org/eigenbase/sql/validate/WithNamespace.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy 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/sql/validate/WithScope.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/sql/validate/WithScope.java b/core/src/main/java/org/eigenbase/sql/validate/WithScope.java
index 2527722..3c9acc7 100644
--- a/core/src/main/java/org/eigenbase/sql/validate/WithScope.java
+++ b/core/src/main/java/org/eigenbase/sql/validate/WithScope.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy 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/sql/validate/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/sql/validate/package-info.java b/core/src/main/java/org/eigenbase/sql/validate/package-info.java
index 0823100..c45287a 100644
--- a/core/src/main/java/org/eigenbase/sql/validate/package-info.java
+++ b/core/src/main/java/org/eigenbase/sql/validate/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/sql2rel/DefaultValueFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/sql2rel/DefaultValueFactory.java b/core/src/main/java/org/eigenbase/sql2rel/DefaultValueFactory.java
index 8dbc32e..d35772a 100644
--- a/core/src/main/java/org/eigenbase/sql2rel/DefaultValueFactory.java
+++ b/core/src/main/java/org/eigenbase/sql2rel/DefaultValueFactory.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy 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/sql2rel/ReflectiveConvertletTable.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/sql2rel/ReflectiveConvertletTable.java b/core/src/main/java/org/eigenbase/sql2rel/ReflectiveConvertletTable.java
index 5ae2e94..b1c0ea7 100644
--- a/core/src/main/java/org/eigenbase/sql2rel/ReflectiveConvertletTable.java
+++ b/core/src/main/java/org/eigenbase/sql2rel/ReflectiveConvertletTable.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy 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/sql2rel/RelDecorrelator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/sql2rel/RelDecorrelator.java b/core/src/main/java/org/eigenbase/sql2rel/RelDecorrelator.java
index c7a0294..6d9a853 100644
--- a/core/src/main/java/org/eigenbase/sql2rel/RelDecorrelator.java
+++ b/core/src/main/java/org/eigenbase/sql2rel/RelDecorrelator.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy 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/sql2rel/RelFieldTrimmer.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/sql2rel/RelFieldTrimmer.java b/core/src/main/java/org/eigenbase/sql2rel/RelFieldTrimmer.java
index 94cf3bd..078bd03 100644
--- a/core/src/main/java/org/eigenbase/sql2rel/RelFieldTrimmer.java
+++ b/core/src/main/java/org/eigenbase/sql2rel/RelFieldTrimmer.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy 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/sql2rel/RelStructuredTypeFlattener.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/sql2rel/RelStructuredTypeFlattener.java b/core/src/main/java/org/eigenbase/sql2rel/RelStructuredTypeFlattener.java
index 02ca123..cb6867e 100644
--- a/core/src/main/java/org/eigenbase/sql2rel/RelStructuredTypeFlattener.java
+++ b/core/src/main/java/org/eigenbase/sql2rel/RelStructuredTypeFlattener.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy 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/sql2rel/SqlNodeToRexConverter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/sql2rel/SqlNodeToRexConverter.java b/core/src/main/java/org/eigenbase/sql2rel/SqlNodeToRexConverter.java
index f7eabd1..859ade8 100644
--- a/core/src/main/java/org/eigenbase/sql2rel/SqlNodeToRexConverter.java
+++ b/core/src/main/java/org/eigenbase/sql2rel/SqlNodeToRexConverter.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy 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/sql2rel/SqlNodeToRexConverterImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/sql2rel/SqlNodeToRexConverterImpl.java b/core/src/main/java/org/eigenbase/sql2rel/SqlNodeToRexConverterImpl.java
index d43c2d4..1011680 100644
--- a/core/src/main/java/org/eigenbase/sql2rel/SqlNodeToRexConverterImpl.java
+++ b/core/src/main/java/org/eigenbase/sql2rel/SqlNodeToRexConverterImpl.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy 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/sql2rel/SqlRexContext.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/sql2rel/SqlRexContext.java b/core/src/main/java/org/eigenbase/sql2rel/SqlRexContext.java
index c476794..b16df8b 100644
--- a/core/src/main/java/org/eigenbase/sql2rel/SqlRexContext.java
+++ b/core/src/main/java/org/eigenbase/sql2rel/SqlRexContext.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy 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/sql2rel/SqlRexConvertlet.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/sql2rel/SqlRexConvertlet.java b/core/src/main/java/org/eigenbase/sql2rel/SqlRexConvertlet.java
index 4f4bcfc..3b100d6 100644
--- a/core/src/main/java/org/eigenbase/sql2rel/SqlRexConvertlet.java
+++ b/core/src/main/java/org/eigenbase/sql2rel/SqlRexConvertlet.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy 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/sql2rel/SqlRexConvertletTable.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/sql2rel/SqlRexConvertletTable.java b/core/src/main/java/org/eigenbase/sql2rel/SqlRexConvertletTable.java
index 0b4114b..76f2a71 100644
--- a/core/src/main/java/org/eigenbase/sql2rel/SqlRexConvertletTable.java
+++ b/core/src/main/java/org/eigenbase/sql2rel/SqlRexConvertletTable.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy 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/sql2rel/SqlToRelConverter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/sql2rel/SqlToRelConverter.java b/core/src/main/java/org/eigenbase/sql2rel/SqlToRelConverter.java
index ec8fcf4..c56c788 100644
--- a/core/src/main/java/org/eigenbase/sql2rel/SqlToRelConverter.java
+++ b/core/src/main/java/org/eigenbase/sql2rel/SqlToRelConverter.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy 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/sql2rel/StandardConvertletTable.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/sql2rel/StandardConvertletTable.java b/core/src/main/java/org/eigenbase/sql2rel/StandardConvertletTable.java
index a553965..9d07c6f 100644
--- a/core/src/main/java/org/eigenbase/sql2rel/StandardConvertletTable.java
+++ b/core/src/main/java/org/eigenbase/sql2rel/StandardConvertletTable.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy 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/sql2rel/SubqueryConverter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/sql2rel/SubqueryConverter.java b/core/src/main/java/org/eigenbase/sql2rel/SubqueryConverter.java
index 758e14e..564a275 100644
--- a/core/src/main/java/org/eigenbase/sql2rel/SubqueryConverter.java
+++ b/core/src/main/java/org/eigenbase/sql2rel/SubqueryConverter.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy 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/sql2rel/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/sql2rel/package-info.java b/core/src/main/java/org/eigenbase/sql2rel/package-info.java
index c3dfe15..7912915 100644
--- a/core/src/main/java/org/eigenbase/sql2rel/package-info.java
+++ b/core/src/main/java/org/eigenbase/sql2rel/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/stat/RelStatColumnStatistics.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/stat/RelStatColumnStatistics.java b/core/src/main/java/org/eigenbase/stat/RelStatColumnStatistics.java
index 85218d3..d398e8f 100644
--- a/core/src/main/java/org/eigenbase/stat/RelStatColumnStatistics.java
+++ b/core/src/main/java/org/eigenbase/stat/RelStatColumnStatistics.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy 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/stat/RelStatSource.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/stat/RelStatSource.java b/core/src/main/java/org/eigenbase/stat/RelStatSource.java
index f075764..5f0b1d1 100644
--- a/core/src/main/java/org/eigenbase/stat/RelStatSource.java
+++ b/core/src/main/java/org/eigenbase/stat/RelStatSource.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy 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/stat/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/stat/package-info.java b/core/src/main/java/org/eigenbase/stat/package-info.java
index fb1be85..b6ff91d 100644
--- a/core/src/main/java/org/eigenbase/stat/package-info.java
+++ b/core/src/main/java/org/eigenbase/stat/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/trace/EigenbaseLogger.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/trace/EigenbaseLogger.java b/core/src/main/java/org/eigenbase/trace/EigenbaseLogger.java
index 3ef6e21..964cf4c 100644
--- a/core/src/main/java/org/eigenbase/trace/EigenbaseLogger.java
+++ b/core/src/main/java/org/eigenbase/trace/EigenbaseLogger.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy 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/trace/EigenbaseTimingTracer.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/trace/EigenbaseTimingTracer.java b/core/src/main/java/org/eigenbase/trace/EigenbaseTimingTracer.java
index a79c1b5..3f10fa9 100644
--- a/core/src/main/java/org/eigenbase/trace/EigenbaseTimingTracer.java
+++ b/core/src/main/java/org/eigenbase/trace/EigenbaseTimingTracer.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy 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/trace/EigenbaseTrace.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/trace/EigenbaseTrace.java b/core/src/main/java/org/eigenbase/trace/EigenbaseTrace.java
index c086ee4..bb537c9 100644
--- a/core/src/main/java/org/eigenbase/trace/EigenbaseTrace.java
+++ b/core/src/main/java/org/eigenbase/trace/EigenbaseTrace.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy 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/trace/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/trace/package-info.java b/core/src/main/java/org/eigenbase/trace/package-info.java
index 855f0b7..3bcab12 100644
--- a/core/src/main/java/org/eigenbase/trace/package-info.java
+++ b/core/src/main/java/org/eigenbase/trace/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/util/BarfingInvocationHandler.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/util/BarfingInvocationHandler.java b/core/src/main/java/org/eigenbase/util/BarfingInvocationHandler.java
index 200277c..cd3d1d6 100644
--- a/core/src/main/java/org/eigenbase/util/BarfingInvocationHandler.java
+++ b/core/src/main/java/org/eigenbase/util/BarfingInvocationHandler.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy 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/util/Benchmark.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/util/Benchmark.java b/core/src/main/java/org/eigenbase/util/Benchmark.java
index 2693d46..fd99b52 100644
--- a/core/src/main/java/org/eigenbase/util/Benchmark.java
+++ b/core/src/main/java/org/eigenbase/util/Benchmark.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy 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/util/BitString.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/util/BitString.java b/core/src/main/java/org/eigenbase/util/BitString.java
index 8761b5e..8812419 100644
--- a/core/src/main/java/org/eigenbase/util/BitString.java
+++ b/core/src/main/java/org/eigenbase/util/BitString.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy 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/util/Bug.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/util/Bug.java b/core/src/main/java/org/eigenbase/util/Bug.java
index 9bda405..a39484d 100644
--- a/core/src/main/java/org/eigenbase/util/Bug.java
+++ b/core/src/main/java/org/eigenbase/util/Bug.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy 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/util/CancelFlag.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/util/CancelFlag.java b/core/src/main/java/org/eigenbase/util/CancelFlag.java
index 81d9bb3..d37a57d 100644
--- a/core/src/main/java/org/eigenbase/util/CancelFlag.java
+++ b/core/src/main/java/org/eigenbase/util/CancelFlag.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy 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/util/CastingList.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/util/CastingList.java b/core/src/main/java/org/eigenbase/util/CastingList.java
index b3d5c31..a7cc9ea 100644
--- a/core/src/main/java/org/eigenbase/util/CastingList.java
+++ b/core/src/main/java/org/eigenbase/util/CastingList.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy 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/util/ChunkList.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/util/ChunkList.java b/core/src/main/java/org/eigenbase/util/ChunkList.java
index 544de38..0a38ade 100644
--- a/core/src/main/java/org/eigenbase/util/ChunkList.java
+++ b/core/src/main/java/org/eigenbase/util/ChunkList.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy 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/util/ClosableAllocation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/util/ClosableAllocation.java b/core/src/main/java/org/eigenbase/util/ClosableAllocation.java
index 982502c..e7cb2ff 100644
--- a/core/src/main/java/org/eigenbase/util/ClosableAllocation.java
+++ b/core/src/main/java/org/eigenbase/util/ClosableAllocation.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy 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/util/ClosableAllocationOwner.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/util/ClosableAllocationOwner.java b/core/src/main/java/org/eigenbase/util/ClosableAllocationOwner.java
index 6cca47d..73966bc 100644
--- a/core/src/main/java/org/eigenbase/util/ClosableAllocationOwner.java
+++ b/core/src/main/java/org/eigenbase/util/ClosableAllocationOwner.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy 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/util/CompositeList.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/util/CompositeList.java b/core/src/main/java/org/eigenbase/util/CompositeList.java
index 18a121c..75c67be 100644
--- a/core/src/main/java/org/eigenbase/util/CompositeList.java
+++ b/core/src/main/java/org/eigenbase/util/CompositeList.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy 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/util/CompoundClosableAllocation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/util/CompoundClosableAllocation.java b/core/src/main/java/org/eigenbase/util/CompoundClosableAllocation.java
index 1cbfd74..8a8876a 100644
--- a/core/src/main/java/org/eigenbase/util/CompoundClosableAllocation.java
+++ b/core/src/main/java/org/eigenbase/util/CompoundClosableAllocation.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy 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/util/ControlFlowException.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/util/ControlFlowException.java b/core/src/main/java/org/eigenbase/util/ControlFlowException.java
index 91fd986..dc7f9c5 100644
--- a/core/src/main/java/org/eigenbase/util/ControlFlowException.java
+++ b/core/src/main/java/org/eigenbase/util/ControlFlowException.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy 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/util/DelegatingInvocationHandler.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/util/DelegatingInvocationHandler.java b/core/src/main/java/org/eigenbase/util/DelegatingInvocationHandler.java
index db96791..8a6ab21 100644
--- a/core/src/main/java/org/eigenbase/util/DelegatingInvocationHandler.java
+++ b/core/src/main/java/org/eigenbase/util/DelegatingInvocationHandler.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy 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/util/EigenbaseContextException.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/util/EigenbaseContextException.java b/core/src/main/java/org/eigenbase/util/EigenbaseContextException.java
index d34f75c..09679a2 100644
--- a/core/src/main/java/org/eigenbase/util/EigenbaseContextException.java
+++ b/core/src/main/java/org/eigenbase/util/EigenbaseContextException.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy 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/util/EigenbaseException.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/util/EigenbaseException.java b/core/src/main/java/org/eigenbase/util/EigenbaseException.java
index 5c5b354..53ba865 100644
--- a/core/src/main/java/org/eigenbase/util/EigenbaseException.java
+++ b/core/src/main/java/org/eigenbase/util/EigenbaseException.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy 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/util/Filterator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/util/Filterator.java b/core/src/main/java/org/eigenbase/util/Filterator.java
index e2b3212..7c9d6fd 100644
--- a/core/src/main/java/org/eigenbase/util/Filterator.java
+++ b/core/src/main/java/org/eigenbase/util/Filterator.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy 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/util/Glossary.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/util/Glossary.java b/core/src/main/java/org/eigenbase/util/Glossary.java
index 89c925a..27f6858 100644
--- a/core/src/main/java/org/eigenbase/util/Glossary.java
+++ b/core/src/main/java/org/eigenbase/util/Glossary.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy 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/util/IdentityHashSet.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/util/IdentityHashSet.java b/core/src/main/java/org/eigenbase/util/IdentityHashSet.java
index ba4e8b3..33810f8 100644
--- a/core/src/main/java/org/eigenbase/util/IdentityHashSet.java
+++ b/core/src/main/java/org/eigenbase/util/IdentityHashSet.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy 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/util/ImmutableIntList.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/util/ImmutableIntList.java b/core/src/main/java/org/eigenbase/util/ImmutableIntList.java
index aa1a35e..b1e9845 100644
--- a/core/src/main/java/org/eigenbase/util/ImmutableIntList.java
+++ b/core/src/main/java/org/eigenbase/util/ImmutableIntList.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy 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/util/ImmutableNullableList.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/util/ImmutableNullableList.java b/core/src/main/java/org/eigenbase/util/ImmutableNullableList.java
index 39c8921..63c3d56 100644
--- a/core/src/main/java/org/eigenbase/util/ImmutableNullableList.java
+++ b/core/src/main/java/org/eigenbase/util/ImmutableNullableList.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy 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/util/IntList.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/util/IntList.java b/core/src/main/java/org/eigenbase/util/IntList.java
index 11ea535..91a9d61 100644
--- a/core/src/main/java/org/eigenbase/util/IntList.java
+++ b/core/src/main/java/org/eigenbase/util/IntList.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy 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/util/IntegerIntervalSet.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/util/IntegerIntervalSet.java b/core/src/main/java/org/eigenbase/util/IntegerIntervalSet.java
index adf0c45..c15ed51 100644
--- a/core/src/main/java/org/eigenbase/util/IntegerIntervalSet.java
+++ b/core/src/main/java/org/eigenbase/util/IntegerIntervalSet.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy 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/util/JsonBuilder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/util/JsonBuilder.java b/core/src/main/java/org/eigenbase/util/JsonBuilder.java
index de6df3a..30e7564 100644
--- a/core/src/main/java/org/eigenbase/util/JsonBuilder.java
+++ b/core/src/main/java/org/eigenbase/util/JsonBuilder.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy 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/util/NlsString.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/util/NlsString.java b/core/src/main/java/org/eigenbase/util/NlsString.java
index e12c601..42f1202 100644
--- a/core/src/main/java/org/eigenbase/util/NlsString.java
+++ b/core/src/main/java/org/eigenbase/util/NlsString.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy 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/util/Pair.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/util/Pair.java b/core/src/main/java/org/eigenbase/util/Pair.java
index e7f2163..f8cee3d 100644
--- a/core/src/main/java/org/eigenbase/util/Pair.java
+++ b/core/src/main/java/org/eigenbase/util/Pair.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy 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/util/Permutation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/util/Permutation.java b/core/src/main/java/org/eigenbase/util/Permutation.java
index 269adc8..3ed1c43 100644
--- a/core/src/main/java/org/eigenbase/util/Permutation.java
+++ b/core/src/main/java/org/eigenbase/util/Permutation.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy 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/util/ReflectUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/util/ReflectUtil.java b/core/src/main/java/org/eigenbase/util/ReflectUtil.java
index 17feaaf..a76334c 100644
--- a/core/src/main/java/org/eigenbase/util/ReflectUtil.java
+++ b/core/src/main/java/org/eigenbase/util/ReflectUtil.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy 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/util/ReflectiveVisitDispatcher.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/util/ReflectiveVisitDispatcher.java b/core/src/main/java/org/eigenbase/util/ReflectiveVisitDispatcher.java
index d1dbfb7..8b25749 100644
--- a/core/src/main/java/org/eigenbase/util/ReflectiveVisitDispatcher.java
+++ b/core/src/main/java/org/eigenbase/util/ReflectiveVisitDispatcher.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy 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/util/ReflectiveVisitor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/util/ReflectiveVisitor.java b/core/src/main/java/org/eigenbase/util/ReflectiveVisitor.java
index edf8d59..25a62ce 100644
--- a/core/src/main/java/org/eigenbase/util/ReflectiveVisitor.java
+++ b/core/src/main/java/org/eigenbase/util/ReflectiveVisitor.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy 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/util/RhBase64.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/util/RhBase64.java b/core/src/main/java/org/eigenbase/util/RhBase64.java
index 23e5b78..9d00828 100644
--- a/core/src/main/java/org/eigenbase/util/RhBase64.java
+++ b/core/src/main/java/org/eigenbase/util/RhBase64.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy 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/util/SaffronProperties.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/util/SaffronProperties.java b/core/src/main/java/org/eigenbase/util/SaffronProperties.java
index 8181db0..280540c 100644
--- a/core/src/main/java/org/eigenbase/util/SaffronProperties.java
+++ b/core/src/main/java/org/eigenbase/util/SaffronProperties.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy 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/util/SerializableCharset.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/util/SerializableCharset.java b/core/src/main/java/org/eigenbase/util/SerializableCharset.java
index fd93dc0..e98696d 100644
--- a/core/src/main/java/org/eigenbase/util/SerializableCharset.java
+++ b/core/src/main/java/org/eigenbase/util/SerializableCharset.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy 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/util/StackWriter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/util/StackWriter.java b/core/src/main/java/org/eigenbase/util/StackWriter.java
index aed9d3f..9ad554c 100644
--- a/core/src/main/java/org/eigenbase/util/StackWriter.java
+++ b/core/src/main/java/org/eigenbase/util/StackWriter.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy 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/util/Stacks.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/util/Stacks.java b/core/src/main/java/org/eigenbase/util/Stacks.java
index e973fd5..fd32836 100644
--- a/core/src/main/java/org/eigenbase/util/Stacks.java
+++ b/core/src/main/java/org/eigenbase/util/Stacks.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy 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/util/Static.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/util/Static.java b/core/src/main/java/org/eigenbase/util/Static.java
index 21ff978..d72eba6 100644
--- a/core/src/main/java/org/eigenbase/util/Static.java
+++ b/core/src/main/java/org/eigenbase/util/Static.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy 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/util/Template.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/util/Template.java b/core/src/main/java/org/eigenbase/util/Template.java
index 44c14ae..2ddc4cb 100644
--- a/core/src/main/java/org/eigenbase/util/Template.java
+++ b/core/src/main/java/org/eigenbase/util/Template.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy 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/util/UnmodifiableArrayList.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/util/UnmodifiableArrayList.java b/core/src/main/java/org/eigenbase/util/UnmodifiableArrayList.java
index dd620cb..e675738 100644
--- a/core/src/main/java/org/eigenbase/util/UnmodifiableArrayList.java
+++ b/core/src/main/java/org/eigenbase/util/UnmodifiableArrayList.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy 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/util/Util.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/util/Util.java b/core/src/main/java/org/eigenbase/util/Util.java
index 9672c0c..e1bcf4a 100644
--- a/core/src/main/java/org/eigenbase/util/Util.java
+++ b/core/src/main/java/org/eigenbase/util/Util.java
@@ -1,11 +1,10 @@
 /*
-// Licensed to Julian Hyde under one or more contributor license
-// agreements. See the NOTICE file distributed with this work for
-// additional information regarding copyright ownership.
-//
-// Julian Hyde licenses this file to you under the Apache License,
-// Version 2.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at:
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy of the License at
 //
 // http://www.apache.org/licenses/LICENSE-2.0
 //