You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by om...@apache.org on 2011/04/28 01:29:32 UTC
svn commit: r1097282 - in /hadoop/common/branches/branch-0.20-security: ./
src/core/ src/core/org/apache/hadoop/fs/
src/docs/src/documentation/content/xdocs/
src/examples/org/apache/hadoop/examples/
src/examples/org/apache/hadoop/examples/dancing/ src/...
Author: omalley
Date: Wed Apr 27 23:29:32 2011
New Revision: 1097282
URL: http://svn.apache.org/viewvc?rev=1097282&view=rev
Log:
HADOOP-7247. Update documentation to match current jar names. (omalley)
Modified:
hadoop/common/branches/branch-0.20-security/ (props changed)
hadoop/common/branches/branch-0.20-security/CHANGES.txt (contents, props changed)
hadoop/common/branches/branch-0.20-security/src/core/org/apache/hadoop/fs/HarFileSystem.java (props changed)
hadoop/common/branches/branch-0.20-security/src/core/overview.html
hadoop/common/branches/branch-0.20-security/src/docs/src/documentation/content/xdocs/capacity_scheduler.xml
hadoop/common/branches/branch-0.20-security/src/docs/src/documentation/content/xdocs/fair_scheduler.xml
hadoop/common/branches/branch-0.20-security/src/docs/src/documentation/content/xdocs/single_node_setup.xml
hadoop/common/branches/branch-0.20-security/src/examples/org/apache/hadoop/examples/AggregateWordCount.java
hadoop/common/branches/branch-0.20-security/src/examples/org/apache/hadoop/examples/AggregateWordHistogram.java
hadoop/common/branches/branch-0.20-security/src/examples/org/apache/hadoop/examples/dancing/package.html
hadoop/common/branches/branch-0.20-security/src/examples/org/apache/hadoop/examples/terasort/TeraGen.java
hadoop/common/branches/branch-0.20-security/src/examples/org/apache/hadoop/examples/terasort/TeraSort.java
hadoop/common/branches/branch-0.20-security/src/examples/org/apache/hadoop/examples/terasort/TeraValidate.java
hadoop/common/branches/branch-0.20-security/src/mapred/ (props changed)
hadoop/common/branches/branch-0.20-security/src/test/org/apache/hadoop/fs/TestHarFileSystem.java (props changed)
hadoop/common/branches/branch-0.20-security/src/tools/org/apache/hadoop/tools/HadoopArchives.java (props changed)
Propchange: hadoop/common/branches/branch-0.20-security/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 27 23:29:32 2011
@@ -1,4 +1,4 @@
/hadoop/common/branches/branch-0.20:960946
-/hadoop/common/branches/branch-0.20-security-203:1096071,1097011,1097249,1097269
+/hadoop/common/branches/branch-0.20-security-203:1096071,1097011,1097249,1097269,1097281
/hadoop/core/branches/branch-0.19:713112
/hadoop/core/trunk:727001,727117,727191,727212,727217,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,736426,738328,738697,740077,740157,741703,741762,743745,743816,743892,744894,745180,746010,746206,746227,746233,746274,746338,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905,755938,755960,755986,755998,756352,757448,757624,757849,758156,758180,759398,759932,760502,760783,761046,761482,761632,762216,762879,763107,763502,764967,765016,765809,765951,771607,771661,772844,772876,772884,772920,773889,776638,778962,778966,779893,781720,784661,785046,785569
Modified: hadoop/common/branches/branch-0.20-security/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/CHANGES.txt?rev=1097282&r1=1097281&r2=1097282&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security/CHANGES.txt Wed Apr 27 23:29:32 2011
@@ -77,6 +77,8 @@ Release 0.20.204.0 - unreleased
Release 0.20.203.0 - unreleased
+ HADOOP-7247. Update documentation to match current jar names. (omalley)
+
HADOOP-7246. Update the log4j configuration to match the EventCounter
package. (Luke Lu via omalley)
Propchange: hadoop/common/branches/branch-0.20-security/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 27 23:29:32 2011
@@ -1,5 +1,5 @@
/hadoop/common/branches/branch-0.20/CHANGES.txt:960946
-/hadoop/common/branches/branch-0.20-security-203/CHANGES.txt:1096071,1097011,1097249,1097269
+/hadoop/common/branches/branch-0.20-security-203/CHANGES.txt:1096071,1097011,1097249,1097269,1097281
/hadoop/core/branches/branch-0.18/CHANGES.txt:727226
/hadoop/core/branches/branch-0.19/CHANGES.txt:713112
/hadoop/core/trunk/CHANGES.txt:727001,727117,727191,727212,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,735082,736426,738602,738697,739416,740077,740157,741703,741762,743296,743745,743816,743892,744894,745180,745268,746010,746193,746206,746227,746233,746274,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752514,752555,752590,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905,755938,755986,755998,756352,757448,757624,757849,758156,758180,759398,759932,760502,760783,761046,761482,761632,762216,762879,763107,763502,764967,765016,765809,765951,771607,772844,772876,772884,772920,773889,776638,778962,778966,779893,781720,784661,785046,785569
Propchange: hadoop/common/branches/branch-0.20-security/src/core/org/apache/hadoop/fs/HarFileSystem.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 27 23:29:32 2011
@@ -1,4 +1,4 @@
-/hadoop/common/branches/branch-0.20-security-203/src/core/org/apache/hadoop/fs/HarFileSystem.java:1097249,1097269
+/hadoop/common/branches/branch-0.20-security-203/src/core/org/apache/hadoop/fs/HarFileSystem.java:1097249,1097269,1097281
/hadoop/common/trunk/src/core/org/apache/hadoop/fs/HarFileSystem.java:910709
/hadoop/common/trunk/src/java/org/apache/hadoop/fs/HarFileSystem.java:979485
/hadoop/core/branches/branch-0.19/src/core/org/apache/hadoop/fs/HarFileSystem.java:713112
Modified: hadoop/common/branches/branch-0.20-security/src/core/overview.html
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/core/overview.html?rev=1097282&r1=1097281&r2=1097282&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/src/core/overview.html (original)
+++ hadoop/common/branches/branch-0.20-security/src/core/overview.html Wed Apr 27 23:29:32 2011
@@ -114,7 +114,7 @@ be demonstrated as follows:</p>
<tt>
mkdir input<br>
cp conf/*.xml input<br>
-bin/hadoop jar hadoop-*-examples.jar grep input output 'dfs[a-z.]+'<br>
+bin/hadoop jar hadoop-examples-*.jar grep input output 'dfs[a-z.]+'<br>
cat output/*
</tt>
<p>This will display counts for each match of the <a
@@ -217,7 +217,7 @@ command, run on the master node:</p>
examine it:</p>
<tt>
-bin/hadoop jar hadoop-*-examples.jar grep input output 'dfs[a-z.]+'<br>
+bin/hadoop jar hadoop-examples-*.jar grep input output 'dfs[a-z.]+'<br>
bin/hadoop fs -get output output
cat output/*
</tt>
Modified: hadoop/common/branches/branch-0.20-security/src/docs/src/documentation/content/xdocs/capacity_scheduler.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/docs/src/documentation/content/xdocs/capacity_scheduler.xml?rev=1097282&r1=1097281&r2=1097282&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/src/docs/src/documentation/content/xdocs/capacity_scheduler.xml (original)
+++ hadoop/common/branches/branch-0.20-security/src/docs/src/documentation/content/xdocs/capacity_scheduler.xml Wed Apr 27 23:29:32 2011
@@ -142,13 +142,13 @@
<p>The CapacityScheduler is available as a JAR file in the Hadoop
tarball under the <em>contrib/capacity-scheduler</em> directory. The name of
- the JAR file would be on the lines of hadoop-*-capacity-scheduler.jar.</p>
+ the JAR file would be on the lines of hadoop-capacity-scheduler-*.jar.</p>
<p>You can also build the Scheduler from source by executing
<em>ant package</em>, in which case it would be available under
<em>build/contrib/capacity-scheduler</em>.</p>
<p>To run the CapacityScheduler in your Hadoop installation, you need
to put it on the <em>CLASSPATH</em>. The easiest way is to copy the
- <code>hadoop-*-capacity-scheduler.jar</code> from
+ <code>hadoop-capacity-scheduler-*.jar</code> from
to <code>HADOOP_HOME/lib</code>. Alternatively, you can modify
<em>HADOOP_CLASSPATH</em> to include this jar, in
<code>conf/hadoop-env.sh</code>.</p>
Modified: hadoop/common/branches/branch-0.20-security/src/docs/src/documentation/content/xdocs/fair_scheduler.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/docs/src/documentation/content/xdocs/fair_scheduler.xml?rev=1097282&r1=1097281&r2=1097282&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/src/docs/src/documentation/content/xdocs/fair_scheduler.xml (original)
+++ hadoop/common/branches/branch-0.20-security/src/docs/src/documentation/content/xdocs/fair_scheduler.xml Wed Apr 27 23:29:32 2011
@@ -93,7 +93,7 @@
<p>
To run the fair scheduler in your Hadoop installation, you need to put
it on the CLASSPATH. The easiest way is to copy the
- <em>hadoop-*-fairscheduler.jar</em> from
+ <em>hadoop-fairscheduler-*.jar</em> from
<em>HADOOP_HOME/contrib/fairscheduler</em> to <em>HADOOP_HOME/lib</em>.
Alternatively you can modify <em>HADOOP_CLASSPATH</em> to include this jar, in
<em>HADOOP_CONF_DIR/hadoop-env.sh</em>
@@ -101,7 +101,7 @@
<p>
In order to compile fair scheduler, from sources execute <em> ant
package</em> in source folder and copy the
- <em>build/contrib/fair-scheduler/hadoop-*-fairscheduler.jar</em>
+ <em>build/contrib/fair-scheduler/hadoop-fairscheduler-*.jar</em>
to <em>HADOOP_HOME/lib</em>
</p>
<p>
Modified: hadoop/common/branches/branch-0.20-security/src/docs/src/documentation/content/xdocs/single_node_setup.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/docs/src/documentation/content/xdocs/single_node_setup.xml?rev=1097282&r1=1097281&r2=1097282&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/src/docs/src/documentation/content/xdocs/single_node_setup.xml (original)
+++ hadoop/common/branches/branch-0.20-security/src/docs/src/documentation/content/xdocs/single_node_setup.xml Wed Apr 27 23:29:32 2011
@@ -146,7 +146,7 @@
<code>$ mkdir input</code><br/>
<code>$ cp conf/*.xml input</code><br/>
<code>
- $ bin/hadoop jar hadoop-*-examples.jar grep input output 'dfs[a-z.]+'
+ $ bin/hadoop jar hadoop-examples-*.jar grep input output 'dfs[a-z.]+'
</code><br/>
<code>$ cat output/*</code>
</p>
@@ -252,7 +252,7 @@
<p>
Run some of the examples provided:<br/>
<code>
- $ bin/hadoop jar hadoop-*-examples.jar grep input output 'dfs[a-z.]+'
+ $ bin/hadoop jar hadoop-examples-*.jar grep input output 'dfs[a-z.]+'
</code>
</p>
Modified: hadoop/common/branches/branch-0.20-security/src/examples/org/apache/hadoop/examples/AggregateWordCount.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/examples/org/apache/hadoop/examples/AggregateWordCount.java?rev=1097282&r1=1097281&r2=1097282&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/src/examples/org/apache/hadoop/examples/AggregateWordCount.java (original)
+++ hadoop/common/branches/branch-0.20-security/src/examples/org/apache/hadoop/examples/AggregateWordCount.java Wed Apr 27 23:29:32 2011
@@ -34,7 +34,7 @@ import org.apache.hadoop.mapred.lib.aggr
* text input files, breaks each line into words and counts them. The output is
* a locally sorted list of words and the count of how often they occurred.
*
- * To run: bin/hadoop jar hadoop-*-examples.jar aggregatewordcount <i>in-dir</i>
+ * To run: bin/hadoop jar hadoop-examples-*.jar aggregatewordcount <i>in-dir</i>
* <i>out-dir</i> <i>numOfReducers</i> textinputformat
*
*/
Modified: hadoop/common/branches/branch-0.20-security/src/examples/org/apache/hadoop/examples/AggregateWordHistogram.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/examples/org/apache/hadoop/examples/AggregateWordHistogram.java?rev=1097282&r1=1097281&r2=1097282&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/src/examples/org/apache/hadoop/examples/AggregateWordHistogram.java (original)
+++ hadoop/common/branches/branch-0.20-security/src/examples/org/apache/hadoop/examples/AggregateWordHistogram.java Wed Apr 27 23:29:32 2011
@@ -32,7 +32,7 @@ import org.apache.hadoop.mapred.lib.aggr
* This is an example Aggregated Hadoop Map/Reduce application. Computes the
* histogram of the words in the input texts.
*
- * To run: bin/hadoop jar hadoop-*-examples.jar aggregatewordhist <i>in-dir</i>
+ * To run: bin/hadoop jar hadoop-examples-*.jar aggregatewordhist <i>in-dir</i>
* <i>out-dir</i> <i>numOfReducers</i> textinputformat
*
*/
Modified: hadoop/common/branches/branch-0.20-security/src/examples/org/apache/hadoop/examples/dancing/package.html
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/examples/org/apache/hadoop/examples/dancing/package.html?rev=1097282&r1=1097281&r2=1097282&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/src/examples/org/apache/hadoop/examples/dancing/package.html (original)
+++ hadoop/common/branches/branch-0.20-security/src/examples/org/apache/hadoop/examples/dancing/package.html Wed Apr 27 23:29:32 2011
@@ -59,8 +59,8 @@ Both applications have been added to the
run as:
<pre>
-bin/hadoop jar hadoop-*-examples.jar pentomino pent-outdir
-bin/hadoop jar hadoop-*-examples.jar sudoku puzzle.txt
+bin/hadoop jar hadoop-examples-*.jar pentomino pent-outdir
+bin/hadoop jar hadoop-examples-*.jar sudoku puzzle.txt
</pre>
<p>
Modified: hadoop/common/branches/branch-0.20-security/src/examples/org/apache/hadoop/examples/terasort/TeraGen.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/examples/org/apache/hadoop/examples/terasort/TeraGen.java?rev=1097282&r1=1097281&r2=1097282&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/src/examples/org/apache/hadoop/examples/terasort/TeraGen.java (original)
+++ hadoop/common/branches/branch-0.20-security/src/examples/org/apache/hadoop/examples/terasort/TeraGen.java Wed Apr 27 23:29:32 2011
@@ -55,7 +55,7 @@ import org.apache.hadoop.util.ToolRunner
*
* <p>
* To run the program:
- * <b>bin/hadoop jar hadoop-*-examples.jar teragen 10000000000 in-dir</b>
+ * <b>bin/hadoop jar hadoop-examples-*.jar teragen 10000000000 in-dir</b>
*/
public class TeraGen extends Configured implements Tool {
Modified: hadoop/common/branches/branch-0.20-security/src/examples/org/apache/hadoop/examples/terasort/TeraSort.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/examples/org/apache/hadoop/examples/terasort/TeraSort.java?rev=1097282&r1=1097281&r2=1097282&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/src/examples/org/apache/hadoop/examples/terasort/TeraSort.java (original)
+++ hadoop/common/branches/branch-0.20-security/src/examples/org/apache/hadoop/examples/terasort/TeraSort.java Wed Apr 27 23:29:32 2011
@@ -45,7 +45,7 @@ import org.apache.hadoop.util.ToolRunner
* finish.
* <p>
* To run the program:
- * <b>bin/hadoop jar hadoop-*-examples.jar terasort in-dir out-dir</b>
+ * <b>bin/hadoop jar hadoop-examples-*.jar terasort in-dir out-dir</b>
*/
public class TeraSort extends Configured implements Tool {
private static final Log LOG = LogFactory.getLog(TeraSort.class);
Modified: hadoop/common/branches/branch-0.20-security/src/examples/org/apache/hadoop/examples/terasort/TeraValidate.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/examples/org/apache/hadoop/examples/terasort/TeraValidate.java?rev=1097282&r1=1097281&r2=1097282&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/src/examples/org/apache/hadoop/examples/terasort/TeraValidate.java (original)
+++ hadoop/common/branches/branch-0.20-security/src/examples/org/apache/hadoop/examples/terasort/TeraValidate.java Wed Apr 27 23:29:32 2011
@@ -44,7 +44,7 @@ import org.apache.hadoop.util.ToolRunner
* Any output from the reduce is problem report.
* <p>
* To run the program:
- * <b>bin/hadoop jar hadoop-*-examples.jar teravalidate out-dir report-dir</b>
+ * <b>bin/hadoop jar hadoop-examples-*.jar teravalidate out-dir report-dir</b>
* <p>
* If there is any output, something is wrong and the output of the reduce
* will have the problem report.
Propchange: hadoop/common/branches/branch-0.20-security/src/mapred/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 27 23:29:32 2011
@@ -1,5 +1,5 @@
/hadoop/common/branches/branch-0.20/src/mapred:960946
-/hadoop/common/branches/branch-0.20-security-203/src/mapred:1096071,1097011,1097249,1097269
+/hadoop/common/branches/branch-0.20-security-203/src/mapred:1096071,1097011,1097249,1097269,1097281
/hadoop/core/branches/branch-0.19/src/mapred:713112
/hadoop/core/trunk/src/mapred:727001,727117,727191,727212,727217,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,736426,738328,738697,740077,740157,741703,741762,743745,743816,743892,744894,745180,746010,746206,746227,746233,746274,746338,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905,755938,755960,755986,755998,756352,757448,757624,757849,758156,758180,759398,759932,760502,760783,761046,761482,761632,762216,762879,763107,763502,764967,765016,765809,765951,771607,771661,772844,772876,772884,772920,773889,776638,778962,778966,779893,781720,784661,785046,785569
/hadoop/mapreduce/trunk/src/java:808650
Propchange: hadoop/common/branches/branch-0.20-security/src/test/org/apache/hadoop/fs/TestHarFileSystem.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 27 23:29:32 2011
@@ -1,4 +1,4 @@
-/hadoop/common/branches/branch-0.20-security-203/src/test/org/apache/hadoop/fs/TestHarFileSystem.java:1097249,1097269
+/hadoop/common/branches/branch-0.20-security-203/src/test/org/apache/hadoop/fs/TestHarFileSystem.java:1097249,1097269,1097281
/hadoop/common/trunk/src/test/core/org/apache/hadoop/fs/TestHarFileSystem.java:979485
/hadoop/common/trunk/src/test/org/apache/hadoop/fs/TestHarFileSystem.java:910709
/hadoop/core/branches/branch-0.19/src/test/org/apache/hadoop/fs/TestHarFileSystem.java:713112
Propchange: hadoop/common/branches/branch-0.20-security/src/tools/org/apache/hadoop/tools/HadoopArchives.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 27 23:29:32 2011
@@ -1,4 +1,4 @@
-/hadoop/common/branches/branch-0.20-security-203/src/tools/org/apache/hadoop/tools/HadoopArchives.java:1097249,1097269
+/hadoop/common/branches/branch-0.20-security-203/src/tools/org/apache/hadoop/tools/HadoopArchives.java:1097249,1097269,1097281
/hadoop/common/trunk/src/tools/org/apache/hadoop/tools/HadoopArchives.java:910709
/hadoop/core/branches/branch-0.19/src/tools/org/apache/hadoop/tools/HadoopArchives.java:713112
/hadoop/core/trunk/src/tools/org/apache/hadoop/tools/HadoopArchives.java:727001,727117,727191,727212,727217,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,736426,738328,738697,740077,740157,741703,741762,743745,743816,743892,744894,745180,746010,746206,746227,746233,746274,746338,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905,755938,755960,755986,755998,756352,757448,757624,757849,758156,758180,759398,759932,760502,760783,761046,761482,761632,762216,762879,763107,763502,764967,765016,765809,765951,771607,771661,772844,772876,772884,772920,773889,776638,778962,778966,779893,781720,784661,785046,785569