You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2013/11/15 21:43:44 UTC
svn commit: r1542390 - in /hbase/branches/0.96/hbase-server/src/main:
jamon/org/apache/hadoop/hbase/tmpl/master/BackupMasterStatusTmpl.jamon
jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon
resources/hbase-webapps/master/table.jsp
Author: tedyu
Date: Fri Nov 15 20:43:44 2013
New Revision: 1542390
URL: http://svn.apache.org/r1542390
Log:
HBASE-9954 Incorporate HTTPS support for HBase
Modified:
hbase/branches/0.96/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/BackupMasterStatusTmpl.jamon
hbase/branches/0.96/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon
hbase/branches/0.96/hbase-server/src/main/resources/hbase-webapps/master/table.jsp
Modified: hbase/branches/0.96/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/BackupMasterStatusTmpl.jamon
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/BackupMasterStatusTmpl.jamon?rev=1542390&r1=1542389&r2=1542390&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/BackupMasterStatusTmpl.jamon (original)
+++ hbase/branches/0.96/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/BackupMasterStatusTmpl.jamon Fri Nov 15 20:43:44 2013
@@ -44,7 +44,7 @@ ServerName [] serverNames = masters.toAr
<%if (!master.isActiveMaster()) %>
<%if serverNames[0] != null %>
<h2>Master</h2>
- <a href="http://<% serverNames[0].getHostname() %>:<% master.getConfiguration().getInt("hbase.master.info.port", 60010) %>/master-status" target="_blank"><% serverNames[0].getHostname() %></a>
+ <a href="//<% serverNames[0].getHostname() %>:<% master.getConfiguration().getInt("hbase.master.info.port", 60010) %>/master-status" target="_blank"><% serverNames[0].getHostname() %></a>
<%else>
Unable to parse master hostname.
</%if>
@@ -62,7 +62,7 @@ ServerName [] serverNames = masters.toAr
for (ServerName serverName : serverNames) {
</%java>
<tr>
- <td><a href="http://<% serverName.getHostname() %>:<% master.getConfiguration().getInt("hbase.master.info.port", 60010) %>/master-status" target="_blank"><% serverName.getHostname() %></a></td>
+ <td><a href="//<% serverName.getHostname() %>:<% master.getConfiguration().getInt("hbase.master.info.port", 60010) %>/master-status" target="_blank"><% serverName.getHostname() %></a></td>
<td><% serverName.getPort() %></td>
<td><% new Date(serverName.getStartcode()) %></td>
</tr>
Modified: hbase/branches/0.96/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon?rev=1542390&r1=1542389&r2=1542390&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon (original)
+++ hbase/branches/0.96/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon Fri Nov 15 20:43:44 2013
@@ -149,7 +149,7 @@ org.apache.hadoop.hbase.protobuf.generat
<%else>
<%java>
String host = regionServer.getMasterAddressManager().getMasterAddress().getHostname() + ":" + masterInfoPort;
- String url = "http://" + host + "/";
+ String url = "//" + host + "/";
</%java>
<a href="<% url %>"><% host %></a>
</%if>
Modified: hbase/branches/0.96/hbase-server/src/main/resources/hbase-webapps/master/table.jsp
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/resources/hbase-webapps/master/table.jsp?rev=1542390&r1=1542389&r2=1542390&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/main/resources/hbase-webapps/master/table.jsp (original)
+++ hbase/branches/0.96/hbase-server/src/main/resources/hbase-webapps/master/table.jsp Fri Nov 15 20:43:44 2013
@@ -200,7 +200,7 @@
HRegionInfo meta = HRegionInfo.FIRST_META_REGIONINFO;
ServerName metaLocation = master.getCatalogTracker().waitForMeta(1);
for (int i = 0; i < 1; i++) {
- String url = "http://" + metaLocation.getHostname() + ":" + infoPort + "/";
+ String url = "//" + metaLocation.getHostname() + ":" + infoPort + "/";
%>
<tr>
<td><%= escapeXml(meta.getRegionNameAsString()) %></td>
@@ -273,7 +273,7 @@
}
// This port might be wrong if RS actually ended up using something else.
urlRegionServer =
- "http://" + addr.getHostname().toString() + ":" + infoPort + "/";
+ addr.getHostname().toString() + ":" + infoPort;
Integer i = regDistribution.get(urlRegionServer);
if (null == i) i = Integer.valueOf(0);
regDistribution.put(urlRegionServer, i+1);
@@ -286,7 +286,7 @@
if (urlRegionServer != null) {
%>
<td>
- <a href="<%= urlRegionServer %>"><%= addr.getHostname().toString() + ":" + infoPort %></a>
+ <a href="<%= "//" + urlRegionServer + "/" %>"><%= urlRegionServer %></a>
</td>
<%
} else {
@@ -307,7 +307,7 @@
for (Map.Entry<String, Integer> rdEntry : regDistribution.entrySet()) {
%>
<tr>
- <td><a href="<%= rdEntry.getKey()%>"><%= rdEntry.getKey()%></a></td>
+ <td><a href="<%= "//" + rdEntry.getKey() + "/" %>"><%= rdEntry.getKey()%></a></td>
<td><%= rdEntry.getValue()%></td>
</tr>
<% } %>