Menu
▾
▴
[Rhq-commits] [rhq-project.org rhq] [2838] [RHQ-1436] - also report the server's local time;
|
From: <jma...@rh...> - 2009-01-30 01:46:28
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head><style type="text/css"><!-- #msg DL { border : 1px #006 solid; background-color : #369; padding : 6px; color : #fff; } #msg DT { float : left; width : 6em; font-weight : bold; } #msg DL, #msg DT, #msg UL, #msg LI { font-family : arial,helvetica,sans-serif; font-size : 10pt; } h3 { font-family : arial,helvetica,sans-serif; font-size : 10pt; font-weight : bold; } #msg PRE { overflow : auto; white-space : normal; background-color : #ffc; border : 1px #fc0 solid; padding : 6px; } #msg UL, PRE, .diff { overflow : auto; } #patch h4 { font-family : arial,helvetica,sans-serif; font-size : 10pt; } #patch h4 { padding: 8px; background : #369; color : #fff; margin : 0; } #patch .propset h4, #patch .binary h4 {margin: 0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {background:#eeeeee;padding: 0 0 10px 0;} #patch .propset .diff, #patch .binary .diff {padding: 10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch .add {background:#ddffdd;} #patch .rem {background:#ffdddd;} #patch .lines, .info {color:#888888;background:#ffffff;} .diff { width : 100%; } #msg DL { border : 1px #006 solid; background-color : #369; padding : 6px; color : #fff; } #msg DT { float : left; width : 6em; font-weight : bold; } #msg DL, #msg DT, #msg UL, #msg LI { font-family : arial,helvetica,sans-serif; font-size : 10pt; } h3 { font-family : arial,helvetica,sans-serif; font-size : 10pt; font-weight : bold; } #msg PRE { overflow : auto; white-space : normal; background-color : #ffc; border : 1px #fc0 solid; padding : 6px; } #msg UL, PRE, .diff { overflow : auto; } #patch h4 { font-family : arial,helvetica,sans-serif; font-size : 10pt; } #patch h4 { padding: 8px; background : #369; color : #fff; margin : 0; } #patch .propset h4, #patch .binary h4 {margin: 0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {background:#eeeeee;padding: 0 0 10px 0;} #patch .propset .diff, #patch .binary .diff {padding: 10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch .add {background:#ddffdd;} #patch .rem {background:#ffdddd;} #patch .lines, .info {color:#888888;background:#ffffff;} .diff { width : 100%; } --></style> <title>[rhq-project.org rhq] [2838] [RHQ-1436] - also report the server's local time; </title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>2838</dd> <dt>Author</dt> <dd>jmarques</dd> <dt>Date</dt> <dd>2009-01-29 19:36:09 -0600 (Thu, 29 Jan 2009)</dd> </dl> <h3>Log Message</h3> <pre>[RHQ-1436] - also report the server's local time; </pre> <h3>Modified Paths</h3> <ul> <li><a href="#rhqtrunkmodulesenterpriseguiportalwarsrcmainwebappadminconfigEditServerConfigFormjsp">rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/admin/config/EditServerConfigForm.jsp</a></li> <li><a href="#rhqtrunkmodulesenterpriseguiportalwarsrcmainwebappfilteredWEBINFclassesApplicationResourcesproperties">rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp-filtered/WEB-INF/classes/ApplicationResources.properties</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="rhqtrunkmodulesenterpriseguiportalwarsrcmainwebappadminconfigEditServerConfigFormjsp"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/admin/config/EditServerConfigForm.jsp (2837 => 2838)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/admin/config/EditServerConfigForm.jsp 2009-01-30 01:02:28 UTC (rev 2837) +++ rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/admin/config/EditServerConfigForm.jsp 2009-01-30 01:36:09 UTC (rev 2838) </span><span class="lines">@@ -1,5 +1,9 @@ </span><span class="cx"> <%@ page language="java" %> <%@ page errorPage="/common/Error.jsp" %> </span><span class="add">+ +<%@page import="java.text.DateFormat"%> +<%@page import="java.util.Date"%> + </span><span class="cx"> <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> <%@ taglib uri="http://jakarta.apache.org/struts/tags-html-el" prefix="html" %> <%@ taglib uri="http://jakarta.apache.org/struts/tags-tiles" prefix="tiles" %> </span><span class="lines">@@ -582,19 +586,31 @@ </span><span class="cx"> <!-- SYSTEM-WIDE CONTENTS --> <table width="100%" cellpadding="0" cellspacing="0" border="0"> <tr> </span><span class="rem">- <td class="BlockLabel"><fmt:message key="admin.settings.TimeZone"/></td> - <td class="BlockLabel"> </span><span class="add">+ <td nowrap="nowrap" width="30%" class="BlockLabel"><fmt:message key="admin.settings.TimeZone"/></td> + <td width="40%" class="BlockLabel"> </span><span class="cx"> <table cellpadding="0" cellspacing="4" border="0"> <tr> <td nowrap="nowrap" align="left"><%= java.util.TimeZone.getDefault().getDisplayName()%></td> </tr> </table> </td> </span><span class="add">+ <td width="15%" class="BlockLabel"></td> + <td width="15%" class="BlockContent"></td> + </tr> + <tr> + <td nowrap="nowrap" class="BlockLabel"><fmt:message key="admin.settings.LocalTime"/></td> + <td class="BlockLabel"> + <table cellpadding="0" cellspacing="4" border="0"> + <tr> + <td nowrap="nowrap" align="left"><%= DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.FULL).format(new Date(System.currentTimeMillis()))%></td> + </tr> + </table> + </td> </span><span class="cx"> <td class="BlockLabel"></td> <td class="BlockContent"></td> </tr> <tr> </span><span class="rem">- <td class="BlockLabel"><fmt:message key="admin.settings.System.DatabaseURL"/></td> </span><span class="add">+ <td nowrap="nowrap" class="BlockLabel"><fmt:message key="admin.settings.System.DatabaseURL"/></td> </span><span class="cx"> <td class="BlockLabel"> <table cellpadding="0" cellspacing="4" border="0"> <tr> </span><span class="lines">@@ -606,7 +622,7 @@ </span><span class="cx"> <td class="BlockContent"></td> </tr> <tr> </span><span class="rem">- <td class="BlockLabel"><fmt:message key="admin.settings.System.DatabaseProductName"/></td> </span><span class="add">+ <td nowrap="nowrap" class="BlockLabel"><fmt:message key="admin.settings.System.DatabaseProductName"/></td> </span><span class="cx"> <td class="BlockLabel"> <table cellpadding="0" cellspacing="4" border="0"> <tr> </span><span class="lines">@@ -618,7 +634,7 @@ </span><span class="cx"> <td class="BlockContent"></td> </tr> <tr> </span><span class="rem">- <td class="BlockLabel"><fmt:message key="admin.settings.System.DatabaseProductVersion"/></td> </span><span class="add">+ <td nowrap="nowrap" class="BlockLabel"><fmt:message key="admin.settings.System.DatabaseProductVersion"/></td> </span><span class="cx"> <td class="BlockLabel"> <table cellpadding="0" cellspacing="4" border="0"> <tr> </span><span class="lines">@@ -630,7 +646,7 @@ </span><span class="cx"> <td class="BlockContent"></td> </tr> <tr> </span><span class="rem">- <td class="BlockLabel"><fmt:message key="admin.settings.System.DatabaseDriverName"/></td> </span><span class="add">+ <td nowrap="nowrap" class="BlockLabel"><fmt:message key="admin.settings.System.DatabaseDriverName"/></td> </span><span class="cx"> <td class="BlockLabel"> <table cellpadding="0" cellspacing="4" border="0"> <tr> </span><span class="lines">@@ -642,7 +658,7 @@ </span><span class="cx"> <td class="BlockContent"></td> </tr> <tr> </span><span class="rem">- <td class="BlockLabel"><fmt:message key="admin.settings.System.DatabaseDriverVersion"/></td> </span><span class="add">+ <td nowrap="nowrap" class="BlockLabel"><fmt:message key="admin.settings.System.DatabaseDriverVersion"/></td> </span><span class="cx"> <td class="BlockLabel"> <table cellpadding="0" cellspacing="4" border="0"> <tr> </span><span class="lines">@@ -654,16 +670,16 @@ </span><span class="cx"> <td class="BlockContent"></td> </tr> <tr> </span><span class="rem">- <td width="20%" class="BlockLabel"><fmt:message key="admin.settings.System.RawTable"/></td> - <td width="30%" class="BlockLabel"> </span><span class="add">+ <td nowrap="nowrap" class="BlockLabel"><fmt:message key="admin.settings.System.RawTable"/></td> + <td class="BlockLabel"> </span><span class="cx"> <table cellpadding="0" cellspacing="4" border="0"> <tr> <td nowrap="nowrap" align="left"><%= org.rhq.enterprise.server.measurement.util.MeasurementDataManagerUtility.getCurrentRawTable() %></td> </tr> </table> </td> </span><span class="rem">- <td width="20%" class="BlockLabel"></td> - <td width="30%" class="BlockContent"> </span><span class="add">+ <td class="BlockLabel"></td> + <td class="BlockContent"> </span><span class="cx"> <table width="100%" cellpadding="0" cellspacing="0" border="0"> <tr> <td nowrap="nowrap" class="BlockContent" colspan="2"> </span><span class="lines">@@ -673,7 +689,7 @@ </span><span class="cx"> </td> </tr> <tr> </span><span class="rem">- <td class="BlockLabel"><fmt:message key="admin.settings.System.RotationTime"/></td> </span><span class="add">+ <td nowrap="nowrap" class="BlockLabel"><fmt:message key="admin.settings.System.RotationTime"/></td> </span><span class="cx"> <td class="BlockLabel"> <table cellpadding="0" cellspacing="4" border="0"> <tr> </span></pre></div> <a id="rhqtrunkmodulesenterpriseguiportalwarsrcmainwebappfilteredWEBINFclassesApplicationResourcesproperties"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp-filtered/WEB-INF/classes/ApplicationResources.properties (2837 => 2838)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp-filtered/WEB-INF/classes/ApplicationResources.properties 2009-01-30 01:02:28 UTC (rev 2837) +++ rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp-filtered/WEB-INF/classes/ApplicationResources.properties 2009-01-30 01:36:09 UTC (rev 2838) </span><span class="lines">@@ -560,6 +560,7 @@ </span><span class="cx"> # ADMIN.SETTINGS admin.settings.TimeZone=Server Timezone: </span><span class="add">+admin.settings.LocalTime=Server Local Time: </span><span class="cx"> admin.settings.EditServerConfig.Title=${product.shortName} Edit ${product.shortName} Server Settings admin.settings.EditServerConfig.PageTitle=Edit ${product.shortName} Server Settings </span> </pre> </div> </div> </body> </html> |