hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acmur...@apache.org
Subject svn commit: r611895 [4/4] - in /lucene/hadoop/branches/branch-0.15: ./ docs/ docs/skin/ docs/skin/images/ src/docs/src/documentation/content/xdocs/
Date Mon, 14 Jan 2008 19:16:46 GMT
Modified: lucene/hadoop/branches/branch-0.15/docs/quickstart.html
URL: http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.15/docs/quickstart.html?rev=611895&r1=611894&r2=611895&view=diff
==============================================================================
--- lucene/hadoop/branches/branch-0.15/docs/quickstart.html (original)
+++ lucene/hadoop/branches/branch-0.15/docs/quickstart.html Mon Jan 14 11:16:43 2008
@@ -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 @@
 <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 @@
     
   
 </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>

Modified: lucene/hadoop/branches/branch-0.15/docs/skin/CommonMessages_de.xml
URL: http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.15/docs/skin/CommonMessages_de.xml?rev=611895&r1=611894&r2=611895&view=diff
==============================================================================
--- lucene/hadoop/branches/branch-0.15/docs/skin/CommonMessages_de.xml (original)
+++ lucene/hadoop/branches/branch-0.15/docs/skin/CommonMessages_de.xml Mon Jan 14 11:16:43 2008
@@ -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
 

Modified: lucene/hadoop/branches/branch-0.15/docs/skin/CommonMessages_en_US.xml
URL: http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.15/docs/skin/CommonMessages_en_US.xml?rev=611895&r1=611894&r2=611895&view=diff
==============================================================================
--- lucene/hadoop/branches/branch-0.15/docs/skin/CommonMessages_en_US.xml (original)
+++ lucene/hadoop/branches/branch-0.15/docs/skin/CommonMessages_en_US.xml Mon Jan 14 11:16:43 2008
@@ -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>

Modified: lucene/hadoop/branches/branch-0.15/docs/skin/CommonMessages_es.xml
URL: http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.15/docs/skin/CommonMessages_es.xml?rev=611895&r1=611894&r2=611895&view=diff
==============================================================================
--- lucene/hadoop/branches/branch-0.15/docs/skin/CommonMessages_es.xml (original)
+++ lucene/hadoop/branches/branch-0.15/docs/skin/CommonMessages_es.xml Mon Jan 14 11:16:43 2008
@@ -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>
-

Modified: lucene/hadoop/branches/branch-0.15/docs/skin/CommonMessages_fr.xml
URL: http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.15/docs/skin/CommonMessages_fr.xml?rev=611895&r1=611894&r2=611895&view=diff
==============================================================================
--- lucene/hadoop/branches/branch-0.15/docs/skin/CommonMessages_fr.xml (original)
+++ lucene/hadoop/branches/branch-0.15/docs/skin/CommonMessages_fr.xml Mon Jan 14 11:16:43 2008
@@ -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
 

Modified: lucene/hadoop/branches/branch-0.15/docs/skin/basic.css
URL: http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.15/docs/skin/basic.css?rev=611895&r1=611894&r2=611895&view=diff
==============================================================================
--- lucene/hadoop/branches/branch-0.15/docs/skin/basic.css (original)
+++ lucene/hadoop/branches/branch-0.15/docs/skin/basic.css Mon Jan 14 11:16:43 2008
@@ -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 @@
   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 @@
 
 #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 {

Modified: lucene/hadoop/branches/branch-0.15/docs/skin/breadcrumbs-optimized.js
URL: http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.15/docs/skin/breadcrumbs-optimized.js?rev=611895&r1=611894&r2=611895&view=diff
==============================================================================
--- lucene/hadoop/branches/branch-0.15/docs/skin/breadcrumbs-optimized.js (original)
+++ lucene/hadoop/branches/branch-0.15/docs/skin/breadcrumbs-optimized.js Mon Jan 14 11:16:43 2008
@@ -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
 *

Modified: lucene/hadoop/branches/branch-0.15/docs/skin/breadcrumbs.js
URL: http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.15/docs/skin/breadcrumbs.js?rev=611895&r1=611894&r2=611895&view=diff
==============================================================================
--- lucene/hadoop/branches/branch-0.15/docs/skin/breadcrumbs.js (original)
+++ lucene/hadoop/branches/branch-0.15/docs/skin/breadcrumbs.js Mon Jan 14 11:16:43 2008
@@ -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
 *

