Author: atm
Date: Thu Jan 26 18:03:46 2012
New Revision: 1236333
URL: http://svn.apache.org/viewvc?rev=1236333&view=rev
Log:
Merge trunk into HA branch.
Added:
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/
- copied from r1236328, hadoop/common/trunk/hadoop-tools/hadoop-distcp/
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/README
- copied unchanged from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/README
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/pom.xml
- copied unchanged from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/pom.xml
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/
- copied from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/main/
- copied from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/main/
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/main/java/
- copied from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/main/java/
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/main/java/org/
- copied from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/main/java/org/
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/main/java/org/apache/
- copied from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/main/java/org/apache/
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/
- copied from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/
- copied from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/CopyListing.java
- copied unchanged from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/CopyListing.java
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCp.java
- copied unchanged from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCp.java
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCpConstants.java
- copied unchanged from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCpConstants.java
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCpOptionSwitch.java
- copied unchanged from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCpOptionSwitch.java
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCpOptions.java
- copied unchanged from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCpOptions.java
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/FileBasedCopyListing.java
- copied unchanged from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/FileBasedCopyListing.java
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/GlobbedCopyListing.java
- copied unchanged from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/GlobbedCopyListing.java
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/OptionsParser.java
- copied unchanged from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/OptionsParser.java
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/SimpleCopyListing.java
- copied unchanged from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/SimpleCopyListing.java
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/
- copied from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/CopyCommitter.java
- copied unchanged from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/CopyCommitter.java
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/CopyMapper.java
- copied unchanged from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/CopyMapper.java
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/CopyOutputFormat.java
- copied unchanged from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/CopyOutputFormat.java
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/RetriableDirectoryCreateCommand.java
- copied unchanged from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/RetriableDirectoryCreateCommand.java
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/RetriableFileCopyCommand.java
- copied unchanged from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/RetriableFileCopyCommand.java
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/UniformSizeInputFormat.java
- copied unchanged from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/UniformSizeInputFormat.java
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/lib/
- copied from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/lib/
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/lib/DynamicInputChunk.java
- copied unchanged from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/lib/DynamicInputChunk.java
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/lib/DynamicInputFormat.java
- copied unchanged from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/lib/DynamicInputFormat.java
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/lib/DynamicRecordReader.java
- copied unchanged from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/lib/DynamicRecordReader.java
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/util/
- copied from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/util/
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/util/DistCpUtils.java
- copied unchanged from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/util/DistCpUtils.java
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/util/RetriableCommand.java
- copied unchanged from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/util/RetriableCommand.java
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/util/ThrottledInputStream.java
- copied unchanged from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/util/ThrottledInputStream.java
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/main/resources/
- copied from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/main/resources/
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/main/resources/distcp-default.xml
- copied unchanged from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/main/resources/distcp-default.xml
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/site/
- copied from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/site/
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/site/fml/
- copied from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/site/fml/
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/site/fml/faq.fml
- copied unchanged from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/site/fml/faq.fml
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/site/pdf.xml
- copied unchanged from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/site/pdf.xml
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/site/xdoc/
- copied from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/site/xdoc/
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/site/xdoc/appendix.xml
- copied unchanged from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/site/xdoc/appendix.xml
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/site/xdoc/architecture.xml
- copied unchanged from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/site/xdoc/architecture.xml
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/site/xdoc/cli.xml
- copied unchanged from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/site/xdoc/cli.xml
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/site/xdoc/index.xml
- copied unchanged from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/site/xdoc/index.xml
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/site/xdoc/usage.xml
- copied unchanged from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/site/xdoc/usage.xml
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/test/
- copied from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/test/
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/test/java/
- copied from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/test/java/
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/test/java/org/
- copied from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/test/java/org/
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/test/java/org/apache/
- copied from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/test/java/org/apache/
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/
- copied from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/
- copied from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/StubContext.java
- copied unchanged from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/StubContext.java
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestCopyListing.java
- copied unchanged from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestCopyListing.java
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestDistCp.java
- copied unchanged from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestDistCp.java
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestFileBasedCopyListing.java
- copied unchanged from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestFileBasedCopyListing.java
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestGlobbedCopyListing.java
- copied unchanged from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestGlobbedCopyListing.java
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestIntegration.java
- copied unchanged from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestIntegration.java
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestOptionsParser.java
- copied unchanged from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestOptionsParser.java
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/
- copied from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java
- copied unchanged from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyMapper.java
- copied unchanged from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyMapper.java
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyOutputFormat.java
- copied unchanged from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyOutputFormat.java
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestUniformSizeInputFormat.java
- copied unchanged from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestUniformSizeInputFormat.java
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/lib/
- copied from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/lib/
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/lib/TestDynamicInputFormat.java
- copied unchanged from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/lib/TestDynamicInputFormat.java
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/util/
- copied from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/util/
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/util/TestDistCpUtils.java
- copied unchanged from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/util/TestDistCpUtils.java
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/util/TestRetriableCommand.java
- copied unchanged from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/util/TestRetriableCommand.java
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/util/TestThrottledInputStream.java
- copied unchanged from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/util/TestThrottledInputStream.java
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/test/resources/
- copied from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/test/resources/
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/src/test/resources/sslConfig.xml
- copied unchanged from r1236328,
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/test/resources/sslConfig.xml
Modified:
hadoop/common/branches/HDFS-1623/ (props changed)
hadoop/common/branches/HDFS-1623/hadoop-project/pom.xml
hadoop/common/branches/HDFS-1623/hadoop-tools/pom.xml
Propchange: hadoop/common/branches/HDFS-1623/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 26 18:03:46 2012
@@ -1 +1 @@
-/hadoop/common/trunk:1152502-1235855
+/hadoop/common/trunk:1152502-1236328
Modified: hadoop/common/branches/HDFS-1623/hadoop-project/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-project/pom.xml?rev=1236333&r1=1236332&r2=1236333&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-project/pom.xml Thu Jan 26 18:03:46
2012
@@ -715,10 +715,20 @@
<version>2.4</version>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.2</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pdf-plugin</artifactId>
+ <version>1.1</version>
+ </plugin>
</plugins>
</pluginManagement>
@@ -778,6 +788,14 @@
</excludes>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pdf-plugin</artifactId>
+ <configuration>
+
<outputDirectory>${project.reporting.outputDirectory}</outputDirectory>
+ <includeReports>false</includeReports>
+ </configuration>
+ </plugin>
</plugins>
</build>
Modified: hadoop/common/branches/HDFS-1623/hadoop-tools/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-tools/pom.xml?rev=1236333&r1=1236332&r2=1236333&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-tools/pom.xml (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-tools/pom.xml Thu Jan 26 18:03:46
2012
@@ -29,6 +29,7 @@
<modules>
<module>hadoop-streaming</module>
+ <module>hadoop-distcp</module>
<module>hadoop-archives</module>
<module>hadoop-rumen</module>
<module>hadoop-tools-dist</module>
