You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by st...@apache.org on 2007/10/11 22:33:55 UTC
svn commit: r583946 - in /lucene/hadoop/trunk/src/contrib/hbase: ./
src/java/org/apache/hadoop/hbase/
src/java/org/apache/hadoop/hbase/generated/master/
src/java/org/apache/hadoop/hbase/generated/regionserver/
src/webapps/master/ src/webapps/regionserv...
Author: stack
Date: Thu Oct 11 13:33:53 2007
New Revision: 583946
URL: http://svn.apache.org/viewvc?rev=583946&view=rev
Log:
HADOOP-2035 Add logo to webapps
Added:
lucene/hadoop/trunk/src/contrib/hbase/src/webapps/static/hbase_logo_med.gif (with props)
Modified:
lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt
lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/generated/master/hql_jsp.java
lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/generated/master/master_jsp.java
lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/generated/regionserver/regionserver_jsp.java
lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/package.html
lucene/hadoop/trunk/src/contrib/hbase/src/webapps/master/hql.jsp
lucene/hadoop/trunk/src/contrib/hbase/src/webapps/master/master.jsp
lucene/hadoop/trunk/src/contrib/hbase/src/webapps/regionserver/regionserver.jsp
lucene/hadoop/trunk/src/contrib/hbase/src/webapps/static/hbase.css
Modified: lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt?rev=583946&r1=583945&r2=583946&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt (original)
+++ lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt Thu Oct 11 13:33:53 2007
@@ -98,6 +98,7 @@
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
Modified: lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/generated/master/hql_jsp.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/generated/master/hql_jsp.java?rev=583946&r1=583945&r2=583946&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/generated/master/hql_jsp.java (original)
+++ lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/generated/master/hql_jsp.java Thu Oct 11 13:33:53 2007
@@ -46,7 +46,7 @@
out = pageContext.getOut();
_jspx_out = out;
- out.write("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \n \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\"> \n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head><meta http-equiv=\"Content-Type\" content=\"text/html;charset=UTF-8\"/>\n<title>HQL</title>\n<link rel=\"stylesheet\" type=\"text/css\" href=\"/static/hbase.css\" />\n</head>\n\n<body>\n<h1><a href=\"http://wiki.apache.org/lucene-hadoop/Hbase/HbaseShell\">HQL</a></h1>\n<p><a href=\"/master.jsp\">Home</a></p>\n");
+ out.write("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \n \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\"> \n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head><meta http-equiv=\"Content-Type\" content=\"text/html;charset=UTF-8\"/>\n<title>HQL</title>\n<link rel=\"stylesheet\" type=\"text/css\" href=\"/static/hbase.css\" />\n</head>\n\n<body>\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\"><a href=\"http://wiki.apache.org/lucene-hadoop/Hbase/HbaseShell\">HQL</a></h1>\n<p id=\"links_menu\"><a href=\"/master.jsp\">Home</a></p>\n<hr id=\"head_rule\" />\n");
String query = request.getParameter("q");
if (query == null) {
query = "";
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=583946&r1=583945&r2=583946&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 Thu Oct 11 13:33:53 2007
@@ -66,9 +66,9 @@
out.write("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \n \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\"> \n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head><meta http-equiv=\"Content-Type\" content=\"text/html;charset=UTF-8\"/>\n<title>Hbase Master: ");
out.print( master.getMasterAddress());
- out.write("</title>\n<link rel=\"stylesheet\" type=\"text/css\" href=\"/static/hbase.css\" />\n</head>\n\n<body>\n<h1><a href=\"http://wiki.apache.org/lucene-hadoop/Hbase\">Hbase</a> Master: ");
+ 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><a href=\"/hql.jsp\">HQL</a>,\n<a href=\"/logs/\">Local logs</a>, <a href=\"/stacks\">Thread Dump</a></p>\n\n<h2>Master Attributes</h2>\n<table>\n<tr><th>Attribute Name</th><th>Value</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></p>\n<hr id=\"head_rule\" />\n\n<h2>Master Attributes</h2>\n<table>\n<tr><th>Attribute Name</th><th>Value</th></tr>\n<tr><td>Filesystem</td><td>");
out.print( conf.get("fs.default.name") );
out.write("</td></tr>\n<tr><td>Hbase Root Directory</td><td>");
out.print( master.getRootDir().toString() );
@@ -125,7 +125,7 @@
}
out.write("\n</table>\n");
}
- out.write("\n</body>\n</html>");
+ out.write("\n</body>\n</html>\n");
} catch (Throwable t) {
if (!(t instanceof SkipPageException)){
out = _jspx_out;
Modified: lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/generated/regionserver/regionserver_jsp.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/generated/regionserver/regionserver_jsp.java?rev=583946&r1=583945&r2=583946&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/generated/regionserver/regionserver_jsp.java (original)
+++ lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/generated/regionserver/regionserver_jsp.java Thu Oct 11 13:33:53 2007
@@ -53,9 +53,9 @@
out.write("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \n \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\"> \n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head><meta http-equiv=\"Content-Type\" content=\"text/html;charset=UTF-8\"/>\n<title>Hbase Region Server: ");
out.print( serverInfo.getServerAddress().toString() );
- out.write("</title>\n<link rel=\"stylesheet\" type=\"text/css\" href=\"/static/hbase.css\" />\n</head>\n\n<body>\n<h1><a href=\"http://wiki.apache.org/lucene-hadoop/Hbase\">Hbase</a> Region Server: ");
+ out.write("</title>\n<link rel=\"stylesheet\" type=\"text/css\" href=\"/static/hbase.css\" />\n</head>\n\n<body>\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\">Region Server: ");
out.print( serverInfo.getServerAddress().toString() );
- out.write("</h1>\n<p><a href=\"/logs/\">Local logs</a>, <a href=\"/stacks\">Thread Dump</a></p>\n\n<h2>Region Server Attributes</h2>\n<table>\n<tr><th>Attribute Name</th><th>Value</th></tr>\n<tr><td>Load</td><td>");
+ out.write("</h1>\n<p id=\"links_menu\"><a href=\"/logs/\">Local logs</a>, <a href=\"/stacks\">Thread Dump</a></p>\n<hr id=\"head_rule\" />\n\n<h2>Region Server Attributes</h2>\n<table>\n<tr><th>Attribute Name</th><th>Value</th></tr>\n<tr><td>Load</td><td>");
out.print( serverInfo.getLoad().toString() );
out.write("</td></tr>\n</table>\n\n<h2>Online Regions</h2>\n");
if (onlineRegions != null && onlineRegions.size() > 0) {
@@ -73,7 +73,7 @@
} else {
out.write("\n<p>Not serving regions</p>\n");
}
- out.write("\n</body>\n</html>");
+ out.write("\n</body>\n</html>\n");
} catch (Throwable t) {
if (!(t instanceof SkipPageException)){
out = _jspx_out;
Modified: lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/package.html
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/package.html?rev=583946&r1=583945&r2=583946&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/package.html (original)
+++ lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/package.html Thu Oct 11 13:33:53 2007
@@ -5,7 +5,7 @@
Provides HBase, the <a href="http://lucene.apache.org/hadoop">Hadoop</a>
simple database.
-<h2>Requirements</h2>
+<h2><a name="requirements">Requirements</a></h2>
<ul>
<li>Java 1.5.x, preferably from <a href="http://www.java.com/en/download/">Sun</a>.</li>
<li>HBase runs on top of <a href="http://lucene.apache.org/hadoop">Hadoop</a>. Hadoop has its own set of
@@ -15,7 +15,7 @@
</li>
</ul>
-<h2>Getting Started</h2>
+<h2><a name="getting_started" >Getting Started</a></h2>
<p>
Start by defining the following directory variables for your convenience:
</p>
@@ -29,7 +29,7 @@
and Confirming Your Installation</a>. If you are running a distributed operation, continue below.
</p>
-<h2>Distributed Operation</h2>
+<h2><a name="distributed" >Distributed Operation</a></h2>
<p>
Make sure you have followed
<a href="http://lucene.apache.org/hadoop/api/overview-summary.html#overview_description">
@@ -63,14 +63,14 @@
host per line (This file is synonymous to the slaves file at
<code>${HADOOP_HOME}/conf/slaves</code>).
</p>
-<h3>Additional Notes on Distributed Operation</h3>
+<h3><a name="additional" >Additional Notes on Distributed Operation</a></h3>
<ul>
<li>Hadoop and HBase must be set up on each host you plan to use.</li>
<li>Additional (optional) HBase-specific variables such as HBASE_HEAPSIZE and HBASE_CLASSPATH
can be set in <code>${HBASE_HOME}/conf/hbase-env.sh</code>.</li>
</ul>
-<h2><a name="runandconfirm"/>Running and Confirming Your Installation</h2>
+<h2><a name="runandconfirm">Running and Confirming Your Installation</a></h2>
<p>
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 @@
<code>help;</code> to see a list of supported commands. Note that all commands in the HBase
shell must end with <code>;</code>. Test your installation by creating, viewing, and dropping
a table, as per the help instructions. Be patient with the <code>create</code> and
-<code>drop</code> operations as they may each take 30 seconds or more. To stop hbase, exit the
+<code>drop</code> operations as they may each take 10 seconds or more. To stop hbase, exit the
HBase shell and enter:
</p>
<pre>
@@ -100,8 +100,10 @@
<p>
The default location for logs is <code>${HADOOP_HOME}/logs</code>.
</p>
+<p>HBase also puts up a UI listing vital attributes. By default its deployed on the master host
+at port 60010.</p>
-<h2>Related Documentation</h2>
+<h2><a name="related" >Related Documentation</a></h2>
<ul>
<li><a href="http://wiki.apache.org/lucene-hadoop/Hbase">HBase Home Page</a>
<li><a href="http://wiki.apache.org/lucene-hadoop/Hbase/HbaseArchitecture">HBase Architecture</a>
Modified: lucene/hadoop/trunk/src/contrib/hbase/src/webapps/master/hql.jsp
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/src/webapps/master/hql.jsp?rev=583946&r1=583945&r2=583946&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/src/webapps/master/hql.jsp (original)
+++ lucene/hadoop/trunk/src/contrib/hbase/src/webapps/master/hql.jsp Thu Oct 11 13:33:53 2007
@@ -16,8 +16,10 @@
</head>
<body>
-<h1><a href="http://wiki.apache.org/lucene-hadoop/Hbase/HbaseShell">HQL</a></h1>
-<p><a href="/master.jsp">Home</a></p>
+<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>
+<h1 id="page_title"><a href="http://wiki.apache.org/lucene-hadoop/Hbase/HbaseShell">HQL</a></h1>
+<p id="links_menu"><a href="/master.jsp">Home</a></p>
+<hr id="head_rule" />
<% String query = request.getParameter("q");
if (query == null) {
query = "";
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=583946&r1=583945&r2=583946&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 Thu Oct 11 13:33:53 2007
@@ -32,9 +32,11 @@
</head>
<body>
-<h1><a href="http://wiki.apache.org/lucene-hadoop/Hbase">Hbase</a> Master: <%=master.getMasterAddress()%></h1>
-<p><a href="/hql.jsp">HQL</a>,
-<a href="/logs/">Local logs</a>, <a href="/stacks">Thread Dump</a></p>
+
+<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>
+<h1 id="page_title">Master: <%=master.getMasterAddress()%></h1>
+<p id="links_menu"><a href="/hql.jsp">HQL</a>, <a href="/logs/">Local logs</a>, <a href="/stacks">Thread Dump</a></p>
+<hr id="head_rule" />
<h2>Master Attributes</h2>
<table>
@@ -81,4 +83,4 @@
</table>
<% } %>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: lucene/hadoop/trunk/src/contrib/hbase/src/webapps/regionserver/regionserver.jsp
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/src/webapps/regionserver/regionserver.jsp?rev=583946&r1=583945&r2=583946&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/src/webapps/regionserver/regionserver.jsp (original)
+++ lucene/hadoop/trunk/src/contrib/hbase/src/webapps/regionserver/regionserver.jsp Thu Oct 11 13:33:53 2007
@@ -19,8 +19,10 @@
</head>
<body>
-<h1><a href="http://wiki.apache.org/lucene-hadoop/Hbase">Hbase</a> Region Server: <%= serverInfo.getServerAddress().toString() %></h1>
-<p><a href="/logs/">Local logs</a>, <a href="/stacks">Thread Dump</a></p>
+<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>
+<h1 id="page_title">Region Server: <%= serverInfo.getServerAddress().toString() %></h1>
+<p id="links_menu"><a href="/logs/">Local logs</a>, <a href="/stacks">Thread Dump</a></p>
+<hr id="head_rule" />
<h2>Region Server Attributes</h2>
<table>
@@ -54,4 +56,4 @@
<p>Not serving regions</p>
<% } %>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: lucene/hadoop/trunk/src/contrib/hbase/src/webapps/static/hbase.css
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/src/webapps/static/hbase.css?rev=583946&r1=583945&r2=583946&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/src/webapps/static/hbase.css (original)
+++ lucene/hadoop/trunk/src/contrib/hbase/src/webapps/static/hbase.css Thu Oct 11 13:33:53 2007
@@ -3,3 +3,6 @@
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;}
Added: lucene/hadoop/trunk/src/contrib/hbase/src/webapps/static/hbase_logo_med.gif
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/src/webapps/static/hbase_logo_med.gif?rev=583946&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lucene/hadoop/trunk/src/contrib/hbase/src/webapps/static/hbase_logo_med.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream