HADOOP-2727. Fix links in Web UI of the hadoop daemons and some docs. Contributed by Amareshwari Sri Ramadasu.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/trunk@629147 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -53,6 +53,9 @@ Trunk (unreleased changes)
     HADOOP-2813. TestDU unit test uses its own directory to run its 
     sequence of tests.  (Mahadev Konar via dhruba)
 
+    HADOOP-2727. Fix links in Web UI of the hadoop daemons and some docs
+    (Amareshwari Sri Ramadasu via ddas)
+
 Release 0.16.1 - Unrelease
 
   BUG FIXES

README.txt

@@ -1,7 +1,7 @@
 For the latest information about Hadoop, please visit our website at:
 
-   http://lucene.apache.org/hadoop/
+   http://hadoop.apache.org/core/
 
 and our wiki, at:
 
-   http://wiki.apache.org/lucene-hadoop/
+   http://wiki.apache.org/hadoop/

src/c++/libhdfs/docs/libhdfs_footer.html

@@ -4,6 +4,6 @@
 -->
 <br />
 <br />
-<a href="http://wiki.apache.org/lucene-hadoop/LibHDFS">libhdfs</a> - 
-<a href="http://lucene.apache.org/hadoop/">Hadoop</a> 
+<a href="http://wiki.apache.org/hadoop/LibHDFS">libhdfs</a> - 
+<a href="http://hadoop.apache.org/core/">Hadoop</a> 
 

src/contrib/ec2/README.txt

@@ -10,4 +10,4 @@ To get help, type the following in a shell:
 
 For full instructions, please visit the Hadoop wiki at:
 
-  http://wiki.apache.org/lucene-hadoop/AmazonEC2#AutomatedScripts
+  http://wiki.apache.org/hadoop/AmazonEC2#AutomatedScripts

src/contrib/ec2/bin/image/create-hadoop-image-remote

@@ -37,7 +37,7 @@ yum install rsync
 
 # Install Hadoop
 cd /usr/local
-wget -nv http://www.apache.org/dist/lucene/hadoop/hadoop-$HADOOP_VERSION/hadoop-$HADOOP_VERSION.tar.gz
+wget -nv http://www.apache.org/dist/hadoop/core/hadoop-$HADOOP_VERSION/hadoop-$HADOOP_VERSION.tar.gz
 tar xzf hadoop-$HADOOP_VERSION.tar.gz
 rm -f hadoop-$HADOOP_VERSION.tar.gz
 

src/contrib/eclipse-plugin/resources/Setup.xml

@@ -5,7 +5,7 @@
   </intro>  
   <item title="Open Browser">
      <description>
-     				Go to http://lucene.apache.org/hadoop/, and follow
+     				Go to http://hadoop.apache.org/core/, and follow
 					links to download the latest stable distribution of
 					Hadoop.
 
@@ -13,6 +13,6 @@
      Use the following embedded command to launch the Hadoop Web site 
         in a browser</description>
      <command serialization=
-        "org.eclipse.ui.browser.openBrowser(url=http://lucene.apache.org/hadoop)"/>
+        "org.eclipse.ui.browser.openBrowser(url=http://hadoop.apache.org/core)"/>
   </item>
-</cheatsheet>
+</cheatsheet>

src/contrib/hod/getting_started.txt

@@ -25,7 +25,7 @@ functionality from HOD:
 * Hadoop: HOD can automatically distribute Hadoop to all nodes in the 
   cluster. However, it can also use a pre-installed version of Hadoop,
   if it is available on all nodes in the cluster.
