From c6bf382ebe96e70eb57a814284eb0af3d618ba30 Mon Sep 17 00:00:00 2001
From: Jim Kellerman <jimk@apache.org>
Date: Thu, 12 Jul 2007 22:08:25 +0000
Subject: [PATCH] HADOOP-1600 Update license in HBase code

git-svn-id: https://svn.apache.org/repos/asf/lucene/hadoop/trunk/src/contrib/hbase@555791 13f79535-47bb-0310-9956-ffa450edef68
---
 CHANGES.txt                                   |  1 +
 bin/hbase                                     | 20 ++++++++++++++++++
 bin/hbase-config.sh                           | 21 +++++++++++++++++++
 bin/hbase-daemon.sh                           | 20 ++++++++++++++++++
 bin/hbase-daemons.sh                          | 20 ++++++++++++++++++
 bin/regionservers.sh                          | 20 ++++++++++++++++++
 bin/start-hbase.sh                            | 21 +++++++++++++++++++
 bin/stop-hbase.sh                             | 21 +++++++++++++++++++
 build.xml                                     | 19 +++++++++++++++++
 conf/hbase-default.xml                        | 21 +++++++++++++++++++
 conf/hbase-env.sh                             | 21 +++++++++++++++++++
 conf/hbase-site.xml                           | 21 +++++++++++++++++++
 .../hadoop/hbase/BloomFilterDescriptor.java   | 10 ++++++---
 .../apache/hadoop/hbase/HAbstractScanner.java | 12 +++++++----
 .../hadoop/hbase/HBaseConfiguration.java      | 10 ++++++---
 src/java/org/apache/hadoop/hbase/HClient.java | 12 +++++++----
 .../hadoop/hbase/HColumnDescriptor.java       | 12 +++++++----
 .../org/apache/hadoop/hbase/HConstants.java   | 10 ++++++---
 .../org/apache/hadoop/hbase/HGlobals.java     | 12 +++++++----
 .../hbase/HInternalScannerInterface.java      | 10 ++++++---
 .../org/apache/hadoop/hbase/HLocking.java     | 10 ++++++---
 src/java/org/apache/hadoop/hbase/HLog.java    | 12 +++++++----
 .../org/apache/hadoop/hbase/HLogEdit.java     | 12 +++++++----
 src/java/org/apache/hadoop/hbase/HLogKey.java | 12 +++++++----
 src/java/org/apache/hadoop/hbase/HMaster.java | 12 +++++++----
 .../apache/hadoop/hbase/HMasterInterface.java | 10 ++++++---
 .../hadoop/hbase/HMasterRegionInterface.java  | 10 ++++++---
 .../org/apache/hadoop/hbase/HMemcache.java    | 12 +++++++----
 src/java/org/apache/hadoop/hbase/HMerge.java  | 10 ++++++---
 src/java/org/apache/hadoop/hbase/HMsg.java    | 12 +++++++----
 src/java/org/apache/hadoop/hbase/HRegion.java | 12 +++++++----
 .../org/apache/hadoop/hbase/HRegionInfo.java  | 12 +++++++----
 .../apache/hadoop/hbase/HRegionInterface.java | 12 +++++++----
 .../apache/hadoop/hbase/HRegionServer.java    | 12 +++++++----
 .../apache/hadoop/hbase/HRegiondirReader.java | 10 ++++++---
 .../hadoop/hbase/HScannerInterface.java       | 10 ++++++---
 .../apache/hadoop/hbase/HServerAddress.java   | 12 +++++++----
 .../org/apache/hadoop/hbase/HServerInfo.java  | 12 +++++++----
 src/java/org/apache/hadoop/hbase/HStore.java  | 12 +++++++----
 .../org/apache/hadoop/hbase/HStoreFile.java   | 10 ++++++---
 .../org/apache/hadoop/hbase/HStoreKey.java    | 12 +++++++----
 .../apache/hadoop/hbase/HTableDescriptor.java | 12 +++++++----
 .../hbase/InvalidColumnNameException.java     | 10 ++++++---
 .../apache/hadoop/hbase/LeaseListener.java    | 10 ++++++---
 src/java/org/apache/hadoop/hbase/Leases.java  | 10 ++++++---
 .../apache/hadoop/hbase/LockException.java    | 10 ++++++---
 .../hbase/MasterNotRunningException.java      | 10 ++++++---
 .../hbase/NoServerForRegionException.java     | 10 ++++++---
 .../hbase/NotServingRegionException.java      | 10 ++++++---
 .../hadoop/hbase/RegionNotFoundException.java | 10 ++++++---
 .../hbase/RegionServerRunningException.java   | 12 +++++++----
 .../hbase/RegionUnavailableListener.java      | 12 +++++++----
 .../hadoop/hbase/RemoteExceptionHandler.java  | 10 ++++++---
 src/java/org/apache/hadoop/hbase/Shell.java   | 10 ++++++---
 .../hbase/TableNotDisabledException.java      | 10 ++++++---
 .../hadoop/hbase/UnknownScannerException.java | 10 ++++++---
 .../hadoop/hbase/WrongRegionException.java    | 10 ++++++---
 .../filter/InvalidRowFilterException.java     | 10 ++++++---
 .../hadoop/hbase/filter/PageRowFilter.java    | 12 +++++++----
 .../hadoop/hbase/filter/RegExpRowFilter.java  | 12 +++++++----
 .../hbase/filter/RowFilterInterface.java      | 12 +++++++----
 .../hadoop/hbase/filter/RowFilterSet.java     | 12 +++++++----
 .../hbase/io/ImmutableBytesWritable.java      |  2 ++
 .../org/apache/hadoop/hbase/io/KeyedData.java | 12 +++++++----
 .../hbase/io/KeyedDataArrayWritable.java      | 10 ++++++---
 .../hadoop/hbase/mapred/GroupingTableMap.java | 10 ++++++---
 .../hadoop/hbase/mapred/IdentityTableMap.java | 10 ++++++---
 .../hbase/mapred/IdentityTableReduce.java     | 10 ++++++---
 .../hadoop/hbase/mapred/TableInputFormat.java | 10 ++++++---
 .../apache/hadoop/hbase/mapred/TableMap.java  | 10 ++++++---
 .../hbase/mapred/TableOutputCollector.java    | 10 ++++++---
 .../hbase/mapred/TableOutputFormat.java       | 10 ++++++---
 .../hadoop/hbase/mapred/TableReduce.java      | 10 ++++++---
 .../hadoop/hbase/mapred/TableSplit.java       | 10 ++++++---
 .../hadoop/hbase/shell/BasicCommand.java      | 10 ++++++---
 .../apache/hadoop/hbase/shell/Command.java    | 10 ++++++---
 .../hadoop/hbase/shell/CommandFactory.java    | 10 ++++++---
 .../hadoop/hbase/shell/ConsoleTable.java      | 10 ++++++---
 .../hadoop/hbase/shell/CreateCommand.java     | 10 ++++++---
 .../hadoop/hbase/shell/DeleteCommand.java     | 10 ++++++---
 .../hadoop/hbase/shell/DescCommand.java       | 10 ++++++---
 .../hadoop/hbase/shell/DropCommand.java       | 10 ++++++---
 .../hadoop/hbase/shell/ExitCommand.java       | 10 ++++++---
 .../apache/hadoop/hbase/shell/HBaseShell.jj   | 10 ++++++---
 .../hadoop/hbase/shell/HelpCommand.java       | 10 ++++++---
 .../hadoop/hbase/shell/HelpContents.java      | 10 ++++++---
 .../hadoop/hbase/shell/HelpManager.java       | 10 ++++++---
 .../hadoop/hbase/shell/InsertCommand.java     | 10 ++++++---
 .../apache/hadoop/hbase/shell/ReturnMsg.java  | 10 ++++++---
 .../hadoop/hbase/shell/SelectCommand.java     | 10 ++++++---
 .../hadoop/hbase/shell/ShowCommand.java       | 10 ++++++---
 .../hbase/shell/generated/ParseException.java | 10 ++++++---
 .../hadoop/hbase/shell/generated/Parser.java  | 10 ++++++---
 .../shell/generated/ParserConstants.java      | 10 ++++++---
 .../shell/generated/ParserTokenManager.java   | 10 ++++++---
 .../shell/generated/SimpleCharStream.java     | 10 ++++++---
 .../hadoop/hbase/shell/generated/Token.java   | 10 ++++++---
 .../hbase/shell/generated/TokenMgrError.java  | 10 ++++++---
 .../org/apache/hadoop/hbase/util/Keying.java  |  2 ++
 src/java/org/onelab/filter/BloomFilter.java   | 17 +++++++++++++++
 .../onelab/filter/CountingBloomFilter.java    | 17 +++++++++++++++
 .../org/onelab/filter/DynamicBloomFilter.java | 17 +++++++++++++++
 src/java/org/onelab/filter/Filter.java        | 17 +++++++++++++++
 src/java/org/onelab/filter/HashFunction.java  | 17 +++++++++++++++
 src/java/org/onelab/filter/Key.java           | 17 +++++++++++++++
 src/java/org/onelab/filter/RemoveScheme.java  | 17 +++++++++++++++
 .../onelab/filter/RetouchedBloomFilter.java   | 17 +++++++++++++++
 src/test/hbase-site.xml                       | 21 +++++++++++++++++++
 .../hadoop/hbase/AbstractMergeTestBase.java   | 10 ++++++---
 .../hadoop/hbase/HBaseClusterTestCase.java    | 12 +++++++----
 .../apache/hadoop/hbase/HBaseTestCase.java    | 12 +++++++----
 .../apache/hadoop/hbase/MiniHBaseCluster.java | 12 +++++++----
 .../hadoop/hbase/PerformanceEvaluation.java   | 12 +++++++----
 .../PerformanceEvaluation_Counter.properties  | 20 ++++++++++++++++++
 .../hadoop/hbase/StaticTestEnvironment.java   | 12 +++++++----
 .../apache/hadoop/hbase/TestBloomFilters.java | 10 ++++++---
 .../hbase/TestCleanRegionServerExit.java      | 12 +++++++----
 src/test/org/apache/hadoop/hbase/TestGet.java | 12 +++++++----
 .../apache/hadoop/hbase/TestHBaseCluster.java | 12 +++++++----
 .../org/apache/hadoop/hbase/TestHClient.java  | 10 ++++++---
 .../org/apache/hadoop/hbase/TestHLog.java     | 10 ++++++---
 .../apache/hadoop/hbase/TestHMemcache.java    | 10 ++++++---
 .../org/apache/hadoop/hbase/TestHRegion.java  | 12 +++++++----
 .../apache/hadoop/hbase/TestMasterAdmin.java  | 12 +++++++----
 .../apache/hadoop/hbase/TestMergeMeta.java    | 10 ++++++---
 .../apache/hadoop/hbase/TestMergeTable.java   | 10 ++++++---
 .../org/apache/hadoop/hbase/TestScanner.java  | 12 +++++++----
 .../org/apache/hadoop/hbase/TestScanner2.java | 10 ++++++---
 .../org/apache/hadoop/hbase/TestTable.java    | 12 +++++++----
 .../hadoop/hbase/TestTableMapReduce.java      | 10 ++++++---
 .../hbase/filter/TestPageRowFilter.java       | 10 ++++++---
 .../hbase/filter/TestRegExpRowFilter.java     | 10 ++++++---
 .../hadoop/hbase/shell/TestHBaseShell.java    | 10 ++++++---
 .../apache/hadoop/hbase/util/TestKeying.java  |  2 ++
 src/test/org/onelab/test/StringKey.java       | 17 +++++++++++++++
 src/test/org/onelab/test/TestFilter.java      | 17 +++++++++++++++
 136 files changed, 1244 insertions(+), 365 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 1e7b2cb5a8f..a88fd778889 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -57,3 +57,4 @@ Trunk (unreleased changes)
      HADOOP-1466 Clean up visibility and javadoc issues in HBase.
  34. HADOOP-1589 Exception handling in HBase is broken over client server connections
  35. HADOOP-1375 a simple parser for hbase (Edward Yoon via Stack)
