Domovská stránka Prehľadávať Pomoc
Registrovať Prihlásiť sa
apache
/
hadoop
zrkadlo https://github.com/apache/hadoop.git
2
0
Fork 1
Súbory Issues 0 Wiki
Prechádzať zdrojové kódy

Merge -r 611886:611887 from trunk to branch-0.15 to fix HADOOP-2574.

git-svn-id: https://svn.apache.org/repos/asf/lucene/hadoop/branches/branch-0.15@611895 13f79535-47bb-0310-9956-ffa450edef68
Arun Murthy 17 rokov pred
rodič
85857e84b5
commit
9c2eb690b2
37 zmenil súbory, kde vykonal 1026 pridanie a 528 odobranie
Rozdelené zobrazenie Ukázať štatistiku rozdielnych dát
  1. 3 0
      CHANGES.txt
  2. 72 9
      docs/cluster_setup.html
  3. 77 14
      docs/hdfs_design.html
  4. 9 9
      docs/hdfs_design.pdf
  5. 72 9
      docs/index.html
  6. 89 34
      docs/linkmap.html
  7. 21 86
      docs/linkmap.pdf
  8. 196 109
      docs/mapred_tutorial.html
  9. 4 4
      docs/mapred_tutorial.pdf
  10. 72 9
      docs/quickstart.html
  11. 6 6
      docs/skin/CommonMessages_de.xml
  12. 7 7
      docs/skin/CommonMessages_en_US.xml
  13. 6 7
      docs/skin/CommonMessages_es.xml
  14. 6 6
      docs/skin/CommonMessages_fr.xml
  15. 33 14
      docs/skin/basic.css
  16. 6 6
      docs/skin/breadcrumbs-optimized.js
  17. 6 6
      docs/skin/breadcrumbs.js
  18. 6 6
      docs/skin/fontsize.js
  19. 16 8
      docs/skin/getBlank.js
  20. 6 6
      docs/skin/getMenu.js
  21. BIN
      docs/skin/images/chapter_open.gif
  22. BIN
      docs/skin/images/rc-b-l-15-1body-2menu-3menu.png
  23. BIN
      docs/skin/images/rc-b-r-15-1body-2menu-3menu.png
  24. BIN
      docs/skin/images/rc-b-r-5-1header-2tab-selected-3tab-selected.png
  25. BIN
      docs/skin/images/rc-t-l-5-1header-2searchbox-3searchbox.png
  26. BIN
      docs/skin/images/rc-t-l-5-1header-2tab-selected-3tab-selected.png
  27. BIN
      docs/skin/images/rc-t-l-5-1header-2tab-unselected-3tab-unselected.png
  28. BIN
      docs/skin/images/rc-t-r-15-1body-2menu-3menu.png
  29. BIN
      docs/skin/images/rc-t-r-5-1header-2searchbox-3searchbox.png
  30. BIN
      docs/skin/images/rc-t-r-5-1header-2tab-selected-3tab-selected.png
  31. BIN
      docs/skin/images/rc-t-r-5-1header-2tab-unselected-3tab-unselected.png
  32. 12 14
      docs/skin/menu.js
  33. 8 8
      docs/skin/print.css
  34. 10 5
      docs/skin/profile.css
  35. 56 19
      docs/skin/screen.css
  36. 72 9
      docs/streaming.html
  37. 155 118
      src/docs/src/documentation/content/xdocs/mapred_tutorial.xml

+ 3 - 0
CHANGES.txt
Zobraziť súbor 

@@ -12,6 +12,9 @@ Release 0.15.3 - (unreleased changes)
 
     HADOOP-2570. "work" directory created unconditionally, and symlinks
 
     created from the task cwds.
 
 
+    HADOOP-2574. Fixed mapred_tutorial.xml to correct minor errors with the
 
+    WordCount examples. (acmurthy) 
+
 
 Release 0.15.2 - 2008-01-02
 
 
   BUG FIXES

+ 72 - 9
docs/cluster_setup.html
Zobraziť súbor 

@@ -1,9 +1,9 @@
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
 <html>
 
 <head>
 
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 
 <meta content="Apache Forrest" name="Generator">
 
-<meta name="Forrest-version" content="0.7">
 
+<meta name="Forrest-version" content="0.8">
 
 <meta name="Forrest-skin-name" content="pelt">
 
 <title>Hadoop Cluster Setup</title>
 
 <link type="text/css" href="skin/basic.css" rel="stylesheet">
 
@@ -16,46 +16,91 @@
 
 <body onload="init()">
 
 <script type="text/javascript">ndeSetTextSize();</script>
 
 <div id="top">
 
+<!--+
 
+    |breadtrail
 
+    +-->
 
 <div class="breadtrail">
 
 <a href="http://www.apache.org/">Apache</a> &gt; <a href="http://lucene.apache.org/">Lucene</a> &gt; <a href="http://lucene.apache.org/hadoop/">Hadoop</a><script src="skin/breadcrumbs.js" language="JavaScript" type="text/javascript"></script>
 
 </div>
 
+<!--+
 
+    |header
 
+    +-->
 
 <div class="header">
 
+<!--+
 
+    |start group logo
 
+    +-->
 
 <div class="grouplogo">
 
 <a href="http://lucene.apache.org/"><img class="logoImage" alt="Lucene" src="images/lucene_green_150.gif" title="Apache Lucene"></a>
 
 </div>
 
+<!--+
 
+    |end group logo
 
+    +-->
 
+<!--+
 
+    |start Project Logo
 
+    +-->
 
 <div class="projectlogo">
 
 <a href="http://lucene.apache.org/hadoop/"><img class="logoImage" alt="Hadoop" src="images/hadoop-logo.jpg" title="Scalable Computing Platform"></a>
 
 </div>
 
+<!--+
 
+    |end Project Logo
 
+    +-->
 
+<!--+
 
+    |start Search
 
+    +-->
 
 <div class="searchbox">
 
 <form action="http://www.google.com/search" method="get" class="roundtopsmall">
 
 <input value="lucene.apache.org" name="sitesearch" type="hidden"><input onFocus="getBlank (this, 'Search the site with google');" size="25" name="q" id="query" type="text" value="Search the site with google">&nbsp; 
-                    <input attr="value" name="Search" value="Search" type="submit">
 
+                    <input name="Search" value="Search" type="submit">
 
 </form>
 
 </div>
 
+<!--+
 
+    |end search
 
+    +-->
 
+<!--+
 
+    |start Tabs
 
+    +-->
 
 <ul id="tabs">
 
 <li>
 
-<a class="base-not-selected" href="http://lucene.apache.org/hadoop/">Project</a>
 
+<a class="unselected" href="http://lucene.apache.org/hadoop/">Project</a>
 
 </li>
 
 <li>
 
-<a class="base-not-selected" href="http://wiki.apache.org/lucene-hadoop">Wiki</a>
 
+<a class="unselected" href="http://wiki.apache.org/lucene-hadoop">Wiki</a>
 
 </li>
 
 <li class="current">
 
-<a class="base-selected" href="index.html">Hadoop 0.15 Documentation</a>
 
+<a class="selected" href="index.html">Hadoop 0.15 Documentation</a>
 
 </li>
 
 </ul>
 
+<!--+
 
+    |end Tabs
 
+    +-->
 
 </div>
 
 </div>
 
 <div id="main">
 
 <div id="publishedStrip">
 
+<!--+
 
+    |start Subtabs
 
+    +-->
 
 <div id="level2tabs"></div>
 
+<!--+
 
+    |end Endtabs
 
+    +-->
 
 <script type="text/javascript"><!--
 
-document.write("<text>Last Published:</text> " + document.lastModified);
 
+document.write("Last Published: " + document.lastModified);
 
 //  --></script>
 
 </div>
 
+<!--+
 
+    |breadtrail
 
+    +-->
 
 <div class="breadtrail">
 
-             
+
 
              &nbsp;
 
            </div>
 
+<!--+
 
+    |start Menu, mainarea
 
+    +-->
 
+<!--+
 
+    |start Menu
 
+    +-->
 
 <div id="menu">
 
 <div onclick="SwitchMenu('menu_selected_1.1', 'skin/')" id="menu_selected_1.1Title" class="menutitle" style="background-image: url('skin/images/chapter_open.gif');">Documentation</div>
 
 <div id="menu_selected_1.1" class="selectedmenuitemgroup" style="display: block;">
 
@@ -93,8 +138,17 @@ document.write("<text>Last Published:</text> " + document.lastModified);
 
 <div id="credit"></div>
 
 <div id="roundbottom">
 
 <img style="display: none" class="corner" height="15" width="15" alt="" src="skin/images/rc-b-l-15-1body-2menu-3menu.png"></div>
 
+<!--+
 
+  |alternative credits
 
+  +-->
 
 <div id="credit2"></div>
 
 </div>
 
+<!--+
 
+    |end Menu
 
+    +-->
 
+<!--+
 
+    |start content
 
+    +-->
 
 <div id="content">
 
 <div title="Portable Document Format" class="pdflink">
 
 <a class="dida" href="cluster_setup.pdf"><img alt="PDF -icon" src="skin/images/pdfdoc.gif" class="skin"><br>
 
@@ -624,18 +678,27 @@ document.write("<text>Last Published:</text> " + document.lastModified);
 
 </div>
 
   
 </div>
 
+<!--+
 
+    |end content
 
+    +-->
 
 <div class="clearboth">&nbsp;</div>
 
 </div>
 
 <div id="footer">
 
+<!--+
 
+    |start bottomstrip
 
+    +-->
 
 <div class="lastmodified">
 
 <script type="text/javascript"><!--
 
-document.write("<text>Last Published:</text> " + document.lastModified);
 
+document.write("Last Published: " + document.lastModified);
 
 //  --></script>
 
 </div>
 
 <div class="copyright">
 
         Copyright &copy;
 
          2007 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
 
 </div>
 
+<!--+
 
+    |end bottomstrip
 
+    +-->
 
 </div>
 
 </body>
 
 </html>

+ 77 - 14
docs/hdfs_design.html
Zobraziť súbor 

@@ -1,9 +1,9 @@
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
 <html>
 
 <head>
 
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 
 <meta content="Apache Forrest" name="Generator">
 
-<meta name="Forrest-version" content="0.7">
 
+<meta name="Forrest-version" content="0.8">
 
 <meta name="Forrest-skin-name" content="pelt">
 
 <title> 
       The Hadoop Distributed File System: Architecture and Design
 
@@ -18,46 +18,91 @@
 
 <body onload="init()">
 
 <script type="text/javascript">ndeSetTextSize();</script>
 
 <div id="top">
 
+<!--+
 
+    |breadtrail
 
+    +-->
 
 <div class="breadtrail">
 
 <a href="http://www.apache.org/">Apache</a> &gt; <a href="http://lucene.apache.org/">Lucene</a> &gt; <a href="http://lucene.apache.org/hadoop/">Hadoop</a><script src="skin/breadcrumbs.js" language="JavaScript" type="text/javascript"></script>
 
 </div>
 
+<!--+
 
+    |header
 
+    +-->
 
 <div class="header">
 
+<!--+
 
+    |start group logo
 
+    +-->
 
 <div class="grouplogo">
 
 <a href="http://lucene.apache.org/"><img class="logoImage" alt="Lucene" src="images/lucene_green_150.gif" title="Apache Lucene"></a>
 
 </div>
 
+<!--+
 
+    |end group logo
 
+    +-->
 
+<!--+
 
+    |start Project Logo
 
+    +-->
 
 <div class="projectlogo">
 
 <a href="http://lucene.apache.org/hadoop/"><img class="logoImage" alt="Hadoop" src="images/hadoop-logo.jpg" title="Scalable Computing Platform"></a>
 
 </div>
 
+<!--+
 
+    |end Project Logo
 
+    +-->
 
+<!--+
 
+    |start Search
 
+    +-->
 
 <div class="searchbox">
 
 <form action="http://www.google.com/search" method="get" class="roundtopsmall">
 
 <input value="lucene.apache.org" name="sitesearch" type="hidden"><input onFocus="getBlank (this, 'Search the site with google');" size="25" name="q" id="query" type="text" value="Search the site with google">&nbsp; 
-                    <input attr="value" name="Search" value="Search" type="submit">
 
