[rhq] Branch 'alertPlugin' - modules/enterprise
by Heiko W. Rupp
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/subsystem/SubsystemAlertDefinitionUIBean.java | 88 +++++++++-
modules/enterprise/gui/portal-war/src/main/webapp/rhq/subsystem/alertDefinitions.xhtml | 12 +
2 files changed, 92 insertions(+), 8 deletions(-)
New commits:
commit f944f3d58c4d7719ea075429faa1dc938737ecf1
Author: James Livingston <jlivings(a)redhat.com>
Date: Fri Feb 26 10:53:48 2010 +0100
BZ 560859 - Add mechanism to enable/disable alert definitions for multiple resources
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/subsystem/SubsystemAlertDefinitionUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/subsystem/SubsystemAlertDefinitionUIBean.java
index 5831f3e..2e8d49c 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/subsystem/SubsystemAlertDefinitionUIBean.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/subsystem/SubsystemAlertDefinitionUIBean.java
@@ -1,6 +1,6 @@
/*
* RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
+ * Copyright (C) 2005-2010 Red Hat, Inc.
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
@@ -73,13 +73,13 @@ public class SubsystemAlertDefinitionUIBean extends SubsystemView {
private SelectItem[] categoryFilterItems;
private IntExtractor<AlertDefinitionComposite> RESOURCE_ID_EXTRACTOR = new IntExtractor<AlertDefinitionComposite>() {
-
+
public int extract(AlertDefinitionComposite object) {
Resource resource = object.getAlertDefinition().getResource();
return resource == null ? 0 : resource.getId();
}
};
-
+
public SubsystemAlertDefinitionUIBean() {
datePattern = EnterpriseFacesContextUtility.getWebUser().getWebPreferences().getDateTimeDisplayPreferences()
.getDateTimeFormatTrigger();
@@ -178,6 +178,84 @@ public class SubsystemAlertDefinitionUIBean extends SubsystemView {
return "success";
}
+ public String disableSelected() {
+ Integer[] selected = getSelectedItems();
+
+ try {
+ Subject subject = getSubject();
+
+ List<Integer> resourceDefinitions = new ArrayList<Integer>();
+ List<Integer> groupDefinitions = new ArrayList<Integer>();
+ List<Integer> typeDefinitions = new ArrayList<Integer>();
+
+ for (Integer definitionId : selected) {
+ if (alertDefinitionManager.isTemplate(definitionId)) {
+ typeDefinitions.add(definitionId);
+ } else if (alertDefinitionManager.isGroupAlertDefinition(definitionId)) {
+ groupDefinitions.add(definitionId);
+ } else {
+ resourceDefinitions.add(definitionId);
+ }
+ }
+
+ // delete resources first
+ alertDefinitionManager.disableAlertDefinitions(subject, resourceDefinitions
+ .toArray(new Integer[resourceDefinitions.size()]));
+
+ // then delete templates and group alert defs, which are both tolerant of missing child definitions
+ groupAlertDefinitionManager.disableGroupAlertDefinitions(subject, groupDefinitions
+ .toArray(new Integer[groupDefinitions.size()]));
+ alertTemplateManager.removeAlertTemplates(subject, typeDefinitions.toArray(new Integer[typeDefinitions
+ .size()]));
+
+ FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, "Disable selected alert definitions.");
+ } catch (Exception e) {
+ FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Failed to disable selected alert definitions.",
+ e);
+ }
+
+ return "success";
+ }
+
+ public String enableSelected() {
+ Integer[] selected = getSelectedItems();
+
+ try {
+ Subject subject = getSubject();
+
+ List<Integer> resourceDefinitions = new ArrayList<Integer>();
+ List<Integer> groupDefinitions = new ArrayList<Integer>();
+ List<Integer> typeDefinitions = new ArrayList<Integer>();
+
+ for (Integer definitionId : selected) {
+ if (alertDefinitionManager.isTemplate(definitionId)) {
+ typeDefinitions.add(definitionId);
+ } else if (alertDefinitionManager.isGroupAlertDefinition(definitionId)) {
+ groupDefinitions.add(definitionId);
+ } else {
+ resourceDefinitions.add(definitionId);
+ }
+ }
+
+ // delete resources first
+ alertDefinitionManager.enableAlertDefinitions(subject, resourceDefinitions
+ .toArray(new Integer[resourceDefinitions.size()]));
+
+ // then delete templates and group alert defs, which are both tolerant of missing child definitions
+ groupAlertDefinitionManager.enableGroupAlertDefinitions(subject, groupDefinitions
+ .toArray(new Integer[groupDefinitions.size()]));
+ alertTemplateManager.removeAlertTemplates(subject, typeDefinitions.toArray(new Integer[typeDefinitions
+ .size()]));
+
+ FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, "Enable selected alert definitions.");
+ } catch (Exception e) {
+ FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Failed to enable selected alert definitions.",
+ e);
+ }
+
+ return "success";
+ }
+
@Override
public DataModel getDataModel() {
if (dataModel == null) {
@@ -229,7 +307,7 @@ public class SubsystemAlertDefinitionUIBean extends SubsystemView {
protected IntExtractor<AlertDefinitionComposite> getResourceIdExtractor() {
return RESOURCE_ID_EXTRACTOR;
}
-
+
private void getDataFromRequest() {
SubsystemAlertDefinitionUIBean outer = SubsystemAlertDefinitionUIBean.this;
outer.resourceFilter = FacesContextUtility.getOptionalRequestParameter(FORM_PREFIX + "resourceFilter");
@@ -255,4 +333,4 @@ public class SubsystemAlertDefinitionUIBean extends SubsystemView {
return null;
}
}
-}
\ No newline at end of file
+}
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/subsystem/alertDefinitions.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/subsystem/alertDefinitions.xhtml
index 2cc9a52..a1caee7 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/subsystem/alertDefinitions.xhtml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/subsystem/alertDefinitions.xhtml
@@ -189,7 +189,7 @@
<f:param name="ad" value="#{item.original.alertDefinition.parentId}"/>
<h:outputText value="View Template" />
</h:outputLink>
-
+
<h:outputLink value="/alerts/Config.do" rendered="#{not empty item.original.alertDefinition.groupAlertDefinition}">
<f:param name="mode" value="viewRoles"/>
<f:param name="groupId" value="#{item.original.alertDefinition.groupAlertDefinition.resourceGroup.id}"/>
@@ -197,8 +197,8 @@
<f:param name="ad" value="#{item.original.alertDefinition.groupAlertDefinition.id}"/>
<h:outputText value="View Group Definition" />
</h:outputLink>
-
- <h:outputText value="N/A"
+
+ <h:outputText value="N/A"
rendered="#{item.original.alertDefinition.parentId eq 0 and empty item.original.alertDefinition.groupAlertDefinition}" />
</rich:column>
@@ -208,6 +208,12 @@
<onc:selectCommandButton action="#{SubsystemAlertDefinitionUIBean.deleteSelected}"
value="DELETE SELECTED" target="selectedItems" styleClass="on-pager-button buttonsmall"
rendered="#{GlobalPermissionsUIBean.superuser}" />
+ <onc:selectCommandButton action="#{SubsystemAlertDefinitionUIBean.disableSelected}"
+ value="DISABLE SELECTED" target="selectedItems" styleClass="on-pager-button buttonsmall"
+ rendered="#{GlobalPermissionsUIBean.superuser}" />
+ <onc:selectCommandButton action="#{SubsystemAlertDefinitionUIBean.enableSelected}"
+ value="ENABLE SELECTED" target="selectedItems" styleClass="on-pager-button buttonsmall"
+ rendered="#{GlobalPermissionsUIBean.superuser}" />
<ui:param name="paginationDataTableName" value="alertDefinitionDataTable"/>
<ui:param name="paginationDataModel" value="#{alertDefinitionDataModel}"/>
14 years, 4 months
[rhq] Branch 'alertPlugin' - modules/enterprise
by jharris
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/AlertUIBean.java | 30 +---------
1 file changed, 5 insertions(+), 25 deletions(-)
New commits:
commit c06cf9c470abf7d8c1bfff7b9969ce68de607105
Author: Justin Harris <jharris(a)redhat.com>
Date: Thu Feb 25 16:28:03 2010 -0500
BZ 562816 - Fixed lazy init excepion by going through entity manager directly instead of using the alert definition manager.
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/AlertUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/AlertUIBean.java
index f3d97c3..b0d92d4 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/AlertUIBean.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/AlertUIBean.java
@@ -22,21 +22,15 @@ package org.rhq.enterprise.gui.alert;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
+import javax.persistence.EntityManager;
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.Create;
import org.jboss.seam.annotations.In;
-import org.jboss.seam.annotations.Logger;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
-import org.jboss.seam.faces.FacesMessages;
-import org.jboss.seam.log.Log;
import org.rhq.core.domain.alert.AlertCondition;
import org.rhq.core.domain.alert.AlertDampening;
import org.rhq.core.domain.alert.AlertDefinition;
-import org.rhq.core.domain.auth.Subject;
-import org.rhq.enterprise.server.alert.AlertDefinitionManagerLocal;
-import org.rhq.enterprise.server.alert.AlertDefinitionUpdateException;
-import org.rhq.enterprise.server.alert.InvalidAlertDefinitionException;
/**
*
@@ -46,18 +40,12 @@ import org.rhq.enterprise.server.alert.InvalidAlertDefinitionException;
@Name("alertUIBean")
public class AlertUIBean implements Serializable {
- @Logger
- private Log log;
- @In("#{webUser.subject}")
- private Subject subject;
- @In
- private FacesMessages facesMessages;
@In
private AlertDescriber alertDescriber;
@In
- private AlertDefinitionManagerLocal alertDefinitionManager;
- @In
private AlertDefinition alertDefinition;
+ @In
+ private EntityManager entityManager;
private List<String> alertConditions;
private String alertDampening;
@@ -78,16 +66,8 @@ public class AlertUIBean implements Serializable {
}
public String saveAlertDefinition() {
- try {
- alertDefinitionManager.updateAlertDefinition(this.subject,
- this.alertDefinition.getId(), this.alertDefinition, false);
- } catch (InvalidAlertDefinitionException e) {
- facesMessages.add("There was an error finding the requested alert definition.");
- log.error("Invalid alert definition: " + this.alertDefinition.toSimpleString(), e);
- } catch (AlertDefinitionUpdateException e) {
- facesMessages.add("There was an error updating the definition for " + this.alertDefinition.getName());
- log.error("Error updating alert definition: " + this.alertDefinition.toSimpleString(), e);
- }
+ AlertDefinition def = entityManager.merge(this.alertDefinition);
+ entityManager.persist(def);
return null;
}
14 years, 4 months
[rhq] Branch 'ldap' - modules/enterprise
by Shannon Hughes
modules/enterprise/gui/portal-war/src/main/webapp/admin/role/ViewRole.jsp | 37 ++++++++++
1 file changed, 37 insertions(+)
New commits:
commit 84c5d0010c7855544018cdc08e8a0f6c4099703e
Author: Shannon Hughes <shughes(a)scooby.rdu.redhat.com>
Date: Thu Feb 25 16:12:53 2010 -0500
initial ldap group block
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/admin/role/ViewRole.jsp b/modules/enterprise/gui/portal-war/src/main/webapp/admin/role/ViewRole.jsp
index 017e832..1909ec5 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/admin/role/ViewRole.jsp
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/admin/role/ViewRole.jsp
@@ -173,6 +173,43 @@ groupWidgetProperties = getWidgetProperties('<c:out value="${groupWidgetInstance
</c:if>
</c:if>
+<c:if test="${not Role.fsystem}">
+<c:if test="${useroperations['MANAGE_SECURITY']}">
+
+<html:form method="POST" action="/admin/role/RemoveLdapGroups">
+
+<tiles:insert definition=".header.tab">
+ <tiles:put name="tabKey" value="admin.role.groups.AssignedGroupsTab"/>
+</tiles:insert>
+
+<display:table items="${RoleLdapGrps}" var="group" action="${selfPgAction}"
+ postfix="g"
+ width="100%" cellpadding="0" cellspacing="0">
+
+ <display:column width="1%" property="id" title="<input type=\"checkbox\" onclick=\"ToggleAll(this, groupWidgetProperties, true)\" name=\"listToggleAll\">" isLocalizedTitle="false" styleClass="ListCellCheckbox" headerStyleClass="ListHeaderCheckbox" >
+ <display:checkboxdecorator name="g" onclick="ToggleSelection(this, groupWidgetProperties, true)" styleClass="listMember"/>
+ </display:column>
+
+ <display:column width="25%" property="name" href="/rhq/group/inventory/view.xhtml?category=${group.groupCategory.name}&groupId=${group.id}" title="common.header.Group"
+ sortAttr="r.name"/>
+ <display:column width="75%" property="description" title="common.header.Description"/>
+</display:table>
+
+<tiles:insert definition=".toolbar.addToList">
+ <tiles:put name="addToListUrl" value="/admin/role/RoleAdmin.do?mode=addLdapGroups"/>
+ <tiles:put name="widgetInstanceName" beanName="groupWidgetInstanceName"/>
+ <tiles:put name="addToListParamName" value="r"/>
+ <tiles:put name="addToListParamValue" beanName="Role" beanProperty="id"/>
+ <tiles:put name="pageList" beanName="RoleLdapGrps"/>
+ <tiles:put name="pageAction" beanName="selfPgAction"/>
+ <tiles:put name="postfix" value="g"/>
+</tiles:insert>
+
+<html:hidden property="r"/>
+</html:form>
+</c:if>
+</c:if>
+
<tiles:insert definition=".page.return">
<tiles:put name="returnUrl" value="/admin/role/RoleAdmin.do?mode=list"/>
<tiles:put name="returnKey" value="admin.role.view.ReturnToRoles"/>
14 years, 4 months
[rhq] Branch 'raw-config' - modules/enterprise
by John Sanda
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/resource/ResourceTreeStateAdvisor.java | 1 +
1 file changed, 1 insertion(+)
New commits:
commit 07ea3a2f57654cb6873497ad7ac5da7d4419370f
Author: John Sanda <john(a)localhost.localdomain>
Date: Thu Feb 25 15:26:36 2010 -0500
Fixing navigation logic when viewing a map property of an older resource configuration
Updated the navigation logic for the resource tree to redirect you to the configuration tab
for the resource that you click on when you are currently viewing the history of a map property.
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/resource/ResourceTreeStateAdvisor.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/resource/ResourceTreeStateAdvisor.java
index 18554d3..f641fa4 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/resource/ResourceTreeStateAdvisor.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/resource/ResourceTreeStateAdvisor.java
@@ -121,6 +121,7 @@ public class ResourceTreeStateAdvisor implements TreeStateAdvisor {
} else if ((path.startsWith("/rhq/resource/configuration/view-map.xhtml") ||
path.startsWith("/rhq/resource/configuration/edit-map.xhtml") ||
path.startsWith("/rhq/resource/configuration/add-map.xhtml") ||
+ path.startsWith("/rhq/resource/configuration/history-view-map.xhtml") ||
path.startsWith("/rhq/resource/configuration/edit.xhtml") && facets.isConfiguration())) {
path = "/rhq/resource/configuration/view.xhtml";
14 years, 4 months
[rhq] Branch 'raw-config' - modules/enterprise
by John Sanda
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/history.xhtml | 1 +
1 file changed, 1 insertion(+)
New commits:
commit f85ff3787fa1b3e965ae282abb0dda4411d246a7
Author: John Sanda <john(a)localhost.localdomain>
Date: Thu Feb 25 14:37:19 2010 -0500
Adding back configuration id parameter that was accidentally removed
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/history.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/history.xhtml
index 23abda0..7e54ace 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/history.xhtml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/history.xhtml
@@ -235,6 +235,7 @@
<h:form id="viewResourceConfigurationForm">
<input type="hidden" name="id" value="#{ResourceUIBean.id}"/>
+ <input type="hidden" name="configId" value="#{param.configId}"/>
<c:choose>
<c:when test="${configurationViewer.rawSupported}">
14 years, 4 months
[rhq] Branch 'raw-config' - 2 commits - modules/enterprise
by John Sanda
modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/pages.xml | 2
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/history.xhtml | 66 ++++++++--
2 files changed, 59 insertions(+), 9 deletions(-)
New commits:
commit 878f8250c2036b55b48bc2ece5cdd62c4f8b4244
Author: John Sanda <john(a)localhost.localdomain>
Date: Thu Feb 25 12:52:56 2010 -0500
Removing unused code
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/history.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/history.xhtml
index f91b86b..23abda0 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/history.xhtml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/history.xhtml
@@ -235,17 +235,6 @@
<h:form id="viewResourceConfigurationForm">
<input type="hidden" name="id" value="#{ResourceUIBean.id}"/>
- <input type="hidden" name="configId" value="#{param.configId}"/>
-
- <ui:remove>
- <onc:config configurationDefinition="#{ViewResourceConfigurationUpdateUIBean.configurationDefinition}"
- configuration="#{ViewResourceConfigurationUpdateUIBean.configuration}"
- readOnly="true"
- nullConfigurationDefinitionMessage="#{ViewResourceConfigurationUpdateUIBean.nullConfigurationDefinitionMessage}"
- nullConfigurationMessage="#{ViewResourceConfigurationUpdateUIBean.nullConfigurationMessage}"
- prevalidate="true"/>
- </ui:remove>
-
<c:choose>
<c:when test="${configurationViewer.rawSupported}">
commit 29f1e948b83f8e0e53352d8ff49b56856e65da43
Author: John Sanda <john(a)localhost.localdomain>
Date: Thu Feb 25 12:51:38 2010 -0500
[BZ 553293] Adding support for raw config on the history page
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/pages.xml b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/pages.xml
index 9f975c6..f7fa56c 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/pages.xml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/pages.xml
@@ -12,6 +12,8 @@
</navigation>
</page>
+ <page view-id="/rhq/resource/configuration/history.xhtml" action="#{configurationViewer.initialize}"/>
+
<page view-id="/rhq/resource/configuration/view-map.xhtml" action="#{configurationViewer.initialize}"/>
<page view-id="/rhq/resource/configuration/edit.xhtml" concurrent-request-timeout="15000" timeout="180000">
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/history.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/history.xhtml
index ac824f8..f91b86b 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/history.xhtml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/history.xhtml
@@ -11,7 +11,8 @@
xmlns:c="http://java.sun.com/jstl/core"
xmlns:onc="http://jboss.org/on/component"
xmlns:onf="http://jboss.org/on/function"
- xmlns:rich="http://richfaces.ajax4jsf.org/rich" xmlns:a4j="https://ajax4jsf.dev.java.net/ajax">
+ xmlns:rich="http://richfaces.ajax4jsf.org/rich" xmlns:a4j="https://ajax4jsf.dev.java.net/ajax"
+ xmlns:s="http://jboss.com/products/seam/taglib">
<ui:composition template="/rhq/resource/layout/main.xhtml">
@@ -22,6 +23,18 @@
<ui:param name="latestConfig" value="#{GetLatestConfigurationUpdateUIBean.latestConfigurationUpdate}"/>
+ <script type="text/javascript">
+ function cursor_wait() {
+ document.body.style.cursor = 'wait';
+ return true;
+ }
+
+ function cursor_clear() {
+ document.body.style.cursor = 'default';
+ return true;
+ }
+ </script>
+
<h:form id="historyForm">
<input type="hidden" name="id" value="${ResourceUIBean.id}"/>
@@ -224,12 +237,58 @@
<input type="hidden" name="id" value="#{ResourceUIBean.id}"/>
<input type="hidden" name="configId" value="#{param.configId}"/>
+ <ui:remove>
<onc:config configurationDefinition="#{ViewResourceConfigurationUpdateUIBean.configurationDefinition}"
configuration="#{ViewResourceConfigurationUpdateUIBean.configuration}"
readOnly="true"
nullConfigurationDefinitionMessage="#{ViewResourceConfigurationUpdateUIBean.nullConfigurationDefinitionMessage}"
nullConfigurationMessage="#{ViewResourceConfigurationUpdateUIBean.nullConfigurationMessage}"
prevalidate="true"/>
+ </ui:remove>
+
+
+ <c:choose>
+ <c:when test="${configurationViewer.rawSupported}">
+ <rich:tabPanel>
+ <rich:tab label="Advanced Mode">
+ <ui:include src="raw.xhtml"/>
+ </rich:tab>
+ </rich:tabPanel>
+ </c:when>
+
+ <c:when test="${configurationViewer.structuredSupported}">
+ <rich:tabPanel>
+ <rich:tab label="Basic Mode">
+ <ui:include src="structured.xhtml"/>
+ </rich:tab>
+ </rich:tabPanel>
+ </c:when>
+
+ <c:when test="${configurationViewer.structuredAndRawSupported}">
+ <rich:tabPanel id="resourceConfigurationTabPanel"
+ switchType="ajax"
+ valueChangeListener="#{configurationViewer.changeTabs}">
+ <rich:tab id="structuredTab"
+ label="Basic Mode"
+ onlabelclick="cursor_wait();"
+ oncomplete="cursor_clear();"
+ limitToList="true"
+ reRender="upperEditButton,lowerEditButton,modalEditor">
+ <ui:include src="structured.xhtml"/>
+ </rich:tab>
+ <rich:tab id="rawTab"
+ label="Advanced Mode"
+ onlabelclick="cursor_wait();"
+ oncomplete="cursor_clear();"
+ limitToList="true"
+ reRender="upperEditButton,lowerEditButton,modalEditor">
+ <ui:include src="raw.xhtml"/>
+ </rich:tab>
+ </rich:tabPanel>
+ </c:when>
+ </c:choose>
+
+ <ui:include src="view-raw-modal.xhtml"/>
</h:form>
14 years, 4 months
[rhq] Branch 'alertPlugin' - modules/enterprise
by jharris
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/viewAlert.xhtml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 2a18d950b525c722a947803b158bc885d82ecec6
Author: Justin Harris <jharris(a)redhat.com>
Date: Thu Feb 25 12:24:48 2010 -0500
Changing ui:composition to ui:decorate to get page title working properly.
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/viewAlert.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/viewAlert.xhtml
index 2e9cc8b..eec04d4 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/viewAlert.xhtml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/viewAlert.xhtml
@@ -27,7 +27,7 @@
</c:otherwise>
</c:choose>
- <ui:composition template="/rhq/layout/main.xhtml">
+ <ui:decorate template="/rhq/layout/main.xhtml">
<ui:param name="pageTitle" value="#{title}"/>
@@ -272,5 +272,5 @@
</rich:modalPanel>
</ui:define>
- </ui:composition>
+ </ui:decorate>
</html>
14 years, 4 months
[rhq] 8 commits - modules/enterprise
by Heiko W. Rupp
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/AlertConditionMessages.java | 60 --------
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/AlertMessages.java | 70 ++++++++++
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/description/ControlDescriber.java | 7 -
modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/alert/listGroupAlertDefinitions.xhtml | 25 +--
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/alertDefinitionProperties.xhtml | 10 +
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/listAlertDefinitions.xhtml | 32 ++--
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/listConditions.xhtml | 38 ++---
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/viewAlert.xhtml | 28 +++-
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java | 3
9 files changed, 153 insertions(+), 120 deletions(-)
New commits:
commit f3d2b483a01c8771e106c407f4af8473bb1e61fb
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Thu Feb 25 17:11:43 2010 +0100
BZ 535432 suppress 'null' is the condition has no name, which is the case for availability.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java
index c21bf21..0f48f9e 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java
@@ -907,7 +907,8 @@ public class AlertManagerBean implements AlertManagerLocal, AlertManagerRemote {
builder.append(condition.getName()).append(' ');
}
} else {
- builder.append(condition.getName()).append(' ');
+ if (category.getName()!=null) // this is null for e.g. availability
+ builder.append(condition.getName()).append(' ');
}
// next format the RHS
commit 95ab39239a9d3d2f4081a49c8edcdc51acdacbfc
Merge: c8338b8... 3705350...
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Thu Feb 25 14:31:21 2010 +0100
Merge branch 'master' into alertPlugin
commit c8338b898b50fbfe86e07d4c25cba30deb9c3139
Merge: a99099e... 4714eb8...
Author: Justin Harris <jharris(a)redhat.com>
Date: Wed Feb 24 12:24:53 2010 -0500
Merge remote branch 'origin/alertPlugin' into bugz
commit a99099ea48d165b4a272949d2fce9e2815a3b061
Author: Justin Harris <jharris(a)redhat.com>
Date: Wed Feb 24 12:21:04 2010 -0500
Fix for BZ 561900
Adding in length and null value validation for alert definition names.
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/AlertConditionMessages.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/AlertConditionMessages.java
deleted file mode 100644
index 62a6fc0..0000000
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/AlertConditionMessages.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2010 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-package org.rhq.enterprise.gui.alert;
-
-import java.text.MessageFormat;
-import java.util.Map;
-import org.jboss.seam.ScopeType;
-import org.jboss.seam.annotations.In;
-import org.jboss.seam.annotations.Name;
-import org.jboss.seam.annotations.Scope;
-
-(a)Scope(ScopeType.APPLICATION)
-@Name("alertConditionMessages")
-public class AlertConditionMessages {
-
- @In
- private Map<String, String> messages;
-
- public String getThreshold() {
- return translate("errors.double", "Threshold");
- }
-
- public String getPercentRange() {
- return translate("errors.range", "Threshold", "0%", "1000%");
- }
-
- public String getDampeningCount() {
- return translate("errors.integer", "Dampening Count");
- }
-
- public String getDampeningEvaluation() {
- return translate("errors.integer", "Dampening Evaluations");
- }
-
- public String getTimePeriod() {
- return translate("errors.integer", "Time Period");
- }
-
- private String translate(String key, Object... params) {
- String message = messages.get(key);
-
- return MessageFormat.format(message, params);
- }
-}
\ No newline at end of file
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/AlertMessages.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/AlertMessages.java
new file mode 100644
index 0000000..79062ef
--- /dev/null
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/AlertMessages.java
@@ -0,0 +1,70 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.enterprise.gui.alert;
+
+import java.text.MessageFormat;
+import java.util.Map;
+import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.In;
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Scope;
+
+(a)Scope(ScopeType.APPLICATION)
+@Name("alertMessages")
+public class AlertMessages {
+
+ @In
+ private Map<String, String> messages;
+
+ public String getNameRequired() {
+ String name = translate("alerts.config.DefinitionList.ListHeader.AlertName");
+ return translate("errors.required", name);
+ }
+
+ public String getNameLength() {
+ String name = translate("alerts.config.DefinitionList.ListHeader.AlertName");
+ return translate("errors.maxlength", name);
+ }
+
+ public String getThreshold() {
+ return translate("errors.double", "Threshold");
+ }
+
+ public String getPercentRange() {
+ return translate("errors.range", "Threshold", "0%", "1000%");
+ }
+
+ public String getDampeningCount() {
+ return translate("errors.integer", "Dampening Count");
+ }
+
+ public String getDampeningEvaluation() {
+ return translate("errors.integer", "Dampening Evaluations");
+ }
+
+ public String getTimePeriod() {
+ return translate("errors.integer", "Time Period");
+ }
+
+ private String translate(String key, Object... params) {
+ String message = messages.get(key);
+
+ return MessageFormat.format(message, params);
+ }
+}
\ No newline at end of file
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/alertDefinitionProperties.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/alertDefinitionProperties.xhtml
index 9439c5f..fd8e260 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/alertDefinitionProperties.xhtml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/alertDefinitionProperties.xhtml
@@ -17,7 +17,15 @@
<h:panelGrid columns="2" border="1" cellpadding="5" style="margin: 15px;">
<h:outputLabel for="alertNameInput" value="Name: " />
- <h:inputText id="alertNameInput" value="#{alertDefinition.name}" style="width: 300px;" />
+ <h:inputText id="alertNameInput"
+ value="#{alertDefinition.name}"
+ style="width: 300px;"
+ maxlength="100"
+ required="true"
+ requiredMessage="#{alertMessages.nameRequired}"
+ validatorMessage="#{alertMessages.nameLength}">
+ <f:validateLength maximum="100" />
+ </h:inputText>
<h:outputLabel for="alertDescriptionInput" value="Description: " />
<h:inputTextarea id="alertDescriptionInput" value="#{alertDefinition.description}" style="width: 300px;" />
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/listConditions.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/listConditions.xhtml
index a5500e4..2000efd 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/listConditions.xhtml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/listConditions.xhtml
@@ -170,9 +170,9 @@
value="#{alertDefinition.alertDampening.value}"
size="4"
required="true"
- requiredMessage="#{alertConditionMessages.dampeningCount}"
- validatorMessage="#{alertConditionMessages.dampeningCount}"
- converterMessage="#{alertConditionMessages.dampeningCount}">
+ requiredMessage="#{alertMessages.dampeningCount}"
+ validatorMessage="#{alertMessages.dampeningCount}"
+ converterMessage="#{alertMessages.dampeningCount}">
<f:validateDoubleRange minimum="0" />
</h:inputText>
<h:outputText value=" #{messages['alert.config.props.CB.Content.DampenConsecutiveCount.2']}" />
@@ -184,9 +184,9 @@
value="#{alertDefinition.alertDampening.value}"
size="4"
required="true"
- requiredMessage="#{alertConditionMessages.dampeningCount}"
- validatorMessage="#{alertConditionMessages.dampeningCount}"
- converterMessage="#{alertConditionMessages.dampeningCount}">
+ requiredMessage="#{alertMessages.dampeningCount}"
+ validatorMessage="#{alertMessages.dampeningCount}"
+ converterMessage="#{alertMessages.dampeningCount}">
<f:validateLongRange minimum="0" />
</h:inputText>
<h:outputText value=" #{messages['alert.config.props.CB.Content.DampenPartialCount.2']} " />
@@ -194,9 +194,9 @@
value="#{alertDefinition.alertDampening.period}"
size="4"
required="true"
- requiredMessage="#{alertConditionMessages.dampeningEvaluation}"
- validatorMessage="#{alertConditionMessages.dampeningEvaluation}"
- converterMessage="#{alertConditionMessages.dampeningEvaluation}">
+ requiredMessage="#{alertMessages.dampeningEvaluation}"
+ validatorMessage="#{alertMessages.dampeningEvaluation}"
+ converterMessage="#{alertMessages.dampeningEvaluation}">
<f:validateLongRange minimum="0" />
</h:inputText>
<h:outputText value=" #{messages['alert.config.props.CB.Content.DampenPartialCount.3']}" />
@@ -208,9 +208,9 @@
value="#{alertDefinition.alertDampening.value}"
size="4"
required="true"
- requiredMessage="#{alertConditionMessages.dampeningCount}"
- validatorMessage="#{alertConditionMessages.dampeningCount}"
- converterMessage="#{alertConditionMessages.dampeningCount}">
+ requiredMessage="#{alertMessages.dampeningCount}"
+ validatorMessage="#{alertMessages.dampeningCount}"
+ converterMessage="#{alertMessages.dampeningCount}">
<f:validateLongRange minimum="0" />
</h:inputText>
<h:outputText value=" #{messages['alert.config.props.CB.Content.DampenDurationCount.2']} " />
@@ -218,9 +218,9 @@
value="#{alertDefinition.alertDampening.period}"
size="4"
required="true"
- requiredMessage="#{alertConditionMessages.timePeriod}"
- validatorMessage="#{alertConditionMessages.timePeriod}"
- converterMessage="#{alertConditionMessages.timePeriod}">
+ requiredMessage="#{alertMessages.timePeriod}"
+ validatorMessage="#{alertMessages.timePeriod}"
+ converterMessage="#{alertMessages.timePeriod}">
<f:validateLongRange minimum="0" />
</h:inputText>
<h:selectOneMenu value="#{alertDefinition.alertDampening.periodUnits}">
@@ -341,8 +341,8 @@
<h:inputText id="metricThresholdAbsolute"
value="#{alertConditionsUIBean.threshold}"
required="true"
- requiredMessage="#{alertConditionMessages.threshold}"
- validatorMessage="#{alertConditionMessages.threshold}">
+ requiredMessage="#{alertMessages.threshold}"
+ validatorMessage="#{alertMessages.threshold}">
<f:validateDoubleRange minimum="0.0" />
</h:inputText>
<h:outputLabel for="metricThresholdAbsolute" value="#{messages['alert.config.props.CB.Content.AbsoluteValue']}" />
@@ -371,8 +371,8 @@
value="#{alertConditionsUIBean.currentCondition.threshold}"
converter="#{metricPercentConverter}"
required="true"
- requiredMessage="#{alertConditionMessages.percentRange}"
- validatorMessage="#{alertConditionMessages.percentRange}">
+ requiredMessage="#{alertMessages.percentRange}"
+ validatorMessage="#{alertMessages.percentRange}">
<f:validateDoubleRange minimum="0.0" maximum="1000.0" />
</h:inputText>
<h:outputLabel for="metricBaselinePercent" value=" #{messages['alert.config.props.CB.Content.Percent']} " />
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/viewAlert.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/viewAlert.xhtml
index a987e65..dd349a1 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/viewAlert.xhtml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/viewAlert.xhtml
@@ -77,8 +77,7 @@
</ui:define>
<ui:define name="body">
- <h:messages showDetail="true"
- globalOnly="true"
+ <h:messages showSummary="true"
infoClass="InfoBlock"
warnClass="WarnBlock"
errorClass="ErrorBlock"
commit 4714eb87aeeb6dce6a6ebcb7573bc80dafa3928d
Merge: e25997a... 7f4d769...
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed Feb 24 18:19:46 2010 +0100
Merge branch 'master' into alertPlugin
commit 38fb361e5cdb167bb5a947596586194d941e4221
Author: Justin Harris <jharris(a)redhat.com>
Date: Wed Feb 24 10:55:35 2010 -0500
Fix for BZ 567375
Changed method of resource id lookup in control describer.
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/description/ControlDescriber.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/description/ControlDescriber.java
index bcf5d25..ab1bd8a 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/description/ControlDescriber.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/description/ControlDescriber.java
@@ -18,9 +18,11 @@
*/
package org.rhq.enterprise.gui.alert.description;
+import org.jboss.seam.Component;
import org.rhq.core.domain.alert.AlertCondition;
import org.rhq.core.domain.alert.AlertConditionCategory;
import org.rhq.core.domain.operation.OperationDefinition;
+import org.rhq.core.domain.resource.ResourceType;
import org.rhq.enterprise.server.operation.OperationManagerLocal;
import org.rhq.enterprise.server.util.LookupUtil;
@@ -53,12 +55,13 @@ public class ControlDescriber extends AlertConditionDescriber {
private OperationDefinition getDefinition(AlertCondition condition) {
OperationManagerLocal operationManager = LookupUtil.getOperationManager();
- Integer resourceTypeId = condition.getAlertDefinition().getResource().getResourceType().getId();
+ // this is not a seam component, so look it up in the component contexts
+ ResourceType resourceType = (ResourceType)Component.getInstance("resourceType");
String operationName = condition.getName();
try {
return operationManager.getOperationDefinitionByResourceTypeAndName(
- resourceTypeId, operationName, false);
+ resourceType.getId(), operationName, false);
} catch (Exception e) {
return null;
}
commit e25997a61a0e49e38768d20461afffb9d19a554e
Merge: 33e3625... 1e8ab54...
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed Feb 24 16:53:45 2010 +0100
Merge branch 'master' into alertPlugin
commit 33e3625f6e4383d2bf44e832452347fc08241b97
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed Feb 24 16:33:43 2010 +0100
Linking fixes for BZ 566896
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/alert/listGroupAlertDefinitions.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/alert/listGroupAlertDefinitions.xhtml
index 2e5a565..5768c23 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/alert/listGroupAlertDefinitions.xhtml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/alert/listGroupAlertDefinitions.xhtml
@@ -18,10 +18,10 @@
<ui:param name="pageTitle" value="List Alert Definitions for Group '#{ResourceGroupUIBean.name}'"/>
<ui:param name="selectedTabName" value="Alert.Definitions"/>
<ui:define name="content">
-
+
<h:form id="alertDefinitionsListForm">
<input type="hidden" name="groupId" value="${param.groupId}"/>
-
+
<rich:panel styleClass="BlockContent">
<f:facet name="header">
<h:outputText value="Alert Definitions"/>
@@ -48,12 +48,12 @@
<f:facet name="PageControlView">
<onc:paginationControl id="GroupAlertDefinitionsList" />
</f:facet>
-
+
<rich:column>
<f:facet name="header">
<onc:allSelect target="selectedAlertDefinitions" />
</f:facet>
-
+
<onc:select name="selectedAlertDefinitions" value="#{item.id}" />
</rich:column>
@@ -63,25 +63,24 @@
<h:outputText styleClass="headerText" value="Name" />
</onc:sortableColumnHeader>
</f:facet>
-
- <h:outputLink value="/alerts/Config.do">
- <f:param name="mode" value="viewRoles"/>
+
+ <h:outputLink value="/rhq/resource/alert/viewAlert.xhtml">
<f:param name="groupId" value="#{param.groupId}"/>
<f:param name="ad" value="#{item.id}"/>
<h:outputText value="#{item.name}" />
</h:outputLink>
</rich:column>
-
+
<rich:column>
<f:facet name="header">
<onc:sortableColumnHeader sort="a.description">
<h:outputText styleClass="headerText" value="Description" />
</onc:sortableColumnHeader>
</f:facet>
-
+
<h:outputText value="#{item.description}"/>
</rich:column>
-
+
<rich:column>
<f:facet name="header">
<onc:sortableColumnHeader sort="a.ctime">
@@ -93,14 +92,14 @@
<f:converter converterId="UserDateTimeConverter" />
</h:outputText>
</rich:column>
-
+
<rich:column>
<f:facet name="header">
<onc:sortableColumnHeader sort="a.enabled">
<h:outputText styleClass="headerText" value="Active" />
</onc:sortableColumnHeader>
</f:facet>
-
+
<h:outputText value="#{item.enabled}"/>
</rich:column>
@@ -134,7 +133,7 @@
</rich:dataTable>
</h:panelGrid>
-
+
</rich:panel>
</h:form>
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 708f559..ef13121 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
@@ -18,10 +18,10 @@
<ui:param name="pageTitle" value="List Alert Definitions for Resource '#{ResourceUIBean.name}'"/>
<ui:param name="selectedTabName" value="Alert.Definitions"/>
<ui:define name="content">
-
+
<h:form id="alertDefinitionsListForm">
<input type="hidden" name="id" value="${param.id}"/>
-
+
<rich:panel styleClass="BlockContent">
<f:facet name="header">
<h:outputText value="Alert Definitions"/>
@@ -48,12 +48,12 @@
<f:facet name="PageControlView">
<onc:paginationControl id="AlertDefinitionsList" />
</f:facet>
-
+
<rich:column>
<f:facet name="header">
<onc:allSelect target="selectedAlertDefinitions" />
</f:facet>
-
+
<onc:select name="selectedAlertDefinitions" value="#{item.id}" />
</rich:column>
@@ -63,24 +63,24 @@
<h:outputText styleClass="headerText" value="Name" />
</onc:sortableColumnHeader>
</f:facet>
-
+
<h:outputLink value="/rhq/resource/alert/viewAlert.xhtml">
<f:param name="id" value="#{Resource.id}"/>
<f:param name="ad" value="#{item.id}"/>
<h:outputText value="#{item.name}" />
</h:outputLink>
</rich:column>
-
+
<rich:column>
<f:facet name="header">
<onc:sortableColumnHeader sort="a.description">
<h:outputText styleClass="headerText" value="Description" />
</onc:sortableColumnHeader>
</f:facet>
-
+
<h:outputText value="#{item.description}"/>
</rich:column>
-
+
<rich:column>
<f:facet name="header">
<onc:sortableColumnHeader sort="a.ctime">
@@ -92,14 +92,14 @@
<f:converter converterId="UserDateTimeConverter" />
</h:outputText>
</rich:column>
-
+
<rich:column>
<f:facet name="header">
<onc:sortableColumnHeader sort="a.enabled">
<h:outputText styleClass="headerText" value="Active" />
</onc:sortableColumnHeader>
</f:facet>
-
+
<h:outputText value="#{item.enabled}"/>
</rich:column>
@@ -107,15 +107,13 @@
<f:facet name="header">
<h:outputText styleClass="headerText" value="Parent" />
</f:facet>
-
- <h:outputLink value="/alerts/Config.do" rendered="#{item.parentId ne 0}">
- <f:param name="mode" value="viewRoles"/>
+
+ <h:outputLink value="http://localhost:7080/rhq/resource/alert/viewAlert.xhtml" rendered="#{item.parentId ne 0}">
<f:param name="type" value="#{item.resource.resourceType.id}"/>
- <f:param name="from" value="#{item.id}"/>
<f:param name="ad" value="#{item.parentId}"/>
<h:outputText value="View Template" />
</h:outputLink>
-
+
<h:outputLink value="/alerts/Config.do" rendered="#{not empty item.groupAlertDefinition}">
<f:param name="mode" value="viewRoles"/>
<f:param name="groupId" value="#{item.groupAlertDefinition.resourceGroup.id}"/>
@@ -129,7 +127,7 @@
<f:facet name="header">
<h:outputText styleClass="headerText" value="Read Only" />
</f:facet>
-
+
<h:outputText value="N/A" rendered="#{item.parentId eq 0 and empty item.groupAlertDefinition}"/>
<h:outputText value="#{item.readOnly}" rendered="#{item.parentId ne 0 or not empty item.groupAlertDefinition}"/>
</rich:column>
@@ -167,7 +165,7 @@
</rich:dataTable>
</h:panelGrid>
-
+
</rich:panel>
</h:form>
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/viewAlert.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/viewAlert.xhtml
index a987e65..75a1d50 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/viewAlert.xhtml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/viewAlert.xhtml
@@ -19,6 +19,9 @@
<c:when test="#{not empty param.type}">
<c:set var="title" value="Definition for '#{alertDefinition.name}' on resource type '#{ResourceTypeUIBean.name}'"/>
</c:when>
+ <c:when test="#{not empty param.groupId}">
+ <c:set var="title" value="Definition for '#{alertDefinition.name}' on group '#{ResourceGroupUIBean.name}'"/>
+ </c:when>
<c:otherwise>
<c:set var="title" value="Definition for '#{alertDefinition.name}' on resource '#{alertDefinition.resource.name}'"/>
</c:otherwise>
@@ -55,18 +58,25 @@
<h:outputText>Alert Definitions</h:outputText>
</h:outputLink>
<h:outputText> > </h:outputText>
- <h:outputLink value="viewAlert.xhtml">
- <f:param name="ad" value="#{alertDefinition.id}" />
- <h:outputText value=" Definition for '#{alertDefinition.name}' "/>
- </h:outputLink>
<c:choose>
<c:when test="#{not empty param.type}">
- <h:outputText> on resource type </h:outputText>
+ <h:outputText value=" Definition for alert template '#{alertDefinition.name}' "/>
+ <h:outputText> on Resource Type </h:outputText>
<h:outputLink value="/rhq/admin/listAlertTemplates.xhtml?type=${param.type}">
<h:outputText value=" #{ResourceTypeUIBean.name}"/>
</h:outputLink>
</c:when>
+ <c:when test="#{not empty param.groupId}">
+ <h:outputText> on resource group </h:outputText>
+ <h:outputLink value="/rhq/group/alert/listGroupAlertDefinitions.xhtml?groupId=${param.groupId}">
+ <h:outputText value=" #{ResourceGroupUIBean.name}"/>
+ </h:outputLink>
+ </c:when>
<c:otherwise>
+ <h:outputLink value="viewAlert.xhtml">
+ <f:param name="ad" value="#{alertDefinition.id}" />
+ <h:outputText value=" Definition for '#{alertDefinition.name}' "/>
+ </h:outputLink>
<h:outputText> on resource </h:outputText>
<h:outputLink value="/rhq/resource/summary/overview.xhtml">
<f:param name="id" value="#{alertDefinition.resource.id}" />
@@ -196,6 +206,11 @@
<h:outputText value="Back to Alert Definitions for Resource Type '#{ResourceTypeUIBean.name}'"/>
</h:outputLink>
</c:when>
+ <c:when test="#{not empty param.groupId}">
+ <h:outputLink value="/rhq/group/alert/listGroupAlertDefinitions.xhtml?groupId=${param.groupId}">
+ <h:outputText value="Back to Alert Definitions for Resource Group '#{ResourceGroupUIBean.name}'"/>
+ </h:outputLink>
+ </c:when>
<c:otherwise>
<h:outputLink value="/rhq/resource/alert/listAlertDefinitions.xhtml">
<f:param name="id" value="#{alertDefinition.resource.id}"/>
14 years, 4 months
[rhq] Branch 'alertPlugin' - modules/enterprise
by Heiko W. Rupp
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit f3d2b483a01c8771e106c407f4af8473bb1e61fb
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Thu Feb 25 17:11:43 2010 +0100
BZ 535432 suppress 'null' is the condition has no name, which is the case for availability.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java
index c21bf21..0f48f9e 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java
@@ -907,7 +907,8 @@ public class AlertManagerBean implements AlertManagerLocal, AlertManagerRemote {
builder.append(condition.getName()).append(' ');
}
} else {
- builder.append(condition.getName()).append(' ');
+ if (category.getName()!=null) // this is null for e.g. availability
+ builder.append(condition.getName()).append(' ');
}
// next format the RHS
14 years, 4 months
[rhq] Branch 'ldap' - 6 commits - modules/core modules/enterprise modules/plugins
by Partha Aji
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/Criteria.java | 17 ++++++---
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/group/inventory/AddGroupResourcesFormPrepareAction.java | 5 ++
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java | 8 ++--
modules/plugins/netservices/pom.xml | 18 +++++++---
4 files changed, 34 insertions(+), 14 deletions(-)
New commits:
commit 3e1622402c2fa5724f505065c5b89512fa7da664
Merge: 59a906f... a986379...
Author: Partha Aji <paji(a)redhat.com>
Date: Thu Feb 25 10:19:20 2010 -0500
Merge branch 'linux-config' into ldap
commit a98637975ee9a36b3c1ef1574bed5a5b947bdc78
Merge: 073abeb... 3705350...
Author: Partha Aji <paji(a)redhat.com>
Date: Thu Feb 25 10:19:06 2010 -0500
Merge branch 'master' into linux-config
commit 37053500c05ec42b23740e4612899f2c56a21864
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Thu Feb 25 11:27:51 2010 +0100
BZ 568275 - add commons-codec which is needed with commons-httpclient 3
diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml
index 58087fa..06ae2ae 100644
--- a/modules/plugins/netservices/pom.xml
+++ b/modules/plugins/netservices/pom.xml
@@ -33,6 +33,11 @@
<artifactId>commons-httpclient</artifactId>
<version>3.0.1</version>
</dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.2</version>
+ </dependency>
</dependencies>
@@ -58,6 +63,11 @@
<artifactId>commons-httpclient</artifactId>
<version>3.0.1</version>
</artifactItem>
+ <artifactItem>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.2</version>
+ </artifactItem>
</artifactItems>
<outputDirectory>${project.build.outputDirectory}/lib</outputDirectory>
</configuration>
@@ -202,13 +212,13 @@
<id>deploy-jar-meta-inf</id>
<phase>package</phase>
<configuration>
- <tasks>
- <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" />
+ <tasks>
+ <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" />
<echo>*** Updating META-INF dir in ${deployment.file}...</echo>
<unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}">
<patternset><include name="META-INF/**" /></patternset>
</unjar>
- <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true">
+ <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true">
</jar>
</tasks>
</configuration>
@@ -216,7 +226,7 @@
<goal>run</goal>
</goals>
</execution>
-
+
<execution>
<id>undeploy</id>
<phase>clean</phase>
commit b32fab5ccf90e3f6bc5c9c16e78daeb069f62675
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Thu Feb 25 10:59:56 2010 +0100
Persisting a new resource is no error ...
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java
index 6755733..3af7a35 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java
@@ -188,7 +188,7 @@ public class ResourceManagerBean implements ResourceManagerLocal, ResourceManage
}
entityManager.persist(resource);
- log.error("********* resource persisted ************");
+ log.debug("********* resource persisted ************");
// Execute sub-methods as overlord to bypass additional security checks.
Subject overlord = this.subjectManager.getOverlord();
updateImplicitMembership(overlord, resource);
@@ -366,7 +366,7 @@ public class ResourceManagerBean implements ResourceManagerLocal, ResourceManage
PluginConfigurationUpdate.QUERY_DELETE_BY_RESOURCES_0,
PluginConfigurationUpdate.QUERY_DELETE_BY_RESOURCES_1, // first delete the config objects
PluginConfigurationUpdate.QUERY_DELETE_BY_RESOURCES_2, // then the history objects wrapping those configs
- AlertConditionLog.QUERY_DELETE_BY_RESOURCES, // Don't
+ AlertConditionLog.QUERY_DELETE_BY_RESOURCES, // Don't
AlertNotificationLog.QUERY_DELETE_BY_RESOURCES, // alter
Alert.QUERY_DELETE_BY_RESOURCES, // order
AlertCondition.QUERY_DELETE_BY_RESOURCES, // of
@@ -2134,7 +2134,7 @@ public class ResourceManagerBean implements ResourceManagerLocal, ResourceManage
parent = null;
break;
}
-
+
} while (parent != null);
if (resource != null) {
if (!authorizationManager.canViewResource(subject, resource.getId())) {
@@ -2164,7 +2164,7 @@ public class ResourceManagerBean implements ResourceManagerLocal, ResourceManage
public <T> ResourceNamesDisambiguationResult<T> disambiguate(List<T> results, boolean alwaysIncludeParent,
IntExtractor<? super T> extractor) {
-
+
if (results.isEmpty()) {
return new ResourceNamesDisambiguationResult<T>(new ArrayList<DisambiguationReport<T>>(), false, false,
false);
commit 810993311fa5e22495be1eb9cfebb154a0e3a3ef
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Wed Feb 24 12:21:24 2010 -0500
don't bother looping/logging if debug not enabled.
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/Criteria.java b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/Criteria.java
index ef27906..dd943e0 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/Criteria.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/Criteria.java
@@ -125,8 +125,11 @@ public abstract class Criteria implements Serializable {
results.put(getCleansedFieldName(filterField, 6), filterFieldValue);
}
}
- for (Map.Entry<String, Object> entries : results.entrySet()) {
- LOG.debug("Filter: (" + entries.getKey() + ", " + entries.getValue() + ")");
+
+ if (LOG.isDebugEnabled()) {
+ for (Map.Entry<String, Object> entries : results.entrySet()) {
+ LOG.debug("Filter: (" + entries.getKey() + ", " + entries.getValue() + ")");
+ }
}
return results;
}
@@ -160,8 +163,10 @@ public abstract class Criteria implements Serializable {
}
}
}
- for (String entry : results) {
- LOG.debug("Fetch: (" + entry + ")");
+ if (LOG.isDebugEnabled()) {
+ for (String entry : results) {
+ LOG.debug("Fetch: (" + entry + ")");
+ }
}
return results;
}
@@ -283,7 +288,9 @@ public abstract class Criteria implements Serializable {
}
}
}
- LOG.debug("Page Control: " + pc);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Page Control: " + pc);
+ }
return pc;
}
commit 7f4d76951a1e2686aa4d104477765d9b4d350dad
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Wed Feb 24 18:13:05 2010 +0100
BZ 566749 - fixing the NPE when adding platforms (that don't have a parent) to a resource group.
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/group/inventory/AddGroupResourcesFormPrepareAction.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/group/inventory/AddGroupResourcesFormPrepareAction.java
index 698cb5a..808f331 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/group/inventory/AddGroupResourcesFormPrepareAction.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/group/inventory/AddGroupResourcesFormPrepareAction.java
@@ -201,7 +201,10 @@ public class AddGroupResourcesFormPrepareAction extends Action {
Resource resource = dr.getOriginal();
Resource parent = resource.getParentResource();
- parent.setName(buildLineage(dr.getParents()));
+ //platforms don't have parents, need to check for null here
+ if (parent != null) {
+ parent.setName(buildLineage(dr.getParents()));
+ }
convertedResults.add(resource);
}
14 years, 4 months