+ 36. HADOOP-1600 Update license in HBase code
diff --git a/bin/hbase b/bin/hbase
index b9559236b69..357819bb9a9 100755
--- a/bin/hbase
+++ b/bin/hbase
@@ -1,4 +1,24 @@
 #! /bin/sh
+#
+#/**
+# * Copyright 2007 The Apache Software Foundation
+# *
+# * Licensed to the Apache Software Foundation (ASF) under one
+# * or more contributor license agreements.  See the NOTICE file
+# * distributed with this work for additional information
+# * regarding copyright ownership.  The ASF licenses this file
+# * to you under the Apache License, Version 2.0 (the
+# * "License"); you may not use this file except in compliance
+# * with the License.  You may obtain a copy of the License at
+# *
+# *     http://www.apache.org/licenses/LICENSE-2.0
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# */
 # 
 # The hbase command script.  Based on the hadoop command script putting
 # in hbase classes, libs and configurations ahead of hadoop's.
diff --git a/bin/hbase-config.sh b/bin/hbase-config.sh
index 9aa664e089b..08984cf224d 100644
--- a/bin/hbase-config.sh
+++ b/bin/hbase-config.sh
@@ -1,3 +1,24 @@
+#
+#/**
+# * Copyright 2007 The Apache Software Foundation
+# *
+# * Licensed to the Apache Software Foundation (ASF) under one
+# * or more contributor license agreements.  See the NOTICE file
+# * distributed with this work for additional information
+# * regarding copyright ownership.  The ASF licenses this file
+# * to you under the Apache License, Version 2.0 (the
+# * "License"); you may not use this file except in compliance
+# * with the License.  You may obtain a copy of the License at
+# *
+# *     http://www.apache.org/licenses/LICENSE-2.0
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# */
+
 # included in all the hbase scripts with source command
 # should not be executable directly
 # also should not be passed any arguments, since we need original $*
diff --git a/bin/hbase-daemon.sh b/bin/hbase-daemon.sh
index 26d3f661994..13489b72395 100755
--- a/bin/hbase-daemon.sh
+++ b/bin/hbase-daemon.sh
@@ -1,4 +1,24 @@
 #!/bin/sh
+#
+#/**
+# * Copyright 2007 The Apache Software Foundation
+# *
+# * Licensed to the Apache Software Foundation (ASF) under one
+# * or more contributor license agreements.  See the NOTICE file
+# * distributed with this work for additional information
+# * regarding copyright ownership.  The ASF licenses this file
+# * to you under the Apache License, Version 2.0 (the
+# * "License"); you may not use this file except in compliance
+# * with the License.  You may obtain a copy of the License at
+# *
+# *     http://www.apache.org/licenses/LICENSE-2.0
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# */
 # 
 # Runs a Hadoop hbase command as a daemon.
 #
diff --git a/bin/hbase-daemons.sh b/bin/hbase-daemons.sh
index af20b7a2189..f2ff7f1a7c0 100755
--- a/bin/hbase-daemons.sh
+++ b/bin/hbase-daemons.sh
@@ -1,4 +1,24 @@
 #!/bin/sh
+#
+#/**
+# * Copyright 2007 The Apache Software Foundation
+# *
+# * Licensed to the Apache Software Foundation (ASF) under one
+# * or more contributor license agreements.  See the NOTICE file
+# * distributed with this work for additional information
+# * regarding copyright ownership.  The ASF licenses this file
+# * to you under the Apache License, Version 2.0 (the
+# * "License"); you may not use this file except in compliance
+# * with the License.  You may obtain a copy of the License at
+# *
+# *     http://www.apache.org/licenses/LICENSE-2.0
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# */
 # 
 # Run a Hadoop hbase command on all slave hosts.
 # Modelled after $HADOOP_HOME/bin/hadoop-daemons.sh
diff --git a/bin/regionservers.sh b/bin/regionservers.sh
index b737f093b15..d87e3d3c60b 100755
--- a/bin/regionservers.sh
+++ b/bin/regionservers.sh
@@ -1,4 +1,24 @@
 #!/bin/bash
+#
+#/**
+# * Copyright 2007 The Apache Software Foundation
+# *
+# * Licensed to the Apache Software Foundation (ASF) under one
+# * or more contributor license agreements.  See the NOTICE file
+# * distributed with this work for additional information
+# * regarding copyright ownership.  The ASF licenses this file
+# * to you under the Apache License, Version 2.0 (the
+# * "License"); you may not use this file except in compliance
+# * with the License.  You may obtain a copy of the License at
+# *
+# *     http://www.apache.org/licenses/LICENSE-2.0
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# */
 # 
 # Run a shell command on all regionserver hosts.
 #
diff --git a/bin/start-hbase.sh b/bin/start-hbase.sh
index b500f05c3bc..bd3939642e9 100755
--- a/bin/start-hbase.sh
+++ b/bin/start-hbase.sh
@@ -1,4 +1,25 @@
 #!/bin/sh
+#
+#/**
+# * Copyright 2007 The Apache Software Foundation
+# *
+# * Licensed to the Apache Software Foundation (ASF) under one
+# * or more contributor license agreements.  See the NOTICE file
+# * distributed with this work for additional information
+# * regarding copyright ownership.  The ASF licenses this file
+# * to you under the Apache License, Version 2.0 (the
+# * "License"); you may not use this file except in compliance
+# * with the License.  You may obtain a copy of the License at
+# *
+# *     http://www.apache.org/licenses/LICENSE-2.0
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# */
+
 # Modelled after $HADOOP_HOME/bin/start-hbase.sh.
 
 # Start hadoop hbase daemons.
diff --git a/bin/stop-hbase.sh b/bin/stop-hbase.sh
index 9a255aeb1a0..b8062f06f1c 100755
--- a/bin/stop-hbase.sh
+++ b/bin/stop-hbase.sh
@@ -1,4 +1,25 @@
 #!/bin/sh