Modified: lucene/hadoop/branches/branch-0.15/docs/skin/fontsize.js
URL: http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.15/docs/skin/fontsize.js?rev=611895&r1=611894&r2=611895&view=diff
==============================================================================
--- lucene/hadoop/branches/branch-0.15/docs/skin/fontsize.js (original)
+++ lucene/hadoop/branches/branch-0.15/docs/skin/fontsize.js Mon Jan 14 11:16:43 2008
@@ -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
 *

Modified: lucene/hadoop/branches/branch-0.15/docs/skin/getBlank.js
URL: http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.15/docs/skin/getBlank.js?rev=611895&r1=611894&r2=611895&view=diff
==============================================================================
--- lucene/hadoop/branches/branch-0.15/docs/skin/getBlank.js (original)
+++ lucene/hadoop/branches/branch-0.15/docs/skin/getBlank.js Mon Jan 14 11:16:43 2008
@@ -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,17 +15,25 @@
 * 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){
 if (form.value == stdValue){
 	form.value = '';
+	}
+return true;
+}
+function getPrompt (form, stdValue){
+if (form.value == ''){
+	form.value = stdValue;
 	}
 return true;
 }

Modified: lucene/hadoop/branches/branch-0.15/docs/skin/getMenu.js
URL: http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.15/docs/skin/getMenu.js?rev=611895&r1=611894&r2=611895&view=diff
==============================================================================
--- lucene/hadoop/branches/branch-0.15/docs/skin/getMenu.js (original)
+++ lucene/hadoop/branches/branch-0.15/docs/skin/getMenu.js Mon Jan 14 11:16:43 2008
@@ -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
 *

Modified: lucene/hadoop/branches/branch-0.15/docs/skin/images/chapter_open.gif
URL: http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.15/docs/skin/images/chapter_open.gif?rev=611895&r1=611894&r2=611895&view=diff
==============================================================================
Binary files - no diff available.

Modified: lucene/hadoop/branches/branch-0.15/docs/skin/images/rc-b-l-15-1body-2menu-3menu.png
URL: http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.15/docs/skin/images/rc-b-l-15-1body-2menu-3menu.png?rev=611895&r1=611894&r2=611895&view=diff
==============================================================================
Binary files - no diff available.

Modified: lucene/hadoop/branches/branch-0.15/docs/skin/images/rc-b-r-15-1body-2menu-3menu.png
URL: http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.15/docs/skin/images/rc-b-r-15-1body-2menu-3menu.png?rev=611895&r1=611894&r2=611895&view=diff
==============================================================================
Binary files - no diff available.

Modified: lucene/hadoop/branches/branch-0.15/docs/skin/images/rc-b-r-5-1header-2tab-selected-3tab-selected.png
URL: http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.15/docs/skin/images/rc-b-r-5-1header-2tab-selected-3tab-selected.png?rev=611895&r1=611894&r2=611895&view=diff
==============================================================================
Binary files - no diff available.

Modified: lucene/hadoop/branches/branch-0.15/docs/skin/images/rc-t-l-5-1header-2searchbox-3searchbox.png
URL: http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.15/docs/skin/images/rc-t-l-5-1header-2searchbox-3searchbox.png?rev=611895&r1=611894&r2=611895&view=diff
==============================================================================
Binary files - no diff available.

Modified: lucene/hadoop/branches/branch-0.15/docs/skin/images/rc-t-l-5-1header-2tab-selected-3tab-selected.png
URL: http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.15/docs/skin/images/rc-t-l-5-1header-2tab-selected-3tab-selected.png?rev=611895&r1=611894&r2=611895&view=diff
==============================================================================
Binary files - no diff available.

Modified: lucene/hadoop/branches/branch-0.15/docs/skin/images/rc-t-l-5-1header-2tab-unselected-3tab-unselected.png
URL: http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.15/docs/skin/images/rc-t-l-5-1header-2tab-unselected-3tab-unselected.png?rev=611895&r1=611894&r2=611895&view=diff
==============================================================================
Binary files - no diff available.

Modified: lucene/hadoop/branches/branch-0.15/docs/skin/images/rc-t-r-15-1body-2menu-3menu.png
URL: http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.15/docs/skin/images/rc-t-r-15-1body-2menu-3menu.png?rev=611895&r1=611894&r2=611895&view=diff
==============================================================================
Binary files - no diff available.

Modified: lucene/hadoop/branches/branch-0.15/docs/skin/images/rc-t-r-5-1header-2searchbox-3searchbox.png
URL: http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.15/docs/skin/images/rc-t-r-5-1header-2searchbox-3searchbox.png?rev=611895&r1=611894&r2=611895&view=diff
==============================================================================
Binary files - no diff available.