+                    <input name="Search" value="Search" type="submit">
 
 </form>
 
 </div>
 
+<!--+
 
+    |end search
 
+    +-->
 
+<!--+
 
+    |start Tabs
 
+    +-->
 
 <ul id="tabs">
 
 <li>
 
-<a class="base-not-selected" href="http://lucene.apache.org/hadoop/">Project</a>
 
+<a class="unselected" href="http://lucene.apache.org/hadoop/">Project</a>
 
 </li>
 
 <li>
 
-<a class="base-not-selected" href="http://wiki.apache.org/lucene-hadoop">Wiki</a>
 
+<a class="unselected" href="http://wiki.apache.org/lucene-hadoop">Wiki</a>
 
 </li>
 
 <li class="current">
 
-<a class="base-selected" href="index.html">Hadoop 0.15 Documentation</a>
 
+<a class="selected" href="index.html">Hadoop 0.15 Documentation</a>
 
 </li>
 
 </ul>
 
+<!--+
 
+    |end Tabs
 
+    +-->
 
 </div>
 
 </div>
 
 <div id="main">
 
 <div id="publishedStrip">
 
+<!--+
 
+    |start Subtabs
 
+    +-->
 
 <div id="level2tabs"></div>
 
+<!--+
 
+    |end Endtabs
 
+    +-->
 
 <script type="text/javascript"><!--
 
-document.write("<text>Last Published:</text> " + document.lastModified);
 
+document.write("Last Published: " + document.lastModified);
 
 //  --></script>
 
 </div>
 
+<!--+
 
+    |breadtrail
 
+    +-->
 
 <div class="breadtrail">
 
-             
+
 
              &nbsp;
 
            </div>
 
+<!--+
 
+    |start Menu, mainarea
 
+    +-->
 
+<!--+
 
+    |start Menu
 
+    +-->
 
 <div id="menu">
 
 <div onclick="SwitchMenu('menu_selected_1.1', 'skin/')" id="menu_selected_1.1Title" class="menutitle" style="background-image: url('skin/images/chapter_open.gif');">Documentation</div>
 
 <div id="menu_selected_1.1" class="selectedmenuitemgroup" style="display: block;">
 
@@ -95,8 +140,17 @@ document.write("<text>Last Published:</text> " + document.lastModified);
 
 <div id="credit"></div>
 
 <div id="roundbottom">
 
 <img style="display: none" class="corner" height="15" width="15" alt="" src="skin/images/rc-b-l-15-1body-2menu-3menu.png"></div>
 
+<!--+
 
+  |alternative credits
 
+  +-->
 
 <div id="credit2"></div>
 
 </div>
 
+<!--+
 
+    |end Menu
 
+    +-->
 
+<!--+
 
+    |start content
 
+    +-->
 
 <div id="content">
 
 <div title="Portable Document Format" class="pdflink">
 
 <a class="dida" href="hdfs_design.pdf"><img alt="PDF -icon" src="skin/images/pdfdoc.gif" class="skin"><br>
 
@@ -276,8 +330,8 @@ document.write("<text>Last Published:</text> " + document.lastModified);
 
 <p>
 
       HDFS has a master/slave architecture. An HDFS cluster consists of a single <em>Namenode</em>, a master server that manages the file system namespace and regulates access to files by clients. In addition, there are a number of <em>Datanodes</em>, usually one per node in the cluster, which manage storage attached to the nodes that they run on. HDFS exposes a file system namespace and allows user data to be stored in files. Internally, a file is split into one or more blocks and these blocks are stored in a set of Datanodes. The Namenode executes file system namespace operations like opening, closing, and renaming files and directories. It also determines the mapping of blocks to Datanodes. The Datanodes are responsible for serving read and write requests from the file system&rsquo;s clients. The Datanodes also perform block creation, deletion, and replication upon instruction from the Namenode.
 
       </p>
 
-<div style="text-align: center;">
 
-<img class="figure" alt="HDFS Architecture" src="images/hdfsarchitecture.gif"></div>
 
+<div id="" style="text-align: center;">
 
+<img id="" class="figure" alt="HDFS Architecture" src="images/hdfsarchitecture.gif"></div>
 
 <p>
 
       The Namenode and Datanode are pieces of software designed to run on commodity machines. These machines typically run a GNU/Linux operating system (<acronym title="operating system">OS</acronym>). HDFS is built using the Java language; any machine that supports Java can run the Namenode or the Datanode software. Usage of the highly portable Java language means that HDFS can be deployed on a wide range of machines. A typical deployment has a dedicated machine that runs only the Namenode software. Each of the other machines in the cluster runs one instance of the Datanode software. The architecture does not preclude running multiple Datanodes on the same machine but in a real deployment that is rarely the case.
 
       </p>
 
@@ -312,8 +366,8 @@ document.write("<text>Last Published:</text> " + document.lastModified);
 
 <p>
 
       The Namenode makes all decisions regarding replication of blocks. It periodically receives a <em>Heartbeat</em> and a <em>Blockreport</em> from each of the Datanodes in the cluster. Receipt of a Heartbeat implies that the Datanode is functioning properly. A Blockreport contains a list of all blocks on a Datanode. 
     </p>
 
-<div style="text-align: center;">
 
-<img class="figure" alt="HDFS Datanodes" src="images/hdfsdatanodes.gif"></div>
 
+<div id="" style="text-align: center;">
 
+<img id="" class="figure" alt="HDFS Datanodes" src="images/hdfsdatanodes.gif"></div>
 
 <a name="N100AC"></a><a name="Replica+Placement%3A+The+First+Baby+Steps"></a>
 
 <h3 class="h4"> Replica Placement: The First Baby Steps </h3>
 
 <p>
 
@@ -389,7 +443,7 @@ document.write("<text>Last Published:</text> " + document.lastModified);
 
 <a name="N1013F"></a><a name="Data+Integrity"></a>
 
 <h3 class="h4"> Data Integrity </h3>
 
 <p>
 
-        
+        <!-- XXX "checksum checking" sounds funny -->
 
         It is possible that a block of data fetched from a Datanode arrives corrupted. This corruption can occur because of faults in a storage device, network faults, or buggy software. The HDFS client software implements checksum checking on the contents of HDFS files. When a client creates an HDFS file, it computes a checksum of each block of the file and stores these checksums in a separate hidden file in the same HDFS namespace. When a client retrieves file contents it verifies that the data it received from each Datanode matches the checksum stored in the associated checksum file. If not, then the client can opt to retrieve that block from another Datanode that has a replica of that block.
 
         </p>
 
 <a name="N1014B"></a><a name="Metadata+Disk+Failure"></a>
 
@@ -558,18 +612,27 @@ document.write("<text>Last Published:</text> " + document.lastModified);
 
 <font size="-2">by&nbsp;Dhruba Borthakur</font>
 
 </p>
 
 </div>
 
+<!--+
 
+    |end content
 
+    +-->
 
 <div class="clearboth">&nbsp;</div>
 
 </div>
 
 <div id="footer">
 
+<!--+
 
+    |start bottomstrip
 
+    +-->
 
 <div class="lastmodified">
 
 <script type="text/javascript"><!--
 
-document.write("<text>Last Published:</text> " + document.lastModified);
 
+document.write("Last Published: " + document.lastModified);
 
 //  --></script>
 
 </div>
 
 <div class="copyright">
 
         Copyright &copy;
 
          2007 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
 
 </div>
 
+<!--+
 
+    |end bottomstrip
 
+    +-->
 
 </div>
 
 </body>
 
 </html>

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 9 - 9
docs/hdfs_design.pdf


+ 72 - 9
docs/index.html
Zobraziť súbor 

@@ -1,9 +1,9 @@
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
 <html>
 
 <head>
 
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 
 <meta content="Apache Forrest" name="Generator">
 
-<meta name="Forrest-version" content="0.7">
 
+<meta name="Forrest-version" content="0.8">
 
 <meta name="Forrest-skin-name" content="pelt">
 
 <title>Hadoop Documentation</title>
 
 <link type="text/css" href="skin/basic.css" rel="stylesheet">
 
@@ -16,46 +16,91 @@
 
 <body onload="init()">
 
 <script type="text/javascript">ndeSetTextSize();</script>
 
 <div id="top">
 
+<!--+
 
+    |breadtrail
 
+    +-->
 
 <div class="breadtrail">
 
 <a href="http://www.apache.org/">Apache</a> &gt; <a href="http://lucene.apache.org/">Lucene</a> &gt; <a href="http://lucene.apache.org/hadoop/">Hadoop</a><script src="skin/breadcrumbs.js" language="JavaScript" type="text/javascript"></script>
 
 </div>
 
+<!--+
 
+    |header
 
+    +-->
 
 <div class="header">
 
+<!--+
 
+    |start group logo
 
+    +-->
 
 <div class="grouplogo">
 
 <a href="http://lucene.apache.org/"><img class="logoImage" alt="Lucene" src="images/lucene_green_150.gif" title="Apache Lucene"></a>
 
 </div>
 
+<!--+
 
+    |end group logo
 
+    +-->
 
+<!--+
 
+    |start Project Logo
 
+    +-->
 
 <div class="projectlogo">
 
 <a href="http://lucene.apache.org/hadoop/"><img class="logoImage" alt="Hadoop" src="images/hadoop-logo.jpg" title="Scalable Computing Platform"></a>
 
 </div>
 
+<!--+
 
+    |end Project Logo
 
+    +-->
 
+<!--+
 
+    |start Search
 
+    +-->
 
 <div class="searchbox">
 
 <form action="http://www.google.com/search" method="get" class="roundtopsmall">
 
 <input value="lucene.apache.org" name="sitesearch" type="hidden"><input onFocus="getBlank (this, 'Search the site with google');" size="25" name="q" id="query" type="text" value="Search the site with google">&nbsp; 
-                    <input attr="value" name="Search" value="Search" type="submit">
 
+                    <input name="Search" value="Search" type="submit">
 
 </form>
 
 </div>
 
+<!--+
 
+    |end search
 
+    +-->
 
+<!--+
 
+    |start Tabs
 
+    +-->
 
 <ul id="tabs">
 
 <li>
 
-<a class="base-not-selected" href="http://lucene.apache.org/hadoop/">Project</a>
 
+<a class="unselected" href="http://lucene.apache.org/hadoop/">Project</a>
 
 </li>
 
 <li>
 
-<a class="base-not-selected" href="http://wiki.apache.org/lucene-hadoop">Wiki</a>
 
+<a class="unselected" href="http://wiki.apache.org/lucene-hadoop">Wiki</a>
 
 </li>
 
 <li class="current">
 
-<a class="base-selected" href="index.html">Hadoop 0.15 Documentation</a>
 
+<a class="selected" href="index.html">Hadoop 0.15 Documentation</a>
 
 </li>
 
 </ul>
 
+<!--+
 
+    |end Tabs
 
+    +-->
 
 </div>
 
 </div>
 
 <div id="main">
 
 <div id="publishedStrip">
 
+<!--+
 
+    |start Subtabs
 
+    +-->
 
 <div id="level2tabs"></div>
 
+<!--+
 
+    |end Endtabs
 
+    +-->
 
 <script type="text/javascript"><!--
 
-document.write("<text>Last Published:</text> " + document.lastModified);
 
+document.write("Last Published: " + document.lastModified);
 
 //  --></script>
 
 </div>
 
+<!--+
 
+    |breadtrail
 
+    +-->
 
 <div class="breadtrail">
 
-             
+
 
              &nbsp;
 
            </div>
 
+<!--+
 
+    |start Menu, mainarea
 
+    +-->
 
+<!--+
 
+    |start Menu
 
+    +-->
 
 <div id="menu">
 
 <div onclick="SwitchMenu('menu_selected_1.1', 'skin/')" id="menu_selected_1.1Title" class="menutitle" style="background-image: url('skin/images/chapter_open.gif');">Documentation</div>
 
 <div id="menu_selected_1.1" class="selectedmenuitemgroup" style="display: block;">
 
@@ -96,8 +141,17 @@ document.write("<text>Last Published:</text> " + document.lastModified);
 
 </div>
 
 <div id="roundbottom">
 
 <img style="display: none" class="corner" height="15" width="15" alt="" src="skin/images/rc-b-l-15-1body-2menu-3menu.png"></div>
 