+#
+#/**
+# * Copyright 2007 The Apache Software Foundation
+# *
+# * Licensed to the Apache Software Foundation (ASF) under one
+# * or more contributor license agreements.  See the NOTICE file
+# * distributed with this work for additional information
+# * regarding copyright ownership.  The ASF licenses this file
+# * to you under the Apache License, Version 2.0 (the
+# * "License"); you may not use this file except in compliance
+# * with the License.  You may obtain a copy of the License at
+# *
+# *     http://www.apache.org/licenses/LICENSE-2.0
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# */
+
 # Modelled after $HADOOP_HOME/bin/stop-hbase.sh.
 
 # Stop hadoop hbase daemons.  Run this on master node.
diff --git a/build.xml b/build.xml
index 6b171284dac..5f3a7e9807c 100644
--- a/build.xml
+++ b/build.xml
@@ -1,5 +1,24 @@
 <?xml version="1.0"?>
 
+<!--
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
 <!-- 
 Before you can run these subtargets directly, you need 
 to call at top-level: ant deploy-contrib compile-core-test
diff --git a/conf/hbase-default.xml b/conf/hbase-default.xml
index b956bb26568..8e733569256 100644
--- a/conf/hbase-default.xml
+++ b/conf/hbase-default.xml
@@ -1,5 +1,26 @@
 <?xml version="1.0"?>
 <?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+<!--
+/**
+ * Copyright 2007 The Apache Software Foundation
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
 <configuration>
   <property>
     <name>hbase.master</name>
diff --git a/conf/hbase-env.sh b/conf/hbase-env.sh
index 40567001a64..ac2b8d5903c 100644
--- a/conf/hbase-env.sh
+++ b/conf/hbase-env.sh
@@ -1,3 +1,24 @@
+#
+#/**
+# * Copyright 2007 The Apache Software Foundation
+# *
+# * Licensed to the Apache Software Foundation (ASF) under one
+# * or more contributor license agreements.  See the NOTICE file
+# * distributed with this work for additional information
+# * regarding copyright ownership.  The ASF licenses this file
+# * to you under the Apache License, Version 2.0 (the
+# * "License"); you may not use this file except in compliance
+# * with the License.  You may obtain a copy of the License at
+# *
+# *     http://www.apache.org/licenses/LICENSE-2.0
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# */
+
 # Set HBase-specific environment variables here.
 
 # The only required environment variable is JAVA_HOME.  All others are
diff --git a/conf/hbase-site.xml b/conf/hbase-site.xml
index c1e46d1481a..dbccd1dbb5c 100644
--- a/conf/hbase-site.xml
+++ b/conf/hbase-site.xml
@@ -1,4 +1,25 @@
 <?xml version="1.0"?>
 <?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+<!--