Modified: lucene/hadoop/branches/branch-0.15/docs/skin/images/rc-t-r-5-1header-2tab-selected-3tab-selected.png
URL: http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.15/docs/skin/images/rc-t-r-5-1header-2tab-selected-3tab-selected.png?rev=611895&r1=611894&r2=611895&view=diff
==============================================================================
Binary files - no diff available.

Modified: lucene/hadoop/branches/branch-0.15/docs/skin/images/rc-t-r-5-1header-2tab-unselected-3tab-unselected.png
URL: http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.15/docs/skin/images/rc-t-r-5-1header-2tab-unselected-3tab-unselected.png?rev=611895&r1=611894&r2=611895&view=diff
==============================================================================
Binary files - no diff available.

Modified: lucene/hadoop/branches/branch-0.15/docs/skin/menu.js
URL: http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.15/docs/skin/menu.js?rev=611895&r1=611894&r2=611895&view=diff
==============================================================================
--- lucene/hadoop/branches/branch-0.15/docs/skin/menu.js (original)
+++ lucene/hadoop/branches/branch-0.15/docs/skin/menu.js Mon Jan 14 11:16:43 2008
@@ -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 @@
     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)

Modified: lucene/hadoop/branches/branch-0.15/docs/skin/print.css
URL: http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.15/docs/skin/print.css?rev=611895&r1=611894&r2=611895&view=diff
==============================================================================
--- lucene/hadoop/branches/branch-0.15/docs/skin/print.css (original)
+++ lucene/hadoop/branches/branch-0.15/docs/skin/print.css Mon Jan 14 11:16:43 2008
@@ -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 @@
   padding: 0;
   float: none !important;
   color: black;
-  background: transparent;
+  background: inherit;
 }
 
 a:link, a:visited {
   color: #336699;
-  background: transparent;
+  background: inherit;
   text-decoration: underline;
 }
 

Modified: lucene/hadoop/branches/branch-0.15/docs/skin/profile.css
URL: http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.15/docs/skin/profile.css?rev=611895&r1=611894&r2=611895&view=diff
==============================================================================
--- lucene/hadoop/branches/branch-0.15/docs/skin/profile.css (original)
+++ lucene/hadoop/branches/branch-0.15/docs/skin/profile.css Mon Jan 14 11:16:43 2008
@@ -46,11 +46,16 @@
 #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 @@
 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 @@
 color: #000000; 
 } 
  
-#menu .menupagetitle  { color: #000000;}    
 #menu .menupageitemgroup     { 
 background-color: #E5E4D9;
 }
@@ -123,8 +128,8 @@
 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;} 

Modified: lucene/hadoop/branches/branch-0.15/docs/skin/screen.css
URL: http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.15/docs/skin/screen.css?rev=611895&r1=611894&r2=611895&view=diff
==============================================================================
--- lucene/hadoop/branches/branch-0.15/docs/skin/screen.css (original)
+++ lucene/hadoop/branches/branch-0.15/docs/skin/screen.css Mon Jan 14 11:16:43 2008
@@ -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 @@
     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 @@
 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 @@
 /**
  * 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 @@
     z-index: 20;
     background-color: #f90;
     font-size : 70%;
+    
 }
 
 .menutitle {
@@ -278,20 +306,26 @@
         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 @@
 }
 
 #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 @@
 #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 @@
 }
 
 .printlink {
+    position: relative; /* IE bugfix cont'd */
     float: right;
 }
 .printlink br {

Modified: lucene/hadoop/branches/branch-0.15/docs/streaming.html
URL: http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.15/docs/streaming.html?rev=611895&r1=611894&r2=611895&view=diff
==============================================================================
--- lucene/hadoop/branches/branch-0.15/docs/streaming.html (original)
+++ lucene/hadoop/branches/branch-0.15/docs/streaming.html Mon Jan 14 11:16:43 2008
@@ -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 @@
 <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 @@
 </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>

Modified: lucene/hadoop/branches/branch-0.15/src/docs/src/documentation/content/xdocs/mapred_tutorial.xml
URL: http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.15/src/docs/src/documentation/content/xdocs/mapred_tutorial.xml?rev=611895&r1=611894&r2=611895&view=diff
==============================================================================
--- lucene/hadoop/branches/branch-0.15/src/docs/src/documentation/content/xdocs/mapred_tutorial.xml (original)
+++ lucene/hadoop/branches/branch-0.15/src/docs/src/documentation/content/xdocs/mapred_tutorial.xml Mon Jan 14 11:16:43 2008
@@ -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>
         



Mime
View raw message