+<!--+
 
+  |alternative credits
 
+  +-->
 
 <div id="credit2"></div>
 
 </div>
 
+<!--+
 
+    |end Menu
 
+    +-->
 
+<!--+
 
+    |start content
 
+    +-->
 
 <div id="content">
 
 <div title="Portable Document Format" class="pdflink">
 
 <a class="dida" href="index.pdf"><img alt="PDF -icon" src="skin/images/pdfdoc.gif" class="skin"><br>
 
@@ -144,12 +198,18 @@ document.write("<text>Last Published:</text> " + document.lastModified);
 
 </ul>
 
   
 </div>
 
+<!--+
 
+    |end content
 
+    +-->
 
 <div class="clearboth">&nbsp;</div>
 
 </div>
 
 <div id="footer">
 
+<!--+
 
+    |start bottomstrip
 
+    +-->
 
 <div class="lastmodified">
 
 <script type="text/javascript"><!--
 
-document.write("<text>Last Published:</text> " + document.lastModified);
 
+document.write("Last Published: " + document.lastModified);
 
 //  --></script>
 
 </div>
 
 <div class="copyright">
 
@@ -157,6 +217,9 @@ document.write("<text>Last Published:</text> " + document.lastModified);
 
          2007 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
 
 </div>
 
 <div id="logos"></div>
 
+<!--+
 
+    |end bottomstrip
 
+    +-->
 
 </div>
 
 </body>
 
 </html>

+ 89 - 34
docs/linkmap.html
Zobraziť súbor 

@@ -1,11 +1,11 @@
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
 <html>
 
 <head>
 
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 
 <meta content="Apache Forrest" name="Generator">
 
-<meta name="Forrest-version" content="0.7">
 
+<meta name="Forrest-version" content="0.8">
 
 <meta name="Forrest-skin-name" content="pelt">
 
-<title>Site Linkmap</title>
 
+<title>Site Linkmap Table of Contents</title>
 
 <link type="text/css" href="skin/basic.css" rel="stylesheet">
 
 <link media="screen" type="text/css" href="skin/screen.css" rel="stylesheet">
 
 <link media="print" type="text/css" href="skin/print.css" rel="stylesheet">
 
@@ -16,46 +16,91 @@
 
 <body onload="init()">
 
 <script type="text/javascript">ndeSetTextSize();</script>
 
 <div id="top">
 
+<!--+
 
+    |breadtrail
 
+    +-->
 
 <div class="breadtrail">
 
 <a href="http://www.apache.org/">Apache</a> &gt; <a href="http://lucene.apache.org/">Lucene</a> &gt; <a href="http://lucene.apache.org/hadoop/">Hadoop</a><script src="skin/breadcrumbs.js" language="JavaScript" type="text/javascript"></script>
 
 </div>
 
+<!--+
 
+    |header
 
+    +-->
 
 <div class="header">
 
+<!--+
 
+    |start group logo
 
+    +-->
 
 <div class="grouplogo">
 
 <a href="http://lucene.apache.org/"><img class="logoImage" alt="Lucene" src="images/lucene_green_150.gif" title="Apache Lucene"></a>
 
 </div>
 
+<!--+
 
+    |end group logo
 
+    +-->
 
+<!--+
 
+    |start Project Logo
 
+    +-->
 
 <div class="projectlogo">
 
 <a href="http://lucene.apache.org/hadoop/"><img class="logoImage" alt="Hadoop" src="images/hadoop-logo.jpg" title="Scalable Computing Platform"></a>
 
 </div>
 
+<!--+
 
+    |end Project Logo
 
+    +-->
 
+<!--+
 
+    |start Search
 
+    +-->
 
 <div class="searchbox">
 
 <form action="http://www.google.com/search" method="get" class="roundtopsmall">
 
 <input value="lucene.apache.org" name="sitesearch" type="hidden"><input onFocus="getBlank (this, 'Search the site with google');" size="25" name="q" id="query" type="text" value="Search the site with google">&nbsp; 
-                    <input attr="value" name="Search" value="Search" type="submit">
 
+                    <input name="Search" value="Search" type="submit">
 
 </form>
 
 </div>
 
+<!--+
 
+    |end search
 
+    +-->
 
+<!--+
 
+    |start Tabs
 
+    +-->
 
 <ul id="tabs">
 
 <li>
 
-<a class="base-not-selected" href="http://lucene.apache.org/hadoop/">Project</a>
 
+<a class="unselected" href="http://lucene.apache.org/hadoop/">Project</a>
 
 </li>
 
 <li>
 
-<a class="base-not-selected" href="http://wiki.apache.org/lucene-hadoop">Wiki</a>
 
+<a class="unselected" href="http://wiki.apache.org/lucene-hadoop">Wiki</a>
 
 </li>
 
 <li class="current">
 
-<a class="base-selected" href="index.html">Hadoop 0.15 Documentation</a>
 
+<a class="selected" href="index.html">Hadoop 0.15 Documentation</a>
 
 </li>
 
 </ul>
 
+<!--+
 
+    |end Tabs
 
+    +-->
 
 </div>
 
 </div>
 
 <div id="main">
 
 <div id="publishedStrip">
 
+<!--+
 
+    |start Subtabs
 
+    +-->
 
 <div id="level2tabs"></div>
 
+<!--+
 
+    |end Endtabs
 
+    +-->
 
 <script type="text/javascript"><!--
 
-document.write("<text>Last Published:</text> " + document.lastModified);
 
+document.write("Last Published: " + document.lastModified);
 
 //  --></script>
 
 </div>
 
+<!--+
 
+    |breadtrail
 
+    +-->
 
 <div class="breadtrail">
 
-             
+
 
              &nbsp;
 
            </div>
 
+<!--+
 
+    |start Menu, mainarea
 
+    +-->
 
+<!--+
 
+    |start Menu
 
+    +-->
 
 <div id="menu">
 
 <div onclick="SwitchMenu('menu_1.1', 'skin/')" id="menu_1.1Title" class="menutitle">Documentation</div>
 
 <div id="menu_1.1" class="menuitemgroup">
 
@@ -93,94 +138,96 @@ document.write("<text>Last Published:</text> " + document.lastModified);
 
 <div id="credit"></div>
 
 <div id="roundbottom">
 
 <img style="display: none" class="corner" height="15" width="15" alt="" src="skin/images/rc-b-l-15-1body-2menu-3menu.png"></div>
 
+<!--+
 
+  |alternative credits
 
+  +-->
 
 <div id="credit2"></div>
 
 </div>
 
+<!--+
 
+    |end Menu
 
+    +-->
 
+<!--+
 
+    |start content
 
+    +-->
 
 <div id="content">
 
 <div title="Portable Document Format" class="pdflink">
 
 <a class="dida" href="linkmap.pdf"><img alt="PDF -icon" src="skin/images/pdfdoc.gif" class="skin"><br>
 
         PDF</a>
 
 </div>
 
-<h1>Site Linkmap</h1>
 
-<div id="minitoc-area">
 
-<ul class="minitoc">
 
-<li>
 
-<a href="#Table+of+Contents">Table of Contents</a>
 
-</li>
 
-</ul>
 
-</div>
 
-<a name="N10007"></a><a name="Table+of+Contents"></a>
 
-<h2 class="h3">Table of Contents</h2>
 
-<div class="section">
 
+<h1>Site Linkmap Table of Contents</h1>
 
+<p>
 
+          This is a map of the complete site and its structure.
 
+        </p>
 
 <ul>
 
 <li>
 
-<a href="">Hadoop</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>site</em>
 
+<a>Hadoop</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>site</em>
 
 </li>
 
 <ul>
 
 
   
 <ul>
 
 <li>
 
-<a href="">Documentation</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>docs</em>
 
+<a>Documentation</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>docs</em>
 
 </li>
 
 <ul> 
     
 <ul>
 
 <li>
 
-<a href="index.html">Overview</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>overview</em>
 
+<a href="index.html">Overview</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>overview</em>
 
 </li>
 
 </ul>
 
     
 <ul>
 
 <li>
 
-<a href="quickstart.html">Quickstart</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>quickstart</em>
 
+<a href="quickstart.html">Quickstart</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>quickstart</em>
 
 </li>
 
 </ul>
 
     
 <ul>
 
 <li>
 
-<a href="cluster_setup.html">Cluster Setup</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>setup</em>
 
+<a href="cluster_setup.html">Cluster Setup</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>setup</em>
 
 </li>
 
 </ul>
 
     
 <ul>
 
 <li>
 
-<a href="hdfs_design.html">HDFS Architecture</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>hdfs</em>
 
+<a href="hdfs_design.html">HDFS Architecture</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>hdfs</em>
 
 </li>
 
 </ul>
 
     
 <ul>
 
 <li>
 
-<a href="mapred_tutorial.html">Map-Reduce Tutorial</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>mapred</em>
 
+<a href="mapred_tutorial.html">Map-Reduce Tutorial</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>mapred</em>
 
 </li>
 
 </ul>
 
     
 <ul>
 
 <li>
 
-<a href="streaming.html">Streaming</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>streaming</em>
 
+<a href="streaming.html">Streaming</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>streaming</em>
 
 </li>
 
 </ul>
 
     
 <ul>
 
 <li>
 
-<a href="api/index.html">API Docs</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>api</em>
 
+<a href="api/index.html">API Docs</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>api</em>
 
 </li>
 
 </ul>
 
     
 <ul>
 
 <li>
 
-<a href="http://wiki.apache.org/lucene-hadoop/">Wiki</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>wiki</em>
 
+<a href="http://wiki.apache.org/lucene-hadoop/">Wiki</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>wiki</em>
 
 </li>
 
 </ul>
 
     
 <ul>
 
 <li>
 
-<a href="http://wiki.apache.org/lucene-hadoop/FAQ">FAQ</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>faq</em>
 
+<a href="http://wiki.apache.org/lucene-hadoop/FAQ">FAQ</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>faq</em>
 
 </li>
 
 </ul>
 
     
 <ul>
 
 <li>
 
-<a href="http://lucene.apache.org/hadoop/mailing_lists.html">Mailing Lists</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>lists</em>
 
+<a href="http://lucene.apache.org/hadoop/mailing_lists.html">Mailing Lists</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>lists</em>
 
 </li>
 
 </ul>
 
   
@@ -193,19 +240,27 @@ document.write("<text>Last Published:</text> " + document.lastModified);
 
 </ul>
 
 </ul>
 
 </div>
 
-</div>
 
+<!--+
 
+    |end content
 
+    +-->
 
 <div class="clearboth">&nbsp;</div>
 
 </div>
 
 <div id="footer">
 
+<!--+
 
+    |start bottomstrip
 
+    +-->
 
 <div class="lastmodified">
 
 <script type="text/javascript"><!--
 
-document.write("<text>Last Published:</text> " + document.lastModified);
 
+document.write("Last Published: " + document.lastModified);
 
 //  --></script>
 
 </div>
 
 <div class="copyright">
 
         Copyright &copy;
 
          2007 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
 
 </div>
 
+<!--+
 
+    |end bottomstrip
 
+    +-->
 
 </div>
 
 </body>
 
 </html>

+ 21 - 86
docs/linkmap.pdf
Zobraziť súbor 

@@ -5,10 +5,10 @@
 
 /Producer (FOP 0.20.5) >>
 
 endobj
 
 5 0 obj
 
-<< /Length 357 /Filter [ /ASCII85Decode /FlateDecode ]
 
+<< /Length 807 /Filter [ /ASCII85Decode /FlateDecode ]
 
  >>
 
 stream
 
-GauI0_,>n>&;KY!METC?CGrC"Nj`F.NYeV(W<]6G1/^A&*T(0o)+Zp_BQ?ZCAG=hhs0WHJ>9?gp&kjq=\>2I.5nM+G'#`g5(eF;:#g<UH]j9#u/%AG;)K*4.U3]$MbmIdn4:EnQ1r1dMX;T+jcNKHEPnq3rPum.l5-:kLX86_r0p''/O]3Qe#m5V<OW1G%7,)fBqF^G*>hr$Mh_DcrLsR56#bIK6F`53R[DXtdUdiT?fEY&K$uH3ZGS9>i8i:fc@\e+]Ng%D?EQA^gaAXTIFn=&tLL\*oq4a5lV52V!1.TC[]-^*T]rUc(4)(7LD>dW)PJ3tGFOJ<P&[llGkcDt]YAB9Cf7*hB0p>c~>
 
