diff --git a/CHANGES.txt b/CHANGES.txt index e920e785793..ec1b9fd2ac3 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -98,6 +98,7 @@ Trunk (unreleased changes) HADOOP-1789 Output formatting HADOOP-1960 If a region server cannot talk to the master before its lease times out, it should shut itself down + HADOOP-2035 Add logo to webapps Below are the list of changes before 2007-08-18 diff --git a/src/java/org/apache/hadoop/hbase/generated/master/hql_jsp.java b/src/java/org/apache/hadoop/hbase/generated/master/hql_jsp.java index 226b1eb79fe..70192da0c77 100644 --- a/src/java/org/apache/hadoop/hbase/generated/master/hql_jsp.java +++ b/src/java/org/apache/hadoop/hbase/generated/master/hql_jsp.java @@ -46,7 +46,7 @@ public final class hql_jsp extends org.apache.jasper.runtime.HttpJspBase out = pageContext.getOut(); _jspx_out = out; - out.write("\n \n\n\nHQL\n\n\n\n\n

HQL

\n

Home

\n"); + out.write("\n \n\n\nHQL\n\n\n\n\n\"Hbase\n

HQL

\n\n
\n"); String query = request.getParameter("q"); if (query == null) { query = ""; diff --git a/src/java/org/apache/hadoop/hbase/generated/master/master_jsp.java b/src/java/org/apache/hadoop/hbase/generated/master/master_jsp.java index b134176f3a3..b8962196dfd 100644 --- a/src/java/org/apache/hadoop/hbase/generated/master/master_jsp.java +++ b/src/java/org/apache/hadoop/hbase/generated/master/master_jsp.java @@ -66,9 +66,9 @@ public final class master_jsp extends org.apache.jasper.runtime.HttpJspBase out.write("\n \n\n\nHbase Master: "); out.print( master.getMasterAddress()); - out.write("\n\n\n\n\n

Hbase Master: "); + out.write("\n\n\n\n\n\n\"Hbase\n

Master: "); out.print(master.getMasterAddress()); - out.write("

\n

HQL,\nLocal logs, Thread Dump

\n\n

Master Attributes

\n\n\n
Attribute NameValue
Filesystem"); + out.write("\n\n
\n\n

Master Attributes

\n\n\n\n
Attribute NameValue
Filesystem"); out.print( conf.get("fs.default.name") ); out.write("
Hbase Root Directory"); out.print( master.getRootDir().toString() ); @@ -125,7 +125,7 @@ public final class master_jsp extends org.apache.jasper.runtime.HttpJspBase } out.write("\n
\n"); } - out.write("\n\n"); + out.write("\n\n\n"); } catch (Throwable t) { if (!(t instanceof SkipPageException)){ out = _jspx_out; diff --git a/src/java/org/apache/hadoop/hbase/generated/regionserver/regionserver_jsp.java b/src/java/org/apache/hadoop/hbase/generated/regionserver/regionserver_jsp.java index ea2532f1d50..25a4aa563ed 100644 --- a/src/java/org/apache/hadoop/hbase/generated/regionserver/regionserver_jsp.java +++ b/src/java/org/apache/hadoop/hbase/generated/regionserver/regionserver_jsp.java @@ -53,9 +53,9 @@ public final class regionserver_jsp extends org.apache.jasper.runtime.HttpJspBas out.write("\n \n\n\nHbase Region Server: "); out.print( serverInfo.getServerAddress().toString() ); - out.write("\n\n\n\n\n

Hbase Region Server: "); + out.write("\n\n\n\n\n\"Hbase\n

Region Server: "); out.print( serverInfo.getServerAddress().toString() ); - out.write("

\n

Local logs, Thread Dump

\n\n

Region Server Attributes

\n\n\n
Attribute NameValue
Load"); + out.write("\n\n
\n\n

Region Server Attributes

\n\n\n\n
Attribute NameValue
Load"); out.print( serverInfo.getLoad().toString() ); out.write("
\n\n

Online Regions

\n"); if (onlineRegions != null && onlineRegions.size() > 0) { @@ -73,7 +73,7 @@ public final class regionserver_jsp extends org.apache.jasper.runtime.HttpJspBas } else { out.write("\n

Not serving regions

\n"); } - out.write("\n\n"); + out.write("\n\n\n"); } catch (Throwable t) { if (!(t instanceof SkipPageException)){ out = _jspx_out; diff --git a/src/java/org/apache/hadoop/hbase/package.html b/src/java/org/apache/hadoop/hbase/package.html index 50939572f21..1740004a09b 100644 --- a/src/java/org/apache/hadoop/hbase/package.html +++ b/src/java/org/apache/hadoop/hbase/package.html @@ -5,7 +5,7 @@ Provides HBase, the Hadoop simple database. -

Requirements

+

Requirements

  • Java 1.5.x, preferably from Sun.
  • HBase runs on top of Hadoop. Hadoop has its own set of @@ -15,7 +15,7 @@ requirements and instructions. Make sure to set
-

Getting Started

+

Getting Started

Start by defining the following directory variables for your convenience:

@@ -29,7 +29,7 @@ If you are running a standalone operation, proceed to Run and Confirming Your Installation. If you are running a distributed operation, continue below.

-

Distributed Operation

+

Distributed Operation

Make sure you have followed @@ -63,14 +63,14 @@ The regionserver file lists all the hosts running HRegionServers, o host per line (This file is synonymous to the slaves file at ${HADOOP_HOME}/conf/slaves).

-

Additional Notes on Distributed Operation

+

Additional Notes on Distributed Operation

  • Hadoop and HBase must be set up on each host you plan to use.
  • Additional (optional) HBase-specific variables such as HBASE_HEAPSIZE and HBASE_CLASSPATH can be set in ${HBASE_HOME}/conf/hbase-env.sh.
-

Running and Confirming Your Installation

+

Running and Confirming Your Installation

If you are running a distributed operation you will need to start the Hadoop daemons before starting HBase and stop the daemons after HBase has shut down. Start and @@ -87,7 +87,7 @@ shell against HBase from which you can execute HBase commands. In the HBase she help; to see a list of supported commands. Note that all commands in the HBase shell must end with ;. Test your installation by creating, viewing, and dropping a table, as per the help instructions. Be patient with the create and -drop operations as they may each take 30 seconds or more. To stop hbase, exit the +drop operations as they may each take 10 seconds or more. To stop hbase, exit the HBase shell and enter: 

@@ -100,8 +100,10 @@ before stopping the Hadoop daemons.
 

 The default location for logs is ${HADOOP_HOME}/logs.
 

+
HBase also puts up a UI listing vital attributes.  By default its deployed on the master host
+at port 60010.

 
-
Related Documentation

+
Related Documentation

 
    
   
  • HBase Home Page
   
  • HBase Architecture
diff --git a/src/webapps/master/hql.jsp b/src/webapps/master/hql.jsp
index 09cf1098050..366769f992f 100644
--- a/src/webapps/master/hql.jsp
+++ b/src/webapps/master/hql.jsp
@@ -16,8 +16,10 @@
 
 
 
-
    HQL
    
-
    Home
    
+
+
    HQL
    
+
+
    
 <% String query = request.getParameter("q");
    if (query == null) {
      query = "";
diff --git a/src/webapps/master/master.jsp b/src/webapps/master/master.jsp
index eea549c00a8..2db71eca7cb 100644
--- a/src/webapps/master/master.jsp
+++ b/src/webapps/master/master.jsp
@@ -32,9 +32,11 @@
 
 
 
-
    Hbase Master: <%=master.getMasterAddress()%>
    
-
    HQL,
-Local logs, Thread Dump
    
+
+
+
    Master: <%=master.getMasterAddress()%>
    
+
+
    
 
 
    Master Attributes
    
 
@@ -81,4 +83,4 @@
 
    
 <% } %>
 
-
\ No newline at end of file
+
diff --git a/src/webapps/regionserver/regionserver.jsp b/src/webapps/regionserver/regionserver.jsp
index 976db7ecc84..d3fada5a29e 100644
--- a/src/webapps/regionserver/regionserver.jsp
+++ b/src/webapps/regionserver/regionserver.jsp
@@ -19,8 +19,10 @@
 
 
 
-
    Hbase Region Server: <%= serverInfo.getServerAddress().toString() %>
    
-
    Local logs, Thread Dump
    
+
+
    Region Server: <%= serverInfo.getServerAddress().toString() %>
    
+
+
    
 
 
    Region Server Attributes
    
 
@@ -54,4 +56,4 @@ further explication.
    
 
    Not serving regions
    
 <% } %>
 
-
\ No newline at end of file
+
diff --git a/src/webapps/static/hbase.css b/src/webapps/static/hbase.css
index b5bd31b3067..ffa2584e54b 100644
--- a/src/webapps/static/hbase.css
+++ b/src/webapps/static/hbase.css
@@ -3,3 +3,6 @@ table { border: thin solid DodgerBlue }
 tr { border: thin solid DodgerBlue }
 td { border: thin solid DodgerBlue }
 th { border: thin solid DodgerBlue }
+#logo {float: left;}
+#logo img {border: none;}
+#page_title {padding-top: 27px;}
diff --git a/src/webapps/static/hbase_logo_med.gif b/src/webapps/static/hbase_logo_med.gif
new file mode 100644
index 00000000000..36d3e3c9127
Binary files /dev/null and b/src/webapps/static/hbase_logo_med.gif differ