+/**
+ * Copyright 2007 The Apache Software Foundation
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
 <configuration>
 </configuration>
diff --git a/src/java/org/apache/hadoop/hbase/BloomFilterDescriptor.java b/src/java/org/apache/hadoop/hbase/BloomFilterDescriptor.java
index e0d959ec929..1040bbd1f4c 100644
--- a/src/java/org/apache/hadoop/hbase/BloomFilterDescriptor.java
+++ b/src/java/org/apache/hadoop/hbase/BloomFilterDescriptor.java
@@ -1,9 +1,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/HAbstractScanner.java b/src/java/org/apache/hadoop/hbase/HAbstractScanner.java
index 4ab6425a70a..e7ba2d5d9c3 100644
--- a/src/java/org/apache/hadoop/hbase/HAbstractScanner.java
+++ b/src/java/org/apache/hadoop/hbase/HAbstractScanner.java
@@ -1,9 +1,13 @@
 /**
- * Copyright 2006 The Apache Software Foundation
+ * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/HBaseConfiguration.java b/src/java/org/apache/hadoop/hbase/HBaseConfiguration.java
index 4b019c7f10f..c6df5d42d4d 100644
--- a/src/java/org/apache/hadoop/hbase/HBaseConfiguration.java
+++ b/src/java/org/apache/hadoop/hbase/HBaseConfiguration.java
@@ -1,9 +1,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/HClient.java b/src/java/org/apache/hadoop/hbase/HClient.java
index 48384d5fee4..0dd922d0284 100644
--- a/src/java/org/apache/hadoop/hbase/HClient.java
+++ b/src/java/org/apache/hadoop/hbase/HClient.java
@@ -1,9 +1,13 @@
 /**
- * Copyright 2006 The Apache Software Foundation
+ * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/HColumnDescriptor.java b/src/java/org/apache/hadoop/hbase/HColumnDescriptor.java
index 29bea3866c2..463c96bc383 100644
--- a/src/java/org/apache/hadoop/hbase/HColumnDescriptor.java
+++ b/src/java/org/apache/hadoop/hbase/HColumnDescriptor.java
@@ -1,9 +1,13 @@
 /**
- * Copyright 2006 The Apache Software Foundation
+ * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/HConstants.java b/src/java/org/apache/hadoop/hbase/HConstants.java
index eda6a092d67..90b422cfb0a 100644
--- a/src/java/org/apache/hadoop/hbase/HConstants.java
+++ b/src/java/org/apache/hadoop/hbase/HConstants.java
@@ -1,9 +1,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/HGlobals.java b/src/java/org/apache/hadoop/hbase/HGlobals.java
index 74a9df92d8f..8870473e2d7 100644
--- a/src/java/org/apache/hadoop/hbase/HGlobals.java
+++ b/src/java/org/apache/hadoop/hbase/HGlobals.java
@@ -1,9 +1,13 @@
 /**
- * Copyright 2006 The Apache Software Foundation
+ * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/HInternalScannerInterface.java b/src/java/org/apache/hadoop/hbase/HInternalScannerInterface.java
index 10bdaa58fa9..021612078ac 100644
--- a/src/java/org/apache/hadoop/hbase/HInternalScannerInterface.java
+++ b/src/java/org/apache/hadoop/hbase/HInternalScannerInterface.java
@@ -1,9 +1,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/HLocking.java b/src/java/org/apache/hadoop/hbase/HLocking.java
index 8031caf99b5..829105a595a 100644
--- a/src/java/org/apache/hadoop/hbase/HLocking.java
+++ b/src/java/org/apache/hadoop/hbase/HLocking.java
@@ -1,9 +1,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/HLog.java b/src/java/org/apache/hadoop/hbase/HLog.java
index d584beab47e..a11594a4535 100644
--- a/src/java/org/apache/hadoop/hbase/HLog.java
+++ b/src/java/org/apache/hadoop/hbase/HLog.java
@@ -1,9 +1,13 @@
 /**
- * Copyright 2006 The Apache Software Foundation
+ * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/HLogEdit.java b/src/java/org/apache/hadoop/hbase/HLogEdit.java
index b46dcb9bf99..4bb4f968554 100644
--- a/src/java/org/apache/hadoop/hbase/HLogEdit.java
+++ b/src/java/org/apache/hadoop/hbase/HLogEdit.java
@@ -1,9 +1,13 @@
 /**
- * Copyright 2006 The Apache Software Foundation
+ * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/HLogKey.java b/src/java/org/apache/hadoop/hbase/HLogKey.java
index 3e95b56a283..60d68b47307 100644
--- a/src/java/org/apache/hadoop/hbase/HLogKey.java
+++ b/src/java/org/apache/hadoop/hbase/HLogKey.java
@@ -1,9 +1,13 @@
 /**
- * Copyright 2006 The Apache Software Foundation
+ * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/HMaster.java b/src/java/org/apache/hadoop/hbase/HMaster.java
index dcb0eaa4bf4..c02be6062bc 100644
--- a/src/java/org/apache/hadoop/hbase/HMaster.java
+++ b/src/java/org/apache/hadoop/hbase/HMaster.java
@@ -1,9 +1,13 @@
 /**
- * Copyright 2006-7 The Apache Software Foundation
+ * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/HMasterInterface.java b/src/java/org/apache/hadoop/hbase/HMasterInterface.java
index e182ea2066f..6cc6a30b655 100644
--- a/src/java/org/apache/hadoop/hbase/HMasterInterface.java
+++ b/src/java/org/apache/hadoop/hbase/HMasterInterface.java
@@ -1,9 +1,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/HMasterRegionInterface.java b/src/java/org/apache/hadoop/hbase/HMasterRegionInterface.java
index ee753b8da01..6661466f708 100644
--- a/src/java/org/apache/hadoop/hbase/HMasterRegionInterface.java
+++ b/src/java/org/apache/hadoop/hbase/HMasterRegionInterface.java
@@ -1,9 +1,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/HMemcache.java b/src/java/org/apache/hadoop/hbase/HMemcache.java
index 43fe6414082..fae4d8c062f 100644
--- a/src/java/org/apache/hadoop/hbase/HMemcache.java
+++ b/src/java/org/apache/hadoop/hbase/HMemcache.java
@@ -1,9 +1,13 @@
 /**
- * Copyright 2006 The Apache Software Foundation
+ * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/HMerge.java b/src/java/org/apache/hadoop/hbase/HMerge.java
index 55ab0d311ad..c08642259d0 100644
--- a/src/java/org/apache/hadoop/hbase/HMerge.java
+++ b/src/java/org/apache/hadoop/hbase/HMerge.java
@@ -1,9 +1,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/HMsg.java b/src/java/org/apache/hadoop/hbase/HMsg.java
index a30eb917c79..b2e9db24686 100644
--- a/src/java/org/apache/hadoop/hbase/HMsg.java
+++ b/src/java/org/apache/hadoop/hbase/HMsg.java
@@ -1,9 +1,13 @@
 /**
- * Copyright 2006-7 The Apache Software Foundation
+ * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/HRegion.java b/src/java/org/apache/hadoop/hbase/HRegion.java
index 9a603afcd05..5a223074066 100644
--- a/src/java/org/apache/hadoop/hbase/HRegion.java
+++ b/src/java/org/apache/hadoop/hbase/HRegion.java
@@ -1,9 +1,13 @@
 /**
- * Copyright 2006 The Apache Software Foundation
+ * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/HRegionInfo.java b/src/java/org/apache/hadoop/hbase/HRegionInfo.java
index b02dd609564..b2e9df201bd 100644
--- a/src/java/org/apache/hadoop/hbase/HRegionInfo.java
+++ b/src/java/org/apache/hadoop/hbase/HRegionInfo.java
@@ -1,9 +1,13 @@
 /**
- * Copyright 2006 The Apache Software Foundation
+ * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/HRegionInterface.java b/src/java/org/apache/hadoop/hbase/HRegionInterface.java
index e99ad09cacf..b4167efe88e 100644
--- a/src/java/org/apache/hadoop/hbase/HRegionInterface.java
+++ b/src/java/org/apache/hadoop/hbase/HRegionInterface.java
@@ -1,9 +1,13 @@
 /**
- * Copyright 2006 The Apache Software Foundation
+ * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/HRegionServer.java b/src/java/org/apache/hadoop/hbase/HRegionServer.java
index 71e6692c659..3a92610fcf3 100644
--- a/src/java/org/apache/hadoop/hbase/HRegionServer.java
+++ b/src/java/org/apache/hadoop/hbase/HRegionServer.java
@@ -1,9 +1,13 @@
 /**
- * Copyright 2006 The Apache Software Foundation
+ * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/HRegiondirReader.java b/src/java/org/apache/hadoop/hbase/HRegiondirReader.java
index 2a95914c7d8..684cbe22039 100644
--- a/src/java/org/apache/hadoop/hbase/HRegiondirReader.java
+++ b/src/java/org/apache/hadoop/hbase/HRegiondirReader.java
@@ -1,9 +1,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/HScannerInterface.java b/src/java/org/apache/hadoop/hbase/HScannerInterface.java
index 6e8efe5b736..f61998dc986 100644
--- a/src/java/org/apache/hadoop/hbase/HScannerInterface.java
+++ b/src/java/org/apache/hadoop/hbase/HScannerInterface.java
@@ -1,9 +1,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/HServerAddress.java b/src/java/org/apache/hadoop/hbase/HServerAddress.java
index 2c00645f91c..dd9af9200f2 100644
--- a/src/java/org/apache/hadoop/hbase/HServerAddress.java
+++ b/src/java/org/apache/hadoop/hbase/HServerAddress.java
@@ -1,9 +1,13 @@
 /**
- * Copyright 2006-7 The Apache Software Foundation
+ * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/HServerInfo.java b/src/java/org/apache/hadoop/hbase/HServerInfo.java
index 562f582ae22..0ef38f60473 100644
--- a/src/java/org/apache/hadoop/hbase/HServerInfo.java
+++ b/src/java/org/apache/hadoop/hbase/HServerInfo.java
@@ -1,9 +1,13 @@
 /**
- * Copyright 2006-7 The Apache Software Foundation
+ * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/HStore.java b/src/java/org/apache/hadoop/hbase/HStore.java
index d5c3b7ed9b7..a767634e19e 100644
--- a/src/java/org/apache/hadoop/hbase/HStore.java
+++ b/src/java/org/apache/hadoop/hbase/HStore.java
@@ -1,9 +1,13 @@
 /**
- * Copyright 2006 The Apache Software Foundation
+ * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/HStoreFile.java b/src/java/org/apache/hadoop/hbase/HStoreFile.java
index 4a85185001a..1a90c9d3f44 100644
--- a/src/java/org/apache/hadoop/hbase/HStoreFile.java
+++ b/src/java/org/apache/hadoop/hbase/HStoreFile.java
@@ -1,9 +1,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/HStoreKey.java b/src/java/org/apache/hadoop/hbase/HStoreKey.java
index 6543bf3ea7b..f1eeed8888f 100644
--- a/src/java/org/apache/hadoop/hbase/HStoreKey.java
+++ b/src/java/org/apache/hadoop/hbase/HStoreKey.java
@@ -1,9 +1,13 @@
 /**
- * Copyright 2006 The Apache Software Foundation
+ * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/HTableDescriptor.java b/src/java/org/apache/hadoop/hbase/HTableDescriptor.java
index b43ac7a385c..331a3a0fb5c 100644
--- a/src/java/org/apache/hadoop/hbase/HTableDescriptor.java
+++ b/src/java/org/apache/hadoop/hbase/HTableDescriptor.java
@@ -1,9 +1,13 @@
 /**
- * Copyright 2006 The Apache Software Foundation
+ * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/InvalidColumnNameException.java b/src/java/org/apache/hadoop/hbase/InvalidColumnNameException.java
index d165acb96d6..2069a7899c1 100644
--- a/src/java/org/apache/hadoop/hbase/InvalidColumnNameException.java
+++ b/src/java/org/apache/hadoop/hbase/InvalidColumnNameException.java
@@ -1,9 +1,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/LeaseListener.java b/src/java/org/apache/hadoop/hbase/LeaseListener.java
index 3d92830f3b6..90a32ef33f8 100644
--- a/src/java/org/apache/hadoop/hbase/LeaseListener.java
+++ b/src/java/org/apache/hadoop/hbase/LeaseListener.java
@@ -1,9 +1,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/Leases.java b/src/java/org/apache/hadoop/hbase/Leases.java
index ad9864a0e91..4e714da89ab 100644
--- a/src/java/org/apache/hadoop/hbase/Leases.java
+++ b/src/java/org/apache/hadoop/hbase/Leases.java
@@ -1,9 +1,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/LockException.java b/src/java/org/apache/hadoop/hbase/LockException.java
index 691ddcac2ec..753c537ed7d 100644
--- a/src/java/org/apache/hadoop/hbase/LockException.java
+++ b/src/java/org/apache/hadoop/hbase/LockException.java
@@ -1,9 +1,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/MasterNotRunningException.java b/src/java/org/apache/hadoop/hbase/MasterNotRunningException.java
index 7021bf7d9f8..ec048f1d5d8 100644
--- a/src/java/org/apache/hadoop/hbase/MasterNotRunningException.java
+++ b/src/java/org/apache/hadoop/hbase/MasterNotRunningException.java
@@ -1,9 +1,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/NoServerForRegionException.java b/src/java/org/apache/hadoop/hbase/NoServerForRegionException.java
index 8694764693c..7114814eafd 100644
--- a/src/java/org/apache/hadoop/hbase/NoServerForRegionException.java
+++ b/src/java/org/apache/hadoop/hbase/NoServerForRegionException.java
@@ -1,9 +1,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/NotServingRegionException.java b/src/java/org/apache/hadoop/hbase/NotServingRegionException.java
index 992d453644e..11f78ee5bac 100644
--- a/src/java/org/apache/hadoop/hbase/NotServingRegionException.java
+++ b/src/java/org/apache/hadoop/hbase/NotServingRegionException.java
@@ -1,9 +1,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/RegionNotFoundException.java b/src/java/org/apache/hadoop/hbase/RegionNotFoundException.java
index b2b240fc0b7..7eef1bb1662 100644
--- a/src/java/org/apache/hadoop/hbase/RegionNotFoundException.java
+++ b/src/java/org/apache/hadoop/hbase/RegionNotFoundException.java
@@ -1,9 +1,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/RegionServerRunningException.java b/src/java/org/apache/hadoop/hbase/RegionServerRunningException.java
index 5ec22bbb81d..571fd550606 100644
--- a/src/java/org/apache/hadoop/hbase/RegionServerRunningException.java
+++ b/src/java/org/apache/hadoop/hbase/RegionServerRunningException.java
@@ -1,9 +1,13 @@
 /**
- * Copyright 2006 The Apache Software Foundation
+ * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/RegionUnavailableListener.java b/src/java/org/apache/hadoop/hbase/RegionUnavailableListener.java
index 3d2b1582c53..05aa2eb8e4b 100644
--- a/src/java/org/apache/hadoop/hbase/RegionUnavailableListener.java
+++ b/src/java/org/apache/hadoop/hbase/RegionUnavailableListener.java
@@ -1,9 +1,13 @@
 /**
- * Copyright 2006 The Apache Software Foundation
+ * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/RemoteExceptionHandler.java b/src/java/org/apache/hadoop/hbase/RemoteExceptionHandler.java
index 5b23ff8c6ed..07d31211625 100644
--- a/src/java/org/apache/hadoop/hbase/RemoteExceptionHandler.java
+++ b/src/java/org/apache/hadoop/hbase/RemoteExceptionHandler.java
@@ -1,9 +1,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/Shell.java b/src/java/org/apache/hadoop/hbase/Shell.java
index 0e1e089a3a7..84b4ecfd19d 100644
--- a/src/java/org/apache/hadoop/hbase/Shell.java
+++ b/src/java/org/apache/hadoop/hbase/Shell.java
@@ -1,9 +1,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/TableNotDisabledException.java b/src/java/org/apache/hadoop/hbase/TableNotDisabledException.java
index 062c1672df9..cf2d4a437f3 100644
--- a/src/java/org/apache/hadoop/hbase/TableNotDisabledException.java
+++ b/src/java/org/apache/hadoop/hbase/TableNotDisabledException.java
@@ -1,9 +1,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/UnknownScannerException.java b/src/java/org/apache/hadoop/hbase/UnknownScannerException.java
index ab898406af7..70d4bc77dcf 100644
--- a/src/java/org/apache/hadoop/hbase/UnknownScannerException.java
+++ b/src/java/org/apache/hadoop/hbase/UnknownScannerException.java
@@ -1,9 +1,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/WrongRegionException.java b/src/java/org/apache/hadoop/hbase/WrongRegionException.java
index 4b23bfdcc86..ce6278c5046 100644
--- a/src/java/org/apache/hadoop/hbase/WrongRegionException.java
+++ b/src/java/org/apache/hadoop/hbase/WrongRegionException.java
@@ -1,9 +1,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/filter/InvalidRowFilterException.java b/src/java/org/apache/hadoop/hbase/filter/InvalidRowFilterException.java
index f45483d42a7..3021761b947 100644
--- a/src/java/org/apache/hadoop/hbase/filter/InvalidRowFilterException.java
+++ b/src/java/org/apache/hadoop/hbase/filter/InvalidRowFilterException.java
@@ -1,9 +1,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/filter/PageRowFilter.java b/src/java/org/apache/hadoop/hbase/filter/PageRowFilter.java
index 2136bbfbd39..c6054e87cf1 100644
--- a/src/java/org/apache/hadoop/hbase/filter/PageRowFilter.java
+++ b/src/java/org/apache/hadoop/hbase/filter/PageRowFilter.java
@@ -1,9 +1,13 @@
 /**
- * Copyright 2006 The Apache Software Foundation
+ * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/filter/RegExpRowFilter.java b/src/java/org/apache/hadoop/hbase/filter/RegExpRowFilter.java
index 3dace94e7c9..89b03eae667 100644
--- a/src/java/org/apache/hadoop/hbase/filter/RegExpRowFilter.java
+++ b/src/java/org/apache/hadoop/hbase/filter/RegExpRowFilter.java
@@ -1,9 +1,13 @@
 /**
- * Copyright 2006 The Apache Software Foundation
+ * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/filter/RowFilterInterface.java b/src/java/org/apache/hadoop/hbase/filter/RowFilterInterface.java
index b09f507f80b..f80cdce8589 100644
--- a/src/java/org/apache/hadoop/hbase/filter/RowFilterInterface.java
+++ b/src/java/org/apache/hadoop/hbase/filter/RowFilterInterface.java
@@ -1,9 +1,13 @@
 /**
- * Copyright 2006 The Apache Software Foundation
+ * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/filter/RowFilterSet.java b/src/java/org/apache/hadoop/hbase/filter/RowFilterSet.java
index 9677576368b..c0d5c3ba3f5 100644
--- a/src/java/org/apache/hadoop/hbase/filter/RowFilterSet.java
+++ b/src/java/org/apache/hadoop/hbase/filter/RowFilterSet.java
@@ -1,9 +1,13 @@
 /**
- * Copyright 2006 The Apache Software Foundation
+ * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/io/ImmutableBytesWritable.java b/src/java/org/apache/hadoop/hbase/io/ImmutableBytesWritable.java
index 82d1b03630b..d4e97ee7b4f 100644
--- a/src/java/org/apache/hadoop/hbase/io/ImmutableBytesWritable.java
+++ b/src/java/org/apache/hadoop/hbase/io/ImmutableBytesWritable.java
@@ -1,4 +1,6 @@
 /**
+ * Copyright 2007 The Apache Software Foundation
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/src/java/org/apache/hadoop/hbase/io/KeyedData.java b/src/java/org/apache/hadoop/hbase/io/KeyedData.java
index 379347d7e3f..2dda56f7ddf 100644
--- a/src/java/org/apache/hadoop/hbase/io/KeyedData.java
+++ b/src/java/org/apache/hadoop/hbase/io/KeyedData.java
@@ -1,9 +1,13 @@
 /**
- * Copyright 2006 The Apache Software Foundation
+ * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/io/KeyedDataArrayWritable.java b/src/java/org/apache/hadoop/hbase/io/KeyedDataArrayWritable.java
index f13c17bc4b7..6cf2d999303 100644
--- a/src/java/org/apache/hadoop/hbase/io/KeyedDataArrayWritable.java
+++ b/src/java/org/apache/hadoop/hbase/io/KeyedDataArrayWritable.java
@@ -1,9 +1,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/mapred/GroupingTableMap.java b/src/java/org/apache/hadoop/hbase/mapred/GroupingTableMap.java
index c5b1c3664b2..04cb22cffe4 100644
--- a/src/java/org/apache/hadoop/hbase/mapred/GroupingTableMap.java
+++ b/src/java/org/apache/hadoop/hbase/mapred/GroupingTableMap.java
@@ -1,9 +1,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/mapred/IdentityTableMap.java b/src/java/org/apache/hadoop/hbase/mapred/IdentityTableMap.java
index 0ec5323f3e8..a8638311c18 100644
--- a/src/java/org/apache/hadoop/hbase/mapred/IdentityTableMap.java
+++ b/src/java/org/apache/hadoop/hbase/mapred/IdentityTableMap.java
@@ -1,9 +1,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/mapred/IdentityTableReduce.java b/src/java/org/apache/hadoop/hbase/mapred/IdentityTableReduce.java
index b8d215512e9..c114add8d69 100644
--- a/src/java/org/apache/hadoop/hbase/mapred/IdentityTableReduce.java
+++ b/src/java/org/apache/hadoop/hbase/mapred/IdentityTableReduce.java
@@ -1,9 +1,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/mapred/TableInputFormat.java b/src/java/org/apache/hadoop/hbase/mapred/TableInputFormat.java
index a00102baf8a..bb99edd3a99 100644
--- a/src/java/org/apache/hadoop/hbase/mapred/TableInputFormat.java
+++ b/src/java/org/apache/hadoop/hbase/mapred/TableInputFormat.java
@@ -1,9 +1,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/mapred/TableMap.java b/src/java/org/apache/hadoop/hbase/mapred/TableMap.java
index 5fe3db3626c..5aa8537acf2 100644
--- a/src/java/org/apache/hadoop/hbase/mapred/TableMap.java
+++ b/src/java/org/apache/hadoop/hbase/mapred/TableMap.java
@@ -1,9 +1,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/mapred/TableOutputCollector.java b/src/java/org/apache/hadoop/hbase/mapred/TableOutputCollector.java
index 63e3c321829..d388ad54edc 100644
--- a/src/java/org/apache/hadoop/hbase/mapred/TableOutputCollector.java
+++ b/src/java/org/apache/hadoop/hbase/mapred/TableOutputCollector.java
@@ -1,9 +1,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/mapred/TableOutputFormat.java b/src/java/org/apache/hadoop/hbase/mapred/TableOutputFormat.java
index dbd6656378e..c9c65765827 100644
--- a/src/java/org/apache/hadoop/hbase/mapred/TableOutputFormat.java
+++ b/src/java/org/apache/hadoop/hbase/mapred/TableOutputFormat.java
@@ -1,9 +1,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/mapred/TableReduce.java b/src/java/org/apache/hadoop/hbase/mapred/TableReduce.java
index 3349d8a5995..0555dee38d1 100644
--- a/src/java/org/apache/hadoop/hbase/mapred/TableReduce.java
+++ b/src/java/org/apache/hadoop/hbase/mapred/TableReduce.java
@@ -1,9 +1,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/mapred/TableSplit.java b/src/java/org/apache/hadoop/hbase/mapred/TableSplit.java
index 1545c0eb064..809305323c0 100644
--- a/src/java/org/apache/hadoop/hbase/mapred/TableSplit.java
+++ b/src/java/org/apache/hadoop/hbase/mapred/TableSplit.java
@@ -1,9 +1,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/shell/BasicCommand.java b/src/java/org/apache/hadoop/hbase/shell/BasicCommand.java
index 7ffdf5f01c7..e198442ed24 100644
--- a/src/java/org/apache/hadoop/hbase/shell/BasicCommand.java
+++ b/src/java/org/apache/hadoop/hbase/shell/BasicCommand.java
@@ -1,9 +1,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/shell/Command.java b/src/java/org/apache/hadoop/hbase/shell/Command.java
index e986001bf2f..cfc1b017af7 100644
--- a/src/java/org/apache/hadoop/hbase/shell/Command.java
+++ b/src/java/org/apache/hadoop/hbase/shell/Command.java
@@ -1,9 +1,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/shell/CommandFactory.java b/src/java/org/apache/hadoop/hbase/shell/CommandFactory.java
index 6b1f3a9f4f8..2ef996d0a1a 100644
--- a/src/java/org/apache/hadoop/hbase/shell/CommandFactory.java
+++ b/src/java/org/apache/hadoop/hbase/shell/CommandFactory.java
@@ -1,9 +1,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/shell/ConsoleTable.java b/src/java/org/apache/hadoop/hbase/shell/ConsoleTable.java
index 6b2a0d13f46..da63676b983 100644
--- a/src/java/org/apache/hadoop/hbase/shell/ConsoleTable.java
+++ b/src/java/org/apache/hadoop/hbase/shell/ConsoleTable.java
@@ -1,9 +1,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/shell/CreateCommand.java b/src/java/org/apache/hadoop/hbase/shell/CreateCommand.java
index 88d745a2be7..08feddce732 100644
--- a/src/java/org/apache/hadoop/hbase/shell/CreateCommand.java
+++ b/src/java/org/apache/hadoop/hbase/shell/CreateCommand.java
@@ -1,9 +1,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/shell/DeleteCommand.java b/src/java/org/apache/hadoop/hbase/shell/DeleteCommand.java
index 93dd8a29573..376fa82e41f 100644
--- a/src/java/org/apache/hadoop/hbase/shell/DeleteCommand.java
+++ b/src/java/org/apache/hadoop/hbase/shell/DeleteCommand.java
@@ -1,9 +1,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/shell/DescCommand.java b/src/java/org/apache/hadoop/hbase/shell/DescCommand.java
index 07bbad066e4..62a09324af0 100644
--- a/src/java/org/apache/hadoop/hbase/shell/DescCommand.java
+++ b/src/java/org/apache/hadoop/hbase/shell/DescCommand.java
@@ -1,9 +1,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/shell/DropCommand.java b/src/java/org/apache/hadoop/hbase/shell/DropCommand.java
index 4acbbcf0cf0..df9442a11a2 100644
--- a/src/java/org/apache/hadoop/hbase/shell/DropCommand.java
+++ b/src/java/org/apache/hadoop/hbase/shell/DropCommand.java
@@ -1,9 +1,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/shell/ExitCommand.java b/src/java/org/apache/hadoop/hbase/shell/ExitCommand.java
index 5aa9b07152f..56362b28ec2 100644
--- a/src/java/org/apache/hadoop/hbase/shell/ExitCommand.java
+++ b/src/java/org/apache/hadoop/hbase/shell/ExitCommand.java
@@ -1,9 +1,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/shell/HBaseShell.jj b/src/java/org/apache/hadoop/hbase/shell/HBaseShell.jj
index 2f0846a2f58..68e26f3e6c4 100644
--- a/src/java/org/apache/hadoop/hbase/shell/HBaseShell.jj
+++ b/src/java/org/apache/hadoop/hbase/shell/HBaseShell.jj
@@ -7,9 +7,13 @@ PARSER_BEGIN(Parser)
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/shell/HelpCommand.java b/src/java/org/apache/hadoop/hbase/shell/HelpCommand.java
index 90e5b361dd0..4da8dbfc090 100644
--- a/src/java/org/apache/hadoop/hbase/shell/HelpCommand.java
+++ b/src/java/org/apache/hadoop/hbase/shell/HelpCommand.java
@@ -1,9 +1,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/shell/HelpContents.java b/src/java/org/apache/hadoop/hbase/shell/HelpContents.java
index b3b1cd386dd..6a6005cbfb7 100644
--- a/src/java/org/apache/hadoop/hbase/shell/HelpContents.java
+++ b/src/java/org/apache/hadoop/hbase/shell/HelpContents.java
@@ -1,9 +1,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/shell/HelpManager.java b/src/java/org/apache/hadoop/hbase/shell/HelpManager.java
index f9f541ee007..fc7f7bb2aca 100644
--- a/src/java/org/apache/hadoop/hbase/shell/HelpManager.java
+++ b/src/java/org/apache/hadoop/hbase/shell/HelpManager.java
@@ -1,9 +1,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/shell/InsertCommand.java b/src/java/org/apache/hadoop/hbase/shell/InsertCommand.java
index e2faeee6dd9..8289f9f6334 100644
--- a/src/java/org/apache/hadoop/hbase/shell/InsertCommand.java
+++ b/src/java/org/apache/hadoop/hbase/shell/InsertCommand.java
@@ -1,9 +1,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/shell/ReturnMsg.java b/src/java/org/apache/hadoop/hbase/shell/ReturnMsg.java
index 41f921d560a..5561d84d4ec 100644
--- a/src/java/org/apache/hadoop/hbase/shell/ReturnMsg.java
+++ b/src/java/org/apache/hadoop/hbase/shell/ReturnMsg.java
@@ -1,9 +1,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/shell/SelectCommand.java b/src/java/org/apache/hadoop/hbase/shell/SelectCommand.java
index f4a0d61ee3d..8bbabc582bb 100644
--- a/src/java/org/apache/hadoop/hbase/shell/SelectCommand.java
+++ b/src/java/org/apache/hadoop/hbase/shell/SelectCommand.java
@@ -1,9 +1,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/shell/ShowCommand.java b/src/java/org/apache/hadoop/hbase/shell/ShowCommand.java
index e9ffe0b878d..310c9dcf8fe 100644
--- a/src/java/org/apache/hadoop/hbase/shell/ShowCommand.java
+++ b/src/java/org/apache/hadoop/hbase/shell/ShowCommand.java
@@ -1,9 +1,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/shell/generated/ParseException.java b/src/java/org/apache/hadoop/hbase/shell/generated/ParseException.java
index 54f47fabb77..466c22e2446 100644
--- a/src/java/org/apache/hadoop/hbase/shell/generated/ParseException.java
+++ b/src/java/org/apache/hadoop/hbase/shell/generated/ParseException.java
@@ -2,9 +2,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/shell/generated/Parser.java b/src/java/org/apache/hadoop/hbase/shell/generated/Parser.java
index c804853d6ef..8ca3226a659 100644
--- a/src/java/org/apache/hadoop/hbase/shell/generated/Parser.java
+++ b/src/java/org/apache/hadoop/hbase/shell/generated/Parser.java
@@ -2,9 +2,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/shell/generated/ParserConstants.java b/src/java/org/apache/hadoop/hbase/shell/generated/ParserConstants.java
index 739f7ea2df9..cc416411b88 100644
--- a/src/java/org/apache/hadoop/hbase/shell/generated/ParserConstants.java
+++ b/src/java/org/apache/hadoop/hbase/shell/generated/ParserConstants.java
@@ -2,9 +2,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/shell/generated/ParserTokenManager.java b/src/java/org/apache/hadoop/hbase/shell/generated/ParserTokenManager.java
index 6663d165c41..330b0fe00e0 100644
--- a/src/java/org/apache/hadoop/hbase/shell/generated/ParserTokenManager.java
+++ b/src/java/org/apache/hadoop/hbase/shell/generated/ParserTokenManager.java
@@ -2,9 +2,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/shell/generated/SimpleCharStream.java b/src/java/org/apache/hadoop/hbase/shell/generated/SimpleCharStream.java
index b38254193db..2a23ed690ad 100644
--- a/src/java/org/apache/hadoop/hbase/shell/generated/SimpleCharStream.java
+++ b/src/java/org/apache/hadoop/hbase/shell/generated/SimpleCharStream.java
@@ -2,9 +2,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/shell/generated/Token.java b/src/java/org/apache/hadoop/hbase/shell/generated/Token.java
index 99a9fd83f85..21cb04ff1b2 100644
--- a/src/java/org/apache/hadoop/hbase/shell/generated/Token.java
+++ b/src/java/org/apache/hadoop/hbase/shell/generated/Token.java
@@ -2,9 +2,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/shell/generated/TokenMgrError.java b/src/java/org/apache/hadoop/hbase/shell/generated/TokenMgrError.java
index cca52cb26bf..8c6b26d2c47 100644
--- a/src/java/org/apache/hadoop/hbase/shell/generated/TokenMgrError.java
+++ b/src/java/org/apache/hadoop/hbase/shell/generated/TokenMgrError.java
@@ -2,9 +2,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/java/org/apache/hadoop/hbase/util/Keying.java b/src/java/org/apache/hadoop/hbase/util/Keying.java
index 2422be587ec..a26f141c27e 100644
--- a/src/java/org/apache/hadoop/hbase/util/Keying.java
+++ b/src/java/org/apache/hadoop/hbase/util/Keying.java
@@ -1,4 +1,6 @@
 /**
+ * Copyright 2007 The Apache Software Foundation
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/src/java/org/onelab/filter/BloomFilter.java b/src/java/org/onelab/filter/BloomFilter.java
index 9db9bb88482..98da0c1e766 100644
--- a/src/java/org/onelab/filter/BloomFilter.java
+++ b/src/java/org/onelab/filter/BloomFilter.java
@@ -28,6 +28,23 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
  * POSSIBILITY OF SUCH DAMAGE.
  */
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.onelab.filter;
 
 import java.io.DataInput;