+GatUr9i'Ou&;KZL'gBJ8f:Vju0$k?8W*7hE4d;se'/+-`NL.Qap"q]g!BZqc.I9[=*a>',)/$s\dldK6VLU@V5e`5>r@9&pDBfQds2?+eF"p%D`[T"'i7H@G)0lWc8<WZs8!g6igP^]VaMm$d=P$bA51?p%[:t]<DifJ9PrZXu.?EP7P/%nh-^X:$CL(nkEYOOf+$L8r_b%GEfh$)rH@Mlh$"d?U>,!VO,nihWVWeH:2%mX-isBn#_(:"D^EJ9F'.cUr>Bl)LH]IedPZlgD3#[JM]`#K&N8HT?$&2SP`\(PUdh!e5&.CpX7bB(*]AV"XdI$i*-B-CG;DcOp6OST??+cL4349KjoY2&Qh]HD#T]G-B.S_/+nQ8/n31V9]"JuiC=.Li/=sFrlS;k-$$WZTs[ki+WV7qgnd@F9CCLlH=Hm;@p3:1COG'<ULMQQJ0#8o=iWNREtcIX"2\8$n,T?0G8/dBQU(pe=c\gt8]8]Va@XH.;ZE,mPRXpC&N]JI,rU0:13O<nIJh>WXSA3%tN.scei@i?fiWkSF&<`2Q0,-CT#a+iTqP$.bYi]$@S3#\)<P+cnc@cF%ml"HMZQHW-IV\TA3o\03&i,4Q&:+*)P]t4%_:?['UmcS:dp.c'qb%9,Pqn#h0=oJJd^>J.\J#$1,O2F>WoB:X:;hd@MUBDn`YX'-m_EfE_2S+c@D0nYHp#l#q,miTtGD#9#)fq*<a:fqBV@W\FFh9HDDn.#2H]'#2"RXJeBQdD];2"X4Dp>%jJsj%7l>jC*@IRB!H"53="'`54FX0WD6iR[Sm7:F~>
 
 endstream
 
 endobj
 
 6 0 obj
 
@@ -17,143 +17,78 @@ endobj
 
 /MediaBox [ 0 0 612 792 ]
 
 /Resources 3 0 R
 
 /Contents 5 0 R
 
-/Annots 7 0 R
 
 >>
 
 endobj
 
 7 0 obj
 
-[
 
-8 0 R
 
-]
 
-endobj
 
-8 0 obj
 
-<< /Type /Annot
 
-/Subtype /Link
 
-/Rect [ 102.0 559.666 195.992 547.666 ]
 
-/C [ 0 0 0 ]
 
-/Border [ 0 0 0 ]
 
-/A 9 0 R
 
-/H /I
 
->>
 
-endobj
 
-10 0 obj
 
-<< /Length 822 /Filter [ /ASCII85Decode /FlateDecode ]
 
- >>
 
-stream
 
-Gatn%?#Q2d'Sc)P'u"K;iqhDKR3p+gC"&LSBc#M\\R6%L&lLEcp?uc>$DoCd&kd+_/H!4XbW.lM3qTRU&mtnU#SR`"XbQq_?OR!Hf*%i[;ZX`upj%GL-(#9NY?utJ0%4*n-f+5[IPCV+b"M4CKV,pgU%_q`CZ1=\.nU]OK`J3"IRY`;$ksW8H#)l[#/UA((8qa23(1Djq*bQR)-j<=X625.:E,[;2r(>kc]=Ai[Zl8r5%dmc8sNigK7NT9bLGbM5_u@)OFTa1j>2a!Nb'83H[B#?V"nFCSkiNPa">T3ni]*405t8boJYR87pS6SqIq-V5Tn%?B9]$Ra6820rnDP\.ZNjhUC&fBO#8<J>!4k!@t`']ibcP$<g?,j?$0tjW@"JcZY>4,le.T+lkh,WcADE"oObYfFHlA@g=aE)9NC;5Ygbup^Lt6<PCH+qq_&1hk,UPg^?`:dS/WlX9O=MERn-a*.:YO4]fHoi*p$r6*\*nD.C@g,L[F^bV3LVBb"d8A:ZA''RbrSZ%W^7X(t1Ha;baEi3i:qjS.(\1O7YW,#UP'=(/KqP(_``5'sj@4rsP"MOJmqS,291(lQXU-/3CPg055,I^.a7_88Uf*[TP,-g-^C/qmX2V^44-OOOt$R,\ZpgRQ`_V;Sk[+;R7D3D/$OZ69TcSSK9!^,sMhE[M!jK*[KQdnA:8k,O/38lbf&:^K\,5q[j(C^-J05#PphDmS#d2Eu5/mHtLcG/%*HZIuAE\1Q>^(=P/8h\;LVZZAZSjmXk737;fc['D&",B4[?0LUcUJd+O^r?-mh_:97+C3ctkCZ[2mZW`)X~>
 
-endstream
 
-endobj
 
-11 0 obj
 
-<< /Type /Page
 
-/Parent 1 0 R
 
-/MediaBox [ 0 0 612 792 ]
 
-/Resources 3 0 R
 
-/Contents 10 0 R
 
->>
 
-endobj
 
-13 0 obj
 
-<<
 
- /Title (\376\377\0\61\0\40\0\124\0\141\0\142\0\154\0\145\0\40\0\157\0\146\0\40\0\103\0\157\0\156\0\164\0\145\0\156\0\164\0\163)
 
- /Parent 12 0 R
 
- /A 9 0 R
 
->> endobj
 
-14 0 obj
 
 << /Type /Font
 
 /Subtype /Type1
 
 /Name /F3
 
 /BaseFont /Helvetica-Bold
 
 /Encoding /WinAnsiEncoding >>
 
 endobj
 
-15 0 obj
 
+8 0 obj
 
 << /Type /Font
 
 /Subtype /Type1
 
 /Name /F5
 
 /BaseFont /Times-Roman
 
 /Encoding /WinAnsiEncoding >>
 
 endobj
 
-16 0 obj
 
+9 0 obj
 
 << /Type /Font
 
 /Subtype /Type1
 
 /Name /F6
 
 /BaseFont /Times-Italic
 
 /Encoding /WinAnsiEncoding >>
 
 endobj
 
-17 0 obj
 
+10 0 obj
 
 << /Type /Font
 
 /Subtype /Type1
 
 /Name /F1
 
 /BaseFont /Helvetica
 
 /Encoding /WinAnsiEncoding >>
 
 endobj
 
-18 0 obj
 
+11 0 obj
 
 << /Type /Font
 
 /Subtype /Type1
 
 /Name /F2
 
 /BaseFont /Helvetica-Oblique
 
 /Encoding /WinAnsiEncoding >>
 
 endobj
 
-19 0 obj
 
-<< /Type /Font
 
-/Subtype /Type1
 
-/Name /F7
 
-/BaseFont /Times-Bold
 
-/Encoding /WinAnsiEncoding >>
 
-endobj
 
 1 0 obj
 
 << /Type /Pages
 
-/Count 2
 
-/Kids [6 0 R 11 0 R ] >>
 
+/Count 1
 
+/Kids [6 0 R ] >>
 
 endobj
 
 2 0 obj
 
 << /Type /Catalog
 
 /Pages 1 0 R
 
- /Outlines 12 0 R
 
- /PageMode /UseOutlines
 
  >>
 
 endobj
 
 3 0 obj
 
 << 
-/Font << /F3 14 0 R /F5 15 0 R /F1 17 0 R /F6 16 0 R /F2 18 0 R /F7 19 0 R >> 
+/Font << /F3 7 0 R /F5 8 0 R /F1 10 0 R /F6 9 0 R /F2 11 0 R >> 
 /ProcSet [ /PDF /ImageC /Text ] >> 
 endobj
 
-9 0 obj
 
-<<
 
-/S /GoTo
 
-/D [11 0 R /XYZ 85.0 659.0 null]
 
->>
 
-endobj
 
-12 0 obj
 
-<<
 
- /First 13 0 R
 
- /Last 13 0 R
 
->> endobj
 
 xref
 
-0 20
 
+0 12
 
 0000000000 65535 f 
-0000002665 00000 n 
-0000002730 00000 n 
-0000002822 00000 n 
+0000001630 00000 n 
+0000001688 00000 n 
+0000001738 00000 n 
 0000000015 00000 n 
 0000000071 00000 n 
-0000000519 00000 n 
-0000000639 00000 n 
-0000000664 00000 n 
-0000002956 00000 n 
-0000000799 00000 n 
-0000001713 00000 n 
-0000003019 00000 n 
-0000001821 00000 n 
-0000001998 00000 n 
-0000002111 00000 n 
-0000002221 00000 n 
-0000002332 00000 n 
-0000002440 00000 n 
-0000002556 00000 n 
+0000000969 00000 n 
+0000001075 00000 n 
+0000001187 00000 n 
+0000001296 00000 n 
+0000001406 00000 n 
+0000001514 00000 n 
 trailer
 
 <<
 
-/Size 20
 
+/Size 12
 
 /Root 2 0 R
 
 /Info 4 0 R
 
 >>
 
 startxref
 
-3070
 
+1858
 
 %%EOF

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 196 - 109
docs/mapred_tutorial.html


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 4 - 4
docs/mapred_tutorial.pdf


+ 72 - 9
docs/quickstart.html
Zobraziť súbor 

@@ -1,9 +1,9 @@
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
 <html>
 
 <head>
 
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 
 <meta content="Apache Forrest" name="Generator">
 
-<meta name="Forrest-version" content="0.7">
 
+<meta name="Forrest-version" content="0.8">
 
 <meta name="Forrest-skin-name" content="pelt">
 
 <title>Hadoop Quickstart</title>
 
 <link type="text/css" href="skin/basic.css" rel="stylesheet">
 
@@ -16,46 +16,91 @@
 
 <body onload="init()">
 
 <script type="text/javascript">ndeSetTextSize();</script>
 
 <div id="top">
 
+<!--+
 
+    |breadtrail
 
+    +-->
 
 <div class="breadtrail">
 
 <a href="http://www.apache.org/">Apache</a> &gt; <a href="http://lucene.apache.org/">Lucene</a> &gt; <a href="http://lucene.apache.org/hadoop/">Hadoop</a><script src="skin/breadcrumbs.js" language="JavaScript" type="text/javascript"></script>
 
 </div>
 
+<!--+
 
+    |header
 
+    +-->
 
 <div class="header">
 
+<!--+
 
+    |start group logo
 
+    +-->
 
 <div class="grouplogo">
 
 <a href="http://lucene.apache.org/"><img class="logoImage" alt="Lucene" src="images/lucene_green_150.gif" title="Apache Lucene"></a>
 
 </div>
 
+<!--+
 
+    |end group logo
 
+    +-->
 
+<!--+
 
+    |start Project Logo
 
+    +-->
 
 <div class="projectlogo">
 
 <a href="http://lucene.apache.org/hadoop/"><img class="logoImage" alt="Hadoop" src="images/hadoop-logo.jpg" title="Scalable Computing Platform"></a>
 
 </div>
 
+<!--+
 
+    |end Project Logo
 
+    +-->
 
+<!--+
 
+    |start Search
 
+    +-->
 
 <div class="searchbox">
 
 <form action="http://www.google.com/search" method="get" class="roundtopsmall">
 
 <input value="lucene.apache.org" name="sitesearch" type="hidden"><input onFocus="getBlank (this, 'Search the site with google');" size="25" name="q" id="query" type="text" value="Search the site with google">&nbsp; 
-                    <input attr="value" name="Search" value="Search" type="submit">
 
+                    <input name="Search" value="Search" type="submit">
 
 </form>
 
 </div>
 
+<!--+
 
+    |end search
 
+    +-->
 
+<!--+
 
+    |start Tabs
 
+    +-->
 
 <ul id="tabs">
 
 <li>
 
-<a class="base-not-selected" href="http://lucene.apache.org/hadoop/">Project</a>
 
+<a class="unselected" href="http://lucene.apache.org/hadoop/">Project</a>
 
 </li>
 
 <li>
 
-<a class="base-not-selected" href="http://wiki.apache.org/lucene-hadoop">Wiki</a>
 
+<a class="unselected" href="http://wiki.apache.org/lucene-hadoop">Wiki</a>
 
 </li>
 
 <li class="current">
 
-<a class="base-selected" href="index.html">Hadoop 0.15 Documentation</a>
 
+<a class="selected" href="index.html">Hadoop 0.15 Documentation</a>
 
 </li>
 
 </ul>
 
+<!--+
 
+    |end Tabs
 
+    +-->
 
 </div>
 
 </div>
 
 <div id="main">
 
 <div id="publishedStrip">
 
+<!--+
 
+    |start Subtabs
 
+    +-->
 
 <div id="level2tabs"></div>
 
+<!--+
 
+    |end Endtabs
 
+    +-->
 
 <script type="text/javascript"><!--
 
-document.write("<text>Last Published:</text> " + document.lastModified);
 
+document.write("Last Published: " + document.lastModified);
 
 //  --></script>
 
 </div>
 
+<!--+
 
+    |breadtrail
 
+    +-->
 
 <div class="breadtrail">
 
-             
+
 
              &nbsp;
 
            </div>
 
+<!--+
 
+    |start Menu, mainarea
 
+    +-->
 
+<!--+
 
+    |start Menu
 
+    +-->
 
 <div id="menu">
 
 <div onclick="SwitchMenu('menu_selected_1.1', 'skin/')" id="menu_selected_1.1Title" class="menutitle" style="background-image: url('skin/images/chapter_open.gif');">Documentation</div>
 
 <div id="menu_selected_1.1" class="selectedmenuitemgroup" style="display: block;">
 
@@ -93,8 +138,17 @@ document.write("<text>Last Published:</text> " + document.lastModified);
 
 <div id="credit"></div>
 
 <div id="roundbottom">
 
 <img style="display: none" class="corner" height="15" width="15" alt="" src="skin/images/rc-b-l-15-1body-2menu-3menu.png"></div>
 
+<!--+
 
+  |alternative credits
 
+  +-->
 
 <div id="credit2"></div>
 
 </div>
 
+<!--+
 
+    |end Menu
 
+    +-->
 
+<!--+
 
+    |start content
 
+    +-->
 
 <div id="content">
 
 <div title="Portable Document Format" class="pdflink">
 
 <a class="dida" href="quickstart.pdf"><img alt="PDF -icon" src="skin/images/pdfdoc.gif" class="skin"><br>
 
@@ -466,18 +520,27 @@ document.write("<text>Last Published:</text> " + document.lastModified);
 
     
   
 </div>
 
+<!--+
 
+    |end content
 
+    +-->
 
 <div class="clearboth">&nbsp;</div>
 
 </div>
 
 <div id="footer">
 
+<!--+
 
+    |start bottomstrip
 
+    +-->
 
 <div class="lastmodified">
 
 <script type="text/javascript"><!--
 
-document.write("<text>Last Published:</text> " + document.lastModified);
 
+document.write("Last Published: " + document.lastModified);
 
 //  --></script>
 
 </div>
 
 <div class="copyright">
 
         Copyright &copy;
 
          2007 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
 
 </div>
 
+<!--+
 
+    |end bottomstrip
 
+    +-->
 
 </div>
 
 </body>
 
 </html>

+ 6 - 6
docs/skin/CommonMessages_de.xml
Zobraziť súbor 

@@ -1,11 +1,11 @@
 
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
 <!--
 
-  Copyright 1999-2004 The Apache Software Foundation or its licensors,
 
-  as applicable.
 
-
 
-  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

+ 7 - 7
docs/skin/CommonMessages_en_US.xml
Zobraziť súbor 

@@ -1,11 +1,11 @@
 
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
 <!--
 
-  Copyright 1999-2004 The Apache Software Foundation or its licensors,
 
-  as applicable.
 
-
 
-  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
 
 
@@ -19,5 +19,5 @@
 
   <message  key="Font size:">Font size:</message>
 
   <message key="Last Published:">Last Published:</message>
 
   <message key="Search">Search</message>
 
-  <message key="Search the site with">Search the site with</message>
 
+  <message key="Search the site with">Search site with</message>
 
 </catalogue>

+ 6 - 7
docs/skin/CommonMessages_es.xml
Zobraziť súbor 

@@ -1,11 +1,11 @@
 
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
 <!--
 
-  Copyright 1999-2004 The Apache Software Foundation or its licensors,
 
-  as applicable.
 
-
 
-  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
 
 
@@ -21,4 +21,3 @@
 
   <message key="Search">Buscar</message>
 
   <message key="Search the site with">Buscar en</message>
 
 </catalogue>
 
-

+ 6 - 6
docs/skin/CommonMessages_fr.xml
Zobraziť súbor 

@@ -1,11 +1,11 @@
 
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
 <!--
 
-  Copyright 1999-2004 The Apache Software Foundation or its licensors,
 
-  as applicable.
 
-
 
-  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

+ 33 - 14
docs/skin/basic.css
Zobraziť súbor 

@@ -1,10 +1,10 @@
 
 /*
 
-* Copyright 2002-2005 The Apache Software Foundation or its licensors,
 
-* as applicable.
 
-*
 
-* 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
 
 *
 
@@ -38,34 +38,45 @@ img { border: 0; }
 
   clear: both;
 
 }
 
 
-.frame {
 
+.note, .warning, .fixme {
 
   border: solid black 1px;
 
   margin: 1em 3em;
 
 }
 
 
-.frame .label {
 
+.note .label {
 
   background: #369;
 
   color: white;
 
   font-weight: bold;
 
   padding: 5px 10px;
 
 }
 
-.frame .content {
 
-  padding: 5px 10px;
 
+.note .content {
 
   background: #F0F0FF;
 
   color: black;
 
   line-height: 120%;
 
   font-size: 90%;
 
+  padding: 5px 10px;
 
 }
 
 .warning .label {
 
   background: #C00;
 
   color: white;
 
+  font-weight: bold;
 
+  padding: 5px 10px;
 
 }
 
 .warning .content {
 
   background: #FFF0F0;
 
   color: black;
 
+  line-height: 120%;
 
+  font-size: 90%;
 
+  padding: 5px 10px;
 
 }
 
 .fixme .label {
 
   background: #C6C600;
 
+  color: black;
 
+  font-weight: bold;
 
+  padding: 5px 10px;
 
+}
 
+.fixme .content {
 
+  padding: 5px 10px;
 
 }
 
 
 /**
 
@@ -128,10 +139,18 @@ p {
 
 
 #content li,
 
 #content th,
 
-#content td {
 
-  line-height: 110%;  
-  margin-top: .1em;
 
-  margin-bottom: .1em;
 
+#content td,
 
+#content li ul,
 
+#content li ol{
 
+  margin-top: .5em;
 
+  margin-bottom: .5em;
 
+}
 
+
 
+
 
+#content li li,
 
+#minitoc-area li{
 
+  margin-top: 0em;
 
+  margin-bottom: 0em;
 
 }
 
 
 #content .attribution {

+ 6 - 6
docs/skin/breadcrumbs-optimized.js
Zobraziť súbor 

@@ -1,10 +1,10 @@
 
 /*
 
-* Copyright 2002-2004 The Apache Software Foundation or its licensors,
 
-* as applicable.
 
-*
 
-* 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
 
 *

+ 6 - 6
docs/skin/breadcrumbs.js
Zobraziť súbor 

@@ -1,10 +1,10 @@
 
 /*
 
-* Copyright 2002-2004 The Apache Software Foundation or its licensors,
 
-* as applicable.
 
-*
 
-* 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
 
 *

+ 6 - 6
docs/skin/fontsize.js
Zobraziť súbor 

@@ -1,10 +1,10 @@
 
 /*
 
-* Copyright 2002-2004 The Apache Software Foundation or its licensors,
 
-* as applicable.
 
-*
 
-* 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
 
 *

+ 16 - 8
docs/skin/getBlank.js
Zobraziť súbor 

@@ -1,10 +1,10 @@
 
 /*
 
-* Copyright 2002-2004 The Apache Software Foundation or its licensors,
 
-* as applicable.
 
-*
 
-* 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
 
 *
 
@@ -15,12 +15,14 @@
 
 * limitations under the License.
 
 */
 
 /**
 
- * This script, when included in a html file and called from a form text field, will set the value of this field to ""
 
+ * getBlank script - when included in a html file and called from a form text field, will set the value of this field to ""
 
  * if the text value is still the standard value.
 
+ * getPrompt script - when included in a html file and called from a form text field, will set the value of this field to the prompt
 
+ * if the text value is empty.
 
  *
 
  * Typical usage:
 
  * <script type="text/javascript" language="JavaScript" src="getBlank.js"></script>
 
- * <input type="text" id="query" value="Search the site:" onFocus="getBlank (this, 'Search the site:');"/>
 
+ * <input type="text" id="query" value="Search the site:" onFocus="getBlank (this, 'Search the site:');" onBlur="getBlank (this, 'Search the site:');"/>
 
  */
 
 <!--
 
 function getBlank (form, stdValue){
 
@@ -29,4 +31,10 @@ if (form.value == stdValue){
 
 	}
 
 return true;
 
 }
 
+function getPrompt (form, stdValue){
 
+if (form.value == ''){
 
+	form.value = stdValue;
 
+	}
 
+return true;
 
+}
 
 //-->

+ 6 - 6
docs/skin/getMenu.js
Zobraziť súbor 

@@ -1,10 +1,10 @@
 
 /*
 
-* Copyright 2002-2004 The Apache Software Foundation or its licensors,
 
-* as applicable.
 
-*
 
-* 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
 
 *

BIN
docs/skin/images/chapter_open.gif
Zobraziť súbor


BIN
docs/skin/images/rc-b-l-15-1body-2menu-3menu.png
Zobraziť súbor


BIN
docs/skin/images/rc-b-r-15-1body-2menu-3menu.png
Zobraziť súbor


BIN
docs/skin/images/rc-b-r-5-1header-2tab-selected-3tab-selected.png
Zobraziť súbor


BIN
docs/skin/images/rc-t-l-5-1header-2searchbox-3searchbox.png
Zobraziť súbor


BIN
docs/skin/images/rc-t-l-5-1header-2tab-selected-3tab-selected.png
Zobraziť súbor


BIN
docs/skin/images/rc-t-l-5-1header-2tab-unselected-3tab-unselected.png
Zobraziť súbor


BIN
docs/skin/images/rc-t-r-15-1body-2menu-3menu.png
Zobraziť súbor


BIN
docs/skin/images/rc-t-r-5-1header-2searchbox-3searchbox.png
Zobraziť súbor


BIN
docs/skin/images/rc-t-r-5-1header-2tab-selected-3tab-selected.png
Zobraziť súbor


BIN
docs/skin/images/rc-t-r-5-1header-2tab-unselected-3tab-unselected.png
Zobraziť súbor


+ 12 - 14
docs/skin/menu.js
Zobraziť súbor 

@@ -1,10 +1,10 @@
 
 /*
 
-* Copyright 2002-2004 The Apache Software Foundation or its licensors,
 
-* as applicable.
 
-*
 
-* 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
 
 *
 
@@ -32,19 +32,17 @@ function SwitchMenu(obj)
 
     var title = document.getElementById(obj+'Title');
 
 
     if(obj.indexOf("_selected_")==0&&el.style.display == ""){
 
-      //nicolaken: doesn't work :-(
 
-      //title.style.backgroundImage = "url('images/chapter_open.gif')";
 
       el.style.display = "block";
 
+      title.className = "pagegroupselected";
 
     }
 
 
-    if(el.style.display != "block"){ 
-      //nicolaken: doesn't work :-(
 
-      //title.style.backgroundImage = 'url([url]images/chapter_open.gif[/url])';
 
+    if(el.style.display != "block"){
 
       el.style.display = "block";
 
-    }else{
 
-      //nicolaken: doesn't work :-(
 
-      //title.style.backgroundImage = "url('images/chapter.gif')";
 
+      title.className = "pagegroupopen";
 
+    }
 
+    else{
 
       el.style.display = "none";
 
+      title.className = "pagegroup";
 
     }
 
   }// end -  if(document.getElementById) 
 }//end - function SwitchMenu(obj)

+ 8 - 8
docs/skin/print.css
Zobraziť súbor 

@@ -1,10 +1,10 @@
 
 /*
 
-* Copyright 2002-2004 The Apache Software Foundation or its licensors,
 
-* as applicable.
 
-*
 
-* 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
 
 *
 
@@ -31,12 +31,12 @@ body {
 
   padding: 0;
 
   float: none !important;
 
   color: black;
 
-  background: transparent;
 
+  background: inherit;
 
 }
 
 
 a:link, a:visited {
 
   color: #336699;
 
-  background: transparent;
 
+  background: inherit;
 
   text-decoration: underline;
 
 }

+ 10 - 5
docs/skin/profile.css
Zobraziť súbor 

@@ -46,11 +46,16 @@ a.external  {
 
 #tabs li a:visited { color: #000000; }
 
 #tabs li a:hover { color: #000000; }
 
 
-#level2tabs       { background-color: #4C6C8F ;} 
+#level2tabs a.selected      { background-color: #4C6C8F ;} 
 #level2tabs a:link {  color: #ffffff;  }
 
 #level2tabs a:visited { color: #ffffff; }
 
 #level2tabs a:hover { color: #ffffff; }
 
 
+#level2tabs { background-color: #E5E4D9;}
 
+#level2tabs a.unselected:link {  color: #000000;  }
 
+#level2tabs a.unselected:visited { color: #000000; }
 
+#level2tabs a.unselected:hover { color: #000000; }
 
+
 
 .heading { background-color: #E5E4D9;} 
 
 .boxed { background-color: #E5E4D9;} 
@@ -80,7 +85,8 @@ color: #000000;
 
 background: #E5E4D9; 
 }
 
 
-#menu .menupagetitle  { background-color: #CFDCED}
 
+#menu .menupagetitle  { background-color: #CFDCED;
 
+  color: #000000;}
 
 
 #menu           { border-color: #999999;}
 
 #menu .menupagetitle  { border-color: #999999;}
 
@@ -104,7 +110,6 @@ background-color: #E5E4D9 ;
 
 color: #000000; 
 } 
  
-#menu .menupagetitle  { color: #000000;}    
 #menu .menupageitemgroup     { 
 background-color: #E5E4D9;
 
 }
 
@@ -123,8 +128,8 @@ background-color: #ffffff;
 
 color: #000000;
 
 } 
 a:link { color:#0000ff} 
-a:visited { color:#0000ff} 
-a:hover { color:#0000ff} 
+a:visited { color:#009999} 
+a:hover { color:#6587ff} 
 
  
 .ForrestTable      { background-color: #ccc;}

+ 56 - 19
docs/skin/screen.css
Zobraziť súbor 

@@ -1,10 +1,10 @@
 
 /*
 
-* Copyright 2002-2004 The Apache Software Foundation or its licensors,
 
-* as applicable.
 
-*
 
-* 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
 
 *
 
@@ -17,7 +17,7 @@
 
 body {  margin: 0px 0px 0px 0px; font-family: Verdana, Helvetica, sans-serif; }
 
 
 h1     { font-size : 160%; margin: 0px 0px 0px 0px;  padding: 0px; }
 
-h2     { font-size : 140%; margin: 0.9em 0px 0px 0px; padding: 0px; font-weight : bold;}
 
+h2     { font-size : 140%; margin: 1em 0px 0.8em 0px; padding: 0px; font-weight : bold;}
 
 h3     { font-size : 130%; margin: 0.8em 0px 0px 0px; padding: 0px; font-weight : bold; }
 
 .h3 { margin: 22px 0px 3px 0px; }
 
 h4     { font-size : 120%; margin: 0.7em 0px 0px 0px; padding: 0px; font-weight : normal; text-align: left; }
 
@@ -152,6 +152,12 @@ html>body #top .searchbox {
 
     width: .1em; /* IE/Win fix */
 
 }
 
 
