Author: cutting
Date: Thu Jan 4 09:41:52 2007
New Revision: 492649
URL: http://svn.apache.org/viewvc?view=rev&rev=492649
Log:
HADOOP-371. Include contrib jars and site documentation in distributions.
Contributed by Nigel.
Added:
lucene/hadoop/trunk/index.html
- copied unchanged from r488727, lucene/java/trunk/index.html
lucene/hadoop/trunk/src/examples/org/apache/hadoop/examples/PiEstimator.java
- copied, changed from r492241,
lucene/hadoop/trunk/src/examples/org/apache/hadoop/examples/PiBenchmark.java
lucene/hadoop/trunk/src/test/org/apache/hadoop/dfs/NNBench.java
- copied, changed from r492241,
lucene/hadoop/trunk/src/examples/org/apache/hadoop/examples/NNBench.java
Removed:
lucene/hadoop/trunk/src/examples/org/apache/hadoop/examples/NNBench.java
lucene/hadoop/trunk/src/examples/org/apache/hadoop/examples/PiBenchmark.java
Modified:
lucene/hadoop/trunk/CHANGES.txt
lucene/hadoop/trunk/build.xml
lucene/hadoop/trunk/docs/about.html
lucene/hadoop/trunk/docs/credits.html
lucene/hadoop/trunk/docs/hdfs_design.html
lucene/hadoop/trunk/docs/hdfs_design.pdf
lucene/hadoop/trunk/docs/index.html
lucene/hadoop/trunk/docs/index.pdf
lucene/hadoop/trunk/docs/issue_tracking.html
lucene/hadoop/trunk/docs/linkmap.html
lucene/hadoop/trunk/docs/mailing_lists.html
lucene/hadoop/trunk/docs/version_control.html
lucene/hadoop/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/UTF8ByteArrayUtils.java
lucene/hadoop/trunk/src/docs/src/documentation/content/xdocs/hdfs_design.xml
lucene/hadoop/trunk/src/docs/src/documentation/content/xdocs/index.xml
lucene/hadoop/trunk/src/docs/src/documentation/content/xdocs/site.xml
lucene/hadoop/trunk/src/examples/org/apache/hadoop/examples/ExampleDriver.java
lucene/hadoop/trunk/src/test/org/apache/hadoop/test/AllTestDriver.java
Modified: lucene/hadoop/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/CHANGES.txt?view=diff&rev=492649&r1=492648&r2=492649
==============================================================================
--- lucene/hadoop/trunk/CHANGES.txt (original)
+++ lucene/hadoop/trunk/CHANGES.txt Thu Jan 4 09:41:52 2007
@@ -177,6 +177,10 @@
50. HADOOP-853. Rename 'site' to 'docs', in preparation for inclusion
in releases. (cutting)
+51. HADOOP-371. Include contrib jars and site documentation in
+ distributions. Also add contrib and example documentation to
+ distributed javadoc, in separate sections. (Nigel Daley via cutting)
+
Release 0.9.2 - 2006-12-15
Modified: lucene/hadoop/trunk/build.xml
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/build.xml?view=diff&rev=492649&r1=492648&r2=492649
==============================================================================
--- lucene/hadoop/trunk/build.xml (original)
+++ lucene/hadoop/trunk/build.xml Thu Jan 4 09:41:52 2007
@@ -417,6 +417,7 @@
<mkdir dir="${build.javadoc}"/>
<javadoc
overview="${src.dir}/overview.html"
+ packagenames="org.apache.hadoop.*"
destdir="${build.javadoc}"
author="true"
version="true"
@@ -427,11 +428,18 @@
>
<packageset dir="${src.dir}"/>
<packageset dir="${examples.dir}"/>
+
+ <packageset dir="src/contrib/streaming/src/java"/>
+ <packageset dir="src/contrib/smallJobsBenchmark/src/java"/>
+
<link href="${javadoc.link.java}"/>
<classpath refid="classpath"/>
- <group title="Core" packages="org.apache.hadoop.*"/>
- <group title="Examples" packages="org.apache.hadoop.examples"/>
+ <group title="Core" packages="org.apache.*"/>
+ <group title="Examples" packages="org.apache.hadoop.examples*"/>
+
+ <group title="contrib: Streaming"
packages="org.apache.hadoop.streaming*"/>
+ <group title="contrib: Small Jobs Benchmark"
packages="org.apache.hadoop.benchmarks.mapred*"/>
</javadoc>
</target>
@@ -439,6 +447,9 @@
<target name="default-doc">
<style basedir="${conf.dir}" destdir="${build.docs}"
includes="hadoop-default.xml" style="conf/configuration.xsl"/>
+ <copy todir="${build.docs}">
+ <fileset dir="${docs.dir}" />
+ </copy>
</target>
<!-- ================================================================== -->
@@ -446,9 +457,10 @@
<!-- ================================================================== -->
<!-- -->
<!-- ================================================================== -->
- <target name="package" depends="jar, javadoc, examples, compile-core-test">
+ <target name="package" depends="jar, javadoc, examples, compile-core-test,
deploy-contrib">
<mkdir dir="${dist.dir}"/>
<mkdir dir="${dist.dir}/lib"/>
+ <mkdir dir="${dist.dir}/contrib"/>
<mkdir dir="${dist.dir}/bin"/>
<mkdir dir="${dist.dir}/docs"/>
<mkdir dir="${dist.dir}/docs/api"/>
@@ -465,6 +477,12 @@
<env key="DIST_LIB_DIR" value="${dist.dir}/lib/native"/>
<arg line="${native.src.dir}/packageNativeHadoop.sh"/>
</exec>
+
+ <copy todir="${dist.dir}/contrib" includeEmptyDirs="false" flatten="true">
+ <fileset dir="build/contrib">
+ <include name="*/*.jar"/>
+ </fileset>
+ </copy>
<copy todir="${dist.dir}/webapps">
<fileset dir="${build.webapps}"/>
Modified: lucene/hadoop/trunk/docs/about.html
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/docs/about.html?view=diff&rev=492649&r1=492648&r2=492649
==============================================================================
--- lucene/hadoop/trunk/docs/about.html (original)
+++ lucene/hadoop/trunk/docs/about.html Thu Jan 4 09:41:52 2007
@@ -81,7 +81,7 @@
<a href="hdfs_design.html">Hadoop File System</a>
</div>
<div class="menuitem">
-<a href="docs/api/">API Docs</a>
+<a href="api/index.html">API Docs</a>
</div>
</div>
<div onclick="SwitchMenu('menu_1.3', 'skin/')" id="menu_1.3Title"
class="menutitle">Resources</div>
Modified: lucene/hadoop/trunk/docs/credits.html
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/docs/credits.html?view=diff&rev=492649&r1=492648&r2=492649
==============================================================================
--- lucene/hadoop/trunk/docs/credits.html (original)
+++ lucene/hadoop/trunk/docs/credits.html Thu Jan 4 09:41:52 2007
@@ -81,7 +81,7 @@
<a href="hdfs_design.html">Hadoop File System</a>
</div>
<div class="menuitem">
-<a href="docs/api/">API Docs</a>
+<a href="api/index.html">API Docs</a>
</div>
</div>
<div onclick="SwitchMenu('menu_1.3', 'skin/')" id="menu_1.3Title"
class="menutitle">Resources</div>
Modified: lucene/hadoop/trunk/docs/hdfs_design.html
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/docs/hdfs_design.html?view=diff&rev=492649&r1=492648&r2=492649
==============================================================================
--- lucene/hadoop/trunk/docs/hdfs_design.html (original)
+++ lucene/hadoop/trunk/docs/hdfs_design.html Thu Jan 4 09:41:52 2007
@@ -83,7 +83,7 @@
<div class="menupagetitle">Hadoop File System</div>
</div>
<div class="menuitem">
-<a href="docs/api/">API Docs</a>
+<a href="api/index.html">API Docs</a>
</div>
</div>
<div onclick="SwitchMenu('menu_1.3', 'skin/')" id="menu_1.3Title"
class="menutitle">Resources</div>
@@ -532,7 +532,7 @@
<div class="section">
<p>
-<a href="http://lucene.apache.org/hadoop/docs/api/";>
+<a href="http://lucene.apache.org/hadoop/api/";>
Browse the HDFS Java Interface
</a>
Modified: lucene/hadoop/trunk/docs/hdfs_design.pdf
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/docs/hdfs_design.pdf?view=diff&rev=492649&r1=492648&r2=492649
==============================================================================
--- lucene/hadoop/trunk/docs/hdfs_design.pdf (original)
+++ lucene/hadoop/trunk/docs/hdfs_design.pdf Thu Jan 4 09:41:52 2007
@@ -598,7 +598,7 @@
/Rect [ 90.0 351.213 247.956 339.213 ]
/C [ 0 0 0 ]
/Border [ 0 0 0 ]
-/A << /URI (http://lucene.apache.org/hadoop/docs/api/)
+/A << /URI (http://lucene.apache.org/hadoop/api/)
/S /URI >>
/H /I
>>
@@ -1154,84 +1154,84 @@
xref
0 144
0000000000 65535 f
-0000041911 00000 n
-0000042048 00000 n
-0000042141 00000 n
+0000041906 00000 n
+0000042043 00000 n
+0000042136 00000 n
0000000015 00000 n
0000000071 00000 n
0000001514 00000 n
0000001634 00000 n
0000001792 00000 n
-0000042269 00000 n
+0000042264 00000 n
0000001927 00000 n
-0000042332 00000 n
+0000042327 00000 n
0000002062 00000 n
-0000042398 00000 n
+0000042393 00000 n
0000002197 00000 n
-0000042464 00000 n
+0000042459 00000 n
0000002334 00000 n
-0000042530 00000 n
+0000042525 00000 n
0000002471 00000 n
-0000042596 00000 n
+0000042591 00000 n
0000002608 00000 n
-0000042662 00000 n
+0000042657 00000 n
0000002745 00000 n
-0000042726 00000 n
+0000042721 00000 n
0000002881 00000 n
-0000042792 00000 n
+0000042787 00000 n
0000003018 00000 n
-0000042858 00000 n
+0000042853 00000 n
0000003154 00000 n
-0000042922 00000 n
+0000042917 00000 n
0000003291 00000 n
-0000042988 00000 n
+0000042983 00000 n
0000003428 00000 n
-0000043054 00000 n
+0000043049 00000 n
0000003565 00000 n
-0000043118 00000 n
+0000043113 00000 n
0000003701 00000 n
-0000043184 00000 n
+0000043179 00000 n
0000003838 00000 n
-0000043248 00000 n
+0000043243 00000 n
0000003975 00000 n
-0000043312 00000 n
+0000043307 00000 n
0000004112 00000 n
-0000043378 00000 n
+0000043373 00000 n
0000004248 00000 n
-0000043444 00000 n
+0000043439 00000 n
0000004385 00000 n
-0000043510 00000 n
+0000043505 00000 n
0000004522 00000 n
0000005564 00000 n
0000005687 00000 n
0000005805 00000 n
-0000043576 00000 n
+0000043571 00000 n
0000005938 00000 n
-0000043640 00000 n
+0000043635 00000 n
0000006071 00000 n
-0000043706 00000 n
+0000043701 00000 n
0000006204 00000 n
-0000043772 00000 n
+0000043767 00000 n
0000006337 00000 n
-0000043837 00000 n
+0000043832 00000 n
0000006470 00000 n
-0000043901 00000 n
+0000043896 00000 n
0000006603 00000 n
-0000043967 00000 n
+0000043962 00000 n
0000006736 00000 n
-0000044033 00000 n
+0000044028 00000 n
0000006868 00000 n
-0000044097 00000 n
+0000044092 00000 n
0000007001 00000 n
-0000044163 00000 n
+0000044158 00000 n
0000007134 00000 n
-0000044229 00000 n
+0000044224 00000 n
0000007267 00000 n
-0000044295 00000 n
+0000044290 00000 n
0000007400 00000 n
-0000044361 00000 n
+0000044356 00000 n
0000007532 00000 n
-0000044426 00000 n
+0000044421 00000 n
0000007665 00000 n
0000010033 00000 n
0000010156 00000 n
@@ -1256,47 +1256,47 @@
0000032600 00000 n
0000032725 00000 n
0000032762 00000 n
-0000032955 00000 n
-0000044493 00000 n
-0000033159 00000 n
-0000033325 00000 n
-0000033601 00000 n
-0000033801 00000 n
-0000034045 00000 n
-0000034253 00000 n
-0000034503 00000 n
-0000034893 00000 n
-0000035376 00000 n
-0000035610 00000 n
-0000035867 00000 n
-0000036114 00000 n
-0000036452 00000 n
-0000036673 00000 n
-0000036826 00000 n
-0000037165 00000 n
-0000037429 00000 n
-0000037641 00000 n
-0000038027 00000 n
-0000038260 00000 n
-0000038475 00000 n
-0000038719 00000 n
-0000038878 00000 n
-0000039131 00000 n
-0000039301 00000 n
-0000039463 00000 n
-0000039628 00000 n
-0000039863 00000 n
-0000040021 00000 n
-0000040194 00000 n
-0000040405 00000 n
-0000040663 00000 n
-0000040920 00000 n
-0000041190 00000 n
-0000041350 00000 n
-0000041464 00000 n
-0000041575 00000 n
-0000041684 00000 n
-0000041801 00000 n
+0000032950 00000 n
+0000044488 00000 n
+0000033154 00000 n
+0000033320 00000 n
+0000033596 00000 n
+0000033796 00000 n
+0000034040 00000 n
+0000034248 00000 n
+0000034498 00000 n
+0000034888 00000 n
+0000035371 00000 n
+0000035605 00000 n
+0000035862 00000 n
+0000036109 00000 n
+0000036447 00000 n
+0000036668 00000 n
+0000036821 00000 n
+0000037160 00000 n
+0000037424 00000 n
+0000037636 00000 n
+0000038022 00000 n
+0000038255 00000 n
+0000038470 00000 n
+0000038714 00000 n
+0000038873 00000 n
+0000039126 00000 n
+0000039296 00000 n
+0000039458 00000 n
+0000039623 00000 n
+0000039858 00000 n
+0000040016 00000 n
+0000040189 00000 n
+0000040400 00000 n
+0000040658 00000 n
+0000040915 00000 n
+0000041185 00000 n
+0000041345 00000 n
+0000041459 00000 n
+0000041570 00000 n
+0000041679 00000 n
+0000041796 00000 n
trailer
<<
/Size 144
@@ -1304,5 +1304,5 @@
/Info 4 0 R
>>
startxref
-44547
+44542
%%EOF
Modified: lucene/hadoop/trunk/docs/index.html
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/docs/index.html?view=diff&rev=492649&r1=492648&r2=492649
==============================================================================
--- lucene/hadoop/trunk/docs/index.html (original)
+++ lucene/hadoop/trunk/docs/index.html Thu Jan 4 09:41:52 2007
@@ -81,7 +81,7 @@
<a href="hdfs_design.html">Hadoop File System</a>
</div>
<div class="menuitem">
-<a href="docs/api/">API Docs</a>
+<a href="api/index.html">API Docs</a>
</div>
</div>
<div onclick="SwitchMenu('menu_1.3', 'skin/')" id="menu_1.3Title"
class="menutitle">Resources</div>
@@ -324,7 +324,7 @@
<a href="http://cvs.apache.org/dist/lucene/hadoop/nightly/";>downloadable
version of Hadoop every
night</a>. All unit tests must pass, or a message is sent to
the developers mailing list and no new version is created. This
- also updates the <a href="docs/api/">javadoc</a>.</p>
+ also updates the <a href="api/index.html">javadoc</a>.</p>
<a name="N10172"></a><a
name="3+February%2C+2006%3A+Hadoop+code+moved+out+of+Nutch"></a>
<h3 class="h4">3 February, 2006: Hadoop code moved out of Nutch</h3>
<p>The Hadoop code has now been moved into its own Subversion
Modified: lucene/hadoop/trunk/docs/index.pdf
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/docs/index.pdf?view=diff&rev=492649&r1=492648&r2=492649
==============================================================================
--- lucene/hadoop/trunk/docs/index.pdf (original)
+++ lucene/hadoop/trunk/docs/index.pdf Thu Jan 4 09:41:52 2007
@@ -824,7 +824,7 @@
/Rect [ 359.964 505.494 397.284 493.494 ]
/C [ 0 0 0 ]
/Border [ 0 0 0 ]
-/A << /URI (docs/api/)
+/A << /URI (api/index.html)
/S /URI >>
/H /I
>>
@@ -1217,59 +1217,59 @@
xref
0 134
0000000000 65535 f
-0000028319 00000 n
-0000028398 00000 n
-0000028491 00000 n
+0000028324 00000 n
+0000028403 00000 n
+0000028496 00000 n
0000000015 00000 n
0000000071 00000 n
0000001324 00000 n
0000001444 00000 n
0000001623 00000 n
-0000028631 00000 n
+0000028636 00000 n
0000001758 00000 n
-0000028694 00000 n
+0000028699 00000 n
0000001895 00000 n
-0000028760 00000 n
+0000028765 00000 n
0000002032 00000 n
-0000028826 00000 n
+0000028831 00000 n
0000002169 00000 n
-0000028891 00000 n
+0000028896 00000 n
0000002305 00000 n
-0000028957 00000 n
+0000028962 00000 n
0000002441 00000 n
-0000029023 00000 n
+0000029028 00000 n
0000002577 00000 n
-0000029089 00000 n
+0000029094 00000 n
0000002713 00000 n
-0000029155 00000 n
+0000029160 00000 n
0000002850 00000 n
-0000029221 00000 n
+0000029226 00000 n
0000002987 00000 n
-0000029287 00000 n
+0000029292 00000 n
0000003124 00000 n
-0000029351 00000 n
+0000029356 00000 n
0000003261 00000 n
-0000029417 00000 n
+0000029422 00000 n
0000003398 00000 n
-0000029483 00000 n
+0000029488 00000 n
0000003535 00000 n
-0000029549 00000 n
+0000029554 00000 n
0000003672 00000 n
-0000029615 00000 n
+0000029620 00000 n
0000003809 00000 n
-0000029681 00000 n
+0000029686 00000 n
0000003946 00000 n
-0000029747 00000 n
+0000029752 00000 n
0000004083 00000 n
-0000029813 00000 n
+0000029818 00000 n
0000004220 00000 n
-0000029879 00000 n
+0000029884 00000 n
0000004355 00000 n
-0000029943 00000 n
+0000029948 00000 n
0000004492 00000 n
-0000030009 00000 n
+0000030014 00000 n
0000004629 00000 n
-0000030075 00000 n
+0000030080 00000 n
0000004766 00000 n
0000006956 00000 n
0000007079 00000 n
@@ -1320,36 +1320,36 @@
0000019442 00000 n
0000019646 00000 n
0000019847 00000 n
-0000030141 00000 n
-0000020011 00000 n
-0000020157 00000 n
-0000020496 00000 n
-0000020845 00000 n
-0000021194 00000 n
-0000021543 00000 n
-0000021891 00000 n
-0000022239 00000 n
-0000022582 00000 n
-0000022942 00000 n
-0000023302 00000 n
-0000023662 00000 n
-0000024004 00000 n
-0000024339 00000 n
-0000024669 00000 n
-0000024967 00000 n
-0000025297 00000 n
-0000025627 00000 n
-0000025956 00000 n
-0000026280 00000 n
-0000026616 00000 n
-0000026922 00000 n
-0000027320 00000 n
-0000027651 00000 n
-0000027765 00000 n
-0000027876 00000 n
-0000027985 00000 n
-0000028092 00000 n
-0000028209 00000 n
+0000030146 00000 n
+0000020016 00000 n
+0000020162 00000 n
+0000020501 00000 n
+0000020850 00000 n
+0000021199 00000 n
+0000021548 00000 n
+0000021896 00000 n
+0000022244 00000 n
+0000022587 00000 n
+0000022947 00000 n
+0000023307 00000 n
+0000023667 00000 n
+0000024009 00000 n
+0000024344 00000 n
+0000024674 00000 n
+0000024972 00000 n
+0000025302 00000 n
+0000025632 00000 n
+0000025961 00000 n
+0000026285 00000 n
+0000026621 00000 n
+0000026927 00000 n
+0000027325 00000 n
+0000027656 00000 n
+0000027770 00000 n
+0000027881 00000 n
+0000027990 00000 n
+0000028097 00000 n
+0000028214 00000 n
trailer
<<
/Size 134
@@ -1357,5 +1357,5 @@
/Info 4 0 R
>>
startxref
-30195
+30200
%%EOF
Modified: lucene/hadoop/trunk/docs/issue_tracking.html
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/docs/issue_tracking.html?view=diff&rev=492649&r1=492648&r2=492649
==============================================================================
--- lucene/hadoop/trunk/docs/issue_tracking.html (original)
+++ lucene/hadoop/trunk/docs/issue_tracking.html Thu Jan 4 09:41:52 2007
@@ -81,7 +81,7 @@
<a href="hdfs_design.html">Hadoop File System</a>
</div>
<div class="menuitem">
-<a href="docs/api/">API Docs</a>
+<a href="api/index.html">API Docs</a>
</div>
</div>
<div onclick="SwitchMenu('menu_selected_1.3', 'skin/')"
id="menu_selected_1.3Title" class="menutitle" style="background-image:
url('skin/images/chapter_open.gif');">Resources</div>
Modified: lucene/hadoop/trunk/docs/linkmap.html
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/docs/linkmap.html?view=diff&rev=492649&r1=492648&r2=492649
==============================================================================
--- lucene/hadoop/trunk/docs/linkmap.html (original)
+++ lucene/hadoop/trunk/docs/linkmap.html Thu Jan 4 09:41:52 2007
@@ -81,7 +81,7 @@
<a href="hdfs_design.html">Hadoop File System</a>
</div>
<div class="menuitem">
-<a href="docs/api/">API Docs</a>
+<a href="api/index.html">API Docs</a>
</div>
</div>
<div onclick="SwitchMenu('menu_1.3', 'skin/')" id="menu_1.3Title"
class="menutitle">Resources</div>
@@ -196,7 +196,7 @@
<ul>
<li>
-<a href="docs/api/">API
Docs</a> _________________________ <em>apidocs</em>
+<a href="api/index.html">API
Docs</a> _________________________ <em>apidocs</em>
</li>
</ul>
Modified: lucene/hadoop/trunk/docs/mailing_lists.html
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/docs/mailing_lists.html?view=diff&rev=492649&r1=492648&r2=492649
==============================================================================
--- lucene/hadoop/trunk/docs/mailing_lists.html (original)
+++ lucene/hadoop/trunk/docs/mailing_lists.html Thu Jan 4 09:41:52 2007
@@ -81,7 +81,7 @@
<a href="hdfs_design.html">Hadoop File System</a>
</div>
<div class="menuitem">
-<a href="docs/api/">API Docs</a>
+<a href="api/index.html">API Docs</a>
</div>
</div>
<div onclick="SwitchMenu('menu_selected_1.3', 'skin/')"
id="menu_selected_1.3Title" class="menutitle" style="background-image:
url('skin/images/chapter_open.gif');">Resources</div>
Modified: lucene/hadoop/trunk/docs/version_control.html
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/docs/version_control.html?view=diff&rev=492649&r1=492648&r2=492649
==============================================================================
--- lucene/hadoop/trunk/docs/version_control.html (original)
+++ lucene/hadoop/trunk/docs/version_control.html Thu Jan 4 09:41:52 2007
@@ -81,7 +81,7 @@
<a href="hdfs_design.html">Hadoop File System</a>
</div>
<div class="menuitem">
-<a href="docs/api/">API Docs</a>
+<a href="api/index.html">API Docs</a>
</div>
</div>
<div onclick="SwitchMenu('menu_selected_1.3', 'skin/')"
id="menu_selected_1.3Title" class="menutitle" style="background-image:
url('skin/images/chapter_open.gif');">Resources</div>
Modified:
lucene/hadoop/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/UTF8ByteArrayUtils.java
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/UTF8ByteArrayUtils.java?view=diff&rev=492649&r1=492648&r2=492649
==============================================================================
---
lucene/hadoop/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/UTF8ByteArrayUtils.java
(original)
+++
lucene/hadoop/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/UTF8ByteArrayUtils.java
Thu Jan 4 09:41:52 2007
@@ -32,7 +32,7 @@
public class UTF8ByteArrayUtils {
/**
* Find the first occured tab in a UTF-8 encoded string
- * @param utf: a byte array containing a UTF-8 encoded string
+ * @param utf a byte array containing a UTF-8 encoded string
* @return position that first tab occures otherwise -1
*/
public static int findTab(byte [] utf) {
@@ -47,11 +47,11 @@
/**
* split a UTF-8 byte array into key and value
* assuming that the delimilator is at splitpos.
- * @param ut: utf-8 encoded string
- * @param key: contains key upon the method is returned
- * @param val: contains value upon the method is returned
- * @param splitPos: the split pos
- * @throws IOException: when
+ * @param utf utf-8 encoded string
+ * @param key contains key upon the method is returned
+ * @param val contains value upon the method is returned
+ * @param splitPos the split pos
+ * @throws IOException
*/
public static void splitKeyVal(byte[] utf, Text key, Text val, int
splitPos)
throws IOException {
Modified:
lucene/hadoop/trunk/src/docs/src/documentation/content/xdocs/hdfs_design.xml
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/docs/src/documentation/content/xdocs/hdfs_design.xml?view=diff&rev=492649&r1=492648&r2=492649
==============================================================================
---
lucene/hadoop/trunk/src/docs/src/documentation/content/xdocs/hdfs_design.xml
(original)
+++
lucene/hadoop/trunk/src/docs/src/documentation/content/xdocs/hdfs_design.xml
Thu Jan 4 09:41:52 2007
@@ -334,7 +334,7 @@
<section>
<title> References </title>
<p>
- <a href="http://lucene.apache.org/hadoop/docs/api/";>
+ <a href="http://lucene.apache.org/hadoop/api/";>
Browse the HDFS Java Interface
</a>
</p>
Modified: lucene/hadoop/trunk/src/docs/src/documentation/content/xdocs/index.xml
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/docs/src/documentation/content/xdocs/index.xml?view=diff&rev=492649&r1=492648&r2=492649
==============================================================================
--- lucene/hadoop/trunk/src/docs/src/documentation/content/xdocs/index.xml
(original)
+++ lucene/hadoop/trunk/src/docs/src/documentation/content/xdocs/index.xml Thu
Jan 4 09:41:52 2007
@@ -190,7 +190,7 @@
<a href="ext:nightly">downloadable version of Hadoop every
night</a>. All unit tests must pass, or a message is sent to
the developers mailing list and no new version is created. This
- also updates the <a href="docs/api/">javadoc</a>.</p>
+ also updates the <a href="api/index.html">javadoc</a>.</p>
</section>
<section>
Modified: lucene/hadoop/trunk/src/docs/src/documentation/content/xdocs/site.xml
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/docs/src/documentation/content/xdocs/site.xml?view=diff&rev=492649&r1=492648&r2=492649
==============================================================================
--- lucene/hadoop/trunk/src/docs/src/documentation/content/xdocs/site.xml
(original)
+++ lucene/hadoop/trunk/src/docs/src/documentation/content/xdocs/site.xml Thu
Jan 4 09:41:52 2007
@@ -27,7 +27,7 @@
<faq label="FAQ" href="ext:faq" />
<wiki label="Wiki" href="ext:wiki" />
<HDFS label="Hadoop File System" href="hdfs_design.html" />
- <apidocs label="API Docs" href="docs/api/" />
+ <apidocs label="API Docs" href="api/index.html" />
</docs>
<resources label="Resources">
Modified:
lucene/hadoop/trunk/src/examples/org/apache/hadoop/examples/ExampleDriver.java
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/examples/org/apache/hadoop/examples/ExampleDriver.java?view=diff&rev=492649&r1=492648&r2=492649
==============================================================================
---
lucene/hadoop/trunk/src/examples/org/apache/hadoop/examples/ExampleDriver.java
(original)
+++
lucene/hadoop/trunk/src/examples/org/apache/hadoop/examples/ExampleDriver.java
Thu Jan 4 09:41:52 2007
@@ -34,10 +34,9 @@
pgd.addClass("grep", Grep.class,
"A map/reduce program that counts the matches of a
regex in the input.");
pgd.addClass("randomwriter", RandomWriter.class,
- "A random writer benchmark that writes 10GB per
node.");
- pgd.addClass("sort", Sort.class, "A sort benchmark that sorts the
data written by the random writer.");
- pgd.addClass("pi", PiBenchmark.class, "A benchmark that estimates
Pi using monte-carlo method.");
- pgd.addClass("nnbench", NNBench.class, "A benchmark that stresses
the namenode");
+ "A map/reduce program that writes 10GB of random data
per node.");
+ pgd.addClass("sort", Sort.class, "A map/reduce program that sorts
the data written by the random writer.");
+ pgd.addClass("pi", PiEstimator.class, "A map/reduce program that
estimates Pi using monte-carlo method.");
pgd.driver(argv);
}
catch(Throwable e){
Copied:
lucene/hadoop/trunk/src/examples/org/apache/hadoop/examples/PiEstimator.java
(from r492241,
lucene/hadoop/trunk/src/examples/org/apache/hadoop/examples/PiBenchmark.java)
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/examples/org/apache/hadoop/examples/PiEstimator.java?view=diff&rev=492649&p1=lucene/hadoop/trunk/src/examples/org/apache/hadoop/examples/PiBenchmark.java&r1=492241&p2=lucene/hadoop/trunk/src/examples/org/apache/hadoop/examples/PiEstimator.java&r2=492649
==============================================================================
---
lucene/hadoop/trunk/src/examples/org/apache/hadoop/examples/PiBenchmark.java
(original)
+++
lucene/hadoop/trunk/src/examples/org/apache/hadoop/examples/PiEstimator.java
Thu Jan 4 09:41:52 2007
@@ -37,7 +37,7 @@
*
* @author Milind Bhandarkar
*/
-public class PiBenchmark {
+public class PiEstimator {
/**
* Mappper class for Pi estimation.
@@ -144,7 +144,7 @@
throws IOException {
Configuration conf = new Configuration();
- JobConf jobConf = new JobConf(conf, PiBenchmark.class);
+ JobConf jobConf = new JobConf(conf, PiEstimator.class);
if (jt != null) { jobConf.set("mapred.job.tracker", jt); }
if (dfs != null) { jobConf.set("fs.default.name", dfs); }
jobConf.setJobName("test-mini-mr");
Copied: lucene/hadoop/trunk/src/test/org/apache/hadoop/dfs/NNBench.java (from
r492241,
lucene/hadoop/trunk/src/examples/org/apache/hadoop/examples/NNBench.java)
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/test/org/apache/hadoop/dfs/NNBench.java?view=diff&rev=492649&p1=lucene/hadoop/trunk/src/examples/org/apache/hadoop/examples/NNBench.java&r1=492241&p2=lucene/hadoop/trunk/src/test/org/apache/hadoop/dfs/NNBench.java&r2=492649
==============================================================================
--- lucene/hadoop/trunk/src/examples/org/apache/hadoop/examples/NNBench.java
(original)
+++ lucene/hadoop/trunk/src/test/org/apache/hadoop/dfs/NNBench.java Thu Jan 4
09:41:52 2007
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.hadoop.examples;
+package org.apache.hadoop.dfs;
import java.io.IOException;
import java.util.Date;
Modified: lucene/hadoop/trunk/src/test/org/apache/hadoop/test/AllTestDriver.java
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/test/org/apache/hadoop/test/AllTestDriver.java?view=diff&rev=492649&r1=492648&r2=492649
==============================================================================
--- lucene/hadoop/trunk/src/test/org/apache/hadoop/test/AllTestDriver.java
(original)
+++ lucene/hadoop/trunk/src/test/org/apache/hadoop/test/AllTestDriver.java Thu
Jan 4 09:41:52 2007
@@ -23,6 +23,7 @@
import org.apache.hadoop.mapred.TestTextInputFormat;
import org.apache.hadoop.mapred.TestSequenceFileInputFormat;
import org.apache.hadoop.dfs.ClusterTestDFS;
+import org.apache.hadoop.dfs.NNBench;
import org.apache.hadoop.fs.TestFileSystem;
import org.apache.hadoop.io.TestArrayFile;
import org.apache.hadoop.io.TestSetFile;
@@ -43,6 +44,7 @@
public static void main(String argv[]){
ProgramDriver pgd = new ProgramDriver();
try {
+ pgd.addClass("nnbench", NNBench.class, "A benchmark that stresses
the namenode.");
pgd.addClass("mapredtest", TestMapRed.class, "A map/reduce test
check.");
pgd.addClass("clustertestdfs", ClusterTestDFS.class, "A pseudo
distributed test for DFS.");
pgd.addClass("testfilesystem", TestFileSystem.class, "A test for
FileSystem read/write.");
