http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 5a5806e..c0859e7 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ of commodity hardware. </description> <url>http://hbase.apache.org</url> - + <inceptionYear>2007</inceptionYear> <scm> <connection>scm:svn:http://svn.apache.org/repos/asf/hbase/trunk</connection> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/hbase/trunk</developerConnection> @@ -326,6 +326,16 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-remote-resources-plugin</artifactId> + <version>1.5</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <version>2.3</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-release-plugin</artifactId> <!--Making a release I've been using mvn 3.0 and specifying the apache-release profile on the command line as follows: @@ -449,6 +459,11 @@ </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> + <artifactId>buildnumber-maven-plugin</artifactId> + <version>1.3</version> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> <version>1.5</version> </plugin> @@ -503,6 +518,35 @@ <execute></execute> </action> </pluginExecution> + <pluginExecution> + <pluginExecutionFilter> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-remote-resources-plugin</artifactId> + <versionRange>[1.5,)</versionRange> + <goals> + <goal>process</goal> + </goals> + </pluginExecutionFilter> + <action> + <execute></execute> + </action> + </pluginExecution> + <pluginExecution> + <pluginExecutionFilter> + <groupId>org.codehaus.mojo</groupId> + <artifactId>buildnumber-maven-plugin</artifactId> + <versionRange>[1.3,)</versionRange> + <goals> + <goal>create-timestamp</goal> + </goals> + </pluginExecutionFilter> + <action> + <execute> + <runOnConfiguration>true</runOnConfiguration> + <runOnIncremental>true</runOnIncremental> + </execute> + </action> + </pluginExecution> </pluginExecutions> </lifecycleMappingMetadata> </configuration> @@ -523,7 +567,8 @@ <exclude>**/target/**</exclude> <exclude>**/CHANGES.txt</exclude> <exclude>**/generated/**</exclude> - <exclude>**/conf/*</exclude> + <!-- No material contents --> + <exclude>conf/regionservers</exclude> <exclude>**/*.avpr</exclude> <exclude>**/*.svg</exclude> <!-- vector graphics --> <exclude>**/*.vm</exclude> <!-- apache doxia generated --> @@ -532,6 +577,8 @@ <exclude>docs/*</exclude> <!-- auto-gen docs --> <!--It don't like freebsd license--> <exclude>**/src/site/resources/css/freebsd_docbook.css</exclude> + <!-- non-standard notice file from jruby included by reference --> + <exclude>**/src/main/resources/META-INF/LEGAL</exclude> <!-- exclude source control files --> <exclude>.git/**</exclude> <exclude>.svn/**</exclude> @@ -550,6 +597,16 @@ <include>hbase-default.xml</include> </includes> </resource> +<!-- + <resource> + <directory>src/main/resources/</directory> + <includes> + <include>META-INF/LICENSE</include> + <include>META-INF/NOTICE</include> + </includes> + <filtering>true</filtering> + </resource> +--> <resource> <directory>${project.build.directory}</directory> <includes> @@ -564,6 +621,15 @@ <exclude>hbase-site.xml</exclude> </excludes> </testResource> +<!-- + <testResource> + <directory>src/main/resources/</directory> + <includes> + <include>META-INF/NOTICE</include> + </includes> + <filtering>true</filtering> + </testResource> +--> </testResources> <plugins> @@ -778,6 +844,16 @@ <goals> <goal>jar-no-fork</goal> </goals> +<!-- + <configuration> + <excludes> + <exclude>META-INF/NOTICE</exclude> + </excludes> + <includes> + <include>${project.build.outputDirectory}/META-INF/NOTICE</include> + </includes> + </configuration> +--> </execution> </executions> </plugin> @@ -1068,10 +1144,131 @@ </additionalConfig> </configuration> </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>buildnumber-maven-plugin</artifactId> + <executions> + <execution> + <phase>validate</phase> + <goals> + <goal>create-timestamp</goal> + </goals> + </execution> + </executions> + <configuration> + <timestampFormat>yyyy</timestampFormat> + <timestampPropertyName>build.year</timestampPropertyName> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-remote-resources-plugin</artifactId> + <executions> + <!-- + This is different from the default execution because we have + to build aggregate information for bundled dependencies. + --> + <execution> + <id>build-legal-for-assembly</id> + <!-- has to run before the default --> +<!-- + <phase>prepare-package</phase> +--> + <phase>process-sources</phase> + <goals> + <goal>process</goal> + </goals> + <configuration> + <appendedResourcesDirectory>src/assembly</appendedResourcesDirectory> + <outputDirectory>${project.build.directory}/maven-shared-archive-resources-for-assembly</outputDirectory> + <resources> + <resource>src/assembly/resource</resource> + </resources> + <supplementalModels> + <supplementalModel>src/assembly/resources/supplemental-models.xml</supplementalModel> + </supplementalModels> + <properties> + <bundled-dependencies>true</bundled-dependencies> + <debug-print-included-work-info>${license.debug.print.included}</debug-print-included-work-info> + </properties> + <resourceBundles> + <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle> + </resourceBundles> + <attach>false</attach> + <attachToMain>false</attachToMain> + <attachToTest>false</attachToTest> + </configuration> + </execution> +<!-- + <execution> + <id>default</id> + </execution> +--> + </executions> + </plugin> + <!-- + Build an aggregation of our templated NOTICE file and the NOTICE files in our dependencies. + If MASSEMBLY-382 is fixed we could do this in the assembly + Currently relies on env, bash, find, and cat. + --> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <!-- put all of the NOTICE files out of our dependencies --> + <id>unpack-dependency-notices</id> + <phase>prepare-package</phase> + <goals> + <goal>unpack-dependencies</goal> + </goals> + <configuration> + <useSubDirectoryPerArtifact>true</useSubDirectoryPerArtifact> + <includes>**\/NOTICE,**\/NOTICE.txt</includes> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <version>1.4.0</version> + <executions> + <execution> + <id>concat-NOTICE-files</id> + <phase>prepare-package</phase> + <goals> + <goal>exec</goal> + </goals> + <configuration> + <executable>env</executable> + <arguments> + <argument>bash</argument> + <argument>-c</argument> + <argument>cat maven-shared-archive-resources-for-assembly/META-INF/NOTICE \ + `find ${project.build.directory}/dependency -iname NOTICE -or -iname NOTICE.txt` \ + </argument> + </arguments> + <outputFile>${project.build.directory}/NOTICE.aggregate</outputFile> + <workingDirectory>${project.build.directory}</workingDirectory> + </configuration> + </execution> + </executions> + </plugin> + <!-- /end building aggregation of NOTICE files --> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.5.3</version> + <inherited>true</inherited> + <extensions>true</extensions> + </plugin> </plugins> </build> <properties> + <!-- override on command line to have generated LICENSE files include + diagnostic info for verifying notice requirements --> + <license.debug.print.included>false</license.debug.print.included> <maven.build.timestamp.format> yyyy-MM-dd'T'HH:mm </maven.build.timestamp.format>
http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/security/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java ---------------------------------------------------------------------- diff --git a/security/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java b/security/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java index 62faa69..97b0849 100644 --- a/security/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java +++ b/security/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java @@ -1,15 +1,20 @@ /* - * 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 + * 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. + * 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.apache.hadoop.hbase.security.access; http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/security/src/main/java/org/apache/hadoop/hbase/security/access/SecureBulkLoadEndpoint.java ---------------------------------------------------------------------- diff --git a/security/src/main/java/org/apache/hadoop/hbase/security/access/SecureBulkLoadEndpoint.java b/security/src/main/java/org/apache/hadoop/hbase/security/access/SecureBulkLoadEndpoint.java index 946a97e..1a93c47 100644 --- a/security/src/main/java/org/apache/hadoop/hbase/security/access/SecureBulkLoadEndpoint.java +++ b/security/src/main/java/org/apache/hadoop/hbase/security/access/SecureBulkLoadEndpoint.java @@ -1,6 +1,4 @@ -/** - * Copyright 2011 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 http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/security/src/main/java/org/apache/hadoop/hbase/security/access/SecureBulkLoadProtocol.java ---------------------------------------------------------------------- diff --git a/security/src/main/java/org/apache/hadoop/hbase/security/access/SecureBulkLoadProtocol.java b/security/src/main/java/org/apache/hadoop/hbase/security/access/SecureBulkLoadProtocol.java index 4f58a46..63f45fd 100644 --- a/security/src/main/java/org/apache/hadoop/hbase/security/access/SecureBulkLoadProtocol.java +++ b/security/src/main/java/org/apache/hadoop/hbase/security/access/SecureBulkLoadProtocol.java @@ -1,6 +1,4 @@ -/** - * Copyright 2011 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 http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/security/src/test/resources/hbase-site.xml ---------------------------------------------------------------------- diff --git a/security/src/test/resources/hbase-site.xml b/security/src/test/resources/hbase-site.xml index cca8832..4f1dd5f 100644 --- a/security/src/test/resources/hbase-site.xml +++ b/security/src/test/resources/hbase-site.xml @@ -2,8 +2,6 @@ <?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 http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/assembly/all.xml ---------------------------------------------------------------------- diff --git a/src/assembly/all.xml b/src/assembly/all.xml index 11d26f1..dc01b7b 100644 --- a/src/assembly/all.xml +++ b/src/assembly/all.xml @@ -33,6 +33,11 @@ <includes> <include>${basedir}/*.txt</include> </includes> + <!-- version for assmebly generated by build --> + <excludes> + <exclude>${basedir}/NOTICE.txt</exclude> + <exclude>${basedir}/LICENSE.txt</exclude> + </excludes> </fileSet> <fileSet> <includes> @@ -108,4 +113,26 @@ <directoryMode>0644</directoryMode> </dependencySet> </dependencySets> + <!-- Include the generated LICENSE and NOTICE files --> + <files> + <file> + <source>${project.build.directory}/maven-shared-archive-resources-for-assembly/META-INF/LICENSE</source> + <outputDirectory>.</outputDirectory> + <destName>LICENSE.txt</destName> + <lineEnding>unix</lineEnding> + </file> + <file> + <source>${project.build.directory}/NOTICE.aggregate</source> + <outputDirectory>.</outputDirectory> + <destName>NOTICE.txt</destName> + <lineEnding>unix</lineEnding> + </file> + <file> + <source>${basedir}/src/main/resources/META-INF/LEGAL</source> + <outputDirectory>.</outputDirectory> + <destName>LEGAL</destName> + <lineEnding>unix</lineEnding> + </file> + </files> + </assembly> http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/examples/mapreduce/org/apache/hadoop/hbase/mapreduce/IndexBuilder.java ---------------------------------------------------------------------- diff --git a/src/examples/mapreduce/org/apache/hadoop/hbase/mapreduce/IndexBuilder.java b/src/examples/mapreduce/org/apache/hadoop/hbase/mapreduce/IndexBuilder.java index 31c1b38..0d092d0 100644 --- a/src/examples/mapreduce/org/apache/hadoop/hbase/mapreduce/IndexBuilder.java +++ b/src/examples/mapreduce/org/apache/hadoop/hbase/mapreduce/IndexBuilder.java @@ -1,6 +1,4 @@ -/** - * Copyright 2009 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 http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/examples/mapreduce/org/apache/hadoop/hbase/mapreduce/SampleUploader.java ---------------------------------------------------------------------- diff --git a/src/examples/mapreduce/org/apache/hadoop/hbase/mapreduce/SampleUploader.java b/src/examples/mapreduce/org/apache/hadoop/hbase/mapreduce/SampleUploader.java index 5629cca..108d652 100644 --- a/src/examples/mapreduce/org/apache/hadoop/hbase/mapreduce/SampleUploader.java +++ b/src/examples/mapreduce/org/apache/hadoop/hbase/mapreduce/SampleUploader.java @@ -1,6 +1,4 @@ -/** - * Copyright 2009 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 http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/examples/thrift/DemoClient.cpp ---------------------------------------------------------------------- diff --git a/src/examples/thrift/DemoClient.cpp b/src/examples/thrift/DemoClient.cpp index 06cbc44..e845669 100644 --- a/src/examples/thrift/DemoClient.cpp +++ b/src/examples/thrift/DemoClient.cpp @@ -1,6 +1,4 @@ /** - * Copyright 2008 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 http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/examples/thrift/DemoClient.java ---------------------------------------------------------------------- diff --git a/src/examples/thrift/DemoClient.java b/src/examples/thrift/DemoClient.java index bb03fcc..036d7fd 100644 --- a/src/examples/thrift/DemoClient.java +++ b/src/examples/thrift/DemoClient.java @@ -1,6 +1,4 @@ -/** - * Copyright 2008 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 http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/examples/thrift/DemoClient.php ---------------------------------------------------------------------- diff --git a/src/examples/thrift/DemoClient.php b/src/examples/thrift/DemoClient.php index 669f2b6..93d79d4 100644 --- a/src/examples/thrift/DemoClient.php +++ b/src/examples/thrift/DemoClient.php @@ -1,7 +1,5 @@ <?php /** - * Copyright 2008 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 http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/examples/thrift/DemoClient.pl ---------------------------------------------------------------------- diff --git a/src/examples/thrift/DemoClient.pl b/src/examples/thrift/DemoClient.pl index 17d92fa..a80cca4 100644 --- a/src/examples/thrift/DemoClient.pl +++ b/src/examples/thrift/DemoClient.pl @@ -1,6 +1,4 @@ #!/usr/bin/perl -# Copyright 2011 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 http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/examples/thrift/DemoClient.py ---------------------------------------------------------------------- diff --git a/src/examples/thrift/DemoClient.py b/src/examples/thrift/DemoClient.py index eabbbe8..723d7a8 100755 --- a/src/examples/thrift/DemoClient.py +++ b/src/examples/thrift/DemoClient.py @@ -1,6 +1,5 @@ #!/usr/bin/python -'''Copyright 2008 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 http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/examples/thrift/DemoClient.rb ---------------------------------------------------------------------- diff --git a/src/examples/thrift/DemoClient.rb b/src/examples/thrift/DemoClient.rb index 2b7b5e7..ea5acad 100644 --- a/src/examples/thrift/DemoClient.rb +++ b/src/examples/thrift/DemoClient.rb @@ -1,7 +1,5 @@ #!/usr/bin/ruby -# Copyright 2008 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 http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/examples/thrift/Makefile ---------------------------------------------------------------------- diff --git a/src/examples/thrift/Makefile b/src/examples/thrift/Makefile index 691a1e9..da2f301 100644 --- a/src/examples/thrift/Makefile +++ b/src/examples/thrift/Makefile @@ -1,5 +1,3 @@ -# Copyright 2008 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 http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/examples/thrift2/DemoClient.java ---------------------------------------------------------------------- diff --git a/src/examples/thrift2/DemoClient.java b/src/examples/thrift2/DemoClient.java index d5b805c..828b4c0 100644 --- a/src/examples/thrift2/DemoClient.java +++ b/src/examples/thrift2/DemoClient.java @@ -1,6 +1,4 @@ -/** - * Copyright 2011 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 http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/examples/thrift2/DemoClient.py ---------------------------------------------------------------------- diff --git a/src/examples/thrift2/DemoClient.py b/src/examples/thrift2/DemoClient.py index 67abc5b..3a3ebbb 100644 --- a/src/examples/thrift2/DemoClient.py +++ b/src/examples/thrift2/DemoClient.py @@ -1,6 +1,4 @@ """ - Copyright 2011 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 http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/jamon/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.jamon ---------------------------------------------------------------------- diff --git a/src/main/jamon/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.jamon b/src/main/jamon/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.jamon index 4379ef5..0304154 100644 --- a/src/main/jamon/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.jamon +++ b/src/main/jamon/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.jamon @@ -1,6 +1,4 @@ <%doc> -Copyright 2011 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 http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/AssignmentManagerStatusTmpl.jamon ---------------------------------------------------------------------- diff --git a/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/AssignmentManagerStatusTmpl.jamon b/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/AssignmentManagerStatusTmpl.jamon index 0dc0691..e06c5e6 100644 --- a/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/AssignmentManagerStatusTmpl.jamon +++ b/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/AssignmentManagerStatusTmpl.jamon @@ -1,6 +1,4 @@ <%doc> -Copyright 2011 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 http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon ---------------------------------------------------------------------- diff --git a/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon b/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon index 6af4025..c1fffed 100644 --- a/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon +++ b/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon @@ -1,6 +1,4 @@ <%doc> -Copyright 2011 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 http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon ---------------------------------------------------------------------- diff --git a/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon b/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon index ee17852..15455b5 100644 --- a/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon +++ b/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon @@ -1,6 +1,4 @@ <%doc> -Copyright 2011 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 http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/Abortable.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/Abortable.java b/src/main/java/org/apache/hadoop/hbase/Abortable.java index 03249c1..ec2e0fc 100644 --- a/src/main/java/org/apache/hadoop/hbase/Abortable.java +++ b/src/main/java/org/apache/hadoop/hbase/Abortable.java @@ -1,6 +1,4 @@ -/** - * Copyright 2010 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 http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/Chore.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/Chore.java b/src/main/java/org/apache/hadoop/hbase/Chore.java index 1581b0c..924f4eb 100644 --- a/src/main/java/org/apache/hadoop/hbase/Chore.java +++ b/src/main/java/org/apache/hadoop/hbase/Chore.java @@ -1,6 +1,4 @@ -/** - * 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 http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/ClockOutOfSyncException.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/ClockOutOfSyncException.java b/src/main/java/org/apache/hadoop/hbase/ClockOutOfSyncException.java index 5c51e4b..ef93c5a 100644 --- a/src/main/java/org/apache/hadoop/hbase/ClockOutOfSyncException.java +++ b/src/main/java/org/apache/hadoop/hbase/ClockOutOfSyncException.java @@ -1,6 +1,4 @@ -/** - * Copyright 2010 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 http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java b/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java index d962594..96248a9 100644 --- a/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java +++ b/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java @@ -1,6 +1,4 @@ -/** - * Copyright 2009 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 http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/Coprocessor.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/Coprocessor.java b/src/main/java/org/apache/hadoop/hbase/Coprocessor.java index c0cb463..b29c531 100644 --- a/src/main/java/org/apache/hadoop/hbase/Coprocessor.java +++ b/src/main/java/org/apache/hadoop/hbase/Coprocessor.java @@ -1,17 +1,20 @@ /* - * Copyright 2010 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 * - * 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 + * http://www.apache.org/licenses/LICENSE-2.0 * - * 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. + * 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.apache.hadoop.hbase; http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/CoprocessorEnvironment.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/CoprocessorEnvironment.java b/src/main/java/org/apache/hadoop/hbase/CoprocessorEnvironment.java index 09bca11..501ecf9 100644 --- a/src/main/java/org/apache/hadoop/hbase/CoprocessorEnvironment.java +++ b/src/main/java/org/apache/hadoop/hbase/CoprocessorEnvironment.java @@ -1,17 +1,20 @@ /* - * Copyright 2010 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 * - * 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 + * http://www.apache.org/licenses/LICENSE-2.0 * - * 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. + * 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.apache.hadoop.hbase; @@ -57,4 +60,4 @@ public interface CoprocessorEnvironment { * @throws IOException */ public HTableInterface getTable(byte[] tableName, ExecutorService service) throws IOException; -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/DoNotRetryIOException.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/DoNotRetryIOException.java b/src/main/java/org/apache/hadoop/hbase/DoNotRetryIOException.java index 5a0c6d2..7b24b16 100644 --- a/src/main/java/org/apache/hadoop/hbase/DoNotRetryIOException.java +++ b/src/main/java/org/apache/hadoop/hbase/DoNotRetryIOException.java @@ -1,6 +1,4 @@ -/** - * Copyright 2008 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 http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/DroppedSnapshotException.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/DroppedSnapshotException.java b/src/main/java/org/apache/hadoop/hbase/DroppedSnapshotException.java index 9b1d021..3b344a3 100644 --- a/src/main/java/org/apache/hadoop/hbase/DroppedSnapshotException.java +++ b/src/main/java/org/apache/hadoop/hbase/DroppedSnapshotException.java @@ -1,17 +1,20 @@ -/** - * 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 + * 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. + * 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.apache.hadoop.hbase; import java.io.IOException; @@ -38,4 +41,4 @@ public class DroppedSnapshotException extends IOException { public DroppedSnapshotException() { super(); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/EmptyWatcher.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/EmptyWatcher.java b/src/main/java/org/apache/hadoop/hbase/EmptyWatcher.java index e0e0a28..03d79e2 100644 --- a/src/main/java/org/apache/hadoop/hbase/EmptyWatcher.java +++ b/src/main/java/org/apache/hadoop/hbase/EmptyWatcher.java @@ -1,6 +1,4 @@ -/** - * Copyright 2009 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 http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java b/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java index 590e774..29617de 100644 --- a/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java +++ b/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java @@ -1,6 +1,4 @@ -/** - * 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 http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/HColumnDescriptor.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/HColumnDescriptor.java b/src/main/java/org/apache/hadoop/hbase/HColumnDescriptor.java index dca442d..00b50c6 100644 --- a/src/main/java/org/apache/hadoop/hbase/HColumnDescriptor.java +++ b/src/main/java/org/apache/hadoop/hbase/HColumnDescriptor.java @@ -1,6 +1,4 @@ -/** - * 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 http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/HConstants.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/HConstants.java b/src/main/java/org/apache/hadoop/hbase/HConstants.java index 6821850..75202cb 100644 --- a/src/main/java/org/apache/hadoop/hbase/HConstants.java +++ b/src/main/java/org/apache/hadoop/hbase/HConstants.java @@ -1,6 +1,4 @@ -/** - * Copyright 2010 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 http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/HDFSBlocksDistribution.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/HDFSBlocksDistribution.java b/src/main/java/org/apache/hadoop/hbase/HDFSBlocksDistribution.java index d0d1dd0..27892f4 100644 --- a/src/main/java/org/apache/hadoop/hbase/HDFSBlocksDistribution.java +++ b/src/main/java/org/apache/hadoop/hbase/HDFSBlocksDistribution.java @@ -1,6 +1,4 @@ -/** - * Copyright 2011 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 http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/HRegionInfo.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/HRegionInfo.java b/src/main/java/org/apache/hadoop/hbase/HRegionInfo.java index 53f6720..641c07d 100644 --- a/src/main/java/org/apache/hadoop/hbase/HRegionInfo.java +++ b/src/main/java/org/apache/hadoop/hbase/HRegionInfo.java @@ -1,6 +1,4 @@ -/** - * 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 http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/HRegionLocation.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/HRegionLocation.java b/src/main/java/org/apache/hadoop/hbase/HRegionLocation.java index 85fb91d..c0ee5cb 100644 --- a/src/main/java/org/apache/hadoop/hbase/HRegionLocation.java +++ b/src/main/java/org/apache/hadoop/hbase/HRegionLocation.java @@ -1,5 +1,4 @@ /** - * Copyright 2007 The Apache Software Foundation * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/HServerAddress.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/HServerAddress.java b/src/main/java/org/apache/hadoop/hbase/HServerAddress.java index e189aaf..59b95f3 100644 --- a/src/main/java/org/apache/hadoop/hbase/HServerAddress.java +++ b/src/main/java/org/apache/hadoop/hbase/HServerAddress.java @@ -1,5 +1,4 @@ /** - * Copyright 2007 The Apache Software Foundation * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/HServerInfo.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/HServerInfo.java b/src/main/java/org/apache/hadoop/hbase/HServerInfo.java index 5934246..cb2d9c3 100644 --- a/src/main/java/org/apache/hadoop/hbase/HServerInfo.java +++ b/src/main/java/org/apache/hadoop/hbase/HServerInfo.java @@ -1,5 +1,4 @@ /** - * Copyright 2010 The Apache Software Foundation * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/HServerLoad.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/HServerLoad.java b/src/main/java/org/apache/hadoop/hbase/HServerLoad.java index ffdbc6b..bf41c3b 100644 --- a/src/main/java/org/apache/hadoop/hbase/HServerLoad.java +++ b/src/main/java/org/apache/hadoop/hbase/HServerLoad.java @@ -1,5 +1,4 @@ /** - * Copyright 2007 The Apache Software Foundation * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java b/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java index edea631..50f39ff 100644 --- a/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java +++ b/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java @@ -1,5 +1,4 @@ /** - * Copyright 2009 The Apache Software Foundation * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/HealthCheckChore.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/HealthCheckChore.java b/src/main/java/org/apache/hadoop/hbase/HealthCheckChore.java index bae41f6..c379750 100644 --- a/src/main/java/org/apache/hadoop/hbase/HealthCheckChore.java +++ b/src/main/java/org/apache/hadoop/hbase/HealthCheckChore.java @@ -1,6 +1,4 @@ -/** - * Copyright 2011 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 http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/HealthChecker.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/HealthChecker.java b/src/main/java/org/apache/hadoop/hbase/HealthChecker.java index e77317c..bc291a9 100644 --- a/src/main/java/org/apache/hadoop/hbase/HealthChecker.java +++ b/src/main/java/org/apache/hadoop/hbase/HealthChecker.java @@ -1,6 +1,4 @@ -/** - * Copyright 2011 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 http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/InvalidFamilyOperationException.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/InvalidFamilyOperationException.java b/src/main/java/org/apache/hadoop/hbase/InvalidFamilyOperationException.java index bb2b666..d08da46 100644 --- a/src/main/java/org/apache/hadoop/hbase/InvalidFamilyOperationException.java +++ b/src/main/java/org/apache/hadoop/hbase/InvalidFamilyOperationException.java @@ -1,5 +1,4 @@ /** - * Copyright 2010 The Apache Software Foundation * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/KeyValue.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/KeyValue.java b/src/main/java/org/apache/hadoop/hbase/KeyValue.java index 69412a2..0e8ee90 100644 --- a/src/main/java/org/apache/hadoop/hbase/KeyValue.java +++ b/src/main/java/org/apache/hadoop/hbase/KeyValue.java @@ -1,5 +1,4 @@ /** - * Copyright 2009 The Apache Software Foundation * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java b/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java index 315309f..3d9c6b8 100644 --- a/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java +++ b/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java @@ -1,5 +1,4 @@ /** - * Copyright 2007 The Apache Software Foundation * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/MasterAddressTracker.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/MasterAddressTracker.java b/src/main/java/org/apache/hadoop/hbase/MasterAddressTracker.java index 2fdc6ba..5277c28 100644 --- a/src/main/java/org/apache/hadoop/hbase/MasterAddressTracker.java +++ b/src/main/java/org/apache/hadoop/hbase/MasterAddressTracker.java @@ -1,5 +1,4 @@ /** - * Copyright 2010 The Apache Software Foundation * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/MasterNotRunningException.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/MasterNotRunningException.java b/src/main/java/org/apache/hadoop/hbase/MasterNotRunningException.java index 6cf564c..56d359f 100644 --- a/src/main/java/org/apache/hadoop/hbase/MasterNotRunningException.java +++ b/src/main/java/org/apache/hadoop/hbase/MasterNotRunningException.java @@ -1,5 +1,4 @@ /** - * Copyright 2007 The Apache Software Foundation * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/NotAllMetaRegionsOnlineException.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/NotAllMetaRegionsOnlineException.java b/src/main/java/org/apache/hadoop/hbase/NotAllMetaRegionsOnlineException.java index 2c275e3..ec3d926 100644 --- a/src/main/java/org/apache/hadoop/hbase/NotAllMetaRegionsOnlineException.java +++ b/src/main/java/org/apache/hadoop/hbase/NotAllMetaRegionsOnlineException.java @@ -1,5 +1,4 @@ /** - * Copyright 2010 The Apache Software Foundation * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/NotServingRegionException.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/NotServingRegionException.java b/src/main/java/org/apache/hadoop/hbase/NotServingRegionException.java index 32da8cb..a2a5c71 100644 --- a/src/main/java/org/apache/hadoop/hbase/NotServingRegionException.java +++ b/src/main/java/org/apache/hadoop/hbase/NotServingRegionException.java @@ -1,5 +1,4 @@ /** - * Copyright 2007 The Apache Software Foundation * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/PleaseHoldException.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/PleaseHoldException.java b/src/main/java/org/apache/hadoop/hbase/PleaseHoldException.java index 309dca4..15410a7 100644 --- a/src/main/java/org/apache/hadoop/hbase/PleaseHoldException.java +++ b/src/main/java/org/apache/hadoop/hbase/PleaseHoldException.java @@ -1,5 +1,4 @@ /** - * Copyright 2010 The Apache Software Foundation * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/RegionException.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/RegionException.java b/src/main/java/org/apache/hadoop/hbase/RegionException.java index 63063a5..39b4f94 100644 --- a/src/main/java/org/apache/hadoop/hbase/RegionException.java +++ b/src/main/java/org/apache/hadoop/hbase/RegionException.java @@ -1,5 +1,4 @@ /** - * Copyright 2008 The Apache Software Foundation * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/RemoteExceptionHandler.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/RemoteExceptionHandler.java b/src/main/java/org/apache/hadoop/hbase/RemoteExceptionHandler.java index 485c254..4a1f7bf 100644 --- a/src/main/java/org/apache/hadoop/hbase/RemoteExceptionHandler.java +++ b/src/main/java/org/apache/hadoop/hbase/RemoteExceptionHandler.java @@ -1,5 +1,4 @@ /** - * Copyright 2007 The Apache Software Foundation * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/Server.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/Server.java b/src/main/java/org/apache/hadoop/hbase/Server.java index de19e2c..4f5815e 100644 --- a/src/main/java/org/apache/hadoop/hbase/Server.java +++ b/src/main/java/org/apache/hadoop/hbase/Server.java @@ -1,5 +1,4 @@ /** - * Copyright 2010 The Apache Software Foundation * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/ServerName.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/ServerName.java b/src/main/java/org/apache/hadoop/hbase/ServerName.java index 2d6fe4e..c3c8069 100644 --- a/src/main/java/org/apache/hadoop/hbase/ServerName.java +++ b/src/main/java/org/apache/hadoop/hbase/ServerName.java @@ -1,5 +1,4 @@ /** - * Copyright 2011 The Apache Software Foundation * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/Stoppable.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/Stoppable.java b/src/main/java/org/apache/hadoop/hbase/Stoppable.java index 74d4f4a..4e345b2 100644 --- a/src/main/java/org/apache/hadoop/hbase/Stoppable.java +++ b/src/main/java/org/apache/hadoop/hbase/Stoppable.java @@ -1,5 +1,4 @@ /** - * Copyright 2010 The Apache Software Foundation * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/TableExistsException.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/TableExistsException.java b/src/main/java/org/apache/hadoop/hbase/TableExistsException.java index 5fde219..cd8c578 100644 --- a/src/main/java/org/apache/hadoop/hbase/TableExistsException.java +++ b/src/main/java/org/apache/hadoop/hbase/TableExistsException.java @@ -1,17 +1,20 @@ -/** - * 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 + * 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. + * 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.apache.hadoop.hbase; http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/TableNotDisabledException.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/TableNotDisabledException.java b/src/main/java/org/apache/hadoop/hbase/TableNotDisabledException.java index 4287800..d8f21d2 100644 --- a/src/main/java/org/apache/hadoop/hbase/TableNotDisabledException.java +++ b/src/main/java/org/apache/hadoop/hbase/TableNotDisabledException.java @@ -1,5 +1,4 @@ /** - * Copyright 2007 The Apache Software Foundation * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/TableNotEnabledException.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/TableNotEnabledException.java b/src/main/java/org/apache/hadoop/hbase/TableNotEnabledException.java index d0392d5..40c67c4 100644 --- a/src/main/java/org/apache/hadoop/hbase/TableNotEnabledException.java +++ b/src/main/java/org/apache/hadoop/hbase/TableNotEnabledException.java @@ -1,5 +1,4 @@ /** - * Copyright 2011 The Apache Software Foundation * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/TableNotFoundException.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/TableNotFoundException.java b/src/main/java/org/apache/hadoop/hbase/TableNotFoundException.java index dc6da43..aa93ad4 100644 --- a/src/main/java/org/apache/hadoop/hbase/TableNotFoundException.java +++ b/src/main/java/org/apache/hadoop/hbase/TableNotFoundException.java @@ -1,5 +1,4 @@ /** - * Copyright 2007 The Apache Software Foundation * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/UnknownRegionException.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/UnknownRegionException.java b/src/main/java/org/apache/hadoop/hbase/UnknownRegionException.java index e87f42a..c545959 100644 --- a/src/main/java/org/apache/hadoop/hbase/UnknownRegionException.java +++ b/src/main/java/org/apache/hadoop/hbase/UnknownRegionException.java @@ -1,5 +1,4 @@ /** - * Copyright 2010 The Apache Software Foundation * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/UnknownRowLockException.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/UnknownRowLockException.java b/src/main/java/org/apache/hadoop/hbase/UnknownRowLockException.java index 675e6e2..9c0ec6b 100644 --- a/src/main/java/org/apache/hadoop/hbase/UnknownRowLockException.java +++ b/src/main/java/org/apache/hadoop/hbase/UnknownRowLockException.java @@ -1,5 +1,4 @@ /** - * Copyright 2007 The Apache Software Foundation * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/UnknownScannerException.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/UnknownScannerException.java b/src/main/java/org/apache/hadoop/hbase/UnknownScannerException.java index 13f2f6c..07ba065 100644 --- a/src/main/java/org/apache/hadoop/hbase/UnknownScannerException.java +++ b/src/main/java/org/apache/hadoop/hbase/UnknownScannerException.java @@ -1,5 +1,4 @@ /** - * Copyright 2007 The Apache Software Foundation * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/YouAreDeadException.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/YouAreDeadException.java b/src/main/java/org/apache/hadoop/hbase/YouAreDeadException.java index fcd2ccd..6c55619 100644 --- a/src/main/java/org/apache/hadoop/hbase/YouAreDeadException.java +++ b/src/main/java/org/apache/hadoop/hbase/YouAreDeadException.java @@ -1,5 +1,4 @@ /** - * Copyright 2010 The Apache Software Foundation * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/ZooKeeperConnectionException.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/ZooKeeperConnectionException.java b/src/main/java/org/apache/hadoop/hbase/ZooKeeperConnectionException.java index ad48b25..7492ffd 100644 --- a/src/main/java/org/apache/hadoop/hbase/ZooKeeperConnectionException.java +++ b/src/main/java/org/apache/hadoop/hbase/ZooKeeperConnectionException.java @@ -1,5 +1,4 @@ /** - * Copyright 2010 The Apache Software Foundation * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/catalog/RootLocationEditor.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/catalog/RootLocationEditor.java b/src/main/java/org/apache/hadoop/hbase/catalog/RootLocationEditor.java index 1cbf1b6..a0836d8 100644 --- a/src/main/java/org/apache/hadoop/hbase/catalog/RootLocationEditor.java +++ b/src/main/java/org/apache/hadoop/hbase/catalog/RootLocationEditor.java @@ -1,6 +1,4 @@ -/** - * Copyright 2010 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 http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/client/Action.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/client/Action.java b/src/main/java/org/apache/hadoop/hbase/client/Action.java index 40b0f2e..b3ee61c 100644 --- a/src/main/java/org/apache/hadoop/hbase/client/Action.java +++ b/src/main/java/org/apache/hadoop/hbase/client/Action.java @@ -1,6 +1,4 @@ -/** - * Copyright 2010 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 http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/client/Attributes.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/client/Attributes.java b/src/main/java/org/apache/hadoop/hbase/client/Attributes.java index 5999e3a..014db38 100644 --- a/src/main/java/org/apache/hadoop/hbase/client/Attributes.java +++ b/src/main/java/org/apache/hadoop/hbase/client/Attributes.java @@ -1,6 +1,4 @@ /* - * Copyright 2011 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 http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/client/Delete.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/client/Delete.java b/src/main/java/org/apache/hadoop/hbase/client/Delete.java index c147f2f..ed032cc 100644 --- a/src/main/java/org/apache/hadoop/hbase/client/Delete.java +++ b/src/main/java/org/apache/hadoop/hbase/client/Delete.java @@ -1,6 +1,4 @@ /* - * Copyright 2010 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 http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/client/Get.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/client/Get.java b/src/main/java/org/apache/hadoop/hbase/client/Get.java index ad9a058..feb782a 100644 --- a/src/main/java/org/apache/hadoop/hbase/client/Get.java +++ b/src/main/java/org/apache/hadoop/hbase/client/Get.java @@ -1,6 +1,4 @@ -/** - * Copyright 2010 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 http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java b/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java index c30b676..201a5d8 100644 --- a/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java +++ b/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java @@ -1,6 +1,4 @@ -/** - * Copyright 2011 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 http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/client/HConnection.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/client/HConnection.java b/src/main/java/org/apache/hadoop/hbase/client/HConnection.java index da8078c..38aeed8 100644 --- a/src/main/java/org/apache/hadoop/hbase/client/HConnection.java +++ b/src/main/java/org/apache/hadoop/hbase/client/HConnection.java @@ -1,6 +1,4 @@ -/** - * Copyright 2010 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 http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java b/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java index 7b68869..7427bc0 100644 --- a/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java +++ b/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java @@ -1,6 +1,4 @@ -/** - * Copyright 2010 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 http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/client/HTable.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/client/HTable.java b/src/main/java/org/apache/hadoop/hbase/client/HTable.java index 309732f..948a615 100644 --- a/src/main/java/org/apache/hadoop/hbase/client/HTable.java +++ b/src/main/java/org/apache/hadoop/hbase/client/HTable.java @@ -1,6 +1,4 @@ -/** - * Copyright 2011 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 http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/client/HTableFactory.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/client/HTableFactory.java b/src/main/java/org/apache/hadoop/hbase/client/HTableFactory.java index 90f6cb9..ed7d850 100644 --- a/src/main/java/org/apache/hadoop/hbase/client/HTableFactory.java +++ b/src/main/java/org/apache/hadoop/hbase/client/HTableFactory.java @@ -1,6 +1,4 @@ -/** - * Copyright 2010 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 http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/client/HTableInterface.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/client/HTableInterface.java b/src/main/java/org/apache/hadoop/hbase/client/HTableInterface.java index e7e296c..20cbfb5 100644 --- a/src/main/java/org/apache/hadoop/hbase/client/HTableInterface.java +++ b/src/main/java/org/apache/hadoop/hbase/client/HTableInterface.java @@ -1,6 +1,4 @@ -/** - * Copyright 2010 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 http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/client/HTableInterfaceFactory.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/client/HTableInterfaceFactory.java b/src/main/java/org/apache/hadoop/hbase/client/HTableInterfaceFactory.java index ab7efcc..a1c7e72 100644 --- a/src/main/java/org/apache/hadoop/hbase/client/HTableInterfaceFactory.java +++ b/src/main/java/org/apache/hadoop/hbase/client/HTableInterfaceFactory.java @@ -1,6 +1,4 @@ -/** - * Copyright 2010 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 http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/client/HTablePool.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/client/HTablePool.java b/src/main/java/org/apache/hadoop/hbase/client/HTablePool.java index 05016e5..e757528 100755 --- a/src/main/java/org/apache/hadoop/hbase/client/HTablePool.java +++ b/src/main/java/org/apache/hadoop/hbase/client/HTablePool.java @@ -1,6 +1,4 @@ -/** - * Copyright 2010 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 http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/client/HTableUtil.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/client/HTableUtil.java b/src/main/java/org/apache/hadoop/hbase/client/HTableUtil.java index bc0872a..d8286b9 100644 --- a/src/main/java/org/apache/hadoop/hbase/client/HTableUtil.java +++ b/src/main/java/org/apache/hadoop/hbase/client/HTableUtil.java @@ -1,6 +1,4 @@ -/** - * Copyright 2011 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 http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/client/Increment.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/client/Increment.java b/src/main/java/org/apache/hadoop/hbase/client/Increment.java index 52fac04..659296b 100644 --- a/src/main/java/org/apache/hadoop/hbase/client/Increment.java +++ b/src/main/java/org/apache/hadoop/hbase/client/Increment.java @@ -1,6 +1,4 @@ -/** - * Copyright 2010 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 http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/client/MetaScanner.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/client/MetaScanner.java b/src/main/java/org/apache/hadoop/hbase/client/MetaScanner.java index be48fc6..9c4a215 100644 --- a/src/main/java/org/apache/hadoop/hbase/client/MetaScanner.java +++ b/src/main/java/org/apache/hadoop/hbase/client/MetaScanner.java @@ -1,6 +1,4 @@ -/** - * Copyright 2009 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 http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/client/MultiAction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/client/MultiAction.java b/src/main/java/org/apache/hadoop/hbase/client/MultiAction.java index 6a864c8..5465c45 100644 --- a/src/main/java/org/apache/hadoop/hbase/client/MultiAction.java +++ b/src/main/java/org/apache/hadoop/hbase/client/MultiAction.java @@ -1,6 +1,4 @@ /* - * Copyright 2009 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 http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/client/MultiPut.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/client/MultiPut.java b/src/main/java/org/apache/hadoop/hbase/client/MultiPut.java index 9235e2d..cd21455 100644 --- a/src/main/java/org/apache/hadoop/hbase/client/MultiPut.java +++ b/src/main/java/org/apache/hadoop/hbase/client/MultiPut.java @@ -1,6 +1,4 @@ /* - * Copyright 2010 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 http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/client/MultiPutResponse.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/client/MultiPutResponse.java b/src/main/java/org/apache/hadoop/hbase/client/MultiPutResponse.java index 7e0311a..90949e0 100644 --- a/src/main/java/org/apache/hadoop/hbase/client/MultiPutResponse.java +++ b/src/main/java/org/apache/hadoop/hbase/client/MultiPutResponse.java @@ -1,6 +1,4 @@ /* - * Copyright 2010 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 http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/client/MultiResponse.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/client/MultiResponse.java b/src/main/java/org/apache/hadoop/hbase/client/MultiResponse.java index 290e4c7..4db8c6b 100644 --- a/src/main/java/org/apache/hadoop/hbase/client/MultiResponse.java +++ b/src/main/java/org/apache/hadoop/hbase/client/MultiResponse.java @@ -1,6 +1,4 @@ /* - * Copyright 2009 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 http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/client/Mutation.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/client/Mutation.java b/src/main/java/org/apache/hadoop/hbase/client/Mutation.java index 32c9e6f..93883b1 100644 --- a/src/main/java/org/apache/hadoop/hbase/client/Mutation.java +++ b/src/main/java/org/apache/hadoop/hbase/client/Mutation.java @@ -1,6 +1,4 @@ /* - * Copyright 2011 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 http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/client/NoServerForRegionException.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/client/NoServerForRegionException.java b/src/main/java/org/apache/hadoop/hbase/client/NoServerForRegionException.java index 4f33914..da2454a 100644 --- a/src/main/java/org/apache/hadoop/hbase/client/NoServerForRegionException.java +++ b/src/main/java/org/apache/hadoop/hbase/client/NoServerForRegionException.java @@ -1,6 +1,4 @@ -/** - * Copyright 2010 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 http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/client/Operation.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/client/Operation.java b/src/main/java/org/apache/hadoop/hbase/client/Operation.java index dedd2e2..c44c571 100644 --- a/src/main/java/org/apache/hadoop/hbase/client/Operation.java +++ b/src/main/java/org/apache/hadoop/hbase/client/Operation.java @@ -1,6 +1,4 @@ /* - * Copyright 2011 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 http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/client/OperationWithAttributes.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/client/OperationWithAttributes.java b/src/main/java/org/apache/hadoop/hbase/client/OperationWithAttributes.java index 97e19b9..777a475 100644 --- a/src/main/java/org/apache/hadoop/hbase/client/OperationWithAttributes.java +++ b/src/main/java/org/apache/hadoop/hbase/client/OperationWithAttributes.java @@ -1,6 +1,4 @@ /* - * Copyright 2011 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 http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/client/Put.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/client/Put.java b/src/main/java/org/apache/hadoop/hbase/client/Put.java index e8ac0a8..7630522 100644 --- a/src/main/java/org/apache/hadoop/hbase/client/Put.java +++ b/src/main/java/org/apache/hadoop/hbase/client/Put.java @@ -1,6 +1,4 @@ /* - * Copyright 2010 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 http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/client/RegionOfflineException.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/client/RegionOfflineException.java b/src/main/java/org/apache/hadoop/hbase/client/RegionOfflineException.java index d223860..022bc36 100644 --- a/src/main/java/org/apache/hadoop/hbase/client/RegionOfflineException.java +++ b/src/main/java/org/apache/hadoop/hbase/client/RegionOfflineException.java @@ -1,6 +1,4 @@ -/** - * Copyright 2010 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 http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/client/Result.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/client/Result.java b/src/main/java/org/apache/hadoop/hbase/client/Result.java index 05f528c..9e78fa9 100644 --- a/src/main/java/org/apache/hadoop/hbase/client/Result.java +++ b/src/main/java/org/apache/hadoop/hbase/client/Result.java @@ -1,6 +1,4 @@ /* - * Copyright 2010 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 http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/client/ResultScanner.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/client/ResultScanner.java b/src/main/java/org/apache/hadoop/hbase/client/ResultScanner.java index 6843018..9b23df5 100644 --- a/src/main/java/org/apache/hadoop/hbase/client/ResultScanner.java +++ b/src/main/java/org/apache/hadoop/hbase/client/ResultScanner.java @@ -1,6 +1,4 @@ -/** - * Copyright 2010 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 http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/client/RetriesExhaustedException.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/client/RetriesExhaustedException.java b/src/main/java/org/apache/hadoop/hbase/client/RetriesExhaustedException.java index b9042f6..7df0cff 100644 --- a/src/main/java/org/apache/hadoop/hbase/client/RetriesExhaustedException.java +++ b/src/main/java/org/apache/hadoop/hbase/client/RetriesExhaustedException.java @@ -1,17 +1,20 @@ -/** - * Copyright 2010 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 + * 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. + * 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.apache.hadoop.hbase.client; http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/client/RetriesExhaustedWithDetailsException.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/client/RetriesExhaustedWithDetailsException.java b/src/main/java/org/apache/hadoop/hbase/client/RetriesExhaustedWithDetailsException.java index ea14c06..c8dd281 100644 --- a/src/main/java/org/apache/hadoop/hbase/client/RetriesExhaustedWithDetailsException.java +++ b/src/main/java/org/apache/hadoop/hbase/client/RetriesExhaustedWithDetailsException.java @@ -1,6 +1,4 @@ /* - * Copyright 2010 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 http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/client/Row.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/client/Row.java b/src/main/java/org/apache/hadoop/hbase/client/Row.java index cd332bd..7e677eb 100644 --- a/src/main/java/org/apache/hadoop/hbase/client/Row.java +++ b/src/main/java/org/apache/hadoop/hbase/client/Row.java @@ -1,6 +1,4 @@ /* - * Copyright 2010 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 http://git-wip-us.apache.org/repos/asf/hbase/blob/498fd221/src/main/java/org/apache/hadoop/hbase/client/RowLock.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/client/RowLock.java b/src/main/java/org/apache/hadoop/hbase/client/RowLock.java index 5888ec8..93ba647 100644 --- a/src/main/java/org/apache/hadoop/hbase/client/RowLock.java +++ b/src/main/java/org/apache/hadoop/hbase/client/RowLock.java @@ -1,6 +1,4 @@ -/** - * Copyright 2010 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
