Menu
▾
▴
[Hyperic-hq-discuss] hq r3735 - in trunk: src/org/hyperic/hq/ui/action/admin/config web/WEB-INF/classes web/admin/config
|
From: <cl...@hy...> - 2007-03-13 21:00:39
|
Author: clee Date: 2007-03-13 13:00:36 -0800 (Tue, 13 Mar 2007) New Revision: 3735 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=3735 Modified: trunk/src/org/hyperic/hq/ui/action/admin/config/EditConfigAction.java trunk/src/org/hyperic/hq/ui/action/admin/config/EditConfigPrepAction.java trunk/src/org/hyperic/hq/ui/action/admin/config/SystemConfigForm.java trunk/web/WEB-INF/classes/ApplicationResources.properties trunk/web/admin/config/EditServerConfigForm.jsp Log: Add Announcement properties to server settings Modified: trunk/src/org/hyperic/hq/ui/action/admin/config/EditConfigAction.java =================================================================== --- trunk/src/org/hyperic/hq/ui/action/admin/config/EditConfigAction.java 2007-03-13 20:26:14 UTC (rev 3734) +++ trunk/src/org/hyperic/hq/ui/action/admin/config/EditConfigAction.java 2007-03-13 21:00:36 UTC (rev 3735) @@ -36,7 +36,9 @@ import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; +import org.hyperic.hq.bizapp.server.session.UpdateStatusMode; import org.hyperic.hq.bizapp.shared.ConfigBoss; +import org.hyperic.hq.bizapp.shared.UpdateBoss; import org.hyperic.hq.ui.action.BaseAction; import org.hyperic.hq.ui.util.ContextUtils; import org.hyperic.hq.ui.util.RequestUtils; @@ -65,14 +67,22 @@ ConfigBoss boss = ContextUtils.getConfigBoss(ctx); if (cForm.isOkClicked()) { - if (log.isTraceEnabled()) log.trace("Getting config"); + if (log.isTraceEnabled()) + log.trace("Getting config"); Properties props = cForm.saveConfigProperties(boss.getConfig()); - if (log.isTraceEnabled()) log.trace("Setting config"); + if (log.isTraceEnabled()) + log.trace("Setting config"); boss.setConfig(props); - if (log.isTraceEnabled()) log.trace("Restarting config service"); + if (log.isTraceEnabled()) + log.trace("Restarting config service"); boss.restartConfig(); + + // Set the update mode + UpdateBoss uboss = ContextUtils.getUpdateBoss(ctx); + uboss.setUpdateMode( + UpdateStatusMode.findByCode(cForm.getUpdateMode())); } RequestUtils.setConfirmation(request, Modified: trunk/src/org/hyperic/hq/ui/action/admin/config/EditConfigPrepAction.java =================================================================== --- trunk/src/org/hyperic/hq/ui/action/admin/config/EditConfigPrepAction.java 2007-03-13 20:26:14 UTC (rev 3734) +++ trunk/src/org/hyperic/hq/ui/action/admin/config/EditConfigPrepAction.java 2007-03-13 21:00:36 UTC (rev 3735) @@ -31,10 +31,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.hyperic.hq.bizapp.shared.ConfigBoss; -import org.hyperic.hq.common.shared.HQConstants; -import org.hyperic.hq.ui.util.ContextUtils; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.struts.action.ActionForm; @@ -42,6 +38,11 @@ import org.apache.struts.action.ActionMapping; import org.apache.struts.tiles.ComponentContext; import org.apache.struts.tiles.actions.TilesAction; +import org.hyperic.hq.bizapp.server.session.UpdateStatusMode; +import org.hyperic.hq.bizapp.shared.ConfigBoss; +import org.hyperic.hq.bizapp.shared.UpdateBoss; +import org.hyperic.hq.common.shared.HQConstants; +import org.hyperic.hq.ui.util.ContextUtils; public class EditConfigPrepAction extends TilesAction { @@ -64,6 +65,11 @@ Properties props = boss.getConfig(); cForm.loadConfigProperties(props); + // Set the update mode + UpdateBoss uboss = ContextUtils.getUpdateBoss(ctx); + UpdateStatusMode upMode = uboss.getUpdateMode(); + cForm.setUpdateMode(upMode.getCode()); + // See if the property exists if (props.containsKey(HQConstants.SNMPVersion)) { String ver = props.getProperty(HQConstants.SNMPVersion); Modified: trunk/src/org/hyperic/hq/ui/action/admin/config/SystemConfigForm.java =================================================================== --- trunk/src/org/hyperic/hq/ui/action/admin/config/SystemConfigForm.java 2007-03-13 20:26:14 UTC (rev 3734) +++ trunk/src/org/hyperic/hq/ui/action/admin/config/SystemConfigForm.java 2007-03-13 21:00:36 UTC (rev 3735) @@ -48,6 +48,7 @@ private String alertPurgeVal = "0"; private String alertPurge = ""; private boolean reindex = false; + private int updateMode = 0; protected String elPurgeVal = "0"; public String toString() { @@ -58,6 +59,7 @@ buf.append(" helpUserId=").append(helpUserId); buf.append(" helpPassword=").append(helpPassword); buf.append(" deleteUnits=").append(deleteUnits); + buf.append(" updateMode=").append(updateMode); return buf.toString(); } @@ -80,6 +82,7 @@ alertPurge = ""; alertPurgeVal = null; elPurgeVal = "0"; + updateMode = 0; } public void loadConfigProperties (Properties prop){ @@ -107,7 +110,7 @@ alertPurge = findTimeUnit(alertPurgeLong.longValue()); alertPurgeVal = calcTimeUnit(alertPurgeLong.longValue()); - String elPurgeValStr = prop.getProperty(org.hyperic.hq.common.shared.HQConstants.EventLogPurge); + String elPurgeValStr = prop.getProperty(HQConstants.EventLogPurge); Long elPurgeLong = new Long(elPurgeValStr); elPurgeVal = calcTimeUnit(elPurgeLong.longValue()); } @@ -184,7 +187,7 @@ convertToMillisecond(Long.parseLong(elPurgeVal), Constants.DAYS_LABEL); - prop.setProperty(org.hyperic.hq.common.shared.HQConstants.EventLogPurge, + prop.setProperty(HQConstants.EventLogPurge, String.valueOf(elPurgeLong)); return prop; @@ -297,4 +300,12 @@ public void setElPurgeVal(String elPurgeVal) { this.elPurgeVal = elPurgeVal; } + + public int getUpdateMode() { + return updateMode; + } + + public void setUpdateMode(int updateMode) { + this.updateMode = updateMode; + } } Modified: trunk/web/WEB-INF/classes/ApplicationResources.properties =================================================================== --- trunk/web/WEB-INF/classes/ApplicationResources.properties 2007-03-13 20:26:14 UTC (rev 3734) +++ trunk/web/WEB-INF/classes/ApplicationResources.properties 2007-03-13 21:00:36 UTC (rev 3735) @@ -490,9 +490,11 @@ admin.settings.RestartNote=<b>NOTE:</b>Any changes to HQ Server Settings will take effect after the next server restart. admin.settings.EmailConfigTab=HQ Email Configuration Properties +admin.settings.UpdateConfigTab=HQ Announcements Properties admin.settings.SMTPHostLabel=SMTP Host: admin.settings.BaseURL=Base URL: admin.settings.SenderEmailAddressLabel=From Email Address: +admin.settings.AnnouncementType=HQ Version and Security Announcements: admin.settings.MiscConfigTab=Miscellaneous Configuration Properties admin.settings.DisableGuide=Disable HQ Guide for All Users (restart the HQ server after changing this setting) @@ -512,6 +514,8 @@ admin.settings.Reindex=Reindex Metric Data Tables Nightly: admin.settings.EventLogPurge=Delete Events and Logs Older Than: +admin.settings.All=All +admin.settings.Major=Major admin.settings.Day=day admin.settings.Days=days admin.settings.Hour=hour @@ -2650,7 +2654,7 @@ inform.config.escalation.scheme.newAction.noactions=Currently there are no actions for this escalation. Click on the "Create Action" button below to create an action to perform when this escalation is invoked. inform.config.escalation.scheme.inProgressEscalation=If you edit an escalation that is currently in progress, the escalation will be stopped. inform.config.escalation.scheme.NoOP=Suppress Additional Alerts -inform.config.admin.HQServerConfig= - Change settings for email, data compression, database maintenance and authentication services +inform.config.admin.HQServerConfig= - Change settings for email, announcements, data compression, database maintenance and authentication services inform.config.admin.MonitoringDefaults= - Define monitoring policies for the entire environment inform.config.admin.PolicyDefaults= - Define monitoring and alerting policies for the entire environment inform.config.admin.EscalationScheme= - Define global escalation schemes that can be applied to individual alerts Modified: trunk/web/admin/config/EditServerConfigForm.jsp =================================================================== --- trunk/web/admin/config/EditServerConfigForm.jsp 2007-03-13 20:26:14 UTC (rev 3734) +++ trunk/web/admin/config/EditServerConfigForm.jsp 2007-03-13 21:00:36 UTC (rev 3735) @@ -69,7 +69,7 @@ <!-- / --> <!-- EMAIL CONFIG CONTENTS --> -<table width="100%" cellpadding="0" cellspacing="0" border="0"> +<table width="100%" cellpadding="0" cellspacing="0" border="0" class="TableBottomLine"> <tr> <td width="30%" class="BlockLabel"><fmt:message key="admin.settings.BaseURL"/></td> <td width="40%" class="BlockContent"><html:text size="31" property="baseUrl" /></td> @@ -80,7 +80,27 @@ <td class="BlockContent"><html:text size="31" property="senderEmail" /></td> <td class="BlockContent" colspan="2"></td> </tr> +</table> +<!-- / --> + +<!-- UPDATE CONFIG TITLE --> +<tiles:insert definition=".header.tab"> + <tiles:put name="tabKey" value="admin.settings.UpdateConfigTab"/> +</tiles:insert> +<!-- / --> + +<!-- UPDATE CONFIG CONTENTS --> +<table width="100%" cellpadding="0" cellspacing="0" border="0"> <tr> + <td width="30%" class="BlockLabel"><fmt:message key="admin.settings.AnnouncementType"/></td> + <td width="40%" class="BlockContent"> + <html:radio property="updateMode" value="0"/><fmt:message key="admin.settings.All"/> + <html:radio property="updateMode" value="1"/><fmt:message key="admin.settings.Major"/> + <html:radio property="updateMode" value="2"/><fmt:message key="common.label.None"/> + </td> + <td width="30%" class="BlockContent" colspan="2"></td> + </tr> + <tr> <td colspan="4" class="BlockBottomLine"><html:img page="/images/spacer.gif" width="1" height="1" border="0"/></td> </tr> <!-- / --> |
