Author: stack
Date: Tue Jan  8 10:11:45 2008
New Revision: 610087

URL: http://svn.apache.org/viewvc?rev=610087&view=rev
Log:
HADOOP-2450 Show version (and svn revision) in hbase web ui

Modified:
    lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt
    
lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/generated/master/master_jsp.java
    lucene/hadoop/trunk/src/contrib/hbase/src/webapps/master/master.jsp

Modified: lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt?rev=610087&r1=610086&r2=610087&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt (original)
+++ lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt Tue Jan  8 10:11:45 2008
@@ -156,6 +156,7 @@
                (Tom White via Stack)
    HADOOP-2502 Insert/Select timestamp, Timestamp data type in HQL
                (Edward Yoon via Stack)
+   HADOOP-2450 Show version (and svn revision) in hbase web ui
                
 
 

Modified: 
lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/generated/master/master_jsp.java
URL: 
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/generated/master/master_jsp.java?rev=610087&r1=610086&r2=610087&view=diff
==============================================================================
--- 
lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/generated/master/master_jsp.java
 (original)
+++ 
lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/generated/master/master_jsp.java
 Tue Jan  8 10:11:45 2008
@@ -5,6 +5,7 @@
 import javax.servlet.jsp.*;
 import java.util.*;
 import org.apache.hadoop.io.Text;
+import org.apache.hadoop.util.VersionInfo;
 import org.apache.hadoop.hbase.HMaster;
 import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.HMaster.MetaRegion;
@@ -69,7 +70,18 @@
       out.print( master.getMasterAddress());
       out.write("</title>\n<link rel=\"stylesheet\" type=\"text/css\" 
href=\"/static/hbase.css\" />\n</head>\n\n<body>\n\n<a id=\"logo\" 
href=\"http://wiki.apache.org/lucene-hadoop/Hbase\";><img 
src=\"/static/hbase_logo_med.gif\" alt=\"Hbase Logo\" title=\"Hbase Logo\" 
/></a>\n<h1 id=\"page_title\">Master: ");
       out.print(master.getMasterAddress());
-      out.write("</h1>\n<p id=\"links_menu\"><a href=\"/hql.jsp\">HQL</a>, <a 
href=\"/logs/\">Local logs</a>, <a href=\"/stacks\">Thread Dump</a>, <a 
href=\"/logLevel\">Log Level</a></p>\n<hr id=\"head_rule\" />\n\n<h2>Master 
Attributes</h2>\n<table>\n<tr><th>Attribute 
Name</th><th>Value</th><th>Description</th></tr>\n<tr><td>Filesystem</td><td>");
+      out.write("</h1>\n<p id=\"links_menu\"><a href=\"/hql.jsp\">HQL</a>, <a 
href=\"/logs/\">Local logs</a>, <a href=\"/stacks\">Thread Dump</a>, <a 
href=\"/logLevel\">Log Level</a></p>\n<hr id=\"head_rule\" />\n\n<h2>Master 
Attributes</h2>\n<table>\n<tr><th>Attribute 
Name</th><th>Value</th><th>Description</th></tr>\n<tr><td>Version</td><td>");
+      out.print( VersionInfo.getVersion() );
+      out.write(',');
+      out.write(' ');
+      out.write('r');
+      out.print( VersionInfo.getRevision() );
+      out.write("</td><td>Hbase version and svn 
revision</td></tr>\n<tr><td>Compiled</td><td>");
+      out.print( VersionInfo.getDate() );
+      out.write(',');
+      out.write(' ');
+      out.print( VersionInfo.getUser() );
+      out.write("</td><td>When this version was compiled and by 
whom</td></tr>\n<tr><td>Filesystem</td><td>");
       out.print( conf.get("fs.default.name") );
       out.write("</td><td>Filesystem hbase is running 
on</td></tr>\n<tr><td>Hbase Root Directory</td><td>");
       out.print( master.getRootDir().toString() );

Modified: lucene/hadoop/trunk/src/contrib/hbase/src/webapps/master/master.jsp
URL: 
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/src/webapps/master/master.jsp?rev=610087&r1=610086&r2=610087&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/src/webapps/master/master.jsp 
(original)
+++ lucene/hadoop/trunk/src/contrib/hbase/src/webapps/master/master.jsp Tue Jan 
 8 10:11:45 2008
@@ -1,6 +1,7 @@
 <%@ page contentType="text/html;charset=UTF-8"
   import="java.util.*"
   import="org.apache.hadoop.io.Text"
+  import="org.apache.hadoop.util.VersionInfo"
   import="org.apache.hadoop.hbase.HMaster"
     import="org.apache.hadoop.hbase.HConstants"
   import="org.apache.hadoop.hbase.HMaster.MetaRegion"
@@ -42,6 +43,8 @@
 <h2>Master Attributes</h2>
 <table>
 <tr><th>Attribute Name</th><th>Value</th><th>Description</th></tr>
+<tr><td>Version</td><td><%= VersionInfo.getVersion() %>, r<%= 
VersionInfo.getRevision() %></td><td>Hbase version and svn revision</td></tr>
+<tr><td>Compiled</td><td><%= VersionInfo.getDate() %>, <%= 
VersionInfo.getUser() %></td><td>When this version was compiled and by 
whom</td></tr>
 <tr><td>Filesystem</td><td><%= conf.get("fs.default.name") 
%></td><td>Filesystem hbase is running on</td></tr>
 <tr><td>Hbase Root Directory</td><td><%= master.getRootDir().toString() 
%></td><td>Location of hbase home directory</td></tr>
 </table>


Reply via email to