diff --git a/src/java/org/onelab/filter/CountingBloomFilter.java b/src/java/org/onelab/filter/CountingBloomFilter.java
index a9249127602..da776be4b86 100644
--- a/src/java/org/onelab/filter/CountingBloomFilter.java
+++ b/src/java/org/onelab/filter/CountingBloomFilter.java
@@ -28,6 +28,23 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
  * POSSIBILITY OF SUCH DAMAGE.
  */
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.onelab.filter;
 
 import java.io.DataInput;
diff --git a/src/java/org/onelab/filter/DynamicBloomFilter.java b/src/java/org/onelab/filter/DynamicBloomFilter.java
index 743cf53145b..bec5d19a706 100644
--- a/src/java/org/onelab/filter/DynamicBloomFilter.java
+++ b/src/java/org/onelab/filter/DynamicBloomFilter.java
@@ -28,6 +28,23 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
  * POSSIBILITY OF SUCH DAMAGE.
  */
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.onelab.filter;
 
 import java.io.DataInput;
diff --git a/src/java/org/onelab/filter/Filter.java b/src/java/org/onelab/filter/Filter.java
index 9a8f232aeaf..9d2c6a4ead7 100644
--- a/src/java/org/onelab/filter/Filter.java
+++ b/src/java/org/onelab/filter/Filter.java
@@ -30,6 +30,23 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
  * POSSIBILITY OF SUCH DAMAGE.
  */
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.onelab.filter;
 
 import java.io.DataInput;
diff --git a/src/java/org/onelab/filter/HashFunction.java b/src/java/org/onelab/filter/HashFunction.java
index 13466fd78da..12d4dc4256c 100644
--- a/src/java/org/onelab/filter/HashFunction.java
+++ b/src/java/org/onelab/filter/HashFunction.java
@@ -30,6 +30,23 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
  * POSSIBILITY OF SUCH DAMAGE.
  */
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.onelab.filter;
 
 import java.security.*;
diff --git a/src/java/org/onelab/filter/Key.java b/src/java/org/onelab/filter/Key.java
index fe304ee987f..018031f9a6b 100644
--- a/src/java/org/onelab/filter/Key.java
+++ b/src/java/org/onelab/filter/Key.java
@@ -28,6 +28,23 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
  * POSSIBILITY OF SUCH DAMAGE.
  */
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.onelab.filter;
 
 import java.io.DataInput;
diff --git a/src/java/org/onelab/filter/RemoveScheme.java b/src/java/org/onelab/filter/RemoveScheme.java
index 5b9f82266f9..be6ea7d88fc 100644
--- a/src/java/org/onelab/filter/RemoveScheme.java
+++ b/src/java/org/onelab/filter/RemoveScheme.java
@@ -30,6 +30,23 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
  * POSSIBILITY OF SUCH DAMAGE.
  */
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.onelab.filter;
 
 /**
diff --git a/src/java/org/onelab/filter/RetouchedBloomFilter.java b/src/java/org/onelab/filter/RetouchedBloomFilter.java
index 5893fa477ad..3539b3cd42c 100644
--- a/src/java/org/onelab/filter/RetouchedBloomFilter.java
+++ b/src/java/org/onelab/filter/RetouchedBloomFilter.java
@@ -28,6 +28,23 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
  * POSSIBILITY OF SUCH DAMAGE.
  */
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.onelab.filter;
 
 import java.io.DataInput;