+#tabs li a:hover {
 
+   
+    cursor: pointer;
 
+    text-decoration:underline;
 
+}
 
+
 
 #tabs > li a { width: auto; } /* Rest of IE/Win fix */
 
 
 /* Commented Backslash Hack hides rule from IE5-Mac \*/
 
@@ -188,6 +194,27 @@ html>body #top .searchbox {
 
 margin: 0;
 
 float:left;
 
 position:relative;
 
+
 
+}
 
+
 
+
 
+
 
+#level2tabs  a:hover {
 
+   
+    cursor: pointer;
 
+    text-decoration:underline;
 
+    
+}
 
+
 
+#level2tabs  a{
 
+   
+    cursor: pointer;
 
+    text-decoration:none;
 
+    background-image: url('images/chapter.gif');
 
+    background-repeat: no-repeat;
 
+    background-position: center left;
 
+    padding-left: 6px;
 
+    margin-left: 6px;
 
 }
 
 
 /*
 
@@ -252,10 +279,10 @@ img.cornersmall {
 
 /**
 
  * Side menu
 
  */
 
-#menu a {  font-weight: normal;}
 
+#menu a {  font-weight: normal; text-decoration: none;}
 
 #menu a:visited {  font-weight: normal; }
 
 #menu a:active {  font-weight: normal; }
 
