modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/PortalAction.java | 33 ++++++++++ modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/struts-config.xml | 16 ++-- modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/tiles/events-def.xml | 8 ++ modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/ViewDefinition.jsp | 6 - modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/listAlertDefinitions.xhtml | 3 5 files changed, 53 insertions(+), 13 deletions(-)
New commits: commit 175a985a31a53dd8f20c515f00e7d6a0e79ced64 Merge: 3e6ba87... 16f3c0a... Author: Ian P. Springer <ips@jetengine.(none)> Date: Wed Mar 31 13:47:55 2010 -0400
Merge branch 'master' into bugfixes
commit 16f3c0a4c268e8f8add9bf16f3bfdd49bd3fe71e Author: Ian P. Springer <ips@jetengine.(none)> Date: Wed Mar 31 12:47:39 2010 -0400
encrypt default DB password (cherry picked from commit 918c94ef5b633a025e96a503b55c4ef46536d948)
diff --git a/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml b/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml index b9f4181..a7e313a 100644 --- a/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml +++ b/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml @@ -9,7 +9,8 @@ <property name="default.rhq.server.database.driver-class" value="org.postgresql.Driver" /> <property name="default.rhq.server.database.xa-datasource-class" value="org.postgresql.xa.PGXADataSource" /> <property name="default.rhq.server.database.user-name" value="rhqadmin" /> - <property name="default.rhq.server.database.password" value="rhqadmin" /> + <!-- NOTE: The below value is "rhqadmin" encrypted. --> + <property name="default.rhq.server.database.password" value="1eeb2f255e832171df8592078de921bc" /> <property name="default.rhq.server.database.type-mapping" value="PostgreSQL" /> <!-- these are needed for the PostgreSQL XADataSource setup --> <property name="default.rhq.server.database.server-name" value="127.0.0.1" />
commit 5c2344cfba3cd95f40d8f4f6fd4f0a2762d7778b Author: Heiko W. Rupp hwr@redhat.com Date: Wed Mar 31 17:32:58 2010 +0200
Revert navigation to the struts-based alert-configuration
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/PortalAction.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/PortalAction.java index d35ed67..f134028 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/PortalAction.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/PortalAction.java @@ -68,6 +68,11 @@ public class PortalAction extends ResourceController { keyMethodMap.setProperty("editConditions", "editDefinitionConditions"); keyMethodMap.setProperty("editControlAction", "editDefinitionControlAction");
+ keyMethodMap.setProperty("viewRoles", "viewDefinitionRoles"); + keyMethodMap.setProperty("viewUsers", "viewDefinitionUsers"); + + keyMethodMap.setProperty("addRoles", "addRolesDefinitions"); + keyMethodMap.setProperty("addUsers", "addUsersDefinitions"); }
@Override @@ -168,6 +173,34 @@ public class PortalAction extends ResourceController { }
+ + public ActionForward viewDefinitionRoles(ActionMapping mapping, ActionForm form, HttpServletRequest request, + HttpServletResponse response) throws Exception { + setResource(request); + Portal portal = Portal.createPortal(); + setTitle(request, portal, "alert.config.platform.props.ViewDef.roles.Title"); + portal.addPortlet(new Portlet(".events.config.view.roles"), 1); + + // JW - this shouldn't be a dialog ... portal.setDialog(true); + request.setAttribute(Constants.PORTAL_KEY, portal); + + return null; + } + + public ActionForward viewDefinitionUsers(ActionMapping mapping, ActionForm form, HttpServletRequest request, + HttpServletResponse response) throws Exception { + setResource(request); + Portal portal = Portal.createPortal(); + setTitle(request, portal, "alert.config.platform.props.ViewDef.users.Title"); + portal.addPortlet(new Portlet(".events.config.view.users"), 1); + + // JW - this shouldn't be a dialog ... portal.setDialog(true); + request.setAttribute(Constants.PORTAL_KEY, portal); + + return null; + } + + public ActionForward monitorConfigureAlerts(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Exception { setResource(request); diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/struts-config.xml b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/struts-config.xml index d18f2d4..a4a323e 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/struts-config.xml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/struts-config.xml @@ -31,7 +31,7 @@ <form-bean name="AddRoleResourceGroupsForm" type="org.rhq.enterprise.gui.admin.role.AddResourceGroupsForm"/> <form-bean name="AddRoleLdapGroupsForm" - type="org.rhq.enterprise.gui.admin.role.AddLdapGroupsForm"/> + type="org.rhq.enterprise.gui.admin.role.AddLdapGroupsForm"/> <form-bean name="RemoveRoleResourceGroupsForm" type="org.rhq.enterprise.gui.admin.role.RemoveResourceGroupsForm"/> <!-- / --> @@ -573,7 +573,7 @@ <forward name="failure" path="/admin/role/RoleAdmin.do?mode=addLdapGroups"/> <forward name="success" path="/admin/role/RoleAdmin.do?mode=view"/> </action> - + <action path="/admin/role/RemoveLdapGroups" type="org.rhq.enterprise.gui.admin.role.RemoveLdapGroupsAction" name="RemoveRoleResourceGroupsForm" @@ -581,13 +581,13 @@ input="/admin/role/RoleAdmin.do?mode=view"> <forward name="failure" path="/admin/role/RoleAdmin.do?mode=view"/> <forward name="success" path="/admin/role/RoleAdmin.do?mode=view"/> - </action> + </action> +
- <!-- / -->
<action path="/admin/role/ChangeOwnerFormPrepare" @@ -2693,10 +2693,9 @@ <forward name="reset" path="/alerts/Config.do?mode=new" redirect="true"/> <forward name="failure" path="/alerts/Config.do?mode=new"/> + <forward name="success" path="/alerts/Config.do?mode=viewRoles"/> <forward name="add" path="/alerts/Config.do?mode=new"/> <forward name="remove" path="/alerts/Config.do?mode=new"/> - - <forward name="success" path="/rhq/resource/alert/viewAlert.xhtml" redirect="true" /> </action>
<action path="/alerts/EditPropertiesFormPrepare" @@ -2729,13 +2728,12 @@ name="EditAlertDefinitionConditionsForm" scope="request" input="/alerts/Config.do?mode=editConditions"> + <forward name="cancel" path="/alerts/Config.do?mode=viewRoles" redirect="true"/> <forward name="reset" path="/alerts/Config.do?mode=editConditions" redirect="true"/> + <forward name="success" path="/alerts/Config.do?mode=viewRoles" redirect="true"/> <forward name="failure" path="/alerts/Config.do?mode=editConditions"/> <forward name="add" path="/alerts/Config.do?mode=editConditions"/> <forward name="remove" path="/alerts/Config.do?mode=editConditions"/> - - <forward name="cancel" path="/rhq/resource/alert/viewAlert.xhtml" redirect="true" /> - <forward name="success" path="/rhq/resource/alert/viewAlert.xhtml" redirect="true" /> </action>
<action path="/alerts/EditControlActionFormPrepare" diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/tiles/events-def.xml b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/tiles/events-def.xml index 53e1545..50286c0 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/tiles/events-def.xml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/tiles/events-def.xml @@ -107,6 +107,14 @@ path="/resource/common/monitor/alerts/ViewAlertNotificationsList.jsp"/>
+ <definition name=".events.alert.view.notifications.roles" + path="/resource/common/monitor/alerts/ViewAlertNotificationsRoles.jsp" + controllerUrl="/alerts/ViewNotificationsRoles.do"/> + + <definition name=".events.alert.view.notifications.users" + path="/resource/common/monitor/alerts/ViewAlertNotificationsUsers.jsp" + controllerUrl="/alerts/ViewNotificationsUsers.do"/> + <definition name=".events.alert.view.controlaction" path="/resource/common/monitor/alerts/config/ViewDefinitionControlAction.jsp" controllerUrl="/alerts/ViewControlAction.do"/> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/ViewDefinition.jsp b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/ViewDefinition.jsp index 3032dee..04b79f5 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/ViewDefinition.jsp +++ b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/ViewDefinition.jsp @@ -18,12 +18,12 @@
<tiles:insert definition=".events.config.view.conditionsbox"/>
-<tiles:insert definition=".events.config.view.notifications"/> +<%--<tiles:insert definition=".events.config.view.notifications"/>--%>
-<tiles:insert definition=".events.config.view.controlactionbox"/> +<%--<tiles:insert definition=".events.config.view.controlactionbox"/>--%>
<tiles:insert definition=".events.config.view.nav"/>
-<a href="/rhq/resource/alert/notif/listAlertSender.xhtml?id=${param.id}&ad=${param.ad}">To Alert sender plugins</a> +<%--<a href="/rhq/resource/alert/notif/listAlertSender.xhtml?id=${param.id}&ad=${param.ad}">To Alert sender plugins</a>--%>
<tiles:insert definition=".page.footer"/> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/listAlertDefinitions.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/listAlertDefinitions.xhtml index 8f369b7..9565c0c 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/listAlertDefinitions.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/listAlertDefinitions.xhtml @@ -64,7 +64,8 @@ </onc:sortableColumnHeader> </f:facet>
- <h:outputLink value="/rhq/resource/alert/viewAlert.xhtml"> + <h:outputLink value="/alerts/Config.do"> + <f:param name="mode" value="viewRoles"/> <f:param name="id" value="#{Resource.id}"/> <f:param name="ad" value="#{item.id}"/> <h:outputText value="#{item.name}" />