diff --git a/src/test/hbase-site.xml b/src/test/hbase-site.xml
index 282ff678c4d..91baea2fa2e 100644
--- a/src/test/hbase-site.xml
+++ b/src/test/hbase-site.xml
@@ -1,5 +1,26 @@
 <?xml version="1.0"?>
 <?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+<!--
+/**
+ * Copyright 2007 The Apache Software Foundation
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
 <configuration>
   <property>
     <name>hbase.regionserver.msginterval</name>
diff --git a/src/test/org/apache/hadoop/hbase/AbstractMergeTestBase.java b/src/test/org/apache/hadoop/hbase/AbstractMergeTestBase.java
index 7f9661f9cd0..7fb1f375f57 100644
--- a/src/test/org/apache/hadoop/hbase/AbstractMergeTestBase.java
+++ b/src/test/org/apache/hadoop/hbase/AbstractMergeTestBase.java
@@ -1,9 +1,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/test/org/apache/hadoop/hbase/HBaseClusterTestCase.java b/src/test/org/apache/hadoop/hbase/HBaseClusterTestCase.java
index c6ec969ca94..3e1d0cf4a8d 100644
--- a/src/test/org/apache/hadoop/hbase/HBaseClusterTestCase.java
+++ b/src/test/org/apache/hadoop/hbase/HBaseClusterTestCase.java
@@ -1,9 +1,13 @@
 /**
- * Copyright 2006 The Apache Software Foundation
+ * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/test/org/apache/hadoop/hbase/HBaseTestCase.java b/src/test/org/apache/hadoop/hbase/HBaseTestCase.java
index 48c6ed96c6b..7e0f13ccb2a 100644
--- a/src/test/org/apache/hadoop/hbase/HBaseTestCase.java
+++ b/src/test/org/apache/hadoop/hbase/HBaseTestCase.java
@@ -1,9 +1,13 @@
 /**
- * Copyright 2006 The Apache Software Foundation
+ * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/test/org/apache/hadoop/hbase/MiniHBaseCluster.java b/src/test/org/apache/hadoop/hbase/MiniHBaseCluster.java
index 183db5dd0f0..d65a720fe51 100644
--- a/src/test/org/apache/hadoop/hbase/MiniHBaseCluster.java
+++ b/src/test/org/apache/hadoop/hbase/MiniHBaseCluster.java
@@ -1,9 +1,13 @@
 /**
- * Copyright 2006 The Apache Software Foundation
+ * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/test/org/apache/hadoop/hbase/PerformanceEvaluation.java b/src/test/org/apache/hadoop/hbase/PerformanceEvaluation.java
index 355fc5af51d..45ba1c046dc 100644
--- a/src/test/org/apache/hadoop/hbase/PerformanceEvaluation.java
+++ b/src/test/org/apache/hadoop/hbase/PerformanceEvaluation.java
@@ -1,9 +1,13 @@
 /**
- * Copyright 2006 The Apache Software Foundation
+ * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/test/org/apache/hadoop/hbase/PerformanceEvaluation_Counter.properties b/src/test/org/apache/hadoop/hbase/PerformanceEvaluation_Counter.properties
index 5fb413457f9..28493ff9f91 100644
--- a/src/test/org/apache/hadoop/hbase/PerformanceEvaluation_Counter.properties
+++ b/src/test/org/apache/hadoop/hbase/PerformanceEvaluation_Counter.properties
@@ -1,5 +1,25 @@
 # ResourceBundle properties file for Map-Reduce counters
 
+#/**
+# * Copyright 2007 The Apache Software Foundation
+# *
+# * Licensed to the Apache Software Foundation (ASF) under one
+# * or more contributor license agreements.  See the NOTICE file
+# * distributed with this work for additional information
+# * regarding copyright ownership.  The ASF licenses this file
+# * to you under the Apache License, Version 2.0 (the
+# * "License"); you may not use this file except in compliance
+# * with the License.  You may obtain a copy of the License at
+# *
+# *     http://www.apache.org/licenses/LICENSE-2.0
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# */
+
 CounterGroupName=              HBase Performance Evaluation
 ELAPSED_TIME.name=             Elapsed time in milliseconds
 ROWS.name=									  Row count