-#menu a:hover {  font-weight: normal; }
 
+#menu a:hover {  font-weight: normal;  text-decoration:underline;}
 
 
 #menuarea { width:10em;}
 
 #menu {
 
@@ -268,6 +295,7 @@ img.cornersmall {
 
     z-index: 20;
 
     background-color: #f90;
 
     font-size : 70%;
 
+    
 }
 
 
 .menutitle {
 
@@ -278,20 +306,26 @@ img.cornersmall {
 
         background-repeat: no-repeat;
 
         background-position: center left;
 
         font-weight : bold;
 
+
 
+        
 }
 
 
+.menutitle:hover{text-decoration:underline;cursor: pointer;}
 
+
 
 #menu .menuitemgroup {
 
         margin: 0px 0px 6px 8px;
 
         padding: 0px;
 
         font-weight : bold; }
 
 
 #menu .selectedmenuitemgroup{
 
-        margin: 0px 0px 6px 8px;
 
+        margin: 0px 0px 0px 8px;
 
         padding: 0px;
 
-        font-weight : bold; }
 
+        font-weight : normal; 
+       
+        }
 
 
 #menu .menuitem {
 
-        padding: 0px 0px 2px 12px;
 
+        padding: 2px 0px 1px 13px;
 
         background-image: url('images/page.gif');
 
         background-repeat: no-repeat;
 
         background-position: center left;
 
@@ -300,19 +334,20 @@ img.cornersmall {
 
 }
 
 
 #menu .menupage {
 
-        margin: 5px 0px 5px 10px;
 
+        margin: 2px 0px 1px 10px;
 
         padding: 0px 3px 0px 12px;
 
-        background-image: url('images/current.gif');
 
+        background-image: url('images/page.gif');
 
         background-repeat: no-repeat;
 
-        background-position: top left;
 
+        background-position: center left;
 
         font-style : normal;
 
 }
 
 #menu .menupagetitle {
 
-        padding: 0px 0px 0px 6px;
 
+        padding: 0px 0px 0px 1px;
 
         font-style : normal;
 
         border-style: solid;
 
         border-width: 1px;
 
         margin-right: 10px;
 
+         
 }
 
 #menu .menupageitemgroup {
 
         padding: 3px 0px 4px 6px;
 
@@ -436,10 +471,11 @@ acronym { cursor: help; }
 
 #minitoc-area {
 
     border-top: solid 1px #4C6C8F;
 
     border-bottom: solid 1px #4C6C8F;
 
-    margin-bottom: 15px;
 
+    margin: 15px 10% 5px 15px;
 
+   /* margin-bottom: 15px;
 
     margin-left: 15px;
 
-    margin-right: 10%;
 
-    padding-bottom: 5px;
 
+    margin-right: 10%;*/
 