-  (http://lucene.apache.org/hadoop)
+  (http://hadoop.apache.org/core)
   HOD currently supports Hadoop 0.15 and above.
 
 NOTE: HOD configuration requires the location of installs of these 

src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamJob.java

@@ -520,7 +520,7 @@ public class StreamJob {
     System.out
       .println("    [...] -jobconf stream.shipped.hadoopstreaming=/path/my-hadoop-streaming.jar");
     System.out.println("For more details about jobconf parameters see:");
-    System.out.println("  http://wiki.apache.org/lucene-hadoop/JobConfFile");
+    System.out.println("  http://wiki.apache.org/hadoop/JobConfFile");
     System.out.println("To set an environement variable in a streaming command:");
     System.out.println("   -cmdenv EXAMPLE_DIR=/home/example/dictionaries/");
     System.out.println();

src/java/org/apache/hadoop/util/ServletUtil.java

@@ -18,6 +18,8 @@
 package org.apache.hadoop.util;
 
 import java.io.*;
+import java.util.Calendar;
+
 import javax.servlet.*;
 
 public class ServletUtil {
@@ -50,6 +52,15 @@ public class ServletUtil {
   }
 
   public static final String HTML_TAIL = "<hr />\n"
-    + "<a href='http://lucene.apache.org/hadoop'>Hadoop</a>, 2007.\n"
+    + "<a href='http://hadoop.apache.org/core'>Hadoop</a>, " 
+    + Calendar.getInstance().get(Calendar.YEAR) + ".\n"
     + "</body></html>";
-}
+  
+  /**
+   * HTML footer to be added in the jsps.
+   * @return the HTML footer.
+   */
+  public static String htmlFooter() {
+    return HTML_TAIL;
+  }
+}

src/java/overview.html

@@ -99,11 +99,6 @@ installed cygwin, start the cygwin installer and select the packages:</p>
 
 <p>First, you need to get a copy of the Hadoop code.</p>
 
-<p>You can download a nightly build from <a
-href="http://cvs.apache.org/dist/lucene/hadoop/nightly/">
-http://cvs.apache.org/dist/lucene/hadoop/nightly/</a>. Unpack the release and 
-connect to its top-level directory.</p>
-
 <p>Edit the file <tt>conf/hadoop-env.sh</tt> to define at least
 <tt>JAVA_HOME</tt>.</p>
 

src/native/README

@@ -3,8 +3,8 @@ Authors: Arun C Murthy <arunc@yahoo-inc.com>
 
 MOTIVATION
 
-The libhadoop package contains the native code for any of hadoop (http://lucene.apache.org/hadoop). 
+The libhadoop package contains the native code for any of hadoop (http://hadoop.apache.org/core). 
 
 IMPROVEMENTS
 
-Any suggestions for improvements or patched should be sent to hadoop-dev@lucene.apache.org. Please go through http://wiki.apache.org/lucene-hadoop/HowToContribute for more information on how to contribute.
+Any suggestions for improvements or patched should be sent to core-dev@hadoop.apache.org. Please go through http://wiki.apache.org/hadoop/HowToContribute for more information on how to contribute.

src/webapps/datanode/browseBlock.jsp

@@ -9,6 +9,7 @@
   import="org.apache.hadoop.io.*"
   import="org.apache.hadoop.conf.*"
   import="org.apache.hadoop.net.DNS"
+  import="org.apache.hadoop.util.*"
   import="java.text.DateFormat"
 %>
 
@@ -358,7 +359,6 @@
 <h2>Local logs</h2>
 <a href="/logs/">Log</a> directory
 
-<hr>
-<a href="http://lucene.apache.org/hadoop">Hadoop</a>, 2007.<br>
-</body>
-</html>
+<%
+out.println(ServletUtil.htmlFooter());
+%>

src/webapps/datanode/browseDirectory.jsp

@@ -10,6 +10,7 @@
   import="org.apache.hadoop.io.*"
   import="org.apache.hadoop.conf.*"
   import="org.apache.hadoop.net.DNS"
+  import="org.apache.hadoop.util.*"
   import="java.text.DateFormat"
 %>
 <%!
@@ -166,7 +167,6 @@ body
 <h2>Local logs</h2>
 <a href="/logs/">Log</a> directory
 
-<hr>
-<a href="http://lucene.apache.org/hadoop">Hadoop</a>, 2007.<br>
-</body>
-</html>
+<%
+out.println(ServletUtil.htmlFooter());
+%>

src/webapps/datanode/tail.jsp

@@ -9,7 +9,8 @@
   import="org.apache.hadoop.io.*"
   import="org.apache.hadoop.conf.*"
   import="org.apache.hadoop.net.DNS"
-	import="org.apache.hadoop.net.NetUtils"
+  import="org.apache.hadoop.util.*"
+  import="org.apache.hadoop.net.NetUtils"
   import="java.text.DateFormat"
 %>
 
@@ -117,7 +118,6 @@
 <h2>Local logs</h2>
 <a href="/logs/">Log</a> directory
 
-<hr>
-<a href="http://lucene.apache.org/hadoop">Hadoop</a>, 2007.<br>
-</body>
-</html>
+<%
+out.println(ServletUtil.htmlFooter());
+%>

src/webapps/dfs/dfshealth.jsp

@@ -249,7 +249,6 @@
 <h3>Local logs</h3>
 <a href="/logs/">Log</a> directory
 
-<hr>
-<a href="http://lucene.apache.org/hadoop">Hadoop</a>, 2007.<br>
-</body>
-</html>
+<%
+out.println(ServletUtil.htmlFooter());
+%>

src/webapps/dfs/nn_browsedfscontent.jsp

@@ -5,6 +5,7 @@
   import="java.io.*"
   import="java.util.*"
   import="org.apache.hadoop.dfs.*"
+  import="org.apache.hadoop.util.*"
   import="java.text.DateFormat"
   import="java.net.InetAddress"
   import="java.net.URLEncoder"
@@ -46,7 +47,6 @@
 <h2>Local logs</h2>
 <a href="/logs/">Log</a> directory
 
-<hr>
-<a href="http://lucene.apache.org/hadoop">Hadoop</a>, 2007.<br>
-</body>
-</html>
+<%
+out.println(ServletUtil.htmlFooter());
+%>

src/webapps/job/jobblacklistedtrackers.jsp

@@ -56,6 +56,6 @@ Black-listed task-trackers</h1>
 
 <hr>
 <a href="jobdetails.jsp?jobid=><%=jobId%>">Go back to <%=jobId%></a><br>
-<a href="http://lucene.apache.org/hadoop">Hadoop</a>, 2007.<br>
-</body>
-</html>
+<%
+out.println(ServletUtil.htmlFooter());
+%>

src/webapps/job/jobconf.jsp

@@ -47,8 +47,6 @@
 %>
 
 <br>
-<hr>
-<a href="http://lucene.apache.org/hadoop">Hadoop</a>, 2007.<br>
-
-</body>
-</html>
+<%
+out.println(ServletUtil.htmlFooter());
+%>

src/webapps/job/jobdetails.jsp

@@ -307,6 +307,6 @@ if("off".equals(session.getAttribute("map.graph"))) { %>
 
 <hr>
 <a href="jobtracker.jsp">Go back to JobTracker</a><br>
-<a href="http://lucene.apache.org/hadoop">Hadoop</a>, 2007.<br>
-</body>
-</html>
+<%
+out.println(ServletUtil.htmlFooter());
+%>

src/webapps/job/jobfailures.jsp

@@ -156,6 +156,6 @@ failures on <a href="jobtracker.jsp"><%=trackerName%></a></h1>
 
 <hr>
 <a href="jobtracker.jsp">Go back to JobTracker</a><br>
-<a href="http://lucene.apache.org/hadoop">Hadoop</a>, 2007.<br>
-</body>
-</html>
+<%
+out.println(ServletUtil.htmlFooter());
+%>

src/webapps/job/jobtasks.jsp

@@ -134,6 +134,6 @@
 
 <hr>
 <a href="jobtracker.jsp">Go back to JobTracker</a><br>
-<a href="http://lucene.apache.org/hadoop">Hadoop</a>, 2007.<br>
-</body>
-</html>
+<%
+out.println(ServletUtil.htmlFooter());
+%>

src/webapps/job/jobtracker.jsp

@@ -137,7 +137,6 @@
 <a href="logs/">Log</a> directory, <a href="jobhistory.jsp?historyFile=JobHistory.log&reload=true">
 Job Tracker History</a>
 
-<hr>
-<a href="http://lucene.apache.org/hadoop">Hadoop</a>, 2007.<br>
-</body>
-</html>
+<%
+out.println(ServletUtil.htmlFooter());
+%>

src/webapps/job/machines.jsp

@@ -80,7 +80,6 @@
   generateTaskTrackerTable(out, tracker);
 %>
 
-<hr>
-<a href="http://lucene.apache.org/hadoop">Hadoop</a>, 2007.<br>
-</body>
-</html>
+<%
+out.println(ServletUtil.htmlFooter());
+%>

src/webapps/job/taskdetails.jsp

@@ -178,6 +178,6 @@
 <hr>
 <a href="jobdetails.jsp?jobid=<%=jobid%>">Go back to the job</a><br>
 <a href="jobtracker.jsp">Go back to JobTracker</a><br>
-<a href="http://lucene.apache.org/hadoop">Hadoop</a>, 2007.<br>
-</body>
-</html>
+<%
+out.println(ServletUtil.htmlFooter());
+%>

src/webapps/job/taskstats.jsp

@@ -9,7 +9,6 @@
   import="org.apache.hadoop.mapred.*"
   import="org.apache.hadoop.util.*"
   import="java.text.SimpleDateFormat"  
-  import="org.apache.hadoop.util.*"
 %>
 <%
   JobTracker tracker = (JobTracker) application.getAttribute("job.tracker");
@@ -78,6 +77,6 @@
 <hr>
 <a href="jobdetails.jsp?jobid=<%=jobid%>">Go back to the job</a><br>
 <a href="jobtracker.jsp">Go back to JobTracker</a><br>
-<a href="http://lucene.apache.org/hadoop">Hadoop</a>, 2007.<br>
-</body>
-</html>
+<%
+out.println(ServletUtil.htmlFooter());
+%>

src/webapps/task/tasktracker.jsp

@@ -60,7 +60,6 @@
 <h2>Local Logs</h2>
 <a href="/logs/">Log</a> directory
 
-<hr>
-<a href="http://lucene.apache.org/hadoop">Hadoop</a>, 2007.<br>
-</body>
-</html>
+<%
+out.println(ServletUtil.htmlFooter());
+%>