diff --git a/src/test/org/apache/hadoop/hbase/StaticTestEnvironment.java b/src/test/org/apache/hadoop/hbase/StaticTestEnvironment.java
index bdde4b63a79..4aef7a86ce4 100644
--- a/src/test/org/apache/hadoop/hbase/StaticTestEnvironment.java
+++ b/src/test/org/apache/hadoop/hbase/StaticTestEnvironment.java
@@ -1,9 +1,13 @@
 /**
- * Copyright 2006 The Apache Software Foundation
+ * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/test/org/apache/hadoop/hbase/TestBloomFilters.java b/src/test/org/apache/hadoop/hbase/TestBloomFilters.java
index f4f05cda183..75512e6ba76 100644
--- a/src/test/org/apache/hadoop/hbase/TestBloomFilters.java
+++ b/src/test/org/apache/hadoop/hbase/TestBloomFilters.java
@@ -1,9 +1,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/test/org/apache/hadoop/hbase/TestCleanRegionServerExit.java b/src/test/org/apache/hadoop/hbase/TestCleanRegionServerExit.java
index f91027b8999..99ac3f4e36d 100644
--- a/src/test/org/apache/hadoop/hbase/TestCleanRegionServerExit.java
+++ b/src/test/org/apache/hadoop/hbase/TestCleanRegionServerExit.java
@@ -1,9 +1,13 @@
 /**
- * Copyright 2006 The Apache Software Foundation
+ * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/test/org/apache/hadoop/hbase/TestGet.java b/src/test/org/apache/hadoop/hbase/TestGet.java
index b608fe4e4ef..7513f599665 100644
--- a/src/test/org/apache/hadoop/hbase/TestGet.java
+++ b/src/test/org/apache/hadoop/hbase/TestGet.java
@@ -1,9 +1,13 @@
 /**
- * Copyright 2006 The Apache Software Foundation
+ * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/test/org/apache/hadoop/hbase/TestHBaseCluster.java b/src/test/org/apache/hadoop/hbase/TestHBaseCluster.java
index 4de9b1c556f..d67cbfc91cd 100644
--- a/src/test/org/apache/hadoop/hbase/TestHBaseCluster.java
+++ b/src/test/org/apache/hadoop/hbase/TestHBaseCluster.java
@@ -1,9 +1,13 @@
 /**
- * Copyright 2006 The Apache Software Foundation
+ * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/test/org/apache/hadoop/hbase/TestHClient.java b/src/test/org/apache/hadoop/hbase/TestHClient.java
index edee9d8934b..d4b0ca056cc 100644
--- a/src/test/org/apache/hadoop/hbase/TestHClient.java
+++ b/src/test/org/apache/hadoop/hbase/TestHClient.java
@@ -1,9 +1,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/test/org/apache/hadoop/hbase/TestHLog.java b/src/test/org/apache/hadoop/hbase/TestHLog.java
index 121d8b8aa00..74a1f971e7a 100644
--- a/src/test/org/apache/hadoop/hbase/TestHLog.java
+++ b/src/test/org/apache/hadoop/hbase/TestHLog.java
@@ -1,9 +1,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/test/org/apache/hadoop/hbase/TestHMemcache.java b/src/test/org/apache/hadoop/hbase/TestHMemcache.java
index 75dd49a00d1..efe97b0c758 100644
--- a/src/test/org/apache/hadoop/hbase/TestHMemcache.java
+++ b/src/test/org/apache/hadoop/hbase/TestHMemcache.java
@@ -1,9 +1,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/test/org/apache/hadoop/hbase/TestHRegion.java b/src/test/org/apache/hadoop/hbase/TestHRegion.java
index 3749706554f..5ca28f49b67 100644
--- a/src/test/org/apache/hadoop/hbase/TestHRegion.java
+++ b/src/test/org/apache/hadoop/hbase/TestHRegion.java
@@ -1,9 +1,13 @@
 /**
- * Copyright 2006 The Apache Software Foundation
+ * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/test/org/apache/hadoop/hbase/TestMasterAdmin.java b/src/test/org/apache/hadoop/hbase/TestMasterAdmin.java
index 839da9bbccd..14ed85d2cbb 100644
--- a/src/test/org/apache/hadoop/hbase/TestMasterAdmin.java
+++ b/src/test/org/apache/hadoop/hbase/TestMasterAdmin.java
@@ -1,9 +1,13 @@
 /**
- * Copyright 2006 The Apache Software Foundation
+ * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/test/org/apache/hadoop/hbase/TestMergeMeta.java b/src/test/org/apache/hadoop/hbase/TestMergeMeta.java
index dd513713fb6..88c0539d9ca 100644
--- a/src/test/org/apache/hadoop/hbase/TestMergeMeta.java
+++ b/src/test/org/apache/hadoop/hbase/TestMergeMeta.java
@@ -1,9 +1,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/test/org/apache/hadoop/hbase/TestMergeTable.java b/src/test/org/apache/hadoop/hbase/TestMergeTable.java
index f10547d7c15..eb11b612f27 100644
--- a/src/test/org/apache/hadoop/hbase/TestMergeTable.java
+++ b/src/test/org/apache/hadoop/hbase/TestMergeTable.java
@@ -1,9 +1,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/test/org/apache/hadoop/hbase/TestScanner.java b/src/test/org/apache/hadoop/hbase/TestScanner.java
index 21e8a526da1..9939012b626 100644
--- a/src/test/org/apache/hadoop/hbase/TestScanner.java
+++ b/src/test/org/apache/hadoop/hbase/TestScanner.java
@@ -1,9 +1,13 @@
 /**
- * Copyright 2006 The Apache Software Foundation
+ * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/test/org/apache/hadoop/hbase/TestScanner2.java b/src/test/org/apache/hadoop/hbase/TestScanner2.java
index 522276d67e9..1a75c17b272 100644
--- a/src/test/org/apache/hadoop/hbase/TestScanner2.java
+++ b/src/test/org/apache/hadoop/hbase/TestScanner2.java
@@ -1,9 +1,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/test/org/apache/hadoop/hbase/TestTable.java b/src/test/org/apache/hadoop/hbase/TestTable.java
index c5a2056a724..3710d361251 100644
--- a/src/test/org/apache/hadoop/hbase/TestTable.java
+++ b/src/test/org/apache/hadoop/hbase/TestTable.java
@@ -1,9 +1,13 @@
 /**
- * Copyright 2006 The Apache Software Foundation
+ * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/test/org/apache/hadoop/hbase/TestTableMapReduce.java b/src/test/org/apache/hadoop/hbase/TestTableMapReduce.java
index 650ca614e42..59b57ae9c73 100644
--- a/src/test/org/apache/hadoop/hbase/TestTableMapReduce.java
+++ b/src/test/org/apache/hadoop/hbase/TestTableMapReduce.java
@@ -1,9 +1,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/test/org/apache/hadoop/hbase/filter/TestPageRowFilter.java b/src/test/org/apache/hadoop/hbase/filter/TestPageRowFilter.java
index 68aecf7bd1f..69722858b72 100644
--- a/src/test/org/apache/hadoop/hbase/filter/TestPageRowFilter.java
+++ b/src/test/org/apache/hadoop/hbase/filter/TestPageRowFilter.java
@@ -1,9 +1,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/test/org/apache/hadoop/hbase/filter/TestRegExpRowFilter.java b/src/test/org/apache/hadoop/hbase/filter/TestRegExpRowFilter.java
index ebf19de7eae..bb77d3688d1 100644
--- a/src/test/org/apache/hadoop/hbase/filter/TestRegExpRowFilter.java
+++ b/src/test/org/apache/hadoop/hbase/filter/TestRegExpRowFilter.java
@@ -1,9 +1,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/test/org/apache/hadoop/hbase/shell/TestHBaseShell.java b/src/test/org/apache/hadoop/hbase/shell/TestHBaseShell.java
index 3167516e116..8ba57ab3dfc 100644
--- a/src/test/org/apache/hadoop/hbase/shell/TestHBaseShell.java
+++ b/src/test/org/apache/hadoop/hbase/shell/TestHBaseShell.java
@@ -1,9 +1,13 @@
 /**
  * Copyright 2007 The Apache Software Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/test/org/apache/hadoop/hbase/util/TestKeying.java b/src/test/org/apache/hadoop/hbase/util/TestKeying.java
index e1a64d4694b..6bc6b9d3ea5 100644
--- a/src/test/org/apache/hadoop/hbase/util/TestKeying.java
+++ b/src/test/org/apache/hadoop/hbase/util/TestKeying.java
@@ -1,4 +1,6 @@
 /**
+ * Copyright 2007 The Apache Software Foundation
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/src/test/org/onelab/test/StringKey.java b/src/test/org/onelab/test/StringKey.java
index b585492f569..f3090533e9b 100644
--- a/src/test/org/onelab/test/StringKey.java
+++ b/src/test/org/onelab/test/StringKey.java
@@ -29,6 +29,23 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
  * POSSIBILITY OF SUCH DAMAGE.
  */
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.onelab.test;
 
 import org.onelab.filter.Key;
diff --git a/src/test/org/onelab/test/TestFilter.java b/src/test/org/onelab/test/TestFilter.java
index d5e61f53558..0d061c740e4 100644
--- a/src/test/org/onelab/test/TestFilter.java
+++ b/src/test/org/onelab/test/TestFilter.java
@@ -29,6 +29,23 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
  * POSSIBILITY OF SUCH DAMAGE.
  */
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.onelab.test;
 
 import junit.framework.TestCase;