+    padding-bottom: 7px;
 
     padding-top: 5px;
 
 }
 
 .minitoc {
 
@@ -523,6 +559,7 @@ li p {
 
 }
 
 
 .printlink {
 
+    position: relative; /* IE bugfix cont'd */
 
     float: right;
 
 }
 
 .printlink br {

+ 72 - 9
docs/streaming.html
Zobraziť súbor 

@@ -1,9 +1,9 @@
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
 <html>
 
 <head>
 
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 
 <meta content="Apache Forrest" name="Generator">
 
-<meta name="Forrest-version" content="0.7">
 
+<meta name="Forrest-version" content="0.8">
 
 <meta name="Forrest-skin-name" content="pelt">
 
 <meta name="http-equiv" content="Content-Type">
 
 <meta name="content" content="text/html;">
 
@@ -19,46 +19,91 @@
 
 <body onload="init()">
 
 <script type="text/javascript">ndeSetTextSize();</script>
 
 <div id="top">
 
+<!--+
 
+    |breadtrail
 
+    +-->
 
 <div class="breadtrail">
 
 <a href="http://www.apache.org/">Apache</a> &gt; <a href="http://lucene.apache.org/">Lucene</a> &gt; <a href="http://lucene.apache.org/hadoop/">Hadoop</a><script src="skin/breadcrumbs.js" language="JavaScript" type="text/javascript"></script>
 
 </div>
 
+<!--+
 
+    |header
 
+    +-->
 
 <div class="header">
 
+<!--+
 
+    |start group logo
 
+    +-->
 
 <div class="grouplogo">
 
 <a href="http://lucene.apache.org/"><img class="logoImage" alt="Lucene" src="images/lucene_green_150.gif" title="Apache Lucene"></a>
 
 </div>
 
+<!--+
 
+    |end group logo
 
+    +-->
 
+<!--+
 
+    |start Project Logo
 
+    +-->
 
 <div class="projectlogo">
 
 <a href="http://lucene.apache.org/hadoop/"><img class="logoImage" alt="Hadoop" src="images/hadoop-logo.jpg" title="Scalable Computing Platform"></a>
 
 </div>
 
+<!--+
 
+    |end Project Logo
 
+    +-->
 
+<!--+
 
+    |start Search
 
+    +-->
 
 <div class="searchbox">
 
 <form action="http://www.google.com/search" method="get" class="roundtopsmall">
 
 <input value="lucene.apache.org" name="sitesearch" type="hidden"><input onFocus="getBlank (this, 'Search the site with google');" size="25" name="q" id="query" type="text" value="Search the site with google">&nbsp; 
-                    <input attr="value" name="Search" value="Search" type="submit">
 
+                    <input name="Search" value="Search" type="submit">
 
 </form>
 
 </div>
 
+<!--+
 
+    |end search
 
+    +-->
 
+<!--+
 
+    |start Tabs
 
+    +-->
 
 <ul id="tabs">
 
 <li>
 
-<a class="base-not-selected" href="http://lucene.apache.org/hadoop/">Project</a>
 
+<a class="unselected" href="http://lucene.apache.org/hadoop/">Project</a>
 
 </li>
 
 <li>
 
-<a class="base-not-selected" href="http://wiki.apache.org/lucene-hadoop">Wiki</a>
 
+<a class="unselected" href="http://wiki.apache.org/lucene-hadoop">Wiki</a>
 
 </li>
 
 <li class="current">
 
-<a class="base-selected" href="index.html">Hadoop 0.15 Documentation</a>
 
+<a class="selected" href="index.html">Hadoop 0.15 Documentation</a>
 
 </li>
 
 </ul>
 
+<!--+
 
+    |end Tabs
 
+    +-->
 
 </div>
 
 </div>
 
 <div id="main">
 
 <div id="publishedStrip">
 
+<!--+
 
+    |start Subtabs
 
+    +-->
 
 <div id="level2tabs"></div>
 
+<!--+
 
+    |end Endtabs
 
+    +-->
 
 <script type="text/javascript"><!--
 
-document.write("<text>Last Published:</text> " + document.lastModified);
 
+document.write("Last Published: " + document.lastModified);
 
 //  --></script>
 
 </div>
 
+<!--+
 
+    |breadtrail
 
+    +-->
 
 <div class="breadtrail">
 
-             
+
 
              &nbsp;
 
            </div>
 
+<!--+
 
+    |start Menu, mainarea
 
+    +-->
 
+<!--+
 
+    |start Menu
 
+    +-->
 
 <div id="menu">
 
 <div onclick="SwitchMenu('menu_selected_1.1', 'skin/')" id="menu_selected_1.1Title" class="menutitle" style="background-image: url('skin/images/chapter_open.gif');">Documentation</div>
 
 <div id="menu_selected_1.1" class="selectedmenuitemgroup" style="display: block;">
 
@@ -96,8 +141,17 @@ document.write("<text>Last Published:</text> " + document.lastModified);
 
 <div id="credit"></div>
 
 <div id="roundbottom">
 
 <img style="display: none" class="corner" height="15" width="15" alt="" src="skin/images/rc-b-l-15-1body-2menu-3menu.png"></div>
 
+<!--+
 
+  |alternative credits
 
+  +-->
 
 <div id="credit2"></div>
 
 </div>
 
+<!--+
 
+    |end Menu
 
+    +-->
 
+<!--+
 
+    |start content
 
+    +-->
 
 <div id="content">
 
 <div title="Portable Document Format" class="pdflink">
 
 <a class="dida" href="streaming.pdf"><img alt="PDF -icon" src="skin/images/pdfdoc.gif" class="skin"><br>
 
@@ -751,18 +805,27 @@ Anything found between BEGIN_STRING and END_STRING would be treated as one recor
 
 </div>
 
 
 </div>
 
+<!--+
 
+    |end content
 
+    +-->
 
 <div class="clearboth">&nbsp;</div>
 
 </div>
 
 <div id="footer">
 
+<!--+
 
+    |start bottomstrip
 
+    +-->
 
 <div class="lastmodified">
 
 <script type="text/javascript"><!--
 
-document.write("<text>Last Published:</text> " + document.lastModified);
 
+document.write("Last Published: " + document.lastModified);
 
 //  --></script>
 
 </div>
 
 <div class="copyright">
 
         Copyright &copy;
 
          2007 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
 
 </div>
 
+<!--+
 
+    |end bottomstrip
 
+    +-->
 
 </div>
 
 </body>
 
 </html>

+ 155 - 118
src/docs/src/documentation/content/xdocs/mapred_tutorial.xml
Zobraziť súbor 

@@ -135,6 +135,12 @@
 
       <p><code>WordCount</code> is a simple application that counts the number of
 
       occurences of each word in a given input set.</p>
 
       
+      <p>This works with a 
+      <a href="quickstart.html#Standalone+Operation">local-standalone</a>,
 
+      <a href="quickstart.html#SingleNodeSetup">pseudo-distributed</a> or
 
+      <a href="quickstart.html#Fully-Distributed+Operation">fully-distributed</a> 
+      Hadoop installation.</p>
 
+      
       <section>
 
         <title>Source Code</title>
 
         
@@ -156,7 +162,7 @@
 
           <tr>
 
             <td>3.</td>
 
             <td>
 
-              <code>import java.io.Exception;</code>
 
+              <code>import java.io.IOException;</code>
 
             </td>
 
           </tr>
 
           <tr>
 
@@ -218,7 +224,7 @@
 
             <td>
 
               &nbsp;&nbsp;
 
               <code>
 
-                public static class MapClass extends MapReduceBase 
+                public static class Map extends MapReduceBase 
                 implements Mapper&lt;LongWritable, Text, Text, IntWritable&gt; {
 
               </code>
 
             </td>
 
@@ -439,7 +445,7 @@
 
             <td>45.</td>
 
             <td>
 
               &nbsp;&nbsp;&nbsp;&nbsp;
 
-              <code>conf.setMapperClass(MapClass.class);</code>
 
+              <code>conf.setMapperClass(Map.class);</code>
 
             </td>
 
           </tr>
 
           <tr>
 
@@ -482,14 +488,14 @@
 
             <td>52.</td>
 
             <td>
 
               &nbsp;&nbsp;&nbsp;&nbsp;
 
-              <code>conf.setInputPath(new Path(args[1]));</code>
 
+              <code>conf.setInputPath(new Path(args[0]));</code>
 
             </td>
 
           </tr>
 
           <tr>
 
             <td>53.</td>
 
             <td>
 
               &nbsp;&nbsp;&nbsp;&nbsp;
 
-              <code>conf.setOutputPath(new Path(args[2]));</code>
 
+              <code>conf.setOutputPath(new Path(args[1]));</code>
 
             </td>
 
           </tr>
 
           <tr>
 
@@ -530,11 +536,12 @@
 
         <code>HADOOP_VERSION</code> is the Hadoop version installed, compile 
         <code>WordCount.java</code> and create a jar:</p>
 
         <p>
 
+          <code>$ mkdir wordcount_classes</code><br/>
 
           <code>
 
             $ javac -classpath ${HADOOP_HOME}/hadoop-${HADOOP_VERSION}-core.jar 
-              WordCount.java
 
+              -d wordcount_classes WordCount.java
 
           </code><br/>
 
-          <code>$ jar -cvf /usr/joe/wordcount.jar WordCount.class</code> 
+          <code>$ jar -cvf /usr/joe/wordcount.jar -C wordcount_classes/ .</code> 
         </p>
 
         
         <p>Assuming that:</p>
 
@@ -1343,7 +1350,13 @@
 
       <title>Example: WordCount v2.0</title>
 
       
       <p>Here is a more complete <code>WordCount</code> which uses many of the
 
-      features provided by the Map-Reduce framework we discussed so far:</p>
 
+      features provided by the Map-Reduce framework we discussed so far.</p>
 
+      
+      <p>This needs the HDFS to be up and running, especially for the 
+      <code>DistributedCache</code>-related features. Hence it only works with a 
+      <a href="quickstart.html#SingleNodeSetup">pseudo-distributed</a> or
 
+      <a href="quickstart.html#Fully-Distributed+Operation">fully-distributed</a> 
+      Hadoop installation.</p>      
       
       <section>
 
         <title>Source Code</title>
 
@@ -1434,7 +1447,7 @@
 
             <td>
 
               &nbsp;&nbsp;
 
               <code>
 
-                public static class MapClass extends MapReduceBase 
+                public static class Map extends MapReduceBase 
                 implements Mapper&lt;LongWritable, Text, Text, IntWritable&gt; {
 
               </code>
 
             </td>
 
@@ -1543,36 +1556,43 @@
 
             <td>32.</td>
 
             <td>
 
               &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
-              <code>Path[] patternsFiles = new Path[0];</code>
 
+              <code>if (job.getBoolean("wordcount.skip.patterns", false)) {</code>
 
             </td>
 
           </tr>
 
           <tr>
 
             <td>33.</td>
 
             <td>
 
-              &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
-              <code>try {</code>
 
+              &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
+              <code>Path[] patternsFiles = new Path[0];</code>
 
             </td>
 
           </tr>
 
           <tr>
 
             <td>34.</td>
 
             <td>
 
               &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
+              <code>try {</code>
 
+            </td>
 
+          </tr>
 
+          <tr>
 
+            <td>35.</td>
 
+            <td>
 
+              &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
               <code>
 
                 patternsFiles = DistributedCache.getLocalCacheFiles(job);
 
               </code>
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>35.</td>
 
+            <td>36.</td>
 
             <td>
 
-              &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
+              &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
               <code>} catch (IOException ioe) {</code>
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>36.</td>
 
+            <td>37.</td>
 
             <td>
 
-              &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
+              &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
               <code>
 
                 System.err.println("Caught exception while getting cached files: " 
                 + StringUtils.stringifyException(ioe));
 
@@ -1580,60 +1600,67 @@
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>37.</td>
 
+            <td>38.</td>
 
             <td>
 
-              &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
+              &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
               <code>}</code>
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>38.</td>
 
+            <td>39.</td>
 
             <td>
 
-              &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
+              &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
               <code>for (Path patternsFile : patternsFiles) {</code>
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>39.</td>
 
+            <td>40.</td>
 
             <td>
 
-              &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
+              &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
               <code>parseSkipFile(patternsFile);</code>
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>40.</td>
 
+            <td>41.</td>
 
+            <td>
 
+              &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
+              <code>}</code>
 
+            </td>
 
+          </tr>
 
+          <tr>
 
+            <td>42.</td>
 
             <td>
 
               &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
               <code>}</code>
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>41.</td>
 
+            <td>43.</td>
 
             <td>
 
               &nbsp;&nbsp;&nbsp;&nbsp;
 
               <code>}</code>
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>42.</td>
 
+            <td>44.</td>
 
             <td></td>
 
           </tr>
 
           <tr>
 
-            <td>43.</td>
 
+            <td>45.</td>
 
             <td>
 
               &nbsp;&nbsp;&nbsp;&nbsp;
 
               <code>private void parseSkipFile(Path patternsFile) {</code>
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>44.</td>
 
+            <td>46.</td>
 
             <td>
 
               &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
               <code>try {</code>
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>45.</td>
 
+            <td>47.</td>
 
             <td>
 
               &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
               <code>
 
@@ -1643,42 +1670,42 @@
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>46.</td>
 
+            <td>48.</td>
 
             <td>
 
               &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
               <code>String pattern = null;</code>
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>47.</td>
 
+            <td>49.</td>
 
             <td>
 
               &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
               <code>while ((pattern = fis.readLine()) != null) {</code>
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>48.</td>
 
+            <td>50.</td>
 
             <td>
 
               &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
               <code>patternsToSkip.add(pattern);</code>
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>49.</td>
 
+            <td>51.</td>
 
             <td>
 
               &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
               <code>}</code>
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>50.</td>
 
+            <td>52.</td>
 
             <td>
 
               &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
               <code>} catch (IOException ioe) {</code>
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>51.</td>
 
+            <td>53.</td>
 
             <td>
 
               &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
               <code>
 
@@ -1690,25 +1717,25 @@
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>52.</td>
 
+            <td>54.</td>
 
             <td>
 
               &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
               <code>}</code>
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>53.</td>
 
+            <td>55.</td>
 
             <td>
 
               &nbsp;&nbsp;&nbsp;&nbsp;
 
               <code>}</code>
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>54.</td>
 
+            <td>56.</td>
 
             <td></td>
 
           </tr>
 
           <tr>
 
-            <td>55.</td>
 
+            <td>57.</td>
 
             <td>
 
               &nbsp;&nbsp;&nbsp;&nbsp;
 
               <code>
 
@@ -1719,7 +1746,7 @@
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>56.</td>
 
+            <td>58.</td>
 
             <td>
 
               &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
               <code>
 
@@ -1730,89 +1757,89 @@
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>57.</td>
 
+            <td>59.</td>
 
             <td></td>
 
           </tr>
 
           <tr>
 
-            <td>58.</td>
 
+            <td>60.</td>
 
             <td>
 
               &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
               <code>for (String pattern : patternsToSkip) {</code>
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>59.</td>
 
+            <td>61.</td>
 
             <td>
 
               &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
               <code>line = line.replaceAll(pattern, "");</code>
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>60.</td>
 
+            <td>62.</td>
 
             <td>
 
               &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
               <code>}</code>
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>61.</td>
 
+            <td>63.</td>
 
             <td></td>
 
           </tr>
 
           <tr>
 
-            <td>62.</td>
 
+            <td>64.</td>
 
             <td>
 
               &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
               <code>StringTokenizer tokenizer = new StringTokenizer(line);</code>
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>63.</td>
 
+            <td>65.</td>
 
             <td>
 
               &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
               <code>while (tokenizer.hasMoreTokens()) {</code>
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>64.</td>
 
+            <td>66.</td>
 
             <td>
 
               &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
               <code>word.set(tokenizer.nextToken());</code>
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>65.</td>
 
+            <td>67.</td>
 
             <td>
 
               &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
               <code>output.collect(word, one);</code>
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>66.</td>
 
+            <td>68.</td>
 
             <td>
 
               &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
               <code>reporter.incrCounter(Counters.INPUT_WORDS, 1);</code>
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>67.</td>
 
+            <td>69.</td>
 
             <td>
 
               &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
               <code>}</code>
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>68.</td>
 
+            <td>70.</td>
 
             <td></td>
 
           </tr>
 
           <tr>
 
-            <td>69.</td>
 
+            <td>71.</td>
 
             <td>
 
               &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
               <code>if ((++numRecords % 100) == 0) {</code>
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>70.</td>
 
+            <td>72.</td>
 
             <td>
 
               &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
               <code>
 
@@ -1823,32 +1850,32 @@
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>71.</td>
 
+            <td>73.</td>
 
             <td>
 
               &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
               <code>}</code>
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>72.</td>
 
+            <td>74.</td>
 
             <td>
 
               &nbsp;&nbsp;&nbsp;&nbsp;
 
               <code>}</code>
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>73.</td>
 
+            <td>75.</td>
 
             <td>
 
               &nbsp;&nbsp;
 
               <code>}</code>
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>74.</td>
 
+            <td>76.</td>
 
             <td></td>
 
           </tr>
 
           <tr>
 
-            <td>75.</td>
 
+            <td>77.</td>
 
             <td>
 
               &nbsp;&nbsp;
 
               <code>
 
@@ -1858,7 +1885,7 @@
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>76.</td>
 
+            <td>78.</td>
 
             <td>
 
               &nbsp;&nbsp;&nbsp;&nbsp;
 
               <code>
 
@@ -1869,67 +1896,67 @@
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>77.</td>
 
+            <td>79.</td>
 
             <td>
 
               &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
               <code>int sum = 0;</code>
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>78.</td>
 
+            <td>80.</td>
 
             <td>
 
               &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
               <code>while (values.hasNext()) {</code>
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>79.</td>
 
+            <td>81.</td>
 
             <td>
 
               &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
               <code>sum += values.next().get();</code>
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>80.</td>
 
+            <td>82.</td>
 
             <td>
 
               &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
               <code>}</code>
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>81.</td>
 
+            <td>83.</td>
 
             <td>
 
               &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
               <code>output.collect(key, new IntWritable(sum));</code>
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>82.</td>
 
+            <td>84.</td>
 
             <td>
 
               &nbsp;&nbsp;&nbsp;&nbsp;
 
               <code>}</code>
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>83.</td>
 
+            <td>85.</td>
 
             <td>
 
               &nbsp;&nbsp;
 
               <code>}</code>
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>84.</td>
 
+            <td>86.</td>
 
             <td></td>
 
           </tr>
 
           <tr>
 
-            <td>85.</td>
 
+            <td>87.</td>
 
             <td>
 
               &nbsp;&nbsp;
 
               <code>public int run(String[] args) throws Exception {</code>
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>86.</td>
 
+            <td>88.</td>
 
             <td>
 
               &nbsp;&nbsp;&nbsp;&nbsp;
 
               <code>
 
@@ -1938,79 +1965,79 @@
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>87.</td>
 
+            <td>89.</td>
 
             <td>
 
               &nbsp;&nbsp;&nbsp;&nbsp;
 
               <code>conf.setJobName("wordcount");</code>
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>88.</td>
 
+            <td>90.</td>
 
             <td></td>
 
           </tr>
 
           <tr>
 
-            <td>89.</td>
 
+            <td>91.</td>
 
             <td>
 
               &nbsp;&nbsp;&nbsp;&nbsp;
 
               <code>conf.setOutputKeyClass(Text.class);</code>
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>90.</td>
 
+            <td>92.</td>
 
             <td>
 
               &nbsp;&nbsp;&nbsp;&nbsp;
 
               <code>conf.setOutputValueClass(IntWritable.class);</code>
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>91.</td>
 
+            <td>93.</td>
 
             <td></td>
 
           </tr>
 
           <tr>
 
-            <td>92.</td>
 
+            <td>94.</td>
 
             <td>
 
               &nbsp;&nbsp;&nbsp;&nbsp;
 
-              <code>conf.setMapperClass(MapClass.class);</code>
 
+              <code>conf.setMapperClass(Map.class);</code>
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>93.</td>
 
+            <td>95.</td>
 
             <td>
 
               &nbsp;&nbsp;&nbsp;&nbsp;
 
               <code>conf.setCombinerClass(Reduce.class);</code>
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>94.</td>
 
+            <td>96.</td>
 
             <td>
 
               &nbsp;&nbsp;&nbsp;&nbsp;
 
               <code>conf.setReducerClass(Reduce.class);</code>
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>95.</td>
 
+            <td>97.</td>
 
             <td></td>
 
           </tr>
 
           <tr>
 
-            <td>96.</td>
 
+            <td>98.</td>
 
             <td>
 
               &nbsp;&nbsp;&nbsp;&nbsp;
 
               <code>conf.setInputFormat(TextInputFormat.class);</code>
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>97.</td>
 
+            <td>99.</td>
 
             <td>
 
               &nbsp;&nbsp;&nbsp;&nbsp;
 
               <code>conf.setOutputFormat(TextOutputFormat.class);</code>
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>98.</td>
 
+            <td>100.</td>
 
             <td></td>
 
           </tr>
 
           <tr>
 
-            <td>99.</td>
 
+            <td>101.</td>
 
             <td>
 
               &nbsp;&nbsp;&nbsp;&nbsp;
 
               <code>
 
@@ -2019,21 +2046,21 @@
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>100.</td>
 
+            <td>102.</td>
 
             <td>
 
               &nbsp;&nbsp;&nbsp;&nbsp;
 
               <code>for (int i=0; i &lt; args.length; ++i) {</code>
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>101.</td>
 
+            <td>103.</td>
 
             <td>
 
               &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
-              <code>if ("-skip".equals(args[i]) {</code>
 
+              <code>if ("-skip".equals(args[i])) {</code>
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>102.</td>
 
+            <td>104.</td>
 
             <td>
 
               &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
               <code>
 
@@ -2042,82 +2069,91 @@
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>103.</td>
 
+            <td>105.</td>
 
+            <td>
 
+              &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
+              <code>
 
+                conf.setBoolean("wordcount.skip.patterns", true);
 
+              </code>
 
+            </td>
 
+          </tr>
 
+          <tr>
 
+            <td>106.</td>
 
             <td>
 
               &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
               <code>} else {</code>
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>104.</td>
 
+            <td>107.</td>
 
             <td>
 
               &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
               <code>other_args.add(args[i]);</code>
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>105.</td>
 
+            <td>108.</td>
 
             <td>
 
               &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
               <code>}</code>
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>106.</td>
 
+            <td>109.</td>
 
             <td>
 
               &nbsp;&nbsp;&nbsp;&nbsp;
 
               <code>}</code>
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>107.</td>
 
+            <td>110.</td>
 
             <td></td>
 
           </tr>
 
           <tr>
 
-            <td>108.</td>
 
+            <td>111.</td>
 
             <td>
 
               &nbsp;&nbsp;&nbsp;&nbsp;
 
-              <code>conf.setInputPath(new Path(other_args[0]));</code>
 
+              <code>conf.setInputPath(new Path(other_args.get(0)));</code>
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>109.</td>
 
+            <td>112.</td>
 
             <td>
 
               &nbsp;&nbsp;&nbsp;&nbsp;
 
-              <code>conf.setOutputPath(new Path(other_args[1]));</code>
 
+              <code>conf.setOutputPath(new Path(other_args.get(1)));</code>
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>110.</td>
 
+            <td>113.</td>
 
             <td></td>
 
           </tr>
 
           <tr>
 
-            <td>111.</td>
 
+            <td>114.</td>
 
             <td>
 
               &nbsp;&nbsp;&nbsp;&nbsp;
 
               <code>JobClient.runJob(conf);</code>
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>112.</td>
 
+            <td>115.</td>
 
             <td>
 
               &nbsp;&nbsp;&nbsp;&nbsp;
 
               <code>return 0;</code>
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>113.</td>
 
+            <td>116.</td>
 
             <td>
 
               &nbsp;&nbsp;
 
               <code>}</code>
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>114.</td>
 
+            <td>117.</td>
 
             <td></td>
 
           </tr>
 
           <tr>
 
-            <td>115.</td>
 
+            <td>118.</td>
 
             <td>
 
               &nbsp;&nbsp;
 
               <code>
 
@@ -2126,7 +2162,7 @@
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>116.</td>
 
+            <td>119.</td>
 
             <td>
 
               &nbsp;&nbsp;&nbsp;&nbsp;
 
               <code>
 
@@ -2136,27 +2172,27 @@
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>117.</td>
 
+            <td>120.</td>
 
             <td>
 
               &nbsp;&nbsp;&nbsp;&nbsp;
 
               <code>System.exit(res);</code>
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>118.</td>
 
+            <td>121.</td>
 
             <td>
 
               &nbsp;&nbsp;
 
               <code>}</code>
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>119.</td>
 
+            <td>122.</td>
 
             <td>
 
               <code>}</code>
 
             </td>
 
           </tr>
 
           <tr>
 
-            <td>120.</td>
 
+            <td>123.</td>
 
             <td></td>
 
           </tr>
 
         </table>
 
@@ -2175,7 +2211,7 @@
 
           <code>Hello World, Bye World!</code><br/>
 
           <br/>
 
           <code>$ bin/hadoop dfs -cat /usr/joe/wordcount/input/file02</code><br/>
 
-          <code>Hello Hadoop, Goodbye the Hadoop.</code>
 
+          <code>Hello Hadoop, Goodbye to hadoop.</code>
 
         </p>
 
         
         <p>Run the application:</p>
 
@@ -2195,11 +2231,11 @@
 
           <code>Bye    1</code><br/>
 
           <code>Goodbye    1</code><br/>
 
           <code>Hadoop,    1</code><br/>
 
-          <code>Hadoop.    1</code><br/>
 
           <code>Hello    2</code><br/>
 
           <code>World!    1</code><br/>
 
           <code>World,    1</code><br/>
 
-          <code>the    1</code><br/>
 
+          <code>hadoop.    1</code><br/>
 
+          <code>to    1</code><br/>
 
         </p>
 
         
         <p>Notice that the inputs differ from the first version we looked at, 
@@ -2213,7 +2249,7 @@
 
           <code>\.</code><br/>
 
           <code>\,</code><br/>
 
           <code>\!</code><br/>
 
-          <code>the</code><br/>
 
+          <code>to</code><br/>
 
         </p>
 
         
         <p>Run it again, this time with more options:</p>
 
@@ -2233,9 +2269,10 @@
 
           <br/>
 
           <code>Bye    1</code><br/>
 
           <code>Goodbye    1</code><br/>
 
-          <code>Hadoop    2</code><br/>
 
+          <code>Hadoop    1</code><br/>
 
           <code>Hello    2</code><br/>
 
           <code>World    2</code><br/>
 
+          <code>hadoop    1</code><br/>
 
         </p>
 
         
         <p>Run it once more, this time switch-off case-sensitivity:</p>
 
@@ -2262,7 +2299,7 @@
 
       </section>
 
       
       <section>
 
-        <title>Salient Points</title>
 
+        <title>Highlights</title>
 
         
         <p>The second version of <code>WordCount</code> improves upon the 
         previous one by using some features offered by the Map-Reduce framework:
 
@@ -2271,23 +2308,23 @@
 
           <li>
 
             Demonstrates how applications can access configuration parameters
 
             in the <code>configure</code> method of the <code>Mapper</code> (and
 
-            <code>Reducer</code>) implementations (lines 28-41).
 
+            <code>Reducer</code>) implementations (lines 28-43).
 
           </li>
 
           <li>
 
             Demonstrates how the <code>DistributedCache</code> can be used to 
             distribute read-only data needed by the jobs. Here it allows the user 
-            to specify word-patterns to skip while counting (line 102).
 
+            to specify word-patterns to skip while counting (line 104).
 
           </li>
 
           <li>
 
             Demonstrates the utility of the <code>Tool</code> interface and the
 
             <code>GenericOptionsParser</code> to handle generic Hadoop 
-            command-line options (lines 85-86, 116).
 
+            command-line options (lines 87-116, 119).
 
           </li>
 
           <li>
 
-            Demonstrates how applications can use <code>Counters</code> (line 66)
 
+            Demonstrates how applications can use <code>Counters</code> (line 68)
 
             and how they can set application-specific status information via 
             the <code>Reporter</code> instance passed to the <code>map</code> (and
 
-            <code>reduce</code>) method (line 70).
 
+            <code>reduce</code>) method (line 72).
 
           </li>
 
         </ul>

Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov