rhq-commits February 2010

rhq-commits@lists.fedorahosted.org

20 participants
382 discussions

[rhq] Branch 'alertPlugin' - modules/core modules/enterprise
by jharris 23 Feb '10

23 Feb '10

modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertConditionCategory.java | 4 modules/core/domain/src/main/java/org/rhq/core/domain/operation/OperationRequestStatus.java | 4 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/AlertConditionUIBean.java | 3 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/AlertConditionsUIBean.java | 71 +++- modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/converter/MetricPercentConverter.java | 9 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/validator/AlertValidatorUtil.java | 45 ++ modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/validator/EventRegexValidator.java | 48 ++ modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/listConditions.xhtml | 174 +++++++--- 9 files changed, 361 insertions(+), 57 deletions(-) New commits: commit dbbfa75ddfa4ce4443f2f72df49b483970ea4e8c Author: Justin Harris <jharris(a)redhat.com> Date: Tue Feb 23 16:54:51 2010 -0500 Adding in validation rules and messaging for the alert conditions page. diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertConditionCategory.java b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertConditionCategory.java index b304f29..531857b 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertConditionCategory.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertConditionCategory.java @@ -60,6 +60,10 @@ public enum AlertConditionCategory { return name(); } + public String getDisplayName() { + return displayName; + } + @Override public String toString() { return this.displayName; diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/operation/OperationRequestStatus.java b/modules/core/domain/src/main/java/org/rhq/core/domain/operation/OperationRequestStatus.java index cd0dcdb..bf816e8 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/operation/OperationRequestStatus.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/operation/OperationRequestStatus.java @@ -38,6 +38,10 @@ public enum OperationRequestStatus { this.displayName = displayName; } + public String getDisplayName() { + return displayName; + } + public String toString() { return displayName; } 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 new file mode 100644 index 0000000..62a6fc0 --- /dev/null +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/AlertConditionMessages.java @@ -0,0 +1,60 @@ +/* + * 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/AlertConditionUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/AlertConditionUIBean.java index 1d5fe02..f15e5de 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/AlertConditionUIBean.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/AlertConditionUIBean.java @@ -18,6 +18,7 @@ */ package org.rhq.enterprise.gui.alert; +import java.util.Arrays; import java.util.EnumSet; import java.util.HashMap; import java.util.List; @@ -74,9 +75,9 @@ public class AlertConditionUIBean { private Map<String, String> conditionExpressions; private Map<String, String> availabilities; private Map<String, String> severities; - private Map<String, String> operationStatuses; private Map<String, String> comparators; private Map<String, String> baselines; + private Map<String, String> operationStatuses; private Map<String, Integer> measurements; private Map<String, Integer> traits; diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/AlertConditionsUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/AlertConditionsUIBean.java index f3365f0..c32965d 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/AlertConditionsUIBean.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/AlertConditionsUIBean.java @@ -19,6 +19,7 @@ package org.rhq.enterprise.gui.alert; import java.util.ArrayList; +import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -36,6 +37,7 @@ import org.jboss.seam.international.StatusMessage.Severity; import org.jboss.seam.log.Log; import org.rhq.core.domain.alert.AlertCondition; import org.rhq.core.domain.alert.AlertConditionCategory; +import org.rhq.core.domain.alert.AlertDampening; import org.rhq.core.domain.alert.AlertDefinition; import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.measurement.MeasurementDefinition; @@ -70,7 +72,7 @@ public class AlertConditionsUIBean { @In private AlertDescriber alertDescriber; private MetricAbsoluteConverter metricAbsoluteConverter = new MetricAbsoluteConverter(); - private Map<AlertConditionCategory, String> categories; + private Map<String, String> categories; private List<ConditionDescription> conditionDescriptions; private AlertCondition currentCondition; @@ -86,11 +88,19 @@ public class AlertConditionsUIBean { } public String getMeasurementDefinitionId() { - return measurementDefinitionId.toString(); + if (this.measurementDefinitionId != null) { + return measurementDefinitionId.toString(); + } + + return null; } public void setMeasurementDefinitionId(String measurementDefinitionId) { - this.measurementDefinitionId = Integer.parseInt(measurementDefinitionId); + try { + this.measurementDefinitionId = Integer.parseInt(measurementDefinitionId); + } catch (NumberFormatException e) { + this.measurementDefinitionId = null; + } } public String getThreshold() { @@ -109,7 +119,7 @@ public class AlertConditionsUIBean { return conditionDescriptions; } - public Map<AlertConditionCategory, String> getCategories() { + public Map<String, String> getCategories() { return categories; } @@ -136,7 +146,10 @@ public class AlertConditionsUIBean { @Create public void init() { this.conditionDescriptions = createDescriptions(); - this.categories = createCategoryMap(); + this.categories = createCategories(); + + // start out with an empty condition + createCondition(); } private List<ConditionDescription> createDescriptions() { @@ -183,6 +196,10 @@ public class AlertConditionsUIBean { } public String saveAlertDefinition() { + if (!validateDefinition()) { + return null; + } + alertDefinition.setConditions(findConditions()); try { @@ -198,12 +215,16 @@ public class AlertConditionsUIBean { } public String newAlertDefinition() { + if (!validateDefinition()) { + return null; + } + alertDefinition.setConditions(findConditions()); try { alertDefinitionManager.createAlertDefinition(subject, alertDefinition, resourceId); } catch(Exception e) { - this.facesMessages.add(Severity.ERROR, "There was an error creating the alert definitino."); + this.facesMessages.add(Severity.ERROR, "There was an error creating the alert definition."); this.log.error("Error persisting AlertDefinition: " + alertDefinition.getName(), e); return null; @@ -212,6 +233,28 @@ public class AlertConditionsUIBean { return SUCCESS_OUTCOME; } + private boolean validateDefinition() { + Set<AlertCondition> conditions = findConditions(); + + if (conditions.isEmpty()) { + this.facesMessages.add(Severity.ERROR, "Please add at least one condition."); + + return false; + } + + AlertDampening dampening = alertDefinition.getAlertDampening(); + + if (dampening.getCategory() == AlertDampening.Category.PARTIAL_COUNT) { + if (dampening.getValue() > dampening.getPeriod()) { + this.facesMessages.addFromResourceBundle(Severity.ERROR, "alert.config.error.PartialCountRangeTooSmall"); + + return false; + } + } + + return true; + } + private boolean shouldSetMeasurementDefinition() { if (currentCondition != null) { AlertConditionCategory category = currentCondition.getCategory(); @@ -245,17 +288,17 @@ public class AlertConditionsUIBean { return conditionSet; } - private Map<AlertConditionCategory, String> createCategoryMap() { - Map<AlertConditionCategory, String> categoryMap = new HashMap<AlertConditionCategory, String>(); + private Map<String, String> createCategories() { + Map<String, String> categoryMap = new HashMap<String, String>(); + List<AlertConditionCategory> categoryList = new ArrayList(Arrays.asList(AlertConditionCategory.values())); + categoryList.remove(AlertConditionCategory.ALERT); - for (AlertConditionCategory category : AlertConditionCategory.values()) { - categoryMap.put(category, category.getName()); + if (configurationManager.getResourceConfigurationDefinitionForResourceType(subject, resourceType.getId()) == null) { + categoryList.remove(AlertConditionCategory.RESOURCE_CONFIG); } - categoryMap.remove(AlertConditionCategory.ALERT); - - if (configurationManager.getResourceConfigurationDefinitionForResourceType(subject, resourceType.getId()) == null) { - categoryMap.remove(AlertConditionCategory.RESOURCE_CONFIG); + for (AlertConditionCategory category : categoryList) { + categoryMap.put(category.toString(), category.getName()); } return categoryMap; diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/converter/MetricPercentConverter.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/converter/MetricPercentConverter.java index eec5333..19dae93 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/converter/MetricPercentConverter.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/converter/MetricPercentConverter.java @@ -30,6 +30,7 @@ import org.jboss.seam.annotations.Scope; import org.jboss.seam.annotations.faces.Converter; import org.rhq.core.domain.measurement.MeasurementUnits; import org.rhq.core.domain.measurement.composite.MeasurementNumericValueAndUnits; +import org.rhq.core.domain.measurement.util.MeasurementConversionException; import org.rhq.core.domain.measurement.util.MeasurementConverter; @Converter @@ -38,9 +39,13 @@ import org.rhq.core.domain.measurement.util.MeasurementConverter; public class MetricPercentConverter implements javax.faces.convert.Converter { public Object getAsObject(FacesContext context, UIComponent component, String value) { - MeasurementNumericValueAndUnits percentage = MeasurementConverter.parse(value, MeasurementUnits.PERCENTAGE); + try { + MeasurementNumericValueAndUnits percentage = MeasurementConverter.parse(value, MeasurementUnits.PERCENTAGE); - return percentage.getValue(); + return percentage.getValue(); + } catch (MeasurementConversionException e) { + return null; + } } public String getAsString(FacesContext context, UIComponent component, Object value) { diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/validator/AlertValidatorUtil.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/validator/AlertValidatorUtil.java new file mode 100644 index 0000000..d8f142c --- /dev/null +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/validator/AlertValidatorUtil.java @@ -0,0 +1,45 @@ +/* + * 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.validator; + +import javax.faces.application.FacesMessage; +import javax.faces.validator.ValidatorException; +import org.jboss.seam.ScopeType; +import org.jboss.seam.annotations.AutoCreate; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Scope; +import org.jboss.seam.faces.FacesMessages; + +@AutoCreate +(a)Scope(ScopeType.APPLICATION) +@Name("validatorUtil") +public class AlertValidatorUtil { + + public void error(String message) throws ValidatorException { + FacesMessage facesMessage = FacesMessages.createFacesMessage(FacesMessage.SEVERITY_ERROR , message); + + throw new ValidatorException(facesMessage); + } + + public void templateError(String key, Object... params) throws ValidatorException { + FacesMessage facesMessage = FacesMessages.createFacesMessage(FacesMessage.SEVERITY_ERROR , key, key, params); + + throw new ValidatorException(facesMessage); + } +} \ No newline at end of file diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/validator/EventRegexValidator.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/validator/EventRegexValidator.java new file mode 100644 index 0000000..e4831d4 --- /dev/null +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/validator/EventRegexValidator.java @@ -0,0 +1,48 @@ +/* + * 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.validator; + +import java.util.regex.Pattern; +import java.util.regex.PatternSyntaxException; +import javax.faces.component.UIComponent; +import javax.faces.context.FacesContext; +import javax.faces.validator.ValidatorException; +import org.jboss.seam.annotations.In; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.faces.Validator; + +@Name("eventRegexValidator") +@Validator +public class EventRegexValidator implements javax.faces.validator.Validator { + + @In + private AlertValidatorUtil validatorUtil; + + public void validate(FacesContext context, UIComponent component, Object value) throws ValidatorException { + String stringValue = (String)value; + + if (stringValue != null && stringValue.length() > 0) { + try { + Pattern.compile(stringValue); + } catch (PatternSyntaxException e) { + validatorUtil.templateError("alert.config.error.InvalidEventDetails"); + } + } + } +} \ No newline at end of file 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 24a0bdf..a5500e4 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 @@ -35,7 +35,16 @@ </ui:define> <ui:define name="body"> - <a4j:form id="alertConditionsForm"> + + <rich:messages showSummary="true" + infoClass="InfoBlock" + warnClass="WarnBlock" + errorClass="ErrorBlock" + fatalClass="FatalBlock" + layout="table" + width="100%" /> + + <h:form id="alertConditionsForm"> <ui:insert name="formTop" /> <rich:panel id="conditionsPanel"> @@ -44,11 +53,11 @@ </f:facet> <rich:panel id="conditionExpression"> - <h:outputText value="#{messages['alert.config.props.CB.ExpressionDetails.1']} " /> - <h:selectOneMenu value="#{alertDefinition.conditionExpression}"> - <f:selectItems value="#{alertConditionUIBean.conditionExpressions}" /> - </h:selectOneMenu> - <h:outputText value=" #{messages['alert.config.props.CB.ExpressionDetails.2']}" /> + <h:outputText value="#{messages['alert.config.props.CB.ExpressionDetails.1']} " /> + <h:selectOneMenu value="#{alertDefinition.conditionExpression}"> + <f:selectItems value="#{alertConditionUIBean.conditionExpressions}" /> + </h:selectOneMenu> + <h:outputText value=" #{messages['alert.config.props.CB.ExpressionDetails.2']}" /> </rich:panel> <rich:panel id="conditionSet"> @@ -56,8 +65,6 @@ <h:outputText value="Condition Set"/> </f:facet> - <h:messages /> - <rich:dataTable id="categoryTable" value="#{alertConditionsUIBean.conditionDescriptions}" var="conditionDescription"> <rich:column> <h:outputText value="#{conditionDescription.description}" /> @@ -71,6 +78,7 @@ <f:setPropertyActionListener value="#{conditionDescription.condition}" target="#{alertConditionsUIBean.currentCondition}" /> <rich:componentControl for="categoryModalPanel" attachTo="editButton" operation="show" event="onclick" /> + <a4j:support event="onclick" reRender="categoryOptionOkButton" /> </a4j:commandButton> </rich:column> @@ -93,7 +101,7 @@ action="#{alertConditionsUIBean.createCondition}" styleClass="buttonmed"> <rich:componentControl for="categoryModalPanel" attachTo="addConditionButton" operation="show" event="onclick" /> - <a4j:support event="onclick" reRender="categoryOptionsPanel" /> + <a4j:support event="onclick" reRender="categoryOptionsPanel,categoryOptionOkButton" /> </a4j:commandButton> </rich:panel> @@ -107,13 +115,20 @@ <h:outputText value="#{messages['alert.config.props.CB.Recovery']} " /> <h:outputText value="#{messages['alert.config.props.CB.RecoveryFor']}" /> - <h:selectOneMenu value="#{alertDefinition.recoveryId}"> + <h:selectOneMenu id="recoveryForAlertSelectBox" + value="#{alertDefinition.recoveryId}" + disabled="#{alertDefinition.willRecover}"> <f:selectItem itemLabel="#{messages['alert.dropdown.SelectOption']}" itemValue="0" /> <f:selectItems value="#{alertConditionUIBean.existingAlerts}" /> + <a4j:support event="onchange" reRender="willRecoverCheckbox" /> </h:selectOneMenu> <br /> - <h:selectBooleanCheckbox id="willRecoverCheckbox" value="#{alertDefinition.willRecover}" /> + <h:selectBooleanCheckbox id="willRecoverCheckbox" + value="#{alertDefinition.willRecover}" + disabled="#{alertDefinition.recoveryId != 0}"> + <a4j:support event="onchange" reRender="recoveryForAlertSelectBox" /> + </h:selectBooleanCheckbox> <h:outputLabel for="willRecoverCheckbox" value="#{messages['alert.config.props.CB.Content.UntilRecovered']}" /> <br /> @@ -151,28 +166,63 @@ <ui:fragment rendered="#{alertDefinition.alertDampening.category == 'CONSECUTIVE_COUNT'}"> <h:outputText value="#{messages['alert.config.props.CB.Content.DampenConsecutiveCount.1']} " /> - <h:inputText value="#{alertDefinition.alertDampening.value}" - required="true" - maxlength="5"/> + <h:inputText id="consecutiveCount" + value="#{alertDefinition.alertDampening.value}" + size="4" + required="true" + requiredMessage="#{alertConditionMessages.dampeningCount}" + validatorMessage="#{alertConditionMessages.dampeningCount}" + converterMessage="#{alertConditionMessages.dampeningCount}"> + <f:validateDoubleRange minimum="0" /> + </h:inputText> <h:outputText value=" #{messages['alert.config.props.CB.Content.DampenConsecutiveCount.2']}" /> </ui:fragment> <ui:fragment rendered="#{alertDefinition.alertDampening.category == 'PARTIAL_COUNT'}"> <h:outputText value="#{messages['alert.config.props.CB.Content.DampenPartialCount.1']} " /> - <h:inputText value="#{alertDefinition.alertDampening.value}" - required="true" - maxlength="5"/> + <h:inputText id="partialCount" + value="#{alertDefinition.alertDampening.value}" + size="4" + required="true" + requiredMessage="#{alertConditionMessages.dampeningCount}" + validatorMessage="#{alertConditionMessages.dampeningCount}" + converterMessage="#{alertConditionMessages.dampeningCount}"> + <f:validateLongRange minimum="0" /> + </h:inputText> <h:outputText value=" #{messages['alert.config.props.CB.Content.DampenPartialCount.2']} " /> - <h:inputText value="#{alertDefinition.alertDampening.period}" /> + <h:inputText id="partialCountPeriod" + value="#{alertDefinition.alertDampening.period}" + size="4" + required="true" + requiredMessage="#{alertConditionMessages.dampeningEvaluation}" + validatorMessage="#{alertConditionMessages.dampeningEvaluation}" + converterMessage="#{alertConditionMessages.dampeningEvaluation}"> + <f:validateLongRange minimum="0" /> + </h:inputText> <h:outputText value=" #{messages['alert.config.props.CB.Content.DampenPartialCount.3']}" /> </ui:fragment> <ui:fragment rendered="#{alertDefinition.alertDampening.category == 'DURATION_COUNT'}"> <h:outputText value="#{messages['alert.config.props.CB.Content.DampenDurationCount.1']} " /> - <h:inputText value="#{alertDefinition.alertDampening.value}" /> + <h:inputText id="durationCount" + value="#{alertDefinition.alertDampening.value}" + size="4" + required="true" + requiredMessage="#{alertConditionMessages.dampeningCount}" + validatorMessage="#{alertConditionMessages.dampeningCount}" + converterMessage="#{alertConditionMessages.dampeningCount}"> + <f:validateLongRange minimum="0" /> + </h:inputText> <h:outputText value=" #{messages['alert.config.props.CB.Content.DampenDurationCount.2']} " /> - <h:inputText value="#{alertDefinition.alertDampening.period}" /> - + <h:inputText id="durationCountPeriod" + value="#{alertDefinition.alertDampening.period}" + size="4" + required="true" + requiredMessage="#{alertConditionMessages.timePeriod}" + validatorMessage="#{alertConditionMessages.timePeriod}" + converterMessage="#{alertConditionMessages.timePeriod}"> + <f:validateLongRange minimum="0" /> + </h:inputText> <h:selectOneMenu value="#{alertDefinition.alertDampening.periodUnits}"> <f:selectItems value="#{alertConditionUIBean.timeUnits}" /> </h:selectOneMenu> @@ -190,7 +240,7 @@ styleClass="buttonmed" style="margin: 10px;" /> </ui:insert> - </a4j:form> + </h:form> <rich:modalPanel id="categoryModalPanel" moveable="false" autosized="true" width="400"> @@ -199,8 +249,8 @@ <h:form id="categoryForm"> <h:selectOneMenu value="#{alertConditionsUIBean.currentCondition.category}"> <f:selectItem itemLabel="#{messages['alert.dropdown.SelectOption']}" /> - <s:selectItems value="#{alertConditionsUIBean.categories}" /> - <a4j:support event="onchange" reRender="categoryOptions" status="categoryLoadStatus" /> + <f:selectItems value="#{alertConditionsUIBean.categories}" /> + <a4j:support event="onchange" reRender="EditConditionForm" status="categoryLoadStatus" /> </h:selectOneMenu> </h:form> @@ -221,14 +271,20 @@ <ui:fragment rendered="#{alertConditionsUIBean.currentCondition.category == 'CONTROL'}"> <h:outputLabel for="operationSelection" value="#{messages['alert.config.props.CB.Content.ControlAction']} " /> - <h:selectOneMenu id="operationSelection" value="#{alertConditionsUIBean.currentCondition.name}"> + <h:selectOneMenu id="operationSelection" + value="#{alertConditionsUIBean.currentCondition.name}" + required="true" + requiredMessage="#{messages['alert.config.error.NoControlActionSelected']}"> <f:selectItem itemLabel="#{messages['alert.dropdown.SelectOption']}" /> <f:selectItems value="#{alertConditionUIBean.operations}" /> </h:selectOneMenu> <h:outputText value=" #{messages['alert.config.props.CB.Content.Comparator.=']} " /> - <h:selectOneMenu id="operationStatusSelection" value="#{alertConditionsUIBean.currentCondition.option}"> + <h:selectOneMenu id="operationStatusSelection" + value="#{alertConditionsUIBean.currentCondition.option}" + required="true" + requiredMessage="#{messages['alert.config.error.NoControlActionStatusSelected']}"> <f:selectItem itemLabel="#{messages['alert.dropdown.SelectOption']}" /> <f:selectItems value="#{alertConditionUIBean.operationStatuses}" /> </h:selectOneMenu> @@ -238,7 +294,10 @@ <ui:fragment rendered="#{alertConditionsUIBean.currentCondition.category == 'AVAILABILITY'}"> <h:outputLabel for="availabilitySelection" value="#{messages['alert.config.props.CB.Content.Availability']} " /> - <h:selectOneMenu id="availabilitySelection" value="#{alertConditionsUIBean.currentCondition.option}"> + <h:selectOneMenu id="availabilitySelection" + value="#{alertConditionsUIBean.currentCondition.option}" + required="true" + requiredMessage="#{messages['alert.config.error.NoAvailabilityStatusSelected']}"> <f:selectItem itemLabel="#{messages['alert.dropdown.SelectOption']}" /> <f:selectItems value="#{alertConditionUIBean.availabilities}" /> </h:selectOneMenu> @@ -248,7 +307,10 @@ <ui:fragment rendered="#{alertConditionsUIBean.currentCondition.category == 'CHANGE'}"> <h:outputLabel for="metricChangeSelection" value="#{messages['alert.config.props.CB.Content.Metric']} " /> - <h:selectOneMenu id="metricChangeSelection" value="#{alertConditionsUIBean.measurementDefinitionId}"> + <h:selectOneMenu id="metricChangeSelection" + value="#{alertConditionsUIBean.measurementDefinitionId}" + required="true" + requiredMessage="#{messages['alert.config.error.NoMetricSelected']}"> <f:selectItem itemLabel="#{messages['alert.dropdown.SelectOption']}" /> <f:selectItems value="#{alertConditionUIBean.measurements}" /> </h:selectOneMenu> @@ -260,7 +322,10 @@ <ui:fragment rendered="#{alertConditionsUIBean.currentCondition.category == 'THRESHOLD'}"> <h:outputLabel for="metricThresholdSelection" value="#{messages['alert.config.props.CB.Content.Metric']}" /> - <h:selectOneMenu id="metricThresholdSelection" value="#{alertConditionsUIBean.measurementDefinitionId}"> + <h:selectOneMenu id="metricThresholdSelection" + value="#{alertConditionsUIBean.measurementDefinitionId}" + required="true" + requiredMessage="#{messages['alert.config.error.NoMetricSelected']}"> <f:selectItem itemLabel="#{messages['alert.dropdown.SelectOption']}" /> <f:selectItems value="#{alertConditionUIBean.measurements}" /> </h:selectOneMenu> @@ -273,14 +338,23 @@ <br /> <br /> - <h:inputText id="metricThresholdAbsolute" value="#{alertConditionsUIBean.threshold}" /> + <h:inputText id="metricThresholdAbsolute" + value="#{alertConditionsUIBean.threshold}" + required="true" + requiredMessage="#{alertConditionMessages.threshold}" + validatorMessage="#{alertConditionMessages.threshold}"> + <f:validateDoubleRange minimum="0.0" /> + </h:inputText> <h:outputLabel for="metricThresholdAbsolute" value="#{messages['alert.config.props.CB.Content.AbsoluteValue']}" /> </ui:fragment> <ui:fragment rendered="#{alertConditionsUIBean.currentCondition.category == 'BASELINE'}"> <h:outputLabel for="metricBaselineSelection" value="#{messages['alert.config.props.CB.Content.Metric']} " /> - <h:selectOneMenu id="metricBaselineSelection" value="#{alertConditionsUIBean.measurementDefinitionId}"> + <h:selectOneMenu id="metricBaselineSelection" + value="#{alertConditionsUIBean.measurementDefinitionId}" + required="true" + requiredMessage="#{messages['alert.config.error.NoMetricSelected']}"> <f:selectItem itemLabel="#{messages['alert.dropdown.SelectOption']}" /> <f:selectItems value="#{alertConditionUIBean.measurements}" /> </h:selectOneMenu> @@ -293,10 +367,20 @@ <br /> <br /> - <h:inputText id="metricBaselinePercent" value="#{alertConditionsUIBean.currentCondition.threshold}" converter="#{metricPercentConverter}" /> + <h:inputText id="metricBaselinePercent" + value="#{alertConditionsUIBean.currentCondition.threshold}" + converter="#{metricPercentConverter}" + required="true" + requiredMessage="#{alertConditionMessages.percentRange}" + validatorMessage="#{alertConditionMessages.percentRange}"> + <f:validateDoubleRange minimum="0.0" maximum="1000.0" /> + </h:inputText> <h:outputLabel for="metricBaselinePercent" value=" #{messages['alert.config.props.CB.Content.Percent']} " /> - <h:selectOneMenu id="metricBaselineBaselineSelection" value="#{alertConditionsUIBean.currentCondition.option}"> + <h:selectOneMenu id="metricBaselineBaselineSelection" + value="#{alertConditionsUIBean.currentCondition.option}" + required="true" + requiredMessage="#{messages['alert.config.error.NoBaselineOptionSelected']}"> <f:selectItems value="#{alertConditionUIBean.baselines}" /> </h:selectOneMenu> </ui:fragment> @@ -305,20 +389,29 @@ <ui:fragment rendered="#{alertConditionsUIBean.currentCondition.category == 'EVENT'}"> <h:outputLabel for="eventSelection" value="#{messages['alert.config.props.CB.Content.EventSeverity']} " /> - <h:selectOneMenu id="eventSelection" value="#{alertConditionsUIBean.currentCondition.name}"> + <h:selectOneMenu id="eventSelection" + value="#{alertConditionsUIBean.currentCondition.name}" + required="true" + requiredMessage="#{messages['alert.config.error.NoEventSeveritySelected']}"> <f:selectItem itemLabel="#{messages['alert.dropdown.SelectOption']}" /> <f:selectItems value="#{alertConditionUIBean.severities}" /> </h:selectOneMenu> <h:outputText value=" #{messages['alert.config.props.CB.Content.Match']}" /> - <h:inputText id="eventExpression" value="#{alertConditionsUIBean.currentCondition.option}" /> + <h:inputText id="eventExpression" + value="#{alertConditionsUIBean.currentCondition.option}"> + <f:validator validatorId="eventRegexValidator" /> + </h:inputText> </ui:fragment> <ui:fragment rendered="#{alertConditionsUIBean.currentCondition.category == 'TRAIT'}"> <h:outputLabel for="traitSelection" value="#{messages['alert.config.props.CB.Content.Trait']} " /> - <h:selectOneMenu id="traitSelection" value="#{alertConditionsUIBean.measurementDefinitionId}"> + <h:selectOneMenu id="traitSelection" + value="#{alertConditionsUIBean.measurementDefinitionId}" + required="true" + requiredMessage="#{messages['alert.config.error.NoTraitSelected']}"> <f:selectItem itemLabel="#{messages['alert.dropdown.SelectOption']}" /> <f:selectItems value="#{alertConditionUIBean.traits}" /> </h:selectOneMenu> @@ -335,10 +428,11 @@ </rich:panel> <h:commandButton id="categoryOptionOkButton" - value="OK" - action="#{alertConditionsUIBean.updateCondition}" - styleClass="buttonmed" - style="margin: 5px;"> + value="OK" + rendered="#{not empty alertConditionsUIBean.currentCondition.category}" + action="#{alertConditionsUIBean.updateCondition}" + styleClass="buttonmed" + style="margin: 5px;"> <rich:componentControl for="categoryModalPanel" attachTo="categoryOptionOkButton" operation="hide" event="onclick" /> <a4j:support event="onclick" reRender="categoryTable" /> </h:commandButton>

1 0

[rhq] Branch 'alertPlugin' - 2 commits - modules/enterprise
by Heiko W. Rupp 23 Feb '10

23 Feb '10

modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/AckAlertAction.java | 78 ++++++++++ modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/struts-config.xml | 10 + modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/ViewAlertProperties.jsp | 49 +++--- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/alert/CustomAlertSenderBackingBean.java | 30 +++ 4 files changed, 148 insertions(+), 19 deletions(-) New commits: commit e956b6f8b2608bc9d2941daba6e732caf4ad5715 Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Tue Feb 23 22:25:45 2010 +0100 Introduce the possibility to ack an alert on the detail page. BZ 567383 diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/AckAlertAction.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/AckAlertAction.java new file mode 100644 index 0000000..6043d19 --- /dev/null +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/AckAlertAction.java @@ -0,0 +1,78 @@ +/* + * 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.legacy.action.resource.common.monitor.alerts; + +import java.util.HashMap; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.tiles.ComponentContext; +import org.apache.struts.tiles.actions.TilesAction; + +import org.rhq.core.domain.alert.Alert; +import org.rhq.core.domain.auth.Subject; +import org.rhq.enterprise.gui.legacy.action.BaseAction; +import org.rhq.enterprise.gui.legacy.util.RequestUtils; +import org.rhq.enterprise.server.alert.AlertManagerLocal; +import org.rhq.enterprise.server.util.LookupUtil; + +/** + * Struts action to acknowledge one single alert from the + * ViewAlertProperties.jsp page + * @author Heiko W. Rupp + */ +public class AckAlertAction extends BaseAction { + + Log log = LogFactory.getLog(AckAlertAction.class); + + public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, + HttpServletResponse response) throws Exception { + + Subject subject = RequestUtils.getSubject(request); + AlertManagerLocal alertManager = LookupUtil.getAlertManager(); + + Map params = new HashMap(3); + // pass-through the alertId and resource id + Integer alertId = new Integer(request.getParameter("a")); + request.setAttribute("a", alertId); + params.put("a",alertId); + + Integer resourceId = new Integer(request.getParameter("id")); + request.setAttribute("id",resourceId); + params.put("id",resourceId); + + String mode = request.getParameter("mode"); + request.setAttribute("mode",mode); + params.put("mode",mode); + + alertManager.acknowledgeAlert(alertId,subject); + + log.debug("Acknowledged Alert with id " + alertId + " and user " + subject.getName()); + + return returnSuccess(request,mapping,params); + } + +} 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 41da1ee..a4c1b31 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 @@ -2559,6 +2559,16 @@ path="/common/GenericError.jsp"/> </action> + <action path="/alerts/AckAlert" + scope="request" + type="org.rhq.enterprise.gui.legacy.action.resource.common.monitor.alerts.AckAlertAction"> + <set-property property="title" value="View+Alert"/> + <exception key="exception.AlertNotFoundException" + type="org.rhq.enterprise.server.legacy.events.AlertNotFoundException" + path="/common/GenericError.jsp"/> + <forward name="success" path="/alerts/Alerts.do" redirect="true" /> + </action> + <action path="/alerts/ViewDefinition" scope="request" type="org.rhq.enterprise.gui.legacy.action.resource.common.monitor.alerts.config.ViewDefinitionAction"> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/ViewAlertProperties.jsp b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/ViewAlertProperties.jsp index 1b1c04b..0b49ecb 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/ViewAlertProperties.jsp +++ b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/ViewAlertProperties.jsp @@ -39,26 +39,37 @@ <td class="BlockLabel"><fmt:message key="alert.current.detail.props.AlertDate"/></td> <td class="BlockContent" colspan="2"><hq:dateFormatter time="false" value="${alert.ctime}"/></td> </tr> - <tr valign="top"> - <td class="BlockLabel">Acknowledged by:</td> - <td class="BlockContent"> - <c:if test="${not empty alert.ackBy}"> - <c:out value="${alert.ackBy.firstName}"/> - <c:out value=" "/> - <c:out value="${alert.ackBy.lastName}"/> - <c:out value=" ("/> - <c:out value="${alert.ackBy.name}"/> - <c:out value=")"/> - </c:if> - </td> - <td class="BlockLabel">Acknowledged at:</td> - <td class="BlockContent"> - <c:if test="${alert.ackTime > 0}"> - <hq:dateFormatter time="false" value="${alert.ackTime}"/> - </c:if> + <c:choose> + <c:when test="${not empty alert.ackBy}"> + <tr valign="top"> + <td class="BlockLabel">Acknowledged by:</td> + <td class="BlockContent"> + <c:out value="${alert.ackBy.firstName}"/> + <c:out value=" "/> + <c:out value="${alert.ackBy.lastName}"/> + <c:out value=" ("/> + <c:out value="${alert.ackBy.name}"/> + <c:out value=")"/> + </td> + <td class="BlockLabel">Acknowledged at:</td> + <td class="BlockContent"> + <hq:dateFormatter time="false" value="${alert.ackTime}"/> + </td> + </tr> + </c:when> + <c:otherwise> + <tr valign="top"> + <td class="BlockLabel">Acknowledge Alert</td> + <td class="BlockContent"> + <a href="/alerts/AckAlert.do?id=${Resource.id}&a=${alert.id}&mode=${param.mode}">click here</a> + </td> + <td class="BlockContent"> </td> + <td class="BlockContent"> </td> + </tr> - </td> - </tr> + </c:otherwise> + + </c:choose> <tr> <td colspan="5" class="BlockContent"><html:img page="/images/spacer.gif" width="1" height="1" border="0"/></td> </tr> commit b22dc41c2c2251ee2c29387eabbdfbf9a616a41d Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Tue Feb 23 16:20:56 2010 +0100 Add a new cleanup() method and some JavaDoc diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/alert/CustomAlertSenderBackingBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/alert/CustomAlertSenderBackingBean.java index 72f6ec8..5b39eae 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/alert/CustomAlertSenderBackingBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/alert/CustomAlertSenderBackingBean.java @@ -40,9 +40,24 @@ public class CustomAlertSenderBackingBean { public void setAlertParameters(Configuration alertParameters) { this.alertParameters = alertParameters; } + /** + * This method is called when the alert notification that uses this backing bean + * is removed, so that the backing bean can do some cleanup work + */ + protected void cleanup() {} + /** + * Persist the passed configuration object. This can be a new object or one + * that already exists in the database. If the input is null, not persistence + * happens and null is returned. + * @param config configuration to persist or update + * @return a merged copy of the configuration or null + */ protected Configuration persistConfiguration(Configuration config) { + if (config==null) + return null; + ConfigurationManagerLocal mgr = LookupUtil.getConfigurationManager(); config = mgr.mergeConfiguration(config); @@ -50,6 +65,14 @@ public class CustomAlertSenderBackingBean { } + /** + * Persist a single property of a given configuration. If the property does not yet exist, + * it is created otherwise overwritten with the new value. + * @param config configuration the property is on + * @param propertyName name of the property to persist + * @param value (new) value of the property to persist + * @return the updated configuration + */ protected Configuration persistProperty(Configuration config, String propertyName, Object value) { PropertySimple prop = config.getSimple(propertyName); @@ -65,6 +88,12 @@ public class CustomAlertSenderBackingBean { return ret; } + /** + * Remove one property from the passed configuration. Returns the updated configuration + * @param config configuration the property is on + * @param propertyName name of the property to remove + * @return the updated configuration + */ protected Configuration cleanProperty(Configuration config, String propertyName) { Configuration ret = config; @@ -76,4 +105,5 @@ public class CustomAlertSenderBackingBean { return ret; } + }

1 0

[rhq] Branch 'bundle' - modules/enterprise
by mazz 23 Feb '10

23 Feb '10

modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ServerPluginManager.java | 1 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/bundle/BundleServerPluginContainer.java | 5 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/bundle/BundleServerPluginFacet.java | 29 +++++ modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/bundle/BundleServerPluginManager.java | 54 ++++++++++ modules/enterprise/server/plugins/filetemplate-bundle/src/main/java/org/rhq/enterprise/server/plugins/filetemplate/BundleServerPluginComponent.java | 3 5 files changed, 90 insertions(+), 2 deletions(-) New commits: commit 27317cceaaffe3c97a9c6c22318fa36ce748b5db Author: John Mazzitelli <mazz(a)redhat.com> Date: Tue Feb 23 13:31:57 2010 -0500 given a bundle type name, you can now get a plugin component from the bundle plugin that supports that type. BundleServerPluginFacet will be the interface of the bundle server plugin to the outside world (the SLSBs for example) diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ServerPluginManager.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ServerPluginManager.java index 768162f..5f75e96 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ServerPluginManager.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ServerPluginManager.java @@ -486,7 +486,6 @@ public class ServerPluginManager { * * The new object will be loaded in the plugin's specific classloader. * - * @param pluginName the name of the plugin whose main component is to be retrieved * @param environment the environment in which the plugin will execute * * @return a new object loaded in the proper plugin classloader that can initialize/shutdown the plugin, diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/bundle/BundleServerPluginContainer.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/bundle/BundleServerPluginContainer.java index 59eb94c..6814b2b 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/bundle/BundleServerPluginContainer.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/bundle/BundleServerPluginContainer.java @@ -44,4 +44,9 @@ public class BundleServerPluginContainer extends AbstractTypeServerPluginContain protected ServerPluginManager createPluginManager() { return new BundleServerPluginManager(this); } + + public BundleServerPluginManager getBundleServerPluginManager() { + return (BundleServerPluginManager) getPluginManager(); + } + } \ No newline at end of file diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/bundle/BundleServerPluginFacet.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/bundle/BundleServerPluginFacet.java new file mode 100644 index 0000000..0585a4b --- /dev/null +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/bundle/BundleServerPluginFacet.java @@ -0,0 +1,29 @@ +/* + * 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.server.plugin.pc.bundle; + +/** + * All bundle server plugins must implement this facet. + * + * @author John Mazzitelli + */ +public interface BundleServerPluginFacet { + +} diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/bundle/BundleServerPluginManager.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/bundle/BundleServerPluginManager.java index c1b542d..68f8a0f 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/bundle/BundleServerPluginManager.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/bundle/BundleServerPluginManager.java @@ -18,8 +18,11 @@ */ package org.rhq.enterprise.server.plugin.pc.bundle; +import org.rhq.enterprise.server.plugin.pc.ServerPluginComponent; import org.rhq.enterprise.server.plugin.pc.ServerPluginEnvironment; import org.rhq.enterprise.server.plugin.pc.ServerPluginManager; +import org.rhq.enterprise.server.xmlschema.generated.serverplugin.bundle.BundlePluginDescriptorType; +import org.rhq.enterprise.server.xmlschema.generated.serverplugin.bundle.BundleType; /** * This loads in all bundle server plugins that can be found. You can obtain a loaded plugin's @@ -38,4 +41,55 @@ public class BundleServerPluginManager extends ServerPluginManager { public void initialize() throws Exception { super.initialize(); } + + @Override + protected void loadPlugin(ServerPluginEnvironment env, boolean enabled) throws Exception { + if (enabled) { + // validate some things about this plugin that are specific for bundle functionality + + BundlePluginDescriptorType descriptor = (BundlePluginDescriptorType) env.getPluginDescriptor(); + BundleType bt = descriptor.getBundle(); + if (bt == null || bt.getType() == null || bt.getType().length() == 0) { + // if the xml parser did its job, this will probably never happen, but just in case, make sure there is + // a non-null, valid bundle type name - we have other code that expects this to be true + throw new Exception("The bundle plugin [" + env.getPluginKey().getPluginName() + + "] did not specify a valid bundle type in its descriptor"); + } + + ServerPluginComponent component = createServerPluginComponent(env); + if (!(component instanceof BundleServerPluginFacet)) { + throw new Exception("The bundle plugin [" + env.getPluginKey().getPluginName() + + "] has an invalid component [" + component + "]. It does not implement [" + + BundleServerPluginFacet.class + "]"); + } + } + + super.loadPlugin(env, enabled); + } + + /** + * Given the {@link BundleType#getName() name of a bundle type}, this will return the stateful plugin component + * that manages bundles of that type. + * + * @param bundleTypeName + * + * @return the plugin component object that will manage bundles of the named bundle type; <code>null</code> if there is no plugin + * that can support the given bundle type + */ + public BundleServerPluginFacet getBundleServerPluginFacet(String bundleTypeName) { + if (bundleTypeName == null) { + throw new IllegalArgumentException("bundleTypeName == null"); + } + + for (ServerPluginEnvironment env : getPluginEnvironments()) { + BundlePluginDescriptorType descriptor = (BundlePluginDescriptorType) env.getPluginDescriptor(); + if (bundleTypeName.equals(descriptor.getBundle().getType())) { + ServerPluginComponent component = getServerPluginComponent(env.getPluginKey().getPluginName()); + // we know this cast will work because our loadPlugin ensured that this component implements this interface + return (BundleServerPluginFacet) component; + } + } + + return null; + } } \ No newline at end of file diff --git a/modules/enterprise/server/plugins/filetemplate-bundle/src/main/java/org/rhq/enterprise/server/plugins/filetemplate/BundleServerPluginComponent.java b/modules/enterprise/server/plugins/filetemplate-bundle/src/main/java/org/rhq/enterprise/server/plugins/filetemplate/BundleServerPluginComponent.java index 0e8659e..58dd5b1 100644 --- a/modules/enterprise/server/plugins/filetemplate-bundle/src/main/java/org/rhq/enterprise/server/plugins/filetemplate/BundleServerPluginComponent.java +++ b/modules/enterprise/server/plugins/filetemplate-bundle/src/main/java/org/rhq/enterprise/server/plugins/filetemplate/BundleServerPluginComponent.java @@ -25,13 +25,14 @@ import org.rhq.enterprise.server.plugin.pc.ControlFacet; import org.rhq.enterprise.server.plugin.pc.ControlResults; import org.rhq.enterprise.server.plugin.pc.ServerPluginComponent; import org.rhq.enterprise.server.plugin.pc.ServerPluginContext; +import org.rhq.enterprise.server.plugin.pc.bundle.BundleServerPluginFacet; /** * A bundle server-side plugin component that the server uses to process file template bundles. * * @author John Mazzitelli */ -public class BundleServerPluginComponent implements ServerPluginComponent, ControlFacet { +public class BundleServerPluginComponent implements ServerPluginComponent, BundleServerPluginFacet, ControlFacet { private ServerPluginContext context;

1 0

[rhq] Branch 'ldap' - modules/core
by Partha Aji 23 Feb '10

23 Feb '10

modules/core/domain/src/main/java/org/rhq/core/domain/auth/Subject.java | 8 - modules/core/domain/src/main/java/org/rhq/core/domain/authz/Role.java | 58 +++++++--- 2 files changed, 46 insertions(+), 20 deletions(-) New commits: commit 7789e66b5e5a114e67e2d0bb2bedc3641a33abc0 Author: Partha Aji <paji(a)redhat.com> Date: Tue Feb 23 13:21:49 2010 -0500 Updated the addSubject/removeSubject stuff from Role to use SubjectRoleEntity bean diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/auth/Subject.java b/modules/core/domain/src/main/java/org/rhq/core/domain/auth/Subject.java index 121f555..023faa3 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/auth/Subject.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/auth/Subject.java @@ -231,13 +231,11 @@ public class Subject implements Externalizable { @JoinTable(name = "RHQ_SUBJECT_ROLE_MAP", joinColumns = { @JoinColumn(name = "SUBJECT_ID") }) private Set<SubjectRoleEntity> subjectRoles; - private Set<Role> roles; - @Transient private Integer sessionId = null; private void init() { - roles = new HashSet<Role>(); + subjectRoles = new HashSet<SubjectRoleEntity>(); } /** @@ -505,7 +503,7 @@ public class Subject implements Externalizable { out.writeBoolean(factive); out.writeBoolean(fsystem); out.writeObject(configuration); - out.writeObject(roles); + out.writeObject(getRoles()); // not supplied by remote: subjectNotifications out.writeInt(this.sessionId == null ? 0 : this.sessionId); } @@ -523,7 +521,7 @@ public class Subject implements Externalizable { this.factive = in.readBoolean(); this.fsystem = in.readBoolean(); this.configuration = (Configuration) in.readObject(); - this.roles = (Set<Role>) in.readObject(); + setRoles((Set<Role>) in.readObject()); this.sessionId = in.readInt(); } diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/authz/Role.java b/modules/core/domain/src/main/java/org/rhq/core/domain/authz/Role.java index 4e157c6..1e66029 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/authz/Role.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/authz/Role.java @@ -110,8 +110,6 @@ public class Role implements Serializable { @JoinTable(name = "RHQ_SUBJECT_ROLE_MAP", joinColumns = { @JoinColumn(name = "ROLE_ID") }) private java.util.Set<SubjectRoleEntity> roleSubjects; - private java.util.Set<Subject> subjects = new HashSet<Subject>(); - @ManyToMany(mappedBy = "roles") private java.util.Set<org.rhq.core.domain.resource.group.ResourceGroup> resourceGroups = new HashSet<org.rhq.core.domain.resource.group.ResourceGroup>(); @@ -183,30 +181,60 @@ public class Role implements Serializable { return this.permissions.remove(permission); } + public Set<SubjectRoleEntity> getRoleSubjects() { + if (roleSubjects == null) { + roleSubjects = new HashSet<SubjectRoleEntity>(); + } + return roleSubjects; + } + + public void setRoleSubjects(Set<SubjectRoleEntity> subjectsIn) { + roleSubjects = subjectsIn; + } + public java.util.Set<Subject> getSubjects() { - return subjects; + Set<Subject> s = new HashSet<Subject>(); + for (SubjectRoleEntity sre : getRoleSubjects()) { + s.add(sre.getSubject()); + } + return s; } public void setSubjects(Set<Subject> subjects) { - this.subjects = subjects; + Set<SubjectRoleEntity> sroles = getRoleSubjects(); + sroles.clear(); + for (Subject subject : subjects) { + SubjectRoleEntity s = new SubjectRoleEntity(); + s.setRole(this); + s.setSubject(subject); + sroles.add(s); + } } - public void addSubject(Subject subject) { - if (this.subjects == null) { - this.subjects = new HashSet<Subject>(); - } + public void addSubject(Subject subject, boolean ldap) { + SubjectRoleEntity s = new SubjectRoleEntity(); + s.setSubject(subject); + s.setRole(this); + s.setLdap(ldap); + getRoleSubjects().add(s); + } - subject.addRole(this); - this.subjects.add(subject); + public void addSubject(Subject subject) { + addSubject(subject, false); } public void removeSubject(Subject subject) { - if (this.subjects == null) { - this.subjects = new HashSet<Subject>(); + SubjectRoleEntity toRemove = null; + for (SubjectRoleEntity s : getRoleSubjects()) { + if (s.getSubject().equals(subject) && s.getRole().equals(this)) { + toRemove = s; + break; + } + } + if (toRemove != null) { + getRoleSubjects().remove(toRemove); + subject.removeRole(this); } - - subject.removeRole(this); - this.subjects.remove(subject); } public Set<org.rhq.core.domain.resource.group.ResourceGroup> getResourceGroups() {

1 0

[rhq] Branch 'ldap' - modules/core
by Partha Aji 23 Feb '10

23 Feb '10

modules/core/domain/src/main/java/org/rhq/core/domain/auth/Subject.java | 42 +++++- modules/core/domain/src/main/java/org/rhq/core/domain/auth/SubjectRoleEntity.java | 62 +++++++++- 2 files changed, 96 insertions(+), 8 deletions(-) New commits: commit dcb59bb828983e2879cac829852437e00e0f29d8 Author: Partha Aji <paji(a)redhat.com> Date: Tue Feb 23 11:03:16 2010 -0500 More clean up work on Subjects and SubjectRoleEntity diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/auth/Subject.java b/modules/core/domain/src/main/java/org/rhq/core/domain/auth/Subject.java index f7f6ac2..121f555 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/auth/Subject.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/auth/Subject.java @@ -229,9 +229,9 @@ public class Subject implements Externalizable { @OneToMany @JoinTable(name = "RHQ_SUBJECT_ROLE_MAP", joinColumns = { @JoinColumn(name = "SUBJECT_ID") }) - private java.util.Set<SubjectRoleEntity> subjectRoles; + private Set<SubjectRoleEntity> subjectRoles; - private java.util.Set<Role> roles; + private Set<Role> roles; @Transient private Integer sessionId = null; @@ -362,14 +362,18 @@ public class Subject implements Externalizable { this.configuration = configuration; } - public java.util.Set<SubjectRoleEntity> getSubjectRoles() { + public Set<SubjectRoleEntity> getSubjectRoles() { if (subjectRoles == null) { subjectRoles = new HashSet<SubjectRoleEntity>(); } return subjectRoles; } - public java.util.Set<Role> getRoles() { + public void setSubjectRoles(Set<SubjectRoleEntity> subjectRolesIn) { + subjectRoles = subjectRolesIn; + } + + public Set<Role> getRoles() { Set<Role> r = new HashSet<Role>(); for (SubjectRoleEntity s : getSubjectRoles()) { r.add(s.getRole()); @@ -378,15 +382,39 @@ public class Subject implements Externalizable { } public void setRoles(Set<Role> roles) { - this.roles = roles; + Set<SubjectRoleEntity> sroles = getSubjectRoles(); + sroles.clear(); + for (Role r : roles) { + SubjectRoleEntity s = new SubjectRoleEntity(); + s.setSubject(this); + s.setRole(r); + sroles.add(s); + } + } + + public void addRole(Role role, boolean ldap) { + SubjectRoleEntity s = new SubjectRoleEntity(); + s.setSubject(this); + s.setRole(role); + s.setLdap(ldap); + getSubjectRoles().add(s); } public void addRole(Role role) { - getRoles().add(role); + addRole(role, false); } public void removeRole(Role role) { - getRoles().remove(role); + SubjectRoleEntity toRemove = null; + for (SubjectRoleEntity s : getSubjectRoles()) { + if (s.getSubject().equals(this) && s.getRole().equals(role)) { + toRemove = s; + break; + } + } + if (toRemove != null) { + getSubjectRoles().remove(toRemove); + } } @Override diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/auth/SubjectRoleEntity.java b/modules/core/domain/src/main/java/org/rhq/core/domain/auth/SubjectRoleEntity.java index 369b491..fc0b0ed 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/auth/SubjectRoleEntity.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/auth/SubjectRoleEntity.java @@ -1,3 +1,25 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2008 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, version 2, as + * published by the Free Software Foundation, and/or the GNU Lesser + * General Public License, version 2.1, also as published by the Free + * Software Foundation. + * + * 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 and the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * and the GNU Lesser General Public License along with this program; + * if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ package org.rhq.core.domain.auth; import java.io.Serializable; @@ -11,7 +33,6 @@ import org.rhq.core.domain.authz.Role; @Table(name = "RHQ_SUBJECT_ROLE_MAP") public class SubjectRoleEntity implements Serializable { - @ManyToOne @JoinColumn(name = "SUBJECT_ID", referencedColumnName = "ID") private Subject subject; @@ -47,4 +68,43 @@ public class SubjectRoleEntity implements Serializable { this.isLdap = isLdap; } + @Override + public int hashCode() { + final int PRIME = 31; + int result = 1; + result = (PRIME * result) + ((subject == null) ? 0 : subject.hashCode()); + result = (PRIME * result) + ((role == null) ? 0 : role.hashCode()); + result = (PRIME * result) + ((isLdap) ? 0 : PRIME); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + + if ((obj == null) || !(obj instanceof SubjectRoleEntity)) { + return false; + } + + final SubjectRoleEntity other = (SubjectRoleEntity) obj; + if (subject == null) { + if (other.subject != null) { + return false; + } + } else if (!subject.equals(other.subject)) { + return false; + } + + if (role == null) { + if (other.role != null) { + return false; + } + } else if (!role.equals(other.role)) { + return false; + } + + return isLdap == other.isLdap; + } }

1 0

[rhq] Branch 'ldap' - 17 commits - modules/core modules/enterprise
by Partha Aji 23 Feb '10

23 Feb '10

modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java | 10 + modules/core/domain/src/main/java/org/rhq/core/domain/util/PersistenceUtility.java | 90 ++++++++++ modules/enterprise/comm/src/main/java/org/rhq/enterprise/communications/command/client/JBossRemotingRemoteCommunicator.java | 80 ++++++-- modules/enterprise/gui/portal-war/src/main/webapp-filtered/WEB-INF/classes/ApplicationResources.properties | 4 modules/enterprise/gui/portal-war/src/main/webapp/admin/test/hibernate.jsp | 24 +- modules/enterprise/gui/portal-war/src/main/webapp/common/RSSFormat.jsp | 7 modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseGroups.xhtml | 4 modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseResources.xhtml | 4 modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/listAlertHistory.xhtml | 3 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java | 59 +++++- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerLocal.java | 3 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/i18n/AlertI18NResourceKeys.java | 21 ++ modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/MasterServerPluginContainer.java | 23 +- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ServerPluginClassLoader.java | 2 modules/enterprise/server/plugins/alert-irc/src/main/java/org/rhq/enterprise/server/plugins/alertIrc/IrcSender.java | 2 modules/enterprise/server/plugins/alert-microblog/src/main/java/org/rhq/enterprise/server/plugins/alertMicroblog/MicroblogSender.java | 9 - modules/enterprise/server/plugins/alert-mobicents/src/main/java/org/rhq/enterprise/server/plugins/alertMobicents/MobicentsSender.java | 2 modules/enterprise/server/plugins/alert-scriptlang/src/main/java/org.rhq.enterprise.server.plugins.alertScriptlang/ScriptLangSender.java | 2 modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpSender.java | 2 modules/enterprise/server/plugins/alert-snmp/src/main/resources/META-INF/rhq-serverplugin.xml | 2 20 files changed, 279 insertions(+), 74 deletions(-) New commits: commit 2e83a0cc092f8feef995642502447389152d598e Merge: 3f91c1c... 4c82f06... Author: Partha Aji <paji(a)redhat.com> Date: Tue Feb 23 10:20:31 2010 -0500 Merge branch 'linux-config' into ldap commit 4c82f0686d4905161b7ea2e27e154c414dfd6368 Merge: 2ae22a1... 59776e2... Author: Partha Aji <paji(a)redhat.com> Date: Tue Feb 23 10:13:20 2010 -0500 Merge branch 'master' into linux-config commit 59776e2009c2e2b17ca45d5c88e6373def9da879 Author: Ian P. Springer <ips(a)jetengine.(none)> Date: Tue Feb 23 09:23:23 2010 -0500 fix a couple invalid docs URLs diff --git a/modules/enterprise/gui/portal-war/src/main/webapp-filtered/WEB-INF/classes/ApplicationResources.properties b/modules/enterprise/gui/portal-war/src/main/webapp-filtered/WEB-INF/classes/ApplicationResources.properties index 571cf22..8132311 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp-filtered/WEB-INF/classes/ApplicationResources.properties +++ b/modules/enterprise/gui/portal-war/src/main/webapp-filtered/WEB-INF/classes/ApplicationResources.properties @@ -88,7 +88,7 @@ common.field.value=Value common.marketing.FeatureDisabled=This feature is unavailable, please contact sales to upgrade -common.url.help=https://network.jboss.com/confluence/display/DOC/Users+Guide +common.url.help=http://www.rhq-project.org/display/JOPR2 common.error.invalid.oid=OID specified is invalid, please enter OID in form of 1.2.3.4 @@ -2916,7 +2916,7 @@ software.common.InstallPreview.PatchTitle=Title software.common.InstallPreview.StepDescription=Step Description software.common.InstallPreview.ShortDescription=Short Description software.common.InstallPreview.LongDescription=Detailed Description -software.common.InstallPreview.TopMessage=Clicking the [Install] button will begin the execution of the steps listed below. Review each step carefully before proceeding with the update installation.<br/><ul><li>Prior to installing this update, if you have applied any one-off fixes to this instance, please check the update description to see that they are included in the fixes that make up this update. If they are not included then this update may overwrite the one-off fix and leave your instance in an unstable state.</li><li>When updating a JBoss instance that shares a common server configuration, follow the instructions documented in the wiki\: <a href\="https\://network.jboss.com/confluence/display/DOC/Installing+a+Patch" target\="_new">Installing a Patch</a>. Please contact support for more information.</li></ul> +software.common.InstallPreview.TopMessage=Clicking the [Install] button will begin the execution of the steps listed below. Review each step carefully before proceeding with the update installation.<br/><ul><li>Prior to installing this update, if you have applied any one-off fixes to this instance, please check the update description to see that they are included in the fixes that make up this update. If they are not included then this update may overwrite the one-off fix and leave your instance in an unstable state.</li><li>When updating a JBoss instance that shares a common server configuration, follow the instructions documented in the wiki\: <a href\="http://www.rhq-project.org/display/JOPR2/Demos#Demos-ContentSubsystem" target\="_new">Installing a Patch</a>. Please contact support for more information.</li></ul> software.common.InstallPreview.NotAllowedToInstall=This user doesn't have the appropriate rights to install an update. Only users that can control a resource may install an update. software.common.ManualUninstall.TableTitle=Manual Update Uninstallation commit b3c691dfd0f407658ba9004bbcbdda0c235404ef Author: Ian P. Springer <ips(a)jetengine.(none)> Date: Tue Feb 23 09:22:03 2010 -0500 fix regression in RSS feed template (https://bugzilla.redhat.com/show_bug.cgi?id=567636) diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/common/RSSFormat.jsp b/modules/enterprise/gui/portal-war/src/main/webapp/common/RSSFormat.jsp index 59bb5d1..3831ebb 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/common/RSSFormat.jsp +++ b/modules/enterprise/gui/portal-war/src/main/webapp/common/RSSFormat.jsp @@ -1,10 +1,10 @@ -<?xml version="1.0" encoding="utf-8" ?> +<?xml version="1.0" encoding="UTF-8"?> <%@ page language="java" contentType="text/xml" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> <%@ taglib uri="http://jakarta.apache.org/struts/tags-html-el" prefix="html" %> <rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:content="http://purl.org/rss/1.0/modules/content/"> - <repo> + <channel> <title><c:out value="${rssFeed.title}"/></title> <link><c:out value="${rssFeed.baseUrl}"/></link> <description><fmt:message key="dashboard.template.title"/> <c:out value="${rssFeed.title}"/></description> @@ -25,5 +25,6 @@ <guid><![CDATA[<c:out value="${item.guid}"/>]]></guid> </item> </c:forEach> - </repo> + </channel> </rss> + commit 3602414a6baff7fb52d637d2006574610212b46f Author: Heiko W. Rupp <pilhuhn(a)fedorapeople.org> Date: Sat Feb 20 10:49:01 2010 +0100 Fix potential NPE diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java index 5ed6d4f..b90def3 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java @@ -113,8 +113,8 @@ public class AlertNotificationLog implements Serializable { @PrePersist @PreUpdate public void trimMessage() { - if (message.length()>255) - message = message.substring(0,254); + if (message!=null && message.length()>255) + message = message.substring(0,255); } protected AlertNotificationLog() { commit 1c26e0f7c827ae7a250b4de583d6ce623ca3ff50 Merge: 32b3daf... e1c7603... Author: Heiko W. Rupp <pilhuhn(a)fedorapeople.org> Date: Sat Feb 20 09:52:53 2010 +0100 Merge branch 'master' into alertPlugin commit 32b3daf0e818830cabf9797197666b8059472ba5 Author: Heiko W. Rupp <pilhuhn(a)fedorapeople.org> Date: Sat Feb 20 09:47:10 2010 +0100 Truncate the message at 140 chars, as identi.ca bails out on longer messages; seems to improve stability with Twitter too. Introduce abbreviated versions of the messages as space on Microblog etc is scarce. BZ 555091 diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java index ba75940..5ed6d4f 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java @@ -38,6 +38,8 @@ import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; import javax.persistence.NamedQueries; import javax.persistence.NamedQuery; +import javax.persistence.PrePersist; +import javax.persistence.PreUpdate; import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Transient; @@ -108,6 +110,13 @@ public class AlertNotificationLog implements Serializable { @Transient transient List<String> transientEmails = new ArrayList<String>(); + @PrePersist + @PreUpdate + public void trimMessage() { + if (message.length()>255) + message = message.substring(0,254); + } + protected AlertNotificationLog() { } // JPA @@ -130,7 +139,6 @@ public class AlertNotificationLog implements Serializable { public AlertNotificationLog(Alert alert, String senderName, ResultState state, String message) { this.alert = alert; - this.sender = sender; this.resultState = state; this.message = message; 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 454b9a9..ff4025f 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 @@ -780,7 +780,7 @@ public class AlertManagerBean implements AlertManagerLocal, AlertManagerRemote { Map<String, String> alertMessage = emailManager.getAlertEmailMessage( prettyPrintResourceHierarchy(alertDefinition.getResource()), alertDefinition.getResource().getName(), alertDefinition.getName(), alertDefinition.getPriority().toString(), new Date(alert.getCtime()).toString(), - prettyPrintAlertConditions(alert.getConditionLogs()), prettyPrintAlertURL(alert)); + prettyPrintAlertConditions(alert.getConditionLogs(), false), prettyPrintAlertURL(alert)); String messageSubject = alertMessage.keySet().iterator().next(); String messageBody = alertMessage.values().iterator().next(); @@ -834,13 +834,14 @@ public class AlertManagerBean implements AlertManagerLocal, AlertManagerRemote { /** * Create a human readable description of the conditions that led to this alert. * @param alert Alert to create human readable condition description + * @param shortVersion if true the messages printed are abbreviated to save space * @return human readable condition log */ - public String prettyPrintAlertConditions(Alert alert) { - return prettyPrintAlertConditions(alert.getConditionLogs()); + public String prettyPrintAlertConditions(Alert alert, boolean shortVersion) { + return prettyPrintAlertConditions(alert.getConditionLogs(), shortVersion); } - private String prettyPrintAlertConditions(Set<AlertConditionLog> conditionLogs) { + private String prettyPrintAlertConditions(Set<AlertConditionLog> conditionLogs, boolean shortVersion) { StringBuilder builder = new StringBuilder(); int conditionCounter = 1; @@ -858,16 +859,27 @@ public class AlertManagerBean implements AlertManagerLocal, AlertManagerRemote { builder.append(NEW_LINE); - builder.append(AlertI18NFactory.getMessage(AlertI18NResourceKeys.ALERT_EMAIL_CONDITION_LOG_FORMAT, - conditionCounter, prettyPrintAlertCondition(aLog.getCondition()), new SimpleDateFormat( - "yyyy/MM/dd HH:mm:ss z").format(new Date(aLog.getCtime())), formattedValue)); + String format; + if (shortVersion) + format = AlertI18NResourceKeys.ALERT_EMAIL_CONDITION_LOG_FORMAT_SHORT; + else + format = AlertI18NResourceKeys.ALERT_EMAIL_CONDITION_LOG_FORMAT; + SimpleDateFormat dateFormat; + if (shortVersion) + dateFormat= new SimpleDateFormat( + "yy/MM/dd HH:mm:ss z"); + else + dateFormat= new SimpleDateFormat( + "yyyy/MM/dd HH:mm:ss z"); + builder.append(AlertI18NFactory.getMessage(format, + conditionCounter, prettyPrintAlertCondition(aLog.getCondition(), shortVersion), dateFormat.format(new Date(aLog.getCtime())), formattedValue)); conditionCounter++; } return builder.toString(); } - private String prettyPrintAlertCondition(AlertCondition condition) { + private String prettyPrintAlertCondition(AlertCondition condition, boolean shortVersion) { StringBuilder builder = new StringBuilder(); AlertConditionCategory category = condition.getCategory(); @@ -915,19 +927,38 @@ public class AlertManagerBean implements AlertManagerLocal, AlertManagerRemote { } } else if ((category == AlertConditionCategory.RESOURCE_CONFIG) || (category == AlertConditionCategory.CHANGE) || (category == AlertConditionCategory.TRAIT)) { - builder.append(AlertI18NFactory.getMessage(AlertI18NResourceKeys.ALERT_CURRENT_LIST_VALUE_CHANGED)); + + if (shortVersion) + builder.append(AlertI18NFactory.getMessage(AlertI18NResourceKeys.ALERT_CURRENT_LIST_VALUE_CHANGED_SHORT)); + else + builder.append(AlertI18NFactory.getMessage(AlertI18NResourceKeys.ALERT_CURRENT_LIST_VALUE_CHANGED)); + } else if (category == AlertConditionCategory.EVENT) { if ((condition.getOption() != null) && (condition.getOption().length() > 0)) { + String propsCbEventSeverityRegexMatch; + if (shortVersion) + propsCbEventSeverityRegexMatch = AlertI18NResourceKeys.ALERT_CONFIG_PROPS_CB_EVENT_SEVERITY_REGEX_MATCH_SHORT; + else + propsCbEventSeverityRegexMatch = AlertI18NResourceKeys.ALERT_CONFIG_PROPS_CB_EVENT_SEVERITY_REGEX_MATCH; + builder.append(AlertI18NFactory.getMessage( - AlertI18NResourceKeys.ALERT_CONFIG_PROPS_CB_EVENT_SEVERITY_REGEX_MATCH, condition.getName(), + propsCbEventSeverityRegexMatch, condition.getName(), condition.getOption())); } else { - builder.append(AlertI18NFactory.getMessage(AlertI18NResourceKeys.ALERT_CONFIG_PROPS_CB_EVENT_SEVERITY, - condition.getName())); + if (shortVersion) + builder.append(AlertI18NFactory.getMessage(AlertI18NResourceKeys.ALERT_CONFIG_PROPS_CB_EVENT_SEVERITY_SHORT, + condition.getName())); + else + builder.append(AlertI18NFactory.getMessage(AlertI18NResourceKeys.ALERT_CONFIG_PROPS_CB_EVENT_SEVERITY, + condition.getName())); } } else if (category == AlertConditionCategory.AVAILABILITY) { - builder.append(AlertI18NFactory.getMessage(AlertI18NResourceKeys.ALERT_CONFIG_PROPS_CB_AVAILABILITY, - condition.getOption())); + if (shortVersion) + builder.append(AlertI18NFactory.getMessage(AlertI18NResourceKeys.ALERT_CONFIG_PROPS_CB_AVAILABILITY_SHORT, + condition.getOption())); + else + builder.append(AlertI18NFactory.getMessage(AlertI18NResourceKeys.ALERT_CONFIG_PROPS_CB_AVAILABILITY, + condition.getOption())); } else { // do nothing } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerLocal.java index 996f245..e482ffa 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerLocal.java @@ -96,9 +96,10 @@ public interface AlertManagerLocal { /** * Create a human readable description of the conditions that led to this alert. * @param alert Alert to create human readable condition description + * @param shortVersion if true the messages printed are abbreviated to save space * @return human readable condition log */ - String prettyPrintAlertConditions(Alert alert); + String prettyPrintAlertConditions(Alert alert, boolean shortVersion); /** * Tells us if the definition of the passed alert will be disabled after this alert was fired diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/i18n/AlertI18NResourceKeys.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/i18n/AlertI18NResourceKeys.java index 8734771..1de3d85 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/i18n/AlertI18NResourceKeys.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/i18n/AlertI18NResourceKeys.java @@ -32,20 +32,41 @@ public interface AlertI18NResourceKeys { @I18NMessage(locale = "de", value = "Verfgbarkeit wird {0}") }) String ALERT_CONFIG_PROPS_CB_AVAILABILITY = "alert.config.props.CB.Availability"; + @I18NMessages( { @I18NMessage("Avail goes {0}"), + @I18NMessage(locale = "de", value = "Verf. wird {0}") }) + String ALERT_CONFIG_PROPS_CB_AVAILABILITY_SHORT = "alert.config.props.CB.Availability.short"; + @I18NMessages( { @I18NMessage("Event Severity: {0}"), @I18NMessage(locale = "de", value = "Schwere des Ereignesses: {0}") }) String ALERT_CONFIG_PROPS_CB_EVENT_SEVERITY = "alert.config.props.CB.EventSeverity"; + @I18NMessages( { @I18NMessage("Sev: {0}"), + @I18NMessage(locale = "de", value = "Schwere: {0}") }) + String ALERT_CONFIG_PROPS_CB_EVENT_SEVERITY_SHORT = "alert.config.props.CB.EventSeverity.short"; + @I18NMessages( { @I18NMessage("Event Severity: {0} and matching expression \"{1}\""), @I18NMessage(locale = "de", value = "Schwere des Ereignesses: {0} und zugehriger Ausdruck \"{1}\"") }) String ALERT_CONFIG_PROPS_CB_EVENT_SEVERITY_REGEX_MATCH = "alert.config.props.CB.EventSeverity.RegexMatch"; + @I18NMessages( { @I18NMessage("Sev: {0} & exp \"{1}\""), + @I18NMessage(locale = "de", value = "Schwere: {0} & Ausdruck \"{1}\"") }) + String ALERT_CONFIG_PROPS_CB_EVENT_SEVERITY_REGEX_MATCH_SHORT = "alert.config.props.CB.EventSeverity.RegexMatch.short"; + @I18NMessages( { @I18NMessage("value changed"), @I18NMessage(locale = "de", value = "Der Wert hat sich gendert") }) String ALERT_CURRENT_LIST_VALUE_CHANGED = "alert.current.list.ValueChanged"; + @I18NMessages( { @I18NMessage("val chg"), @I18NMessage(locale = "de", value = "Wertnd.") }) + String ALERT_CURRENT_LIST_VALUE_CHANGED_SHORT = "alert.current.list.ValueChanged.short"; + @I18NMessages( { @I18NMessage("\\ - Condition {0}: {1}\\n\\\n" + "\\ - Date/Time: {2}\\n\\\n" + "\\ - Details: {3}\\n\\\n"), @I18NMessage(locale = "de", value = " - Bedingung {0}: {1}\\n\\\n - Datum/Uhrzeit: {2}\\n\\\n" + "\\ - Details: {3}\\n\\\n") }) String ALERT_EMAIL_CONDITION_LOG_FORMAT = "alert.email.condition.log.format"; + + @I18NMessages( { + @I18NMessage("\\ - Cond {0}: {1}\\n\\\n" + "\\ - Time: {2}\\n\\\n" + "\\ - Det: {3}\\n\\\n"), + @I18NMessage(locale = "de", value = " - Bed {0}: {1}\\n\\\n - Zeit: {2}\\n\\\n" + + "\\ - Det: {3}\\n\\\n") }) + String ALERT_EMAIL_CONDITION_LOG_FORMAT_SHORT = "alert.email.condition.log.format.short"; } \ No newline at end of file diff --git a/modules/enterprise/server/plugins/alert-irc/src/main/java/org/rhq/enterprise/server/plugins/alertIrc/IrcSender.java b/modules/enterprise/server/plugins/alert-irc/src/main/java/org/rhq/enterprise/server/plugins/alertIrc/IrcSender.java index 93eecc6..95abdb9 100644 --- a/modules/enterprise/server/plugins/alert-irc/src/main/java/org/rhq/enterprise/server/plugins/alertIrc/IrcSender.java +++ b/modules/enterprise/server/plugins/alert-irc/src/main/java/org/rhq/enterprise/server/plugins/alertIrc/IrcSender.java @@ -65,7 +65,7 @@ public class IrcSender extends AlertSender<IrcAlertComponent> { b.append("): "); b.append(alertManager.prettyPrintAlertURL(alert)); b.append("\n"); - b.append(alertManager.prettyPrintAlertConditions(alert)); + b.append(alertManager.prettyPrintAlertConditions(alert, false)); return b.toString(); } diff --git a/modules/enterprise/server/plugins/alert-microblog/src/main/java/org/rhq/enterprise/server/plugins/alertMicroblog/MicroblogSender.java b/modules/enterprise/server/plugins/alert-microblog/src/main/java/org/rhq/enterprise/server/plugins/alertMicroblog/MicroblogSender.java index 257b315..b13763e 100644 --- a/modules/enterprise/server/plugins/alert-microblog/src/main/java/org/rhq/enterprise/server/plugins/alertMicroblog/MicroblogSender.java +++ b/modules/enterprise/server/plugins/alert-microblog/src/main/java/org/rhq/enterprise/server/plugins/alertMicroblog/MicroblogSender.java @@ -57,14 +57,19 @@ public class MicroblogSender extends AlertSender { b.append("' ("); b.append(alert.getAlertDefinition().getResource().getId()); b.append("): "); - b.append(alertManager.prettyPrintAlertConditions(alert)); + b.append(alertManager.prettyPrintAlertConditions(alert, true)); b.append("-by @JBossJopr"); // TODO not for production :-) // TODO use some alert url shortening service SenderResult result ; String txt = "user@baseUrl [" + user + "@" + baseUrl + "]:"; try { - Status status = twitter.updateStatus(b.toString()); + String msg = b.toString(); + if (msg.length()>140) + msg = msg.substring(0,140); + + Status status = twitter.updateStatus(msg); + result = new SenderResult(ResultState.SUCCESS,"Send notification to " + txt + ", msg-id: " + status.getId()); } catch (TwitterException e) { diff --git a/modules/enterprise/server/plugins/alert-mobicents/src/main/java/org/rhq/enterprise/server/plugins/alertMobicents/MobicentsSender.java b/modules/enterprise/server/plugins/alert-mobicents/src/main/java/org/rhq/enterprise/server/plugins/alertMobicents/MobicentsSender.java index 649d6ed..b14c85d 100644 --- a/modules/enterprise/server/plugins/alert-mobicents/src/main/java/org/rhq/enterprise/server/plugins/alertMobicents/MobicentsSender.java +++ b/modules/enterprise/server/plugins/alert-mobicents/src/main/java/org/rhq/enterprise/server/plugins/alertMobicents/MobicentsSender.java @@ -74,7 +74,7 @@ public class MobicentsSender extends AlertSender { // Switch locale to english, as the voice synthesizer expects this for now Locale currentLocale = Locale.getDefault(); Locale.setDefault(Locale.ENGLISH); - b.append(alertManager.prettyPrintAlertConditions(alert)); + b.append(alertManager.prettyPrintAlertConditions(alert, false)); Locale.setDefault(currentLocale); boolean willBeDisabled = alertManager.willDefinitionBeDisabled(alert); diff --git a/modules/enterprise/server/plugins/alert-scriptlang/src/main/java/org.rhq.enterprise.server.plugins.alertScriptlang/ScriptLangSender.java b/modules/enterprise/server/plugins/alert-scriptlang/src/main/java/org.rhq.enterprise.server.plugins.alertScriptlang/ScriptLangSender.java index 985d890..bac51fb 100644 --- a/modules/enterprise/server/plugins/alert-scriptlang/src/main/java/org.rhq.enterprise.server.plugins.alertScriptlang/ScriptLangSender.java +++ b/modules/enterprise/server/plugins/alert-scriptlang/src/main/java/org.rhq.enterprise.server.plugins.alertScriptlang/ScriptLangSender.java @@ -93,7 +93,7 @@ public class ScriptLangSender extends AlertSender<ScriptLangComponent> { Object[] args = new Object[3]; args[0] = alert; args[1] = alertManager.prettyPrintAlertURL(alert); - args[2] = alertManager.prettyPrintAlertConditions(alert); + args[2] = alertManager.prettyPrintAlertConditions(alert, false); result = ((Invocable) engine).invokeFunction("sendAlert", args); if (result == null) { diff --git a/modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpSender.java b/modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpSender.java index 3fd5d79..045c3bb 100644 --- a/modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpSender.java +++ b/modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpSender.java @@ -68,7 +68,7 @@ public class SnmpSender extends AlertSender { String result; List<Resource> lineage = resourceManager.getResourceLineage(alert.getAlertDefinition().getResource().getId()); String platformName = lineage.get(0).getName(); - String conditions = alertManager.prettyPrintAlertConditions(alert); + String conditions = alertManager.prettyPrintAlertConditions(alert, false); String alertUrl = alertManager.prettyPrintAlertURL(alert); SenderResult res ; commit e1c760378fe3f3fdcbee42beef05f9930eb3fd65 Author: John Mazzitelli <mazz(a)redhat.com> Date: Fri Feb 19 17:51:53 2010 -0500 i think this should report an error always on lock acq failure. we'll leave the flag alone - don't set it to true - let the next call take care of whether or not the init callback should be invoked or not diff --git a/modules/enterprise/comm/src/main/java/org/rhq/enterprise/communications/command/client/JBossRemotingRemoteCommunicator.java b/modules/enterprise/comm/src/main/java/org/rhq/enterprise/communications/command/client/JBossRemotingRemoteCommunicator.java index 8c37b50..cd3b479 100644 --- a/modules/enterprise/comm/src/main/java/org/rhq/enterprise/communications/command/client/JBossRemotingRemoteCommunicator.java +++ b/modules/enterprise/comm/src/main/java/org/rhq/enterprise/communications/command/client/JBossRemotingRemoteCommunicator.java @@ -588,11 +588,9 @@ public class JBossRemotingRemoteCommunicator implements RemoteCommunicator { writeLock.unlock(); } } else { - if (m_needToCallInitializeCallback) { - Throwable t = new Throwable("Initialize callback lock could not be acquired"); - LOG.error(CommI18NResourceKeys.INITIALIZE_CALLBACK_FAILED, t.getMessage()); - return new GenericCommandResponse(command, false, null, t); - } + Throwable t = new Throwable("Initialize callback lock could not be acquired"); + LOG.error(CommI18NResourceKeys.INITIALIZE_CALLBACK_FAILED, t.getMessage()); + return new GenericCommandResponse(command, false, null, t); } } return null; commit 1740b73d4ec9dddf1222fcf99b69a8164c090bbb Author: John Mazzitelli <mazz(a)redhat.com> Date: Fri Feb 19 17:44:11 2010 -0500 should not worry about the lock failure if the init callback doesn't need to be invoked anyway diff --git a/modules/enterprise/comm/src/main/java/org/rhq/enterprise/communications/command/client/JBossRemotingRemoteCommunicator.java b/modules/enterprise/comm/src/main/java/org/rhq/enterprise/communications/command/client/JBossRemotingRemoteCommunicator.java index 762b9b4..8c37b50 100644 --- a/modules/enterprise/comm/src/main/java/org/rhq/enterprise/communications/command/client/JBossRemotingRemoteCommunicator.java +++ b/modules/enterprise/comm/src/main/java/org/rhq/enterprise/communications/command/client/JBossRemotingRemoteCommunicator.java @@ -588,10 +588,11 @@ public class JBossRemotingRemoteCommunicator implements RemoteCommunicator { writeLock.unlock(); } } else { - m_needToCallInitializeCallback = true; // can't invoke callback, we'll want to still call it later - Throwable t = new Throwable("Initialize callback lock could not be acquired"); - LOG.error(CommI18NResourceKeys.INITIALIZE_CALLBACK_FAILED, t.getMessage()); - return new GenericCommandResponse(command, false, null, t); + if (m_needToCallInitializeCallback) { + Throwable t = new Throwable("Initialize callback lock could not be acquired"); + LOG.error(CommI18NResourceKeys.INITIALIZE_CALLBACK_FAILED, t.getMessage()); + return new GenericCommandResponse(command, false, null, t); + } } } return null; commit 60fa4314138911d607d6e95110987feb5a7b8fb7 Author: John Mazzitelli <mazz(a)redhat.com> Date: Fri Feb 19 17:38:16 2010 -0500 BZ 537396 - to not block indefinitely if a lock cannot be acquired before attempting to invoke the initialize callback diff --git a/modules/enterprise/comm/src/main/java/org/rhq/enterprise/communications/command/client/JBossRemotingRemoteCommunicator.java b/modules/enterprise/comm/src/main/java/org/rhq/enterprise/communications/command/client/JBossRemotingRemoteCommunicator.java index 3775212..762b9b4 100644 --- a/modules/enterprise/comm/src/main/java/org/rhq/enterprise/communications/command/client/JBossRemotingRemoteCommunicator.java +++ b/modules/enterprise/comm/src/main/java/org/rhq/enterprise/communications/command/client/JBossRemotingRemoteCommunicator.java @@ -21,6 +21,9 @@ package org.rhq.enterprise.communications.command.client; import java.net.MalformedURLException; import java.util.HashMap; import java.util.Map; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.locks.ReentrantReadWriteLock; +import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock; import mazz.i18n.Logger; @@ -95,10 +98,22 @@ public class JBossRemotingRemoteCommunicator implements RemoteCommunicator { private InitializeCallback m_initializeCallback; /** - * When the first element is <code>true</code>, the initialize callback will need to be called prior - * to sending any commands. This is an array because the array itself is used for its lock. + * When <code>true</code>, the initialize callback will need to be called prior + * to sending any commands. Used in conjunection with its associated RW lock. */ - private final boolean[] m_needToCallInitializeCallback; + private boolean m_needToCallInitializeCallback; + + /** + * RW lock when needing to access its associated atomic boolean flag. + */ + private final ReentrantReadWriteLock m_needToCallInitializeCallbackLock; + + /** + * Number of minutes to wait while attempting to aquire a lock before attempting + * to invoke the initialize callback. If this amount of minutes expires before the lock + * is acquired, an error will occur and the initialize callback will have to be attempted later. + */ + private final long m_initializeCallbackLockAcquisitionTimeoutMins; /** * Constructor for {@link JBossRemotingRemoteCommunicator} that initializes the client with no invoker locator @@ -200,7 +215,17 @@ public class JBossRemotingRemoteCommunicator implements RemoteCommunicator { m_clientConfiguration.putAll(client_config); } - m_needToCallInitializeCallback = new boolean[] { false }; + m_needToCallInitializeCallback = false; + m_needToCallInitializeCallbackLock = new ReentrantReadWriteLock(); + + long mins; + try { + String minsStr = System.getProperty("rhq.communications.initial-callback-lock-wait-mins", "60"); + mins = Long.parseLong(minsStr); + } catch (Throwable t) { + mins = 60L; + } + m_initializeCallbackLockAcquisitionTimeoutMins = mins; return; } @@ -319,7 +344,7 @@ public class JBossRemotingRemoteCommunicator implements RemoteCommunicator { if (m_remotingClient != null) { m_remotingClient.disconnect(); m_remotingClient = null; - m_needToCallInitializeCallback[0] = (getInitializeCallback() != null); // specifically do not synchronize, just set it + m_needToCallInitializeCallback = (getInitializeCallback() != null); // specifically do not synchrononize by using lock, just set it } LOG.info(CommI18NResourceKeys.COMMUNICATOR_CHANGING_ENDPOINT, m_invokerLocator, locator); @@ -377,7 +402,7 @@ public class JBossRemotingRemoteCommunicator implements RemoteCommunicator { public void setInitializeCallback(InitializeCallback callback) { m_initializeCallback = callback; - m_needToCallInitializeCallback[0] = (callback != null); // specifically do not synchronize, just set it + m_needToCallInitializeCallback = (callback != null); // specifically do not synchrononize by using lock, just set it } public String getRemoteEndpoint() { @@ -403,7 +428,7 @@ public class JBossRemotingRemoteCommunicator implements RemoteCommunicator { public void connect() throws Exception { if ((m_remotingClient != null) && !m_remotingClient.isConnected()) { m_remotingClient.connect(); - m_needToCallInitializeCallback[0] = (getInitializeCallback() != null); // specifically do not synchronize, just set it + m_needToCallInitializeCallback = (getInitializeCallback() != null); // specifically do not synchrononize by using lock, just set it } return; @@ -412,7 +437,7 @@ public class JBossRemotingRemoteCommunicator implements RemoteCommunicator { public void disconnect() { if (m_remotingClient != null) { m_remotingClient.disconnect(); - m_needToCallInitializeCallback[0] = (getInitializeCallback() != null); // specifically do not synchronize, just set it + m_needToCallInitializeCallback = (getInitializeCallback() != null); // specifically do not synchrononize by using lock, just set it } return; @@ -535,18 +560,38 @@ public class JBossRemotingRemoteCommunicator implements RemoteCommunicator { private CommandResponse invokeInitializeCallbackIfNeeded(Command command) { InitializeCallback callback = getInitializeCallback(); if (callback != null) { - // block here - in effect, this will stop all commands from going out until the callback is done - synchronized (m_needToCallInitializeCallback) { - if (m_needToCallInitializeCallback[0]) { - try { - m_needToCallInitializeCallback[0] = !callback.sendingInitialCommand(this, command); - LOG.debug(CommI18NResourceKeys.INITIALIZE_CALLBACK_DONE, m_needToCallInitializeCallback[0]); - } catch (Throwable t) { - m_needToCallInitializeCallback[0] = true; // callback failed, we'll want to call it again - LOG.error(t, CommI18NResourceKeys.INITIALIZE_CALLBACK_FAILED, ThrowableUtil.getAllMessages(t)); - return new GenericCommandResponse(command, false, null, t); + // block here - in effect, this will stop all commands from going out until the callback is done + // to avoid infinite blocking, we'll only wait for a set time (though long). + + WriteLock writeLock = m_needToCallInitializeCallbackLock.writeLock(); + boolean locked; + try { + locked = writeLock.tryLock(m_initializeCallbackLockAcquisitionTimeoutMins, TimeUnit.MINUTES); + } catch (InterruptedException ie) { + locked = false; + } + + if (locked) { + try { + if (m_needToCallInitializeCallback) { + try { + m_needToCallInitializeCallback = (!callback.sendingInitialCommand(this, command)); + LOG.debug(CommI18NResourceKeys.INITIALIZE_CALLBACK_DONE, m_needToCallInitializeCallback); + } catch (Throwable t) { + m_needToCallInitializeCallback = true; // callback failed, we'll want to call it again + LOG.error(t, CommI18NResourceKeys.INITIALIZE_CALLBACK_FAILED, ThrowableUtil + .getAllMessages(t)); + return new GenericCommandResponse(command, false, null, t); + } } + } finally { + writeLock.unlock(); } + } else { + m_needToCallInitializeCallback = true; // can't invoke callback, we'll want to still call it later + Throwable t = new Throwable("Initialize callback lock could not be acquired"); + LOG.error(CommI18NResourceKeys.INITIALIZE_CALLBACK_FAILED, t.getMessage()); + return new GenericCommandResponse(command, false, null, t); } } return null; commit 474b186034125b179eb03e1ff069036a3299f730 Author: John Mazzitelli <mazz(a)redhat.com> Date: Fri Feb 19 11:10:53 2010 -0500 BZ 566724 - if classloader fails to be created, master PC will skip the plugin diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/MasterServerPluginContainer.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/MasterServerPluginContainer.java index f46eaf5..bd4feac 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/MasterServerPluginContainer.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/MasterServerPluginContainer.java @@ -136,16 +136,23 @@ public class MasterServerPluginContainer { String pluginName = descriptor.getName(); ServerPluginType pluginType = new ServerPluginType(descriptor); PluginKey pluginKey = PluginKey.createServerPluginKey(pluginType.stringify(), pluginName); - ClassLoader classLoader = this.classLoaderManager.obtainServerPluginClassLoader(pluginKey); - log.debug("Pre-loading server plugin [" + pluginKey + "] from [" + pluginUrl - + "] into its plugin container"); try { - ServerPluginEnvironment env = new ServerPluginEnvironment(pluginUrl, classLoader, descriptor); - boolean enabled = !allDisabledPlugins.contains(pluginKey); - pc.loadPlugin(env, enabled); - log.info("Preloaded server plugin [" + pluginKey.getPluginName() + "]"); + ClassLoader classLoader = this.classLoaderManager.obtainServerPluginClassLoader(pluginKey); + log.debug("Pre-loading server plugin [" + pluginKey + "] from [" + pluginUrl + + "] into its plugin container"); + try { + ServerPluginEnvironment env = new ServerPluginEnvironment(pluginUrl, classLoader, + descriptor); + boolean enabled = !allDisabledPlugins.contains(pluginKey); + pc.loadPlugin(env, enabled); + log.info("Preloaded server plugin [" + pluginName + "]"); + } catch (Exception e) { + log.warn("Failed to preload server plugin [" + pluginName + "] from URL [" + pluginUrl + + "]", e); + } } catch (Exception e) { - log.warn("Failed to preload server plugin [" + pluginUrl + "]", e); + log.warn("Failed to preload server plugin [" + pluginName + + "]; cannot get its classloader from URL [ " + pluginUrl + "]", e); } } else { log.warn("There is no server plugin container to support plugin: " + pluginUrl); diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ServerPluginClassLoader.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ServerPluginClassLoader.java index 9f27ce9..fa26970 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ServerPluginClassLoader.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ServerPluginClassLoader.java @@ -64,7 +64,7 @@ public class ServerPluginClassLoader extends URLClassLoader { try { unpackedDirectory = unpackEmbeddedJars(pluginJarName, pluginUrl, classpathUrlList, tmpDirectory); } catch (Exception e) { - throw new Exception("Failed to unpack embedded JARs within: " + pluginUrl); + throw new Exception("Failed to unpack embedded JARs within: " + pluginUrl, e); } } } commit b5e46e4c6e802cdf883307c46e5a275a94514457 Author: Heiko W. Rupp <pilhuhn(a)fedorapeople.org> Date: Fri Feb 19 13:37:36 2010 +0100 Fix link to definitions BZ 566004 diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/listAlertHistory.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/listAlertHistory.xhtml index b6e386c..fd09f82 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/listAlertHistory.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/listAlertHistory.xhtml @@ -148,8 +148,7 @@ </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="id" value="#{Resource.id}"/> <f:param name="ad" value="#{item.alert.alertDefinition.id}"/> <h:outputText value="#{item.alert.alertDefinition.name}" /> commit 195e7a1dd15ed80a86e8f6bcc1e2787d511de3a9 Author: Joseph Marques <joseph(a)redhat.com> Date: Fri Feb 19 02:37:35 2010 -0500 BZ-534284 (RHQ-1095) - make hibernate.jsp work for non-string bind parameters: * support binding to boolean as well as all numeric basic types; * support binding to enums (user can enter ordinal or name [case-insensitively] of enum); * support binding to entities (user can enter id / primary key); * modify label for input field next to each query parameter to give a brief explanation of how it's supported; diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/util/PersistenceUtility.java b/modules/core/domain/src/main/java/org/rhq/core/domain/util/PersistenceUtility.java index 282faec..5122c2f 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/util/PersistenceUtility.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/util/PersistenceUtility.java @@ -22,6 +22,7 @@ */ package org.rhq.core.domain.util; +import java.lang.reflect.Field; import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -44,11 +45,16 @@ import org.hibernate.engine.NamedQueryDefinition; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.jmx.StatisticsService; import org.hibernate.stat.Statistics; +import org.hibernate.type.CustomType; +import org.hibernate.type.EntityType; +import org.hibernate.type.PrimitiveType; +import org.hibernate.type.Type; /** * Various persistence utility methods - mostly Hibernate-specific. * * @author Heiko Rupp + * @author Joseph Marques * @author Greg Hinkle */ public class PersistenceUtility { @@ -61,6 +67,90 @@ public class PersistenceUtility { public static final String HIBERNATE_STATISTICS_MBEAN_OBJECTNAME = "Hibernate:type=statistics,application=RHQ"; + public static String getDisplayString(Type hibernateType) { + if (hibernateType instanceof EntityType) { + return hibernateType.getName() + " (enter integer of ID / primary key field)"; + } else if (hibernateType instanceof CustomType) { + if (Enum.class.isAssignableFrom(hibernateType.getReturnedClass())) { + Class<? extends Enum<?>> enumClass = hibernateType.getReturnedClass(); + StringBuilder result = new StringBuilder(); + result.append(enumClass.getName()); + result.append(" ("); + boolean first = true; + for (Enum<?> nextEnum : enumClass.getEnumConstants()) { + if (!first) { + result.append(" | "); + } else { + first = false; + } + result.append(nextEnum.name()); + } + result.append(")"); + return result.toString(); + } + } + return hibernateType.getName(); + } + + @SuppressWarnings("unchecked") + public static Object cast(String value, Type hibernateType) { + if (hibernateType instanceof PrimitiveType) { + Class<?> type = ((PrimitiveType) hibernateType).getPrimitiveClass(); + if (type.equals(Byte.TYPE)) { + return Byte.valueOf(value); + } else if (type.equals(Short.TYPE)) { + return Short.valueOf(value); + } else if (type.equals(Integer.TYPE)) { + return Integer.valueOf(value); + } else if (type.equals(Long.TYPE)) { + return Long.valueOf(value); + } else if (type.equals(Float.TYPE)) { + return Float.valueOf(value); + } else if (type.equals(Double.TYPE)) { + return Double.valueOf(value); + } else if (type.equals(Boolean.TYPE)) { + return Boolean.valueOf(value); + } + } else if (hibernateType instanceof EntityType) { + String entityName = ((EntityType) hibernateType).getAssociatedEntityName(); + try { + Class<?> entityClass = Class.forName(entityName); + Object entity = entityClass.newInstance(); + + Field primaryKeyField = entityClass.getDeclaredField("id"); + primaryKeyField.setAccessible(true); + primaryKeyField.setInt(entity, Integer.valueOf(value)); + return entity; + } catch (Throwable t) { + throw new IllegalArgumentException("Type[" + entityName + "] must have PK field named 'id'"); + } + } else if (hibernateType instanceof CustomType) { + if (Enum.class.isAssignableFrom(hibernateType.getReturnedClass())) { + Class<? extends Enum<?>> enumClass = hibernateType.getReturnedClass(); + Enum<?>[] enumValues = enumClass.getEnumConstants(); + try { + int enumOrdinal = Integer.valueOf(value); + try { + return enumValues[enumOrdinal]; + } catch (ArrayIndexOutOfBoundsException aioobe) { + throw new IllegalArgumentException("There is no " + enumClass.getSimpleName() + + " enum with ordinal '" + enumOrdinal + "'"); + } + } catch (NumberFormatException nfe) { + String ucaseValue = value.toUpperCase(); + for (Enum<?> nextEnum : enumValues) { + if (nextEnum.name().toUpperCase().equals(ucaseValue)) { + return nextEnum; + } + } + throw new IllegalArgumentException("There is no " + enumClass.getSimpleName() + " enum with name '" + + value + "'"); + } + } + } + return value; + } + /** * Used to create queries to use with the {@link PageControl} objects. The query will already have its sort column * and order appended as well as having its first result and max results set according to the page control data. diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/admin/test/hibernate.jsp b/modules/enterprise/gui/portal-war/src/main/webapp/admin/test/hibernate.jsp index 95424b1..7dc7c2e 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/admin/test/hibernate.jsp +++ b/modules/enterprise/gui/portal-war/src/main/webapp/admin/test/hibernate.jsp @@ -7,6 +7,7 @@ <%@ page import="org.hibernate.type.IntegerType" %> <%@ page import="org.hibernate.type.LongType" %> <%@ page import="org.hibernate.type.Type" %> +<%@ page import="org.rhq.core.domain.util.PersistenceUtility" %> <%@ page import="org.rhq.enterprise.gui.legacy.util.SessionUtils" %> <%@ page import="org.rhq.enterprise.server.util.LookupUtil" %> <%@ page import="javax.naming.InitialContext" %> @@ -143,7 +144,7 @@ <td><input type="text" name="${pn}" value="${param[pn]}"></td> <td> <c:set value="${pn}" var="pn" scope="request"/> - <%=qt.getParameterTranslations().getNamedParameterExpectedType((String) request.getAttribute("pn")).getName()%> + <%=PersistenceUtility.getDisplayString(qt.getParameterTranslations().getNamedParameterExpectedType((String) request.getAttribute("pn")))%> </td> </tr> </c:forEach> @@ -163,15 +164,10 @@ Iterator iter = parameterNames.iterator(); while (iter.hasNext()) { String pn = (String) iter.next(); - Object paramterValue = request.getParameter(pn); + Object paramValue = request.getParameter(pn); Type type = qt.getParameterTranslations().getNamedParameterExpectedType(pn); - if (type instanceof LongType) - paramterValue = Long.parseLong((String) paramterValue); - else if (type instanceof IntegerType) - paramterValue = Integer.parseInt((String) paramterValue); - - //out.println("parameter " + pn + " = " + paramterValue); - q.setParameter(pn, paramterValue); + paramValue = PersistenceUtility.cast((String)paramValue, type); + q.setParameter(pn, paramValue); } if (isDMLStyle) { commit e2dce2b51a6948629af959d88011b86c122ed209 Author: Joseph Marques <joseph(a)redhat.com> Date: Thu Feb 18 19:35:40 2010 -0500 update hibernate.jsp to provide translations for DML-style operations; diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/admin/test/hibernate.jsp b/modules/enterprise/gui/portal-war/src/main/webapp/admin/test/hibernate.jsp index 0147f1e..95424b1 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/admin/test/hibernate.jsp +++ b/modules/enterprise/gui/portal-war/src/main/webapp/admin/test/hibernate.jsp @@ -106,7 +106,7 @@ <% if (hql != null || namedQuery != null) { System.out.println("hql: " + hql); - String sql = null; + List<String> sqlStrings = null; Set<String> parameterNames = null; try { qt = new ASTQueryTranslatorFactory().createQueryTranslator( @@ -116,12 +116,10 @@ (SessionFactoryImplementor) s.getSessionFactory()); qt.compile(null, false); - sql = qt.getSQLString(); + sqlStrings = qt.collectSqlStrings(); - if (sql == null) { - out.write("Could not get SQL translation for DML-style operation"); - } else { - out.write("<b>SQL: </b><textarea rows=\"10\" cols=\"120\">" + sql + "</textarea>"); + for (String nextSQL : sqlStrings) { + out.write("<b>SQL: </b><textarea rows=\"10\" cols=\"120\">" + nextSQL + "</textarea>"); } ParameterTranslations pt = qt.getParameterTranslations(); commit 8f6ee4ef76b4b4158b28b48c117a7ce1b448dba1 Merge: 3c21fc0... 2622dd5... Author: Joseph Marques <joseph(a)redhat.com> Date: Thu Feb 18 19:28:47 2010 -0500 Merge branch 'master' into search commit 2622dd5e50066c74d29e532d156ceabbe10a30f6 Author: Bryan Kearney <bkearney(a)redhat.com> Date: Thu Feb 18 13:27:31 2010 -0500 553398: Fixed a typo diff --git a/modules/enterprise/server/plugins/alert-snmp/src/main/resources/META-INF/rhq-serverplugin.xml b/modules/enterprise/server/plugins/alert-snmp/src/main/resources/META-INF/rhq-serverplugin.xml index ae84d32..31e3a5a 100644 --- a/modules/enterprise/server/plugins/alert-snmp/src/main/resources/META-INF/rhq-serverplugin.xml +++ b/modules/enterprise/server/plugins/alert-snmp/src/main/resources/META-INF/rhq-serverplugin.xml @@ -36,7 +36,7 @@ <c:simple-property name="agentAddress" description="Address of our SNMP agent" required="false"/> </c:group>  commit 3c21fc0d894bd0992a44d8bbe64887b35358a4a7 Author: Joseph Marques <joseph(a)redhat.com> Date: Mon Feb 15 13:24:41 2010 -0500 add sorting to the resource/group description field diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseGroups.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseGroups.xhtml index c40aa71..9d92183 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseGroups.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseGroups.xhtml @@ -175,7 +175,9 @@ <rich:column> <f:facet name="header"> - <h:outputText styleClass="headerText" value="Description" /> + <onc:sortableColumnHeader sort="rg.description"> + <h:outputText styleClass="headerText" value="Description" /> + </onc:sortableColumnHeader> </f:facet> <h:outputText value="#{item.resourceGroup.description}" /> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseResources.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseResources.xhtml index 2551307..7890d64 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseResources.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseResources.xhtml @@ -187,7 +187,9 @@ <rich:column> <f:facet name="header"> - <h:outputText styleClass="headerText" value="Description" /> + <onc:sortableColumnHeader sort="r.description"> + <h:outputText styleClass="headerText" value="Description" /> + </onc:sortableColumnHeader> </f:facet> <h:outputText value="#{item.original.resource.description}" />

1 0

[rhq] Branch 'linux-config' - 16 commits - modules/core modules/enterprise
by Partha Aji 23 Feb '10

23 Feb '10

modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java | 10 + modules/core/domain/src/main/java/org/rhq/core/domain/util/PersistenceUtility.java | 90 ++++++++++ modules/enterprise/comm/src/main/java/org/rhq/enterprise/communications/command/client/JBossRemotingRemoteCommunicator.java | 80 ++++++-- modules/enterprise/gui/portal-war/src/main/webapp-filtered/WEB-INF/classes/ApplicationResources.properties | 4 modules/enterprise/gui/portal-war/src/main/webapp/admin/test/hibernate.jsp | 24 +- modules/enterprise/gui/portal-war/src/main/webapp/common/RSSFormat.jsp | 7 modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseGroups.xhtml | 4 modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseResources.xhtml | 4 modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/listAlertHistory.xhtml | 3 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java | 59 +++++- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerLocal.java | 3 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/i18n/AlertI18NResourceKeys.java | 21 ++ modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/MasterServerPluginContainer.java | 23 +- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ServerPluginClassLoader.java | 2 modules/enterprise/server/plugins/alert-irc/src/main/java/org/rhq/enterprise/server/plugins/alertIrc/IrcSender.java | 2 modules/enterprise/server/plugins/alert-microblog/src/main/java/org/rhq/enterprise/server/plugins/alertMicroblog/MicroblogSender.java | 9 - modules/enterprise/server/plugins/alert-mobicents/src/main/java/org/rhq/enterprise/server/plugins/alertMobicents/MobicentsSender.java | 2 modules/enterprise/server/plugins/alert-scriptlang/src/main/java/org.rhq.enterprise.server.plugins.alertScriptlang/ScriptLangSender.java | 2 modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpSender.java | 2 modules/enterprise/server/plugins/alert-snmp/src/main/resources/META-INF/rhq-serverplugin.xml | 2 20 files changed, 279 insertions(+), 74 deletions(-) New commits: commit 4c82f0686d4905161b7ea2e27e154c414dfd6368 Merge: 2ae22a1... 59776e2... Author: Partha Aji <paji(a)redhat.com> Date: Tue Feb 23 10:13:20 2010 -0500 Merge branch 'master' into linux-config commit 59776e2009c2e2b17ca45d5c88e6373def9da879 Author: Ian P. Springer <ips(a)jetengine.(none)> Date: Tue Feb 23 09:23:23 2010 -0500 fix a couple invalid docs URLs diff --git a/modules/enterprise/gui/portal-war/src/main/webapp-filtered/WEB-INF/classes/ApplicationResources.properties b/modules/enterprise/gui/portal-war/src/main/webapp-filtered/WEB-INF/classes/ApplicationResources.properties index 571cf22..8132311 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp-filtered/WEB-INF/classes/ApplicationResources.properties +++ b/modules/enterprise/gui/portal-war/src/main/webapp-filtered/WEB-INF/classes/ApplicationResources.properties @@ -88,7 +88,7 @@ common.field.value=Value common.marketing.FeatureDisabled=This feature is unavailable, please contact sales to upgrade -common.url.help=https://network.jboss.com/confluence/display/DOC/Users+Guide +common.url.help=http://www.rhq-project.org/display/JOPR2 common.error.invalid.oid=OID specified is invalid, please enter OID in form of 1.2.3.4 @@ -2916,7 +2916,7 @@ software.common.InstallPreview.PatchTitle=Title software.common.InstallPreview.StepDescription=Step Description software.common.InstallPreview.ShortDescription=Short Description software.common.InstallPreview.LongDescription=Detailed Description -software.common.InstallPreview.TopMessage=Clicking the [Install] button will begin the execution of the steps listed below. Review each step carefully before proceeding with the update installation.<br/><ul><li>Prior to installing this update, if you have applied any one-off fixes to this instance, please check the update description to see that they are included in the fixes that make up this update. If they are not included then this update may overwrite the one-off fix and leave your instance in an unstable state.</li><li>When updating a JBoss instance that shares a common server configuration, follow the instructions documented in the wiki\: <a href\="https\://network.jboss.com/confluence/display/DOC/Installing+a+Patch" target\="_new">Installing a Patch</a>. Please contact support for more information.</li></ul> +software.common.InstallPreview.TopMessage=Clicking the [Install] button will begin the execution of the steps listed below. Review each step carefully before proceeding with the update installation.<br/><ul><li>Prior to installing this update, if you have applied any one-off fixes to this instance, please check the update description to see that they are included in the fixes that make up this update. If they are not included then this update may overwrite the one-off fix and leave your instance in an unstable state.</li><li>When updating a JBoss instance that shares a common server configuration, follow the instructions documented in the wiki\: <a href\="http://www.rhq-project.org/display/JOPR2/Demos#Demos-ContentSubsystem" target\="_new">Installing a Patch</a>. Please contact support for more information.</li></ul> software.common.InstallPreview.NotAllowedToInstall=This user doesn't have the appropriate rights to install an update. Only users that can control a resource may install an update. software.common.ManualUninstall.TableTitle=Manual Update Uninstallation commit b3c691dfd0f407658ba9004bbcbdda0c235404ef Author: Ian P. Springer <ips(a)jetengine.(none)> Date: Tue Feb 23 09:22:03 2010 -0500 fix regression in RSS feed template (https://bugzilla.redhat.com/show_bug.cgi?id=567636) diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/common/RSSFormat.jsp b/modules/enterprise/gui/portal-war/src/main/webapp/common/RSSFormat.jsp index 59bb5d1..3831ebb 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/common/RSSFormat.jsp +++ b/modules/enterprise/gui/portal-war/src/main/webapp/common/RSSFormat.jsp @@ -1,10 +1,10 @@ -<?xml version="1.0" encoding="utf-8" ?> +<?xml version="1.0" encoding="UTF-8"?> <%@ page language="java" contentType="text/xml" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> <%@ taglib uri="http://jakarta.apache.org/struts/tags-html-el" prefix="html" %> <rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:content="http://purl.org/rss/1.0/modules/content/"> - <repo> + <channel> <title><c:out value="${rssFeed.title}"/></title> <link><c:out value="${rssFeed.baseUrl}"/></link> <description><fmt:message key="dashboard.template.title"/> <c:out value="${rssFeed.title}"/></description> @@ -25,5 +25,6 @@ <guid><![CDATA[<c:out value="${item.guid}"/>]]></guid> </item> </c:forEach> - </repo> + </channel> </rss> + commit 3602414a6baff7fb52d637d2006574610212b46f Author: Heiko W. Rupp <pilhuhn(a)fedorapeople.org> Date: Sat Feb 20 10:49:01 2010 +0100 Fix potential NPE diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java index 5ed6d4f..b90def3 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java @@ -113,8 +113,8 @@ public class AlertNotificationLog implements Serializable { @PrePersist @PreUpdate public void trimMessage() { - if (message.length()>255) - message = message.substring(0,254); + if (message!=null && message.length()>255) + message = message.substring(0,255); } protected AlertNotificationLog() { commit 1c26e0f7c827ae7a250b4de583d6ce623ca3ff50 Merge: 32b3daf... e1c7603... Author: Heiko W. Rupp <pilhuhn(a)fedorapeople.org> Date: Sat Feb 20 09:52:53 2010 +0100 Merge branch 'master' into alertPlugin commit 32b3daf0e818830cabf9797197666b8059472ba5 Author: Heiko W. Rupp <pilhuhn(a)fedorapeople.org> Date: Sat Feb 20 09:47:10 2010 +0100 Truncate the message at 140 chars, as identi.ca bails out on longer messages; seems to improve stability with Twitter too. Introduce abbreviated versions of the messages as space on Microblog etc is scarce. BZ 555091 diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java index ba75940..5ed6d4f 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java @@ -38,6 +38,8 @@ import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; import javax.persistence.NamedQueries; import javax.persistence.NamedQuery; +import javax.persistence.PrePersist; +import javax.persistence.PreUpdate; import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Transient; @@ -108,6 +110,13 @@ public class AlertNotificationLog implements Serializable { @Transient transient List<String> transientEmails = new ArrayList<String>(); + @PrePersist + @PreUpdate + public void trimMessage() { + if (message.length()>255) + message = message.substring(0,254); + } + protected AlertNotificationLog() { } // JPA @@ -130,7 +139,6 @@ public class AlertNotificationLog implements Serializable { public AlertNotificationLog(Alert alert, String senderName, ResultState state, String message) { this.alert = alert; - this.sender = sender; this.resultState = state; this.message = message; 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 454b9a9..ff4025f 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 @@ -780,7 +780,7 @@ public class AlertManagerBean implements AlertManagerLocal, AlertManagerRemote { Map<String, String> alertMessage = emailManager.getAlertEmailMessage( prettyPrintResourceHierarchy(alertDefinition.getResource()), alertDefinition.getResource().getName(), alertDefinition.getName(), alertDefinition.getPriority().toString(), new Date(alert.getCtime()).toString(), - prettyPrintAlertConditions(alert.getConditionLogs()), prettyPrintAlertURL(alert)); + prettyPrintAlertConditions(alert.getConditionLogs(), false), prettyPrintAlertURL(alert)); String messageSubject = alertMessage.keySet().iterator().next(); String messageBody = alertMessage.values().iterator().next(); @@ -834,13 +834,14 @@ public class AlertManagerBean implements AlertManagerLocal, AlertManagerRemote { /** * Create a human readable description of the conditions that led to this alert. * @param alert Alert to create human readable condition description + * @param shortVersion if true the messages printed are abbreviated to save space * @return human readable condition log */ - public String prettyPrintAlertConditions(Alert alert) { - return prettyPrintAlertConditions(alert.getConditionLogs()); + public String prettyPrintAlertConditions(Alert alert, boolean shortVersion) { + return prettyPrintAlertConditions(alert.getConditionLogs(), shortVersion); } - private String prettyPrintAlertConditions(Set<AlertConditionLog> conditionLogs) { + private String prettyPrintAlertConditions(Set<AlertConditionLog> conditionLogs, boolean shortVersion) { StringBuilder builder = new StringBuilder(); int conditionCounter = 1; @@ -858,16 +859,27 @@ public class AlertManagerBean implements AlertManagerLocal, AlertManagerRemote { builder.append(NEW_LINE); - builder.append(AlertI18NFactory.getMessage(AlertI18NResourceKeys.ALERT_EMAIL_CONDITION_LOG_FORMAT, - conditionCounter, prettyPrintAlertCondition(aLog.getCondition()), new SimpleDateFormat( - "yyyy/MM/dd HH:mm:ss z").format(new Date(aLog.getCtime())), formattedValue)); + String format; + if (shortVersion) + format = AlertI18NResourceKeys.ALERT_EMAIL_CONDITION_LOG_FORMAT_SHORT; + else + format = AlertI18NResourceKeys.ALERT_EMAIL_CONDITION_LOG_FORMAT; + SimpleDateFormat dateFormat; + if (shortVersion) + dateFormat= new SimpleDateFormat( + "yy/MM/dd HH:mm:ss z"); + else + dateFormat= new SimpleDateFormat( + "yyyy/MM/dd HH:mm:ss z"); + builder.append(AlertI18NFactory.getMessage(format, + conditionCounter, prettyPrintAlertCondition(aLog.getCondition(), shortVersion), dateFormat.format(new Date(aLog.getCtime())), formattedValue)); conditionCounter++; } return builder.toString(); } - private String prettyPrintAlertCondition(AlertCondition condition) { + private String prettyPrintAlertCondition(AlertCondition condition, boolean shortVersion) { StringBuilder builder = new StringBuilder(); AlertConditionCategory category = condition.getCategory(); @@ -915,19 +927,38 @@ public class AlertManagerBean implements AlertManagerLocal, AlertManagerRemote { } } else if ((category == AlertConditionCategory.RESOURCE_CONFIG) || (category == AlertConditionCategory.CHANGE) || (category == AlertConditionCategory.TRAIT)) { - builder.append(AlertI18NFactory.getMessage(AlertI18NResourceKeys.ALERT_CURRENT_LIST_VALUE_CHANGED)); + + if (shortVersion) + builder.append(AlertI18NFactory.getMessage(AlertI18NResourceKeys.ALERT_CURRENT_LIST_VALUE_CHANGED_SHORT)); + else + builder.append(AlertI18NFactory.getMessage(AlertI18NResourceKeys.ALERT_CURRENT_LIST_VALUE_CHANGED)); + } else if (category == AlertConditionCategory.EVENT) { if ((condition.getOption() != null) && (condition.getOption().length() > 0)) { + String propsCbEventSeverityRegexMatch; + if (shortVersion) + propsCbEventSeverityRegexMatch = AlertI18NResourceKeys.ALERT_CONFIG_PROPS_CB_EVENT_SEVERITY_REGEX_MATCH_SHORT; + else + propsCbEventSeverityRegexMatch = AlertI18NResourceKeys.ALERT_CONFIG_PROPS_CB_EVENT_SEVERITY_REGEX_MATCH; + builder.append(AlertI18NFactory.getMessage( - AlertI18NResourceKeys.ALERT_CONFIG_PROPS_CB_EVENT_SEVERITY_REGEX_MATCH, condition.getName(), + propsCbEventSeverityRegexMatch, condition.getName(), condition.getOption())); } else { - builder.append(AlertI18NFactory.getMessage(AlertI18NResourceKeys.ALERT_CONFIG_PROPS_CB_EVENT_SEVERITY, - condition.getName())); + if (shortVersion) + builder.append(AlertI18NFactory.getMessage(AlertI18NResourceKeys.ALERT_CONFIG_PROPS_CB_EVENT_SEVERITY_SHORT, + condition.getName())); + else + builder.append(AlertI18NFactory.getMessage(AlertI18NResourceKeys.ALERT_CONFIG_PROPS_CB_EVENT_SEVERITY, + condition.getName())); } } else if (category == AlertConditionCategory.AVAILABILITY) { - builder.append(AlertI18NFactory.getMessage(AlertI18NResourceKeys.ALERT_CONFIG_PROPS_CB_AVAILABILITY, - condition.getOption())); + if (shortVersion) + builder.append(AlertI18NFactory.getMessage(AlertI18NResourceKeys.ALERT_CONFIG_PROPS_CB_AVAILABILITY_SHORT, + condition.getOption())); + else + builder.append(AlertI18NFactory.getMessage(AlertI18NResourceKeys.ALERT_CONFIG_PROPS_CB_AVAILABILITY, + condition.getOption())); } else { // do nothing } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerLocal.java index 996f245..e482ffa 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerLocal.java @@ -96,9 +96,10 @@ public interface AlertManagerLocal { /** * Create a human readable description of the conditions that led to this alert. * @param alert Alert to create human readable condition description + * @param shortVersion if true the messages printed are abbreviated to save space * @return human readable condition log */ - String prettyPrintAlertConditions(Alert alert); + String prettyPrintAlertConditions(Alert alert, boolean shortVersion); /** * Tells us if the definition of the passed alert will be disabled after this alert was fired diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/i18n/AlertI18NResourceKeys.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/i18n/AlertI18NResourceKeys.java index 8734771..1de3d85 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/i18n/AlertI18NResourceKeys.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/i18n/AlertI18NResourceKeys.java @@ -32,20 +32,41 @@ public interface AlertI18NResourceKeys { @I18NMessage(locale = "de", value = "Verfgbarkeit wird {0}") }) String ALERT_CONFIG_PROPS_CB_AVAILABILITY = "alert.config.props.CB.Availability"; + @I18NMessages( { @I18NMessage("Avail goes {0}"), + @I18NMessage(locale = "de", value = "Verf. wird {0}") }) + String ALERT_CONFIG_PROPS_CB_AVAILABILITY_SHORT = "alert.config.props.CB.Availability.short"; + @I18NMessages( { @I18NMessage("Event Severity: {0}"), @I18NMessage(locale = "de", value = "Schwere des Ereignesses: {0}") }) String ALERT_CONFIG_PROPS_CB_EVENT_SEVERITY = "alert.config.props.CB.EventSeverity"; + @I18NMessages( { @I18NMessage("Sev: {0}"), + @I18NMessage(locale = "de", value = "Schwere: {0}") }) + String ALERT_CONFIG_PROPS_CB_EVENT_SEVERITY_SHORT = "alert.config.props.CB.EventSeverity.short"; + @I18NMessages( { @I18NMessage("Event Severity: {0} and matching expression \"{1}\""), @I18NMessage(locale = "de", value = "Schwere des Ereignesses: {0} und zugehriger Ausdruck \"{1}\"") }) String ALERT_CONFIG_PROPS_CB_EVENT_SEVERITY_REGEX_MATCH = "alert.config.props.CB.EventSeverity.RegexMatch"; + @I18NMessages( { @I18NMessage("Sev: {0} & exp \"{1}\""), + @I18NMessage(locale = "de", value = "Schwere: {0} & Ausdruck \"{1}\"") }) + String ALERT_CONFIG_PROPS_CB_EVENT_SEVERITY_REGEX_MATCH_SHORT = "alert.config.props.CB.EventSeverity.RegexMatch.short"; + @I18NMessages( { @I18NMessage("value changed"), @I18NMessage(locale = "de", value = "Der Wert hat sich gendert") }) String ALERT_CURRENT_LIST_VALUE_CHANGED = "alert.current.list.ValueChanged"; + @I18NMessages( { @I18NMessage("val chg"), @I18NMessage(locale = "de", value = "Wertnd.") }) + String ALERT_CURRENT_LIST_VALUE_CHANGED_SHORT = "alert.current.list.ValueChanged.short"; + @I18NMessages( { @I18NMessage("\\ - Condition {0}: {1}\\n\\\n" + "\\ - Date/Time: {2}\\n\\\n" + "\\ - Details: {3}\\n\\\n"), @I18NMessage(locale = "de", value = " - Bedingung {0}: {1}\\n\\\n - Datum/Uhrzeit: {2}\\n\\\n" + "\\ - Details: {3}\\n\\\n") }) String ALERT_EMAIL_CONDITION_LOG_FORMAT = "alert.email.condition.log.format"; + + @I18NMessages( { + @I18NMessage("\\ - Cond {0}: {1}\\n\\\n" + "\\ - Time: {2}\\n\\\n" + "\\ - Det: {3}\\n\\\n"), + @I18NMessage(locale = "de", value = " - Bed {0}: {1}\\n\\\n - Zeit: {2}\\n\\\n" + + "\\ - Det: {3}\\n\\\n") }) + String ALERT_EMAIL_CONDITION_LOG_FORMAT_SHORT = "alert.email.condition.log.format.short"; } \ No newline at end of file diff --git a/modules/enterprise/server/plugins/alert-irc/src/main/java/org/rhq/enterprise/server/plugins/alertIrc/IrcSender.java b/modules/enterprise/server/plugins/alert-irc/src/main/java/org/rhq/enterprise/server/plugins/alertIrc/IrcSender.java index 93eecc6..95abdb9 100644 --- a/modules/enterprise/server/plugins/alert-irc/src/main/java/org/rhq/enterprise/server/plugins/alertIrc/IrcSender.java +++ b/modules/enterprise/server/plugins/alert-irc/src/main/java/org/rhq/enterprise/server/plugins/alertIrc/IrcSender.java @@ -65,7 +65,7 @@ public class IrcSender extends AlertSender<IrcAlertComponent> { b.append("): "); b.append(alertManager.prettyPrintAlertURL(alert)); b.append("\n"); - b.append(alertManager.prettyPrintAlertConditions(alert)); + b.append(alertManager.prettyPrintAlertConditions(alert, false)); return b.toString(); } diff --git a/modules/enterprise/server/plugins/alert-microblog/src/main/java/org/rhq/enterprise/server/plugins/alertMicroblog/MicroblogSender.java b/modules/enterprise/server/plugins/alert-microblog/src/main/java/org/rhq/enterprise/server/plugins/alertMicroblog/MicroblogSender.java index 257b315..b13763e 100644 --- a/modules/enterprise/server/plugins/alert-microblog/src/main/java/org/rhq/enterprise/server/plugins/alertMicroblog/MicroblogSender.java +++ b/modules/enterprise/server/plugins/alert-microblog/src/main/java/org/rhq/enterprise/server/plugins/alertMicroblog/MicroblogSender.java @@ -57,14 +57,19 @@ public class MicroblogSender extends AlertSender { b.append("' ("); b.append(alert.getAlertDefinition().getResource().getId()); b.append("): "); - b.append(alertManager.prettyPrintAlertConditions(alert)); + b.append(alertManager.prettyPrintAlertConditions(alert, true)); b.append("-by @JBossJopr"); // TODO not for production :-) // TODO use some alert url shortening service SenderResult result ; String txt = "user@baseUrl [" + user + "@" + baseUrl + "]:"; try { - Status status = twitter.updateStatus(b.toString()); + String msg = b.toString(); + if (msg.length()>140) + msg = msg.substring(0,140); + + Status status = twitter.updateStatus(msg); + result = new SenderResult(ResultState.SUCCESS,"Send notification to " + txt + ", msg-id: " + status.getId()); } catch (TwitterException e) { diff --git a/modules/enterprise/server/plugins/alert-mobicents/src/main/java/org/rhq/enterprise/server/plugins/alertMobicents/MobicentsSender.java b/modules/enterprise/server/plugins/alert-mobicents/src/main/java/org/rhq/enterprise/server/plugins/alertMobicents/MobicentsSender.java index 649d6ed..b14c85d 100644 --- a/modules/enterprise/server/plugins/alert-mobicents/src/main/java/org/rhq/enterprise/server/plugins/alertMobicents/MobicentsSender.java +++ b/modules/enterprise/server/plugins/alert-mobicents/src/main/java/org/rhq/enterprise/server/plugins/alertMobicents/MobicentsSender.java @@ -74,7 +74,7 @@ public class MobicentsSender extends AlertSender { // Switch locale to english, as the voice synthesizer expects this for now Locale currentLocale = Locale.getDefault(); Locale.setDefault(Locale.ENGLISH); - b.append(alertManager.prettyPrintAlertConditions(alert)); + b.append(alertManager.prettyPrintAlertConditions(alert, false)); Locale.setDefault(currentLocale); boolean willBeDisabled = alertManager.willDefinitionBeDisabled(alert); diff --git a/modules/enterprise/server/plugins/alert-scriptlang/src/main/java/org.rhq.enterprise.server.plugins.alertScriptlang/ScriptLangSender.java b/modules/enterprise/server/plugins/alert-scriptlang/src/main/java/org.rhq.enterprise.server.plugins.alertScriptlang/ScriptLangSender.java index 985d890..bac51fb 100644 --- a/modules/enterprise/server/plugins/alert-scriptlang/src/main/java/org.rhq.enterprise.server.plugins.alertScriptlang/ScriptLangSender.java +++ b/modules/enterprise/server/plugins/alert-scriptlang/src/main/java/org.rhq.enterprise.server.plugins.alertScriptlang/ScriptLangSender.java @@ -93,7 +93,7 @@ public class ScriptLangSender extends AlertSender<ScriptLangComponent> { Object[] args = new Object[3]; args[0] = alert; args[1] = alertManager.prettyPrintAlertURL(alert); - args[2] = alertManager.prettyPrintAlertConditions(alert); + args[2] = alertManager.prettyPrintAlertConditions(alert, false); result = ((Invocable) engine).invokeFunction("sendAlert", args); if (result == null) { diff --git a/modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpSender.java b/modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpSender.java index 3fd5d79..045c3bb 100644 --- a/modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpSender.java +++ b/modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpSender.java @@ -68,7 +68,7 @@ public class SnmpSender extends AlertSender { String result; List<Resource> lineage = resourceManager.getResourceLineage(alert.getAlertDefinition().getResource().getId()); String platformName = lineage.get(0).getName(); - String conditions = alertManager.prettyPrintAlertConditions(alert); + String conditions = alertManager.prettyPrintAlertConditions(alert, false); String alertUrl = alertManager.prettyPrintAlertURL(alert); SenderResult res ; commit e1c760378fe3f3fdcbee42beef05f9930eb3fd65 Author: John Mazzitelli <mazz(a)redhat.com> Date: Fri Feb 19 17:51:53 2010 -0500 i think this should report an error always on lock acq failure. we'll leave the flag alone - don't set it to true - let the next call take care of whether or not the init callback should be invoked or not diff --git a/modules/enterprise/comm/src/main/java/org/rhq/enterprise/communications/command/client/JBossRemotingRemoteCommunicator.java b/modules/enterprise/comm/src/main/java/org/rhq/enterprise/communications/command/client/JBossRemotingRemoteCommunicator.java index 8c37b50..cd3b479 100644 --- a/modules/enterprise/comm/src/main/java/org/rhq/enterprise/communications/command/client/JBossRemotingRemoteCommunicator.java +++ b/modules/enterprise/comm/src/main/java/org/rhq/enterprise/communications/command/client/JBossRemotingRemoteCommunicator.java @@ -588,11 +588,9 @@ public class JBossRemotingRemoteCommunicator implements RemoteCommunicator { writeLock.unlock(); } } else { - if (m_needToCallInitializeCallback) { - Throwable t = new Throwable("Initialize callback lock could not be acquired"); - LOG.error(CommI18NResourceKeys.INITIALIZE_CALLBACK_FAILED, t.getMessage()); - return new GenericCommandResponse(command, false, null, t); - } + Throwable t = new Throwable("Initialize callback lock could not be acquired"); + LOG.error(CommI18NResourceKeys.INITIALIZE_CALLBACK_FAILED, t.getMessage()); + return new GenericCommandResponse(command, false, null, t); } } return null; commit 1740b73d4ec9dddf1222fcf99b69a8164c090bbb Author: John Mazzitelli <mazz(a)redhat.com> Date: Fri Feb 19 17:44:11 2010 -0500 should not worry about the lock failure if the init callback doesn't need to be invoked anyway diff --git a/modules/enterprise/comm/src/main/java/org/rhq/enterprise/communications/command/client/JBossRemotingRemoteCommunicator.java b/modules/enterprise/comm/src/main/java/org/rhq/enterprise/communications/command/client/JBossRemotingRemoteCommunicator.java index 762b9b4..8c37b50 100644 --- a/modules/enterprise/comm/src/main/java/org/rhq/enterprise/communications/command/client/JBossRemotingRemoteCommunicator.java +++ b/modules/enterprise/comm/src/main/java/org/rhq/enterprise/communications/command/client/JBossRemotingRemoteCommunicator.java @@ -588,10 +588,11 @@ public class JBossRemotingRemoteCommunicator implements RemoteCommunicator { writeLock.unlock(); } } else { - m_needToCallInitializeCallback = true; // can't invoke callback, we'll want to still call it later - Throwable t = new Throwable("Initialize callback lock could not be acquired"); - LOG.error(CommI18NResourceKeys.INITIALIZE_CALLBACK_FAILED, t.getMessage()); - return new GenericCommandResponse(command, false, null, t); + if (m_needToCallInitializeCallback) { + Throwable t = new Throwable("Initialize callback lock could not be acquired"); + LOG.error(CommI18NResourceKeys.INITIALIZE_CALLBACK_FAILED, t.getMessage()); + return new GenericCommandResponse(command, false, null, t); + } } } return null; commit 60fa4314138911d607d6e95110987feb5a7b8fb7 Author: John Mazzitelli <mazz(a)redhat.com> Date: Fri Feb 19 17:38:16 2010 -0500 BZ 537396 - to not block indefinitely if a lock cannot be acquired before attempting to invoke the initialize callback diff --git a/modules/enterprise/comm/src/main/java/org/rhq/enterprise/communications/command/client/JBossRemotingRemoteCommunicator.java b/modules/enterprise/comm/src/main/java/org/rhq/enterprise/communications/command/client/JBossRemotingRemoteCommunicator.java index 3775212..762b9b4 100644 --- a/modules/enterprise/comm/src/main/java/org/rhq/enterprise/communications/command/client/JBossRemotingRemoteCommunicator.java +++ b/modules/enterprise/comm/src/main/java/org/rhq/enterprise/communications/command/client/JBossRemotingRemoteCommunicator.java @@ -21,6 +21,9 @@ package org.rhq.enterprise.communications.command.client; import java.net.MalformedURLException; import java.util.HashMap; import java.util.Map; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.locks.ReentrantReadWriteLock; +import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock; import mazz.i18n.Logger; @@ -95,10 +98,22 @@ public class JBossRemotingRemoteCommunicator implements RemoteCommunicator { private InitializeCallback m_initializeCallback; /** - * When the first element is <code>true</code>, the initialize callback will need to be called prior - * to sending any commands. This is an array because the array itself is used for its lock. + * When <code>true</code>, the initialize callback will need to be called prior + * to sending any commands. Used in conjunection with its associated RW lock. */ - private final boolean[] m_needToCallInitializeCallback; + private boolean m_needToCallInitializeCallback; + + /** + * RW lock when needing to access its associated atomic boolean flag. + */ + private final ReentrantReadWriteLock m_needToCallInitializeCallbackLock; + + /** + * Number of minutes to wait while attempting to aquire a lock before attempting + * to invoke the initialize callback. If this amount of minutes expires before the lock + * is acquired, an error will occur and the initialize callback will have to be attempted later. + */ + private final long m_initializeCallbackLockAcquisitionTimeoutMins; /** * Constructor for {@link JBossRemotingRemoteCommunicator} that initializes the client with no invoker locator @@ -200,7 +215,17 @@ public class JBossRemotingRemoteCommunicator implements RemoteCommunicator { m_clientConfiguration.putAll(client_config); } - m_needToCallInitializeCallback = new boolean[] { false }; + m_needToCallInitializeCallback = false; + m_needToCallInitializeCallbackLock = new ReentrantReadWriteLock(); + + long mins; + try { + String minsStr = System.getProperty("rhq.communications.initial-callback-lock-wait-mins", "60"); + mins = Long.parseLong(minsStr); + } catch (Throwable t) { + mins = 60L; + } + m_initializeCallbackLockAcquisitionTimeoutMins = mins; return; } @@ -319,7 +344,7 @@ public class JBossRemotingRemoteCommunicator implements RemoteCommunicator { if (m_remotingClient != null) { m_remotingClient.disconnect(); m_remotingClient = null; - m_needToCallInitializeCallback[0] = (getInitializeCallback() != null); // specifically do not synchronize, just set it + m_needToCallInitializeCallback = (getInitializeCallback() != null); // specifically do not synchrononize by using lock, just set it } LOG.info(CommI18NResourceKeys.COMMUNICATOR_CHANGING_ENDPOINT, m_invokerLocator, locator); @@ -377,7 +402,7 @@ public class JBossRemotingRemoteCommunicator implements RemoteCommunicator { public void setInitializeCallback(InitializeCallback callback) { m_initializeCallback = callback; - m_needToCallInitializeCallback[0] = (callback != null); // specifically do not synchronize, just set it + m_needToCallInitializeCallback = (callback != null); // specifically do not synchrononize by using lock, just set it } public String getRemoteEndpoint() { @@ -403,7 +428,7 @@ public class JBossRemotingRemoteCommunicator implements RemoteCommunicator { public void connect() throws Exception { if ((m_remotingClient != null) && !m_remotingClient.isConnected()) { m_remotingClient.connect(); - m_needToCallInitializeCallback[0] = (getInitializeCallback() != null); // specifically do not synchronize, just set it + m_needToCallInitializeCallback = (getInitializeCallback() != null); // specifically do not synchrononize by using lock, just set it } return; @@ -412,7 +437,7 @@ public class JBossRemotingRemoteCommunicator implements RemoteCommunicator { public void disconnect() { if (m_remotingClient != null) { m_remotingClient.disconnect(); - m_needToCallInitializeCallback[0] = (getInitializeCallback() != null); // specifically do not synchronize, just set it + m_needToCallInitializeCallback = (getInitializeCallback() != null); // specifically do not synchrononize by using lock, just set it } return; @@ -535,18 +560,38 @@ public class JBossRemotingRemoteCommunicator implements RemoteCommunicator { private CommandResponse invokeInitializeCallbackIfNeeded(Command command) { InitializeCallback callback = getInitializeCallback(); if (callback != null) { - // block here - in effect, this will stop all commands from going out until the callback is done - synchronized (m_needToCallInitializeCallback) { - if (m_needToCallInitializeCallback[0]) { - try { - m_needToCallInitializeCallback[0] = !callback.sendingInitialCommand(this, command); - LOG.debug(CommI18NResourceKeys.INITIALIZE_CALLBACK_DONE, m_needToCallInitializeCallback[0]); - } catch (Throwable t) { - m_needToCallInitializeCallback[0] = true; // callback failed, we'll want to call it again - LOG.error(t, CommI18NResourceKeys.INITIALIZE_CALLBACK_FAILED, ThrowableUtil.getAllMessages(t)); - return new GenericCommandResponse(command, false, null, t); + // block here - in effect, this will stop all commands from going out until the callback is done + // to avoid infinite blocking, we'll only wait for a set time (though long). + + WriteLock writeLock = m_needToCallInitializeCallbackLock.writeLock(); + boolean locked; + try { + locked = writeLock.tryLock(m_initializeCallbackLockAcquisitionTimeoutMins, TimeUnit.MINUTES); + } catch (InterruptedException ie) { + locked = false; + } + + if (locked) { + try { + if (m_needToCallInitializeCallback) { + try { + m_needToCallInitializeCallback = (!callback.sendingInitialCommand(this, command)); + LOG.debug(CommI18NResourceKeys.INITIALIZE_CALLBACK_DONE, m_needToCallInitializeCallback); + } catch (Throwable t) { + m_needToCallInitializeCallback = true; // callback failed, we'll want to call it again + LOG.error(t, CommI18NResourceKeys.INITIALIZE_CALLBACK_FAILED, ThrowableUtil + .getAllMessages(t)); + return new GenericCommandResponse(command, false, null, t); + } } + } finally { + writeLock.unlock(); } + } else { + m_needToCallInitializeCallback = true; // can't invoke callback, we'll want to still call it later + Throwable t = new Throwable("Initialize callback lock could not be acquired"); + LOG.error(CommI18NResourceKeys.INITIALIZE_CALLBACK_FAILED, t.getMessage()); + return new GenericCommandResponse(command, false, null, t); } } return null; commit 474b186034125b179eb03e1ff069036a3299f730 Author: John Mazzitelli <mazz(a)redhat.com> Date: Fri Feb 19 11:10:53 2010 -0500 BZ 566724 - if classloader fails to be created, master PC will skip the plugin diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/MasterServerPluginContainer.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/MasterServerPluginContainer.java index f46eaf5..bd4feac 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/MasterServerPluginContainer.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/MasterServerPluginContainer.java @@ -136,16 +136,23 @@ public class MasterServerPluginContainer { String pluginName = descriptor.getName(); ServerPluginType pluginType = new ServerPluginType(descriptor); PluginKey pluginKey = PluginKey.createServerPluginKey(pluginType.stringify(), pluginName); - ClassLoader classLoader = this.classLoaderManager.obtainServerPluginClassLoader(pluginKey); - log.debug("Pre-loading server plugin [" + pluginKey + "] from [" + pluginUrl - + "] into its plugin container"); try { - ServerPluginEnvironment env = new ServerPluginEnvironment(pluginUrl, classLoader, descriptor); - boolean enabled = !allDisabledPlugins.contains(pluginKey); - pc.loadPlugin(env, enabled); - log.info("Preloaded server plugin [" + pluginKey.getPluginName() + "]"); + ClassLoader classLoader = this.classLoaderManager.obtainServerPluginClassLoader(pluginKey); + log.debug("Pre-loading server plugin [" + pluginKey + "] from [" + pluginUrl + + "] into its plugin container"); + try { + ServerPluginEnvironment env = new ServerPluginEnvironment(pluginUrl, classLoader, + descriptor); + boolean enabled = !allDisabledPlugins.contains(pluginKey); + pc.loadPlugin(env, enabled); + log.info("Preloaded server plugin [" + pluginName + "]"); + } catch (Exception e) { + log.warn("Failed to preload server plugin [" + pluginName + "] from URL [" + pluginUrl + + "]", e); + } } catch (Exception e) { - log.warn("Failed to preload server plugin [" + pluginUrl + "]", e); + log.warn("Failed to preload server plugin [" + pluginName + + "]; cannot get its classloader from URL [ " + pluginUrl + "]", e); } } else { log.warn("There is no server plugin container to support plugin: " + pluginUrl); diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ServerPluginClassLoader.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ServerPluginClassLoader.java index 9f27ce9..fa26970 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ServerPluginClassLoader.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ServerPluginClassLoader.java @@ -64,7 +64,7 @@ public class ServerPluginClassLoader extends URLClassLoader { try { unpackedDirectory = unpackEmbeddedJars(pluginJarName, pluginUrl, classpathUrlList, tmpDirectory); } catch (Exception e) { - throw new Exception("Failed to unpack embedded JARs within: " + pluginUrl); + throw new Exception("Failed to unpack embedded JARs within: " + pluginUrl, e); } } } commit b5e46e4c6e802cdf883307c46e5a275a94514457 Author: Heiko W. Rupp <pilhuhn(a)fedorapeople.org> Date: Fri Feb 19 13:37:36 2010 +0100 Fix link to definitions BZ 566004 diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/listAlertHistory.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/listAlertHistory.xhtml index b6e386c..fd09f82 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/listAlertHistory.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/listAlertHistory.xhtml @@ -148,8 +148,7 @@ </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="id" value="#{Resource.id}"/> <f:param name="ad" value="#{item.alert.alertDefinition.id}"/> <h:outputText value="#{item.alert.alertDefinition.name}" /> commit 195e7a1dd15ed80a86e8f6bcc1e2787d511de3a9 Author: Joseph Marques <joseph(a)redhat.com> Date: Fri Feb 19 02:37:35 2010 -0500 BZ-534284 (RHQ-1095) - make hibernate.jsp work for non-string bind parameters: * support binding to boolean as well as all numeric basic types; * support binding to enums (user can enter ordinal or name [case-insensitively] of enum); * support binding to entities (user can enter id / primary key); * modify label for input field next to each query parameter to give a brief explanation of how it's supported; diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/util/PersistenceUtility.java b/modules/core/domain/src/main/java/org/rhq/core/domain/util/PersistenceUtility.java index 282faec..5122c2f 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/util/PersistenceUtility.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/util/PersistenceUtility.java @@ -22,6 +22,7 @@ */ package org.rhq.core.domain.util; +import java.lang.reflect.Field; import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -44,11 +45,16 @@ import org.hibernate.engine.NamedQueryDefinition; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.jmx.StatisticsService; import org.hibernate.stat.Statistics; +import org.hibernate.type.CustomType; +import org.hibernate.type.EntityType; +import org.hibernate.type.PrimitiveType; +import org.hibernate.type.Type; /** * Various persistence utility methods - mostly Hibernate-specific. * * @author Heiko Rupp + * @author Joseph Marques * @author Greg Hinkle */ public class PersistenceUtility { @@ -61,6 +67,90 @@ public class PersistenceUtility { public static final String HIBERNATE_STATISTICS_MBEAN_OBJECTNAME = "Hibernate:type=statistics,application=RHQ"; + public static String getDisplayString(Type hibernateType) { + if (hibernateType instanceof EntityType) { + return hibernateType.getName() + " (enter integer of ID / primary key field)"; + } else if (hibernateType instanceof CustomType) { + if (Enum.class.isAssignableFrom(hibernateType.getReturnedClass())) { + Class<? extends Enum<?>> enumClass = hibernateType.getReturnedClass(); + StringBuilder result = new StringBuilder(); + result.append(enumClass.getName()); + result.append(" ("); + boolean first = true; + for (Enum<?> nextEnum : enumClass.getEnumConstants()) { + if (!first) { + result.append(" | "); + } else { + first = false; + } + result.append(nextEnum.name()); + } + result.append(")"); + return result.toString(); + } + } + return hibernateType.getName(); + } + + @SuppressWarnings("unchecked") + public static Object cast(String value, Type hibernateType) { + if (hibernateType instanceof PrimitiveType) { + Class<?> type = ((PrimitiveType) hibernateType).getPrimitiveClass(); + if (type.equals(Byte.TYPE)) { + return Byte.valueOf(value); + } else if (type.equals(Short.TYPE)) { + return Short.valueOf(value); + } else if (type.equals(Integer.TYPE)) { + return Integer.valueOf(value); + } else if (type.equals(Long.TYPE)) { + return Long.valueOf(value); + } else if (type.equals(Float.TYPE)) { + return Float.valueOf(value); + } else if (type.equals(Double.TYPE)) { + return Double.valueOf(value); + } else if (type.equals(Boolean.TYPE)) { + return Boolean.valueOf(value); + } + } else if (hibernateType instanceof EntityType) { + String entityName = ((EntityType) hibernateType).getAssociatedEntityName(); + try { + Class<?> entityClass = Class.forName(entityName); + Object entity = entityClass.newInstance(); + + Field primaryKeyField = entityClass.getDeclaredField("id"); + primaryKeyField.setAccessible(true); + primaryKeyField.setInt(entity, Integer.valueOf(value)); + return entity; + } catch (Throwable t) { + throw new IllegalArgumentException("Type[" + entityName + "] must have PK field named 'id'"); + } + } else if (hibernateType instanceof CustomType) { + if (Enum.class.isAssignableFrom(hibernateType.getReturnedClass())) { + Class<? extends Enum<?>> enumClass = hibernateType.getReturnedClass(); + Enum<?>[] enumValues = enumClass.getEnumConstants(); + try { + int enumOrdinal = Integer.valueOf(value); + try { + return enumValues[enumOrdinal]; + } catch (ArrayIndexOutOfBoundsException aioobe) { + throw new IllegalArgumentException("There is no " + enumClass.getSimpleName() + + " enum with ordinal '" + enumOrdinal + "'"); + } + } catch (NumberFormatException nfe) { + String ucaseValue = value.toUpperCase(); + for (Enum<?> nextEnum : enumValues) { + if (nextEnum.name().toUpperCase().equals(ucaseValue)) { + return nextEnum; + } + } + throw new IllegalArgumentException("There is no " + enumClass.getSimpleName() + " enum with name '" + + value + "'"); + } + } + } + return value; + } + /** * Used to create queries to use with the {@link PageControl} objects. The query will already have its sort column * and order appended as well as having its first result and max results set according to the page control data. diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/admin/test/hibernate.jsp b/modules/enterprise/gui/portal-war/src/main/webapp/admin/test/hibernate.jsp index 95424b1..7dc7c2e 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/admin/test/hibernate.jsp +++ b/modules/enterprise/gui/portal-war/src/main/webapp/admin/test/hibernate.jsp @@ -7,6 +7,7 @@ <%@ page import="org.hibernate.type.IntegerType" %> <%@ page import="org.hibernate.type.LongType" %> <%@ page import="org.hibernate.type.Type" %> +<%@ page import="org.rhq.core.domain.util.PersistenceUtility" %> <%@ page import="org.rhq.enterprise.gui.legacy.util.SessionUtils" %> <%@ page import="org.rhq.enterprise.server.util.LookupUtil" %> <%@ page import="javax.naming.InitialContext" %> @@ -143,7 +144,7 @@ <td><input type="text" name="${pn}" value="${param[pn]}"></td> <td> <c:set value="${pn}" var="pn" scope="request"/> - <%=qt.getParameterTranslations().getNamedParameterExpectedType((String) request.getAttribute("pn")).getName()%> + <%=PersistenceUtility.getDisplayString(qt.getParameterTranslations().getNamedParameterExpectedType((String) request.getAttribute("pn")))%> </td> </tr> </c:forEach> @@ -163,15 +164,10 @@ Iterator iter = parameterNames.iterator(); while (iter.hasNext()) { String pn = (String) iter.next(); - Object paramterValue = request.getParameter(pn); + Object paramValue = request.getParameter(pn); Type type = qt.getParameterTranslations().getNamedParameterExpectedType(pn); - if (type instanceof LongType) - paramterValue = Long.parseLong((String) paramterValue); - else if (type instanceof IntegerType) - paramterValue = Integer.parseInt((String) paramterValue); - - //out.println("parameter " + pn + " = " + paramterValue); - q.setParameter(pn, paramterValue); + paramValue = PersistenceUtility.cast((String)paramValue, type); + q.setParameter(pn, paramValue); } if (isDMLStyle) { commit e2dce2b51a6948629af959d88011b86c122ed209 Author: Joseph Marques <joseph(a)redhat.com> Date: Thu Feb 18 19:35:40 2010 -0500 update hibernate.jsp to provide translations for DML-style operations; diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/admin/test/hibernate.jsp b/modules/enterprise/gui/portal-war/src/main/webapp/admin/test/hibernate.jsp index 0147f1e..95424b1 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/admin/test/hibernate.jsp +++ b/modules/enterprise/gui/portal-war/src/main/webapp/admin/test/hibernate.jsp @@ -106,7 +106,7 @@ <% if (hql != null || namedQuery != null) { System.out.println("hql: " + hql); - String sql = null; + List<String> sqlStrings = null; Set<String> parameterNames = null; try { qt = new ASTQueryTranslatorFactory().createQueryTranslator( @@ -116,12 +116,10 @@ (SessionFactoryImplementor) s.getSessionFactory()); qt.compile(null, false); - sql = qt.getSQLString(); + sqlStrings = qt.collectSqlStrings(); - if (sql == null) { - out.write("Could not get SQL translation for DML-style operation"); - } else { - out.write("<b>SQL: </b><textarea rows=\"10\" cols=\"120\">" + sql + "</textarea>"); + for (String nextSQL : sqlStrings) { + out.write("<b>SQL: </b><textarea rows=\"10\" cols=\"120\">" + nextSQL + "</textarea>"); } ParameterTranslations pt = qt.getParameterTranslations(); commit 8f6ee4ef76b4b4158b28b48c117a7ce1b448dba1 Merge: 3c21fc0... 2622dd5... Author: Joseph Marques <joseph(a)redhat.com> Date: Thu Feb 18 19:28:47 2010 -0500 Merge branch 'master' into search commit 2622dd5e50066c74d29e532d156ceabbe10a30f6 Author: Bryan Kearney <bkearney(a)redhat.com> Date: Thu Feb 18 13:27:31 2010 -0500 553398: Fixed a typo diff --git a/modules/enterprise/server/plugins/alert-snmp/src/main/resources/META-INF/rhq-serverplugin.xml b/modules/enterprise/server/plugins/alert-snmp/src/main/resources/META-INF/rhq-serverplugin.xml index ae84d32..31e3a5a 100644 --- a/modules/enterprise/server/plugins/alert-snmp/src/main/resources/META-INF/rhq-serverplugin.xml +++ b/modules/enterprise/server/plugins/alert-snmp/src/main/resources/META-INF/rhq-serverplugin.xml @@ -36,7 +36,7 @@ <c:simple-property name="agentAddress" description="Address of our SNMP agent" required="false"/> </c:group>  commit 3c21fc0d894bd0992a44d8bbe64887b35358a4a7 Author: Joseph Marques <joseph(a)redhat.com> Date: Mon Feb 15 13:24:41 2010 -0500 add sorting to the resource/group description field diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseGroups.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseGroups.xhtml index c40aa71..9d92183 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseGroups.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseGroups.xhtml @@ -175,7 +175,9 @@ <rich:column> <f:facet name="header"> - <h:outputText styleClass="headerText" value="Description" /> + <onc:sortableColumnHeader sort="rg.description"> + <h:outputText styleClass="headerText" value="Description" /> + </onc:sortableColumnHeader> </f:facet> <h:outputText value="#{item.resourceGroup.description}" /> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseResources.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseResources.xhtml index 2551307..7890d64 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseResources.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseResources.xhtml @@ -187,7 +187,9 @@ <rich:column> <f:facet name="header"> - <h:outputText styleClass="headerText" value="Description" /> + <onc:sortableColumnHeader sort="r.description"> + <h:outputText styleClass="headerText" value="Description" /> + </onc:sortableColumnHeader> </f:facet> <h:outputText value="#{item.original.resource.description}" />

1 0

[rhq] Branch 'ldap' - modules/core
by Partha Aji 23 Feb '10

23 Feb '10

modules/core/domain/src/main/java/org/rhq/core/domain/auth/Subject.java | 25 +++-- modules/core/domain/src/main/java/org/rhq/core/domain/auth/SubjectRoleEntity.java | 50 ++++++++++ modules/core/domain/src/main/java/org/rhq/core/domain/authz/Role.java | 9 + 3 files changed, 72 insertions(+), 12 deletions(-) New commits: commit 3f91c1ca64b04ae174d42ca3839fa1cdaa99dbbc Author: Partha Aji <paji(a)redhat.com> Date: Tue Feb 23 10:09:47 2010 -0500 Adding initial mapping change needed for ldap diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/auth/Subject.java b/modules/core/domain/src/main/java/org/rhq/core/domain/auth/Subject.java index f13d6ef..f7f6ac2 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/auth/Subject.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/auth/Subject.java @@ -37,7 +37,6 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.JoinColumn; import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; import javax.persistence.NamedQueries; import javax.persistence.NamedQuery; import javax.persistence.OneToMany; @@ -161,8 +160,7 @@ import org.rhq.core.domain.util.serial.ExternalizableStrategy; + " AND s.fsystem = FALSE " // + " AND s.factive = TRUE"), // @NamedQuery(name = Subject.QUERY_DYNAMIC_CONFIG_VALUES, query = "" // - + "SELECT s.name, s.name FROM Subject AS s WHERE s.fsystem = false") -}) + + "SELECT s.name, s.name FROM Subject AS s WHERE s.fsystem = false") }) @SequenceGenerator(name = "RHQ_SUBJECT_ID_SEQ", sequenceName = "RHQ_SUBJECT_ID_SEQ") @Table(name = "RHQ_SUBJECT") /*@Cache(usage= CacheConcurrencyStrategy.TRANSACTIONAL)*/ @@ -229,8 +227,10 @@ public class Subject implements Externalizable { @OneToOne(cascade = { CascadeType.PERSIST, CascadeType.REMOVE, CascadeType.MERGE }) private Configuration configuration; - @JoinTable(name = "RHQ_SUBJECT_ROLE_MAP", joinColumns = { @JoinColumn(name = "SUBJECT_ID") }, inverseJoinColumns = { @JoinColumn(name = "ROLE_ID") }) - @ManyToMany + @OneToMany + @JoinTable(name = "RHQ_SUBJECT_ROLE_MAP", joinColumns = { @JoinColumn(name = "SUBJECT_ID") }) + private java.util.Set<SubjectRoleEntity> subjectRoles; + private java.util.Set<Role> roles; @Transient @@ -362,12 +362,19 @@ public class Subject implements Externalizable { this.configuration = configuration; } - public java.util.Set<Role> getRoles() { - if (this.roles == null) { - this.roles = new HashSet<Role>(); + public java.util.Set<SubjectRoleEntity> getSubjectRoles() { + if (subjectRoles == null) { + subjectRoles = new HashSet<SubjectRoleEntity>(); } + return subjectRoles; + } - return this.roles; + public java.util.Set<Role> getRoles() { + Set<Role> r = new HashSet<Role>(); + for (SubjectRoleEntity s : getSubjectRoles()) { + r.add(s.getRole()); + } + return r; } public void setRoles(Set<Role> roles) { diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/auth/SubjectRoleEntity.java b/modules/core/domain/src/main/java/org/rhq/core/domain/auth/SubjectRoleEntity.java new file mode 100644 index 0000000..369b491 --- /dev/null +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/auth/SubjectRoleEntity.java @@ -0,0 +1,50 @@ +package org.rhq.core.domain.auth; + +import java.io.Serializable; + +import javax.persistence.Column; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.Table; + +import org.rhq.core.domain.authz.Role; + +@Table(name = "RHQ_SUBJECT_ROLE_MAP") +public class SubjectRoleEntity implements Serializable { + + @ManyToOne + @JoinColumn(name = "SUBJECT_ID", referencedColumnName = "ID") + private Subject subject; + + @ManyToOne + @JoinColumn(name = "ROLE_ID", referencedColumnName = "ID") + private Role role; + + @Column(name = "IS_LDAP") + private boolean isLdap; + + public Subject getSubject() { + return subject; + } + + public void setSubject(Subject subject) { + this.subject = subject; + } + + public Role getRole() { + return role; + } + + public void setRole(Role role) { + this.role = role; + } + + public boolean isLdap() { + return isLdap; + } + + public void setLdap(boolean isLdap) { + this.isLdap = isLdap; + } + +} diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/authz/Role.java b/modules/core/domain/src/main/java/org/rhq/core/domain/authz/Role.java index 35772bd..4e157c6 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/authz/Role.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/authz/Role.java @@ -47,6 +47,7 @@ import org.hibernate.annotations.CollectionOfElements; import org.jetbrains.annotations.NotNull; import org.rhq.core.domain.auth.Subject; +import org.rhq.core.domain.auth.SubjectRoleEntity; /** * A role has zero or more {@link org.rhq.core.domain.resource.group.ResourceGroup}s assigned to it. You can assign a @@ -78,8 +79,7 @@ import org.rhq.core.domain.auth.Subject; + " JOIN ss.roles AS rr " // + " WHERE ss.id = :subjectId )"), // @NamedQuery(name = Role.QUERY_DYNAMIC_CONFIG_VALUES, query = "" // - + "SELECT r.name, r.name FROM Role AS r") -}) + + "SELECT r.name, r.name FROM Role AS r") }) @SequenceGenerator(name = "RHQ_ROLE_ID_SEQ", sequenceName = "RHQ_ROLE_ID_SEQ") @Table(name = "RHQ_ROLE") public class Role implements Serializable { @@ -106,7 +106,10 @@ public class Role implements Serializable { @Column(name = "FSYSTEM") private Boolean fsystem; - @ManyToMany(mappedBy = "roles") + @OneToMany + @JoinTable(name = "RHQ_SUBJECT_ROLE_MAP", joinColumns = { @JoinColumn(name = "ROLE_ID") }) + private java.util.Set<SubjectRoleEntity> roleSubjects; + private java.util.Set<Subject> subjects = new HashSet<Subject>(); @ManyToMany(mappedBy = "roles")

1 0

[rhq] Branch 'alertPlugin' - 3 commits - modules/enterprise
by Heiko W. Rupp 23 Feb '10

23 Feb '10

modules/enterprise/gui/portal-war/src/main/webapp-filtered/WEB-INF/classes/ApplicationResources.properties | 4 ++-- modules/enterprise/gui/portal-war/src/main/webapp/common/RSSFormat.jsp | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) New commits: commit 6c0f0ebe7f448eb3aec0acdf04f581146938f45a Merge: 354dd60... 59776e2... Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Tue Feb 23 15:29:43 2010 +0100 Merge branch 'master' into alertPlugin commit 59776e2009c2e2b17ca45d5c88e6373def9da879 Author: Ian P. Springer <ips(a)jetengine.(none)> Date: Tue Feb 23 09:23:23 2010 -0500 fix a couple invalid docs URLs diff --git a/modules/enterprise/gui/portal-war/src/main/webapp-filtered/WEB-INF/classes/ApplicationResources.properties b/modules/enterprise/gui/portal-war/src/main/webapp-filtered/WEB-INF/classes/ApplicationResources.properties index 571cf22..8132311 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp-filtered/WEB-INF/classes/ApplicationResources.properties +++ b/modules/enterprise/gui/portal-war/src/main/webapp-filtered/WEB-INF/classes/ApplicationResources.properties @@ -88,7 +88,7 @@ common.field.value=Value common.marketing.FeatureDisabled=This feature is unavailable, please contact sales to upgrade -common.url.help=https://network.jboss.com/confluence/display/DOC/Users+Guide +common.url.help=http://www.rhq-project.org/display/JOPR2 common.error.invalid.oid=OID specified is invalid, please enter OID in form of 1.2.3.4 @@ -2916,7 +2916,7 @@ software.common.InstallPreview.PatchTitle=Title software.common.InstallPreview.StepDescription=Step Description software.common.InstallPreview.ShortDescription=Short Description software.common.InstallPreview.LongDescription=Detailed Description -software.common.InstallPreview.TopMessage=Clicking the [Install] button will begin the execution of the steps listed below. Review each step carefully before proceeding with the update installation.<br/><ul><li>Prior to installing this update, if you have applied any one-off fixes to this instance, please check the update description to see that they are included in the fixes that make up this update. If they are not included then this update may overwrite the one-off fix and leave your instance in an unstable state.</li><li>When updating a JBoss instance that shares a common server configuration, follow the instructions documented in the wiki\: <a href\="https\://network.jboss.com/confluence/display/DOC/Installing+a+Patch" target\="_new">Installing a Patch</a>. Please contact support for more information.</li></ul> +software.common.InstallPreview.TopMessage=Clicking the [Install] button will begin the execution of the steps listed below. Review each step carefully before proceeding with the update installation.<br/><ul><li>Prior to installing this update, if you have applied any one-off fixes to this instance, please check the update description to see that they are included in the fixes that make up this update. If they are not included then this update may overwrite the one-off fix and leave your instance in an unstable state.</li><li>When updating a JBoss instance that shares a common server configuration, follow the instructions documented in the wiki\: <a href\="http://www.rhq-project.org/display/JOPR2/Demos#Demos-ContentSubsystem" target\="_new">Installing a Patch</a>. Please contact support for more information.</li></ul> software.common.InstallPreview.NotAllowedToInstall=This user doesn't have the appropriate rights to install an update. Only users that can control a resource may install an update. software.common.ManualUninstall.TableTitle=Manual Update Uninstallation commit b3c691dfd0f407658ba9004bbcbdda0c235404ef Author: Ian P. Springer <ips(a)jetengine.(none)> Date: Tue Feb 23 09:22:03 2010 -0500 fix regression in RSS feed template (https://bugzilla.redhat.com/show_bug.cgi?id=567636) diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/common/RSSFormat.jsp b/modules/enterprise/gui/portal-war/src/main/webapp/common/RSSFormat.jsp index 59bb5d1..3831ebb 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/common/RSSFormat.jsp +++ b/modules/enterprise/gui/portal-war/src/main/webapp/common/RSSFormat.jsp @@ -1,10 +1,10 @@ -<?xml version="1.0" encoding="utf-8" ?> +<?xml version="1.0" encoding="UTF-8"?> <%@ page language="java" contentType="text/xml" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> <%@ taglib uri="http://jakarta.apache.org/struts/tags-html-el" prefix="html" %> <rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:content="http://purl.org/rss/1.0/modules/content/"> - <repo> + <channel> <title><c:out value="${rssFeed.title}"/></title> <link><c:out value="${rssFeed.baseUrl}"/></link> <description><fmt:message key="dashboard.template.title"/> <c:out value="${rssFeed.title}"/></description> @@ -25,5 +25,6 @@ <guid><![CDATA[<c:out value="${item.guid}"/>]]></guid> </item> </c:forEach> - </repo> + </channel> </rss> +

1 0

[rhq] Branch 'alertPlugin' - 3 commits - modules/enterprise
by Heiko W. Rupp 23 Feb '10

23 Feb '10

modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/CustomContentUIBean.java | 9 modules/enterprise/server/plugins/alert-operations/src/main/java/org/rhq/enterprise/server/plugins/alertOperations/OperationsBackingBean.java | 156 +++++++- modules/enterprise/server/plugins/alert-operations/src/main/java/org/rhq/enterprise/server/plugins/alertOperations/OperationsSender.java | 81 ++++ modules/enterprise/server/plugins/alert-operations/src/main/java/org/rhq/enterprise/server/plugins/alertOperations/Token.java | 72 ++++ modules/enterprise/server/plugins/alert-operations/src/main/java/org/rhq/enterprise/server/plugins/alertOperations/TokenClass.java | 59 +++ modules/enterprise/server/plugins/alert-operations/src/main/java/org/rhq/enterprise/server/plugins/alertOperations/TokenReplacer.java | 178 ++++++++++ modules/enterprise/server/plugins/alert-operations/src/main/resources/operations.xhtml | 47 +- modules/enterprise/server/plugins/alert-operations/src/test/java/org/rhq/enterprise/server/plugins/alertOperations/TokenReplacementTest.java | 135 +++++++ 8 files changed, 688 insertions(+), 49 deletions(-) New commits: commit 354dd6076c8e6c700086c6472963924f35b8deb1 Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Tue Feb 23 15:28:34 2010 +0100 Cleanup of variable names and obtain the right operation name. diff --git a/modules/enterprise/server/plugins/alert-operations/src/main/java/org/rhq/enterprise/server/plugins/alertOperations/OperationsBackingBean.java b/modules/enterprise/server/plugins/alert-operations/src/main/java/org/rhq/enterprise/server/plugins/alertOperations/OperationsBackingBean.java index deabeae..2a3b635 100644 --- a/modules/enterprise/server/plugins/alert-operations/src/main/java/org/rhq/enterprise/server/plugins/alertOperations/OperationsBackingBean.java +++ b/modules/enterprise/server/plugins/alert-operations/src/main/java/org/rhq/enterprise/server/plugins/alertOperations/OperationsBackingBean.java @@ -28,7 +28,6 @@ import org.apache.commons.logging.LogFactory; import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.Create; import org.jboss.seam.annotations.Scope; -import org.jboss.seam.annotations.web.RequestParameter; import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.configuration.Configuration; @@ -54,8 +53,8 @@ public class OperationsBackingBean extends CustomAlertSenderBackingBean { private String resMode; private String tokenMode; Integer resId; - private Integer operationName; - private Map<String, Integer> operationNames = new HashMap<String, Integer>(); + private Integer operationId; + private Map<String, Integer> operationIds = new HashMap<String, Integer>(); private String resourceName; @@ -79,12 +78,12 @@ public class OperationsBackingBean extends CustomAlertSenderBackingBean { if (resId != null) { persistProperty(alertParameters, OperationsSender.RESOURCE_ID,resId); - cleanProperty(alertParameters,OperationsSender.OPERATION_NAME); + cleanProperty(alertParameters,OperationsSender.OPERATION_ID); cleanProperty(alertParameters,OperationsSender.USABLE); } - obtainOperationNames(); + obtainOperationIds(); return ALERT_NOTIFICATIONS; } @@ -92,10 +91,10 @@ public class OperationsBackingBean extends CustomAlertSenderBackingBean { public String selectOperation() { - log.info("In selectOperation, resId is " + resId + " opName is " + operationName); + log.info("In selectOperation, resId is " + resId + " opName is " + operationId); - if (operationName != null ) { - persistProperty(alertParameters, OperationsSender.OPERATION_NAME,operationName); + if (operationId != null ) { + persistProperty(alertParameters, OperationsSender.OPERATION_ID, operationId); lookupConfiguration(); } @@ -112,10 +111,10 @@ public class OperationsBackingBean extends CustomAlertSenderBackingBean { // int operationId = Integer.valueOf(FacesContextUtility.getRequiredRequestParameter("opId")); OperationManagerLocal opMan = LookupUtil.getOperationManager(); - obtainOperationNames(); + obtainOperationIds(); - OperationDefinition operationDefinition = opMan.getOperationDefinition(subject, operationName); + OperationDefinition operationDefinition = opMan.getOperationDefinition(subject, operationId); configurationDefinition = operationDefinition.getParametersConfigurationDefinition(); @@ -140,7 +139,7 @@ log.info("gConfig: " + configuration + ", " + configuration.hashCode() + ", " + return ALERT_NOTIFICATIONS; } - private void obtainOperationNames() { + private void obtainOperationIds() { PropertySimple prop = alertParameters.getSimple(OperationsSender.RESOURCE_ID); if (prop!=null) @@ -152,7 +151,7 @@ log.info("gConfig: " + configuration + ", " + configuration.hashCode() + ", " + Subject subject = LookupUtil.getSubjectManager().getOverlord(); // TODO replace with real subject List<OperationDefinition> opDefs = opMan.findSupportedResourceOperations(subject, resId, false); for (OperationDefinition def : opDefs) { - operationNames.put(def.getDisplayName(),def.getId()); // TODO add more distinctive stuff in display + operationIds.put(def.getDisplayName(),def.getId()); // TODO add more distinctive stuff in display } } } @@ -205,30 +204,30 @@ log.info("gConfig: " + configuration + ", " + configuration.hashCode() + ", " + this.resourceName = resourceName; } - public Integer getOperationName() { + public Integer getOperationId() { - if (operationName==null) { - PropertySimple prop = alertParameters.getSimple(OperationsSender.OPERATION_NAME); + if (operationId ==null) { + PropertySimple prop = alertParameters.getSimple(OperationsSender.OPERATION_ID); if (prop!=null) - operationName = prop.getIntegerValue(); + operationId = prop.getIntegerValue(); } - return operationName; + return operationId; } - public void setOperationName(Integer operationName) { - this.operationName = operationName; + public void setOperationId(Integer operationId) { + this.operationId = operationId; } - public Map<String, Integer> getOperationNames() { + public Map<String, Integer> getOperationIds() { - obtainOperationNames(); + obtainOperationIds(); - return operationNames; + return operationIds; } - public void setOperationNames(Map<String, Integer> operationNames) { - this.operationNames = operationNames; + public void setOperationIds(Map<String, Integer> operationIds) { + this.operationIds = operationIds; } public ConfigurationDefinition getConfigurationDefinition() { @@ -239,15 +238,11 @@ log.info("gConfig: " + configuration + ", " + configuration.hashCode() + ", " + } public void setConfigurationDefinition(ConfigurationDefinition configurationDefinition) { - log.info("set CD: " + configurationDefinition); this.configurationDefinition = configurationDefinition; } public Configuration getConfiguration() { - return configuration; - - } public void setConfiguration(Configuration configuration) { @@ -255,7 +250,7 @@ log.info("gConfig: " + configuration + ", " + configuration.hashCode() + ", " + log.info("setC: " + configuration); } - public String getNullConfigurationDefinitionMessage() { + public String getNullConfigurationDefinitionMessage() { return "This operation does not take any parameters."; } @@ -280,5 +275,4 @@ log.info("gConfig: " + configuration + ", " + configuration.hashCode() + ", " + persistProperty(alertParameters, OperationsSender.TOKEN_MODE,tokenMode); } - } diff --git a/modules/enterprise/server/plugins/alert-operations/src/main/java/org/rhq/enterprise/server/plugins/alertOperations/OperationsSender.java b/modules/enterprise/server/plugins/alert-operations/src/main/java/org/rhq/enterprise/server/plugins/alertOperations/OperationsSender.java index 4359ad4..4f6c88e 100644 --- a/modules/enterprise/server/plugins/alert-operations/src/main/java/org/rhq/enterprise/server/plugins/alertOperations/OperationsSender.java +++ b/modules/enterprise/server/plugins/alert-operations/src/main/java/org/rhq/enterprise/server/plugins/alertOperations/OperationsSender.java @@ -18,9 +18,8 @@ */ package org.rhq.enterprise.server.plugins.alertOperations; +import java.util.List; import java.util.Map; -import java.util.regex.Matcher; -import java.util.regex.Pattern; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -34,7 +33,7 @@ import org.rhq.core.domain.alert.notification.SenderResult; import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.PropertySimple; -import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.operation.OperationDefinition; import org.rhq.enterprise.server.configuration.ConfigurationManagerLocal; import org.rhq.enterprise.server.exception.ScheduleException; import org.rhq.enterprise.server.operation.OperationManagerLocal; @@ -51,7 +50,7 @@ public class OperationsSender extends AlertSender { private final Log log = LogFactory.getLog(OperationsSender.class); static final String RESOURCE_ID = "resourceId"; - static final String OPERATION_NAME = "operationName"; + static final String OPERATION_ID = "operationName"; static final String USABLE = "usable"; protected static final String TOKEN_MODE = "tokenMode"; private static final String LITERAL = "literal"; @@ -62,8 +61,8 @@ public class OperationsSender extends AlertSender { public SenderResult send(Alert alert) { PropertySimple resProp = alertParameters.getSimple(RESOURCE_ID); - PropertySimple opNameProp = alertParameters.getSimple(OPERATION_NAME); - if (resProp==null || resProp.getIntegerValue() == null || opNameProp == null || opNameProp.getStringValue() == null) + PropertySimple opIdProp = alertParameters.getSimple(OPERATION_ID); + if (resProp==null || resProp.getIntegerValue() == null || opIdProp == null || opIdProp.getStringValue() == null) return new SenderResult(ResultState.FAILURE, "Not enough parameters given"); PropertySimple usableProp = alertParameters.getSimple(USABLE); @@ -71,11 +70,26 @@ public class OperationsSender extends AlertSender { return new SenderResult(ResultState.FAILURE,"Not yet configured"); Integer resourceId = resProp.getIntegerValue(); - String opName = opNameProp.getStringValue(); + Integer opId = opIdProp.getIntegerValue(); + + String opName = null; OperationManagerLocal opMgr = LookupUtil.getOperationManager(); Subject subject = LookupUtil.getSubjectManager().getOverlord(); // TODO get real subject + List<OperationDefinition> opdefs = opMgr.findSupportedResourceOperations(subject,resourceId,false); + for (OperationDefinition opdef : opdefs ) { + if (opdef.getId() == opId) { + opName = opdef.getName(); + break; + } + } + + if (opName==null) { + return new SenderResult(ResultState.FAILURE, "No operation found "); + } + + PropertySimple parameterConfigProp = alertParameters.getSimple(PARAMETERS_CONFIG); Configuration parameters = null ; if (parameterConfigProp!=null) { diff --git a/modules/enterprise/server/plugins/alert-operations/src/main/resources/operations.xhtml b/modules/enterprise/server/plugins/alert-operations/src/main/resources/operations.xhtml index 4a6c0e6..98dcada 100644 --- a/modules/enterprise/server/plugins/alert-operations/src/main/resources/operations.xhtml +++ b/modules/enterprise/server/plugins/alert-operations/src/main/resources/operations.xhtml @@ -36,13 +36,13 @@ </h:panelGroup> <h:panelGroup style="width:60%; vertical-align:top;" > - <rich:panel rendered="#{not empty operationsBean.operationNames}"> + <rich:panel rendered="#{not empty operationsBean.operationIds}"> Operations for: <h:outputText value=" #{operationsBean.resourceName}"/> <br/> - <h:selectOneMenu id="selectOperationMenu" value="#{operationsBean.operationName}"> - <f:selectItems value="#{operationsBean.operationNames}"/> + <h:selectOneMenu id="selectOperationMenu" value="#{operationsBean.operationId}"> + <f:selectItems value="#{operationsBean.operationIds}"/> </h:selectOneMenu> <p/> <h:commandButton id="opNameSubmit" @@ -57,9 +57,9 @@ <p/> <h:panelGroup style="width:100%"> <h:messages /> - <rich:panel rendered="#{not empty operationsBean.operationName}"> + <rich:panel rendered="#{not empty operationsBean.operationId}"> <br/> - Parameters for <h:outputText value=" #{operationsBean.operationName}"/> + Parameters for <h:outputText value=" #{operationsBean.operationId}"/> <p/> <h:selectOneMenu id="tokenModeMenu" value="#{operationsBean.tokenMode}"> <f:selectItem itemValue="literal" itemLabel="Literal"/> commit 7bdec1c039fbda0b202c078fe0c7be1507d95612 Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Tue Feb 23 10:57:34 2010 +0100 Display, persist and use operation parameters. diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/CustomContentUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/CustomContentUIBean.java index 8b7c8d8..683057b 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/CustomContentUIBean.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/CustomContentUIBean.java @@ -73,7 +73,12 @@ public class CustomContentUIBean { * name of bean, but this class is not an "official" seam component. */ private void outjectBean(String name, CustomAlertSenderBackingBean bean) { - Context pageContext = Contexts.getPageContext(); - pageContext.set(name, bean); + + Context context = Contexts.getSessionContext(); + + CustomAlertSenderBackingBean csb = (CustomAlertSenderBackingBean) context.get(name); + if (csb ==null) + context.set(name,bean); + } } diff --git a/modules/enterprise/server/plugins/alert-operations/src/main/java/org/rhq/enterprise/server/plugins/alertOperations/OperationsBackingBean.java b/modules/enterprise/server/plugins/alert-operations/src/main/java/org/rhq/enterprise/server/plugins/alertOperations/OperationsBackingBean.java index 32e9f16..deabeae 100644 --- a/modules/enterprise/server/plugins/alert-operations/src/main/java/org/rhq/enterprise/server/plugins/alertOperations/OperationsBackingBean.java +++ b/modules/enterprise/server/plugins/alert-operations/src/main/java/org/rhq/enterprise/server/plugins/alertOperations/OperationsBackingBean.java @@ -25,38 +25,64 @@ import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.jboss.seam.ScopeType; +import org.jboss.seam.annotations.Create; +import org.jboss.seam.annotations.Scope; +import org.jboss.seam.annotations.web.RequestParameter; + import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.domain.configuration.definition.ConfigurationDefinition; import org.rhq.core.domain.operation.OperationDefinition; +import org.rhq.core.domain.resource.Resource; +import org.rhq.enterprise.server.configuration.ConfigurationManagerLocal; import org.rhq.enterprise.server.operation.OperationManagerLocal; import org.rhq.enterprise.server.plugin.pc.alert.CustomAlertSenderBackingBean; +import org.rhq.enterprise.server.resource.ResourceManagerLocal; import org.rhq.enterprise.server.util.LookupUtil; /** * Backing bean for the operations alert sender * @author Heiko W. Rupp */ - +(a)Scope(ScopeType.PAGE) public class OperationsBackingBean extends CustomAlertSenderBackingBean { private final Log log = LogFactory.getLog(OperationsBackingBean.class); private String resMode; + private String tokenMode; Integer resId; - private String operationName; - private Map<String,String> operationNames = new HashMap<String,String>(); + private Integer operationName; + private Map<String, Integer> operationNames = new HashMap<String, Integer>(); + private String resourceName; + + private ConfigurationDefinition configurationDefinition; private Configuration configuration; private static final String ALERT_NOTIFICATIONS = "ALERT_NOTIFICATIONS"; + public OperationsBackingBean() { + log.info("new " + hashCode()); + } + + @Create + public void init() { + log.info("init"); + } + + public String selectResource() { log.info("In select Resource, resId is " + resId + " resMode is " + resMode); - if (resId != null) + if (resId != null) { persistProperty(alertParameters, OperationsSender.RESOURCE_ID,resId); + cleanProperty(alertParameters,OperationsSender.OPERATION_NAME); + cleanProperty(alertParameters,OperationsSender.USABLE); + + } obtainOperationNames(); @@ -68,15 +94,47 @@ public class OperationsBackingBean extends CustomAlertSenderBackingBean { public String selectOperation() { log.info("In selectOperation, resId is " + resId + " opName is " + operationName); - if (operationName != null ) + if (operationName != null ) { persistProperty(alertParameters, OperationsSender.OPERATION_NAME,operationName); + lookupConfiguration(); + } return ALERT_NOTIFICATIONS; } + private void lookupConfiguration() { + + +// log.info("getCD: " + configurationDefinition); + try { +// Subject subject = EnterpriseFacesContextUtility.getSubject(); + Subject subject = LookupUtil.getSubjectManager().getOverlord(); // TODO replace with real subject + +// int operationId = Integer.valueOf(FacesContextUtility.getRequiredRequestParameter("opId")); + OperationManagerLocal opMan = LookupUtil.getOperationManager(); + obtainOperationNames(); + + + OperationDefinition operationDefinition = opMan.getOperationDefinition(subject, operationName); + configurationDefinition = operationDefinition.getParametersConfigurationDefinition(); + + + // call a SLSB method to get around lazy initialization of configDefs and configTemplates + ConfigurationManagerLocal configurationManager = LookupUtil.getConfigurationManager(); + configuration = configurationManager.getConfigurationFromDefaultTemplate(configurationDefinition); +// Configuration newConfiguration = configuration.deepCopy(false); +log.info("gConfig: " + configuration + ", " + configuration.hashCode() + ", " + configuration.getSimpleValue("detailedDiscovery","-unset-")); + } catch (Exception e) { + e.printStackTrace(); + } + } + public String useConfiguration() { - log.info("In useConfiguration"); + log.info("In useConfiguration, Configuration is " + configuration ); + // COnfiguration should be valid here ... + super.persistConfiguration(configuration); + persistProperty(alertParameters,OperationsSender.PARAMETERS_CONFIG,configuration.getId()); persistProperty(alertParameters, OperationsSender.USABLE,true); return ALERT_NOTIFICATIONS; @@ -94,7 +152,7 @@ public class OperationsBackingBean extends CustomAlertSenderBackingBean { Subject subject = LookupUtil.getSubjectManager().getOverlord(); // TODO replace with real subject List<OperationDefinition> opDefs = opMan.findSupportedResourceOperations(subject, resId, false); for (OperationDefinition def : opDefs) { - operationNames.put(def.getDisplayName(),def.getName()); // TODO add more distinctive stuff in display + operationNames.put(def.getDisplayName(),def.getId()); // TODO add more distinctive stuff in display } } } @@ -107,6 +165,7 @@ public class OperationsBackingBean extends CustomAlertSenderBackingBean { public void setResMode(String resMode) { this.resMode = resMode; + log.info("setResMode: " + resMode); } public Integer getResId() { @@ -122,47 +181,104 @@ public class OperationsBackingBean extends CustomAlertSenderBackingBean { public void setResId(Integer resId) { this.resId = resId; + log.info("Set resid " + resId); + if (resId!=null) { + persistProperty(alertParameters,OperationsSender.RESOURCE_ID,resId); + } } - public String getOperationName() { + public String getResourceName() { + if (resId==null) + getResId(); + + if (resId!=null) { + ResourceManagerLocal resMgr = LookupUtil.getResourceManager(); + Subject subject = LookupUtil.getSubjectManager().getOverlord(); // TODO replace with real subject + Resource res = resMgr.getResource(subject,resId); + + resourceName = res.getName() + " (" + res.getResourceType().getName() + ")"; + } + return resourceName; + } + + public void setResourceName(String resourceName) { + this.resourceName = resourceName; + } + + public Integer getOperationName() { if (operationName==null) { PropertySimple prop = alertParameters.getSimple(OperationsSender.OPERATION_NAME); if (prop!=null) - operationName = prop.getStringValue(); + operationName = prop.getIntegerValue(); } return operationName; } - public void setOperationName(String operationName) { + public void setOperationName(Integer operationName) { this.operationName = operationName; } - public Map<String,String> getOperationNames() { + public Map<String, Integer> getOperationNames() { obtainOperationNames(); return operationNames; } - public void setOperationNames(Map<String,String> operationNames) { + public void setOperationNames(Map<String, Integer> operationNames) { this.operationNames = operationNames; } public ConfigurationDefinition getConfigurationDefinition() { return configurationDefinition; + + + } public void setConfigurationDefinition(ConfigurationDefinition configurationDefinition) { + log.info("set CD: " + configurationDefinition); this.configurationDefinition = configurationDefinition; } public Configuration getConfiguration() { + return configuration; + + } public void setConfiguration(Configuration configuration) { this.configuration = configuration; + log.info("setC: " + configuration); } + + public String getNullConfigurationDefinitionMessage() { + return "This operation does not take any parameters."; + } + + public String getNullConfigurationMessage() { + return "This operation parameters definition has not been initialized."; + } + + public String getTokenMode() { + if (tokenMode==null) { + PropertySimple prop = alertParameters.getSimple(OperationsSender.TOKEN_MODE); + if (prop!=null) + tokenMode = prop.getStringValue(); + } + + return tokenMode; + } + + public void setTokenMode(String tokenMode) { + this.tokenMode = tokenMode; + log.info("token mode" + tokenMode); + + persistProperty(alertParameters, OperationsSender.TOKEN_MODE,tokenMode); + } + + } diff --git a/modules/enterprise/server/plugins/alert-operations/src/main/java/org/rhq/enterprise/server/plugins/alertOperations/OperationsSender.java b/modules/enterprise/server/plugins/alert-operations/src/main/java/org/rhq/enterprise/server/plugins/alertOperations/OperationsSender.java index 4fa9bba..4359ad4 100644 --- a/modules/enterprise/server/plugins/alert-operations/src/main/java/org/rhq/enterprise/server/plugins/alertOperations/OperationsSender.java +++ b/modules/enterprise/server/plugins/alert-operations/src/main/java/org/rhq/enterprise/server/plugins/alertOperations/OperationsSender.java @@ -18,14 +18,24 @@ */ package org.rhq.enterprise.server.plugins.alertOperations; +import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.jboss.seam.ScopeType; +import org.jboss.seam.annotations.Scope; + import org.rhq.core.domain.alert.Alert; import org.rhq.core.domain.alert.notification.ResultState; import org.rhq.core.domain.alert.notification.SenderResult; import org.rhq.core.domain.auth.Subject; +import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.PropertySimple; +import org.rhq.core.domain.resource.Resource; +import org.rhq.enterprise.server.configuration.ConfigurationManagerLocal; import org.rhq.enterprise.server.exception.ScheduleException; import org.rhq.enterprise.server.operation.OperationManagerLocal; import org.rhq.enterprise.server.operation.ResourceOperationSchedule; @@ -36,12 +46,17 @@ import org.rhq.enterprise.server.util.LookupUtil; * Alert sender that triggers an operation on the resource * @author Heiko W. Rupp */ +@Scope(value = ScopeType.PAGE) public class OperationsSender extends AlertSender { private final Log log = LogFactory.getLog(OperationsSender.class); static final String RESOURCE_ID = "resourceId"; static final String OPERATION_NAME = "operationName"; static final String USABLE = "usable"; + protected static final String TOKEN_MODE = "tokenMode"; + private static final String LITERAL = "literal"; + private static final String INTERPRETED = "interpreted"; + public static final String PARAMETERS_CONFIG = "parametersConfig"; @Override public SenderResult send(Alert alert) { @@ -52,7 +67,7 @@ public class OperationsSender extends AlertSender { return new SenderResult(ResultState.FAILURE, "Not enough parameters given"); PropertySimple usableProp = alertParameters.getSimple(USABLE); - if (usableProp==null || usableProp.getBooleanValue()== null || usableProp.getBooleanValue() == false) + if (usableProp==null || usableProp.getBooleanValue()== null || !usableProp.getBooleanValue()) return new SenderResult(ResultState.FAILURE,"Not yet configured"); Integer resourceId = resProp.getIntegerValue(); @@ -61,17 +76,53 @@ public class OperationsSender extends AlertSender { OperationManagerLocal opMgr = LookupUtil.getOperationManager(); Subject subject = LookupUtil.getSubjectManager().getOverlord(); // TODO get real subject + PropertySimple parameterConfigProp = alertParameters.getSimple(PARAMETERS_CONFIG); + Configuration parameters = null ; + if (parameterConfigProp!=null) { + Integer paramId = parameterConfigProp.getIntegerValue(); + if (paramId!=null) { + ConfigurationManagerLocal cmgr = LookupUtil.getConfigurationManager(); + parameters = cmgr.getConfiguration(subject,paramId); + } + } + + + String tokenMode = alertParameters.getSimpleValue(TOKEN_MODE, LITERAL); + + /* + * If we have parameters and the user wants tokens to be interpreted, then loop + * over the parameters and do token replacement. + */ + if (parameters!=null && tokenMode.equals(INTERPRETED)) { + Map<String,PropertySimple> propsMap = parameters.getSimpleProperties(); + if (!propsMap.isEmpty()) { + TokenReplacer tr = new TokenReplacer(alert); + for (PropertySimple prop : propsMap.values()) { + String tmp = prop.getStringValue(); + tmp = tr.replaceTokens(tmp); + prop.setStringValue(tmp); + } + } + } + + + + /* + * Now fire off the operation with no delay and no repetition. + */ ResourceOperationSchedule sched; try { - sched = opMgr.scheduleResourceOperation(subject, resourceId, opName, 0, 0, 0, 0, null, + sched = opMgr.scheduleResourceOperation(subject, resourceId, opName, 0, 0, 0, 0, parameters, "Alert operation for " + alert.getAlertDefinition().getName()); } catch (ScheduleException e) { return new SenderResult(ResultState.FAILURE, "Scheduling of operation " + opName + " on resource " + resourceId + " failed: " + e.getMessage()); } - // TODO evaluate retuen of schedule() call and defer, so we can leter check - // If op sending was successfull + // If op sending was successful return new SenderResult(ResultState.SUCCESS, "Scheduled operation " + opName + " on resource " + resourceId + " with jobId " + sched.getJobId() ); } + + + } diff --git a/modules/enterprise/server/plugins/alert-operations/src/main/resources/operations.xhtml b/modules/enterprise/server/plugins/alert-operations/src/main/resources/operations.xhtml index 1fd74ad..4a6c0e6 100644 --- a/modules/enterprise/server/plugins/alert-operations/src/main/resources/operations.xhtml +++ b/modules/enterprise/server/plugins/alert-operations/src/main/resources/operations.xhtml @@ -29,12 +29,18 @@ <h:commandButton id="resourceIdSubmit" value="Select" type="submit" - action="#{operationsBean.selectResource}" /> + action="#{operationsBean.selectResource}" + styleClass="buttonmed" + /> </rich:panel> </h:panelGroup> - <h:panelGroup style="width:60%"> + <h:panelGroup style="width:60%; vertical-align:top;" > <rich:panel rendered="#{not empty operationsBean.operationNames}"> + + Operations for: <h:outputText value=" #{operationsBean.resourceName}"/> + <br/> + <h:selectOneMenu id="selectOperationMenu" value="#{operationsBean.operationName}"> <f:selectItems value="#{operationsBean.operationNames}"/> </h:selectOneMenu> @@ -42,31 +48,40 @@ <h:commandButton id="opNameSubmit" value="Select" type="submit" - action="#{operationsBean.selectOperation}" /> + action="#{operationsBean.selectOperation}" + styleClass="buttonmed" + /> </rich:panel> </h:panelGroup> </h:panelGrid> <p/> <h:panelGroup style="width:100%"> - <h:outputText value="3rd panel : "/> - <h:outputText value="#{operationsBean.operationName}"/> - <br/> + <h:messages /> <rich:panel rendered="#{not empty operationsBean.operationName}"> + <br/> + Parameters for <h:outputText value=" #{operationsBean.operationName}"/> + <p/> + <h:selectOneMenu id="tokenModeMenu" value="#{operationsBean.tokenMode}"> + <f:selectItem itemValue="literal" itemLabel="Literal"/> + <f:selectItem itemValue="interpreted" itemLabel="Interpreted"/> + </h:selectOneMenu> + <p/> <onc:config configurationDefinition="#{operationsBean.configurationDefinition}" configuration="#{operationsBean.configuration}" - nullConfigurationDefinitionMessage="NUll configuration definition" - nullConfigurationMessage="null configuration" + nullConfigurationDefinitionMessage="#{operationsBean.nullConfigurationDefinitionMessage}" + nullConfigurationMessage="#{nullConfigurationMessage}" nullConfigurationStyle="InfoBlock" - - id="opParamConfiguration" + readOnly="false" /> <p/> <h:commandButton id="opParamSubmit" value="Set" type="submit" - action="#{operationsBean.useConfiguration}" /> + action="#{operationsBean.useConfiguration}" + styleClass="buttonmed" + /> </rich:panel> </h:panelGroup> </body> -</html> \ No newline at end of file +</html> commit b196e883688008615778ad6eb73fb94caff12015 Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Tue Feb 23 10:56:59 2010 +0100 Implement code for token replacement diff --git a/modules/enterprise/server/plugins/alert-operations/src/main/java/org/rhq/enterprise/server/plugins/alertOperations/Token.java b/modules/enterprise/server/plugins/alert-operations/src/main/java/org/rhq/enterprise/server/plugins/alertOperations/Token.java new file mode 100644 index 0000000..bcd7570 --- /dev/null +++ b/modules/enterprise/server/plugins/alert-operations/src/main/java/org/rhq/enterprise/server/plugins/alertOperations/Token.java @@ -0,0 +1,72 @@ +/* + * 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.server.plugins.alertOperations; + +import java.util.EnumSet; + +/** + * Tokens that can be replaced in + * @author Heiko W. Rupp + */ +public enum Token { + + // Alert related tokens + ALERT_ID(TokenClass.ALERT, "id"), + ALERT_URL(TokenClass.ALERT, "url"), + + // resource that triggered the alert related tokens + RESOURCE_ID(TokenClass.RESOURCE, "id"), + RESOURCE_NAME(TokenClass.RESOURCE, "name"), + + + // resource the operation is run on related tokens + TRESOURCE_ID(TokenClass.TARGET_RESOURCE, "id"), + TRESOURCE_NAME(TokenClass.TARGET_RESOURCE, "name"), + + + // only for testing + TEST_ECHO(TokenClass.TEST,"echo"), + TEST_FIX(TokenClass.TEST,"fix") + + ; + + + private String text; + + private Token(TokenClass tc, String text) { + + this.text = tc.getText() + "." + text; + } + + /** + * Return the token that matches the input text or null if not found. + * The token delimiters need to be already stripped from the input + * @param input a token text like <i>alert.id</i>, which would return the + * <i>ALERT_ID</i> token. + * @return The matching token or null if not found + */ + public static Token getByText(String input) { + EnumSet<Token> es = EnumSet.allOf(Token.class); + for (Token t : es) { + if (t.text.equals(input)) + return t; + } + return null; + } +} diff --git a/modules/enterprise/server/plugins/alert-operations/src/main/java/org/rhq/enterprise/server/plugins/alertOperations/TokenClass.java b/modules/enterprise/server/plugins/alert-operations/src/main/java/org/rhq/enterprise/server/plugins/alertOperations/TokenClass.java new file mode 100644 index 0000000..5125a72 --- /dev/null +++ b/modules/enterprise/server/plugins/alert-operations/src/main/java/org/rhq/enterprise/server/plugins/alertOperations/TokenClass.java @@ -0,0 +1,59 @@ +/* + * 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.server.plugins.alertOperations; + +import java.util.EnumSet; + +/** + * Class a @See{Token} can be in. + * @author Heiko W. Rupp + */ +public enum TokenClass { + + ALERT("alert"), + RESOURCE("resource"), + TARGET_RESOURCE("targetResource"), + TEST("test"); + + private String text; + + private TokenClass(String text) { + this.text = text; + } + + public String getText() { + return text; + } + + /** + * Return the tokenclass that matches the input text or null if not found. + * The token delimiters need to be already stripped from the input + * @param input a token text like <i>alert</i>, which would return the + * <i>ALERT</i> token class. + * @return The matching token class or null if not found + */ + public static TokenClass getByText(String input) { + EnumSet<TokenClass> es = EnumSet.allOf(TokenClass.class); + for (TokenClass t : es) { + if (t.text.equals(input)) + return t; + } + return null; + } +} diff --git a/modules/enterprise/server/plugins/alert-operations/src/main/java/org/rhq/enterprise/server/plugins/alertOperations/TokenReplacer.java b/modules/enterprise/server/plugins/alert-operations/src/main/java/org/rhq/enterprise/server/plugins/alertOperations/TokenReplacer.java new file mode 100644 index 0000000..0b230b4 --- /dev/null +++ b/modules/enterprise/server/plugins/alert-operations/src/main/java/org/rhq/enterprise/server/plugins/alertOperations/TokenReplacer.java @@ -0,0 +1,178 @@ +/* + * 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.server.plugins.alertOperations; + +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import org.rhq.core.domain.alert.Alert; +import org.rhq.core.domain.resource.Resource; + +/** + * Helper to replace tokens by their values + * @author Heiko W. Rupp + */ +public class TokenReplacer { + + private final Log log = LogFactory.getLog(TokenReplacer.class); + private static final String NOT_YET_IMPLEMENTED = " - not yet implemented -"; + protected static final String THE_QUICK_BROWN_FOX_JUMPS_OVER_THE_LAZY_DOG = "TheQuickBrownFoxJumpsOverTheLazyDOg"; + private Alert alert; + private Pattern pattern; + + public TokenReplacer(Alert alert) { + this.alert = alert; + pattern = Pattern.compile("<%\\s*([a-z]+\\.[a-z0-9]+)\\s*%>"); + } + + /** + * Replace all tokens on the input line. If no tokens are found the input is returned. + * Tokens have the form '<i><% class.sub %></i>' + * @param input a line of text + * @return input with tokens replaced. + * @see org.rhq.enterprise.server.plugins.alertOperations.Token + * @see org.rhq.enterprise.server.plugins.alertOperations.TokenClass + */ + public String replaceTokens(String input) { + + String work = input; + Matcher matcher = pattern.matcher(work); + if (!matcher.find()) { + log.warn("No tokens found in " + input); + return input; + } + matcher.reset(); + + do { +// System.out.println(input); + matcher = pattern.matcher(work); + if (!matcher.find()) { + break; + } +// System.out.println(matcher.regionStart() + ":" + matcher.regionEnd() + input.substring(matcher.regionStart(),matcher.regionEnd())); +// System.out.println(matcher.group(1)); + String replacement = replaceToken(matcher.group(1) ); + String s = matcher.replaceFirst(replacement); +// System.out.println(s); + work = s; + +// System.out.println("----"); + } while (true); + + return work; + } + + + + /** + * Replace the token string passed (without the token delimiters ) with the actual value + * @param tokenString Input like alert.id + * @return replacement string or the input if the token was not valid. + */ + public String replaceToken(String tokenString) { + + // Ok, we have at least one token. Now split the tokenString and loop over the tokens + + if (!tokenString.contains(".")) + return tokenString; + + String tmp = tokenString.substring(0, tokenString.indexOf(".")); + TokenClass tc = TokenClass.getByText(tmp); + if (tc==null) { + log.warn("Unknown token class in [" + tokenString + "], not replacing tokens"); + return tokenString; + } + + Token token = Token.getByText(tokenString); + if (token == null) { + log.warn("No known token found in [" + tokenString + "], not replacing token"); + return tokenString; + } + String ret = null; + switch (tc) { + case ALERT: + ret = replaceAlertToken(token,alert); + break; + case RESOURCE: + ret = replaceResourceToken(token,alert.getAlertDefinition().getResource()); + break; + case TARGET_RESOURCE: + Resource resource = null; // TODO + ret = replaceTargetResourceToken(token, resource); + break; + case TEST: + switch (token) { + case TEST_ECHO: + ret = tokenString; + break; + case TEST_FIX: + ret = THE_QUICK_BROWN_FOX_JUMPS_OVER_THE_LAZY_DOG; + break; + default: + ret = NOT_YET_IMPLEMENTED; + } + break; + } + return ret; + } + + private String replaceAlertToken(Token token, Alert alert) { + + switch (token) { + case ALERT_ID: + return String.valueOf(alert.getId()); + case ALERT_URL: + return NOT_YET_IMPLEMENTED; + + default: + return NOT_YET_IMPLEMENTED; + } + + } + + private String replaceResourceToken(Token token, Resource resource) { + + switch (token) { + case RESOURCE_ID: + return String.valueOf(resource.getId()); + case RESOURCE_NAME: + return resource.getName(); + + default: + return NOT_YET_IMPLEMENTED; + } + } + + private String replaceTargetResourceToken(Token token, Resource resource) { + + switch (token) { + case TRESOURCE_ID: + return String.valueOf(resource.getId()); + case TRESOURCE_NAME: + return resource.getName(); + + default: + return NOT_YET_IMPLEMENTED; + } + } + +} diff --git a/modules/enterprise/server/plugins/alert-operations/src/test/java/org/rhq/enterprise/server/plugins/alertOperations/TokenReplacementTest.java b/modules/enterprise/server/plugins/alert-operations/src/test/java/org/rhq/enterprise/server/plugins/alertOperations/TokenReplacementTest.java new file mode 100644 index 0000000..f41fc85 --- /dev/null +++ b/modules/enterprise/server/plugins/alert-operations/src/test/java/org/rhq/enterprise/server/plugins/alertOperations/TokenReplacementTest.java @@ -0,0 +1,135 @@ +/* + * 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.server.plugins.alertOperations; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.testng.annotations.Test; + +import org.rhq.core.domain.alert.Alert; +import org.rhq.core.domain.alert.AlertDefinition; +import org.rhq.core.domain.resource.Resource; + +/** + * // TODO: Document this + * @author Heiko W. Rupp + */ +@Test +public class TokenReplacementTest { + + private final Log log = LogFactory.getLog(TokenReplacementTest.class); + private static final String TEST_ECHO = "test.echo"; + private static final String FOO_BAR = "fooBar"; + private static final String FOO_DOT_BAR = "foo.bar"; + private static final String ALERT_BAR = "alert.bar"; + + public void testSimpleReplacement() throws Exception { + + Alert al = new Alert(); + TokenReplacer tr = new TokenReplacer(al); + + + String res = tr.replaceToken("test.fix"); + assert res != null; + assert res.equals(TokenReplacer.THE_QUICK_BROWN_FOX_JUMPS_OVER_THE_LAZY_DOG); + + res = tr.replaceToken(TEST_ECHO); + assert res != null; + assert res.equals(TEST_ECHO); + + res = tr.replaceToken("alert.id"); + assert res != null; + assert res.equals("0"); + + Resource r = new Resource(1234); + r.setName("A resource"); + AlertDefinition def = new AlertDefinition(); + def.setResource(r); + al = new Alert(def, System.currentTimeMillis()); + tr = new TokenReplacer(al); + + res = tr.replaceToken("resource.id"); + assert "1234".equals(res); + res = tr.replaceToken("resource.name"); + assert "A resource".equals(res); + } + + public void testInvalidTokenString() { + + Alert al = new Alert(); + TokenReplacer tr = new TokenReplacer(al); + + + String res = tr.replaceToken(FOO_BAR); + assert res != null; + assert res.equals(FOO_BAR); + + res = tr.replaceToken(FOO_DOT_BAR); + assert res != null; + assert res.equals(FOO_DOT_BAR); + + res = tr.replaceToken(ALERT_BAR); + assert res != null; + assert res.equals(ALERT_BAR); + + } + + public void testFullTokenSimple() { + + Alert al = new Alert(); + TokenReplacer tr = new TokenReplacer(al); + + + String res = tr.replaceTokens("<%test.fix%>"); + assert res != null; + assert !res.equals("<%test.fix%>") : "Res was " + res; + assert res.equals(TokenReplacer.THE_QUICK_BROWN_FOX_JUMPS_OVER_THE_LAZY_DOG); + + String TF2 = "<% test.fix %>"; + res = tr.replaceTokens(TF2); + assert res != null; + assert !res.equals(TF2) : "Res was " + res; + + String TF3 = "<% test.fix %>"; + res = tr.replaceTokens(TF3); + assert res != null; + assert !res.equals(TF3) : "Res was " + res; + + String TF4 = "<% test.fix%> xXx <% test.echo%>"; + res = tr.replaceTokens(TF4); + assert res != null; + assert !res.equals(TF4) : "Res was " + res; + + res = tr.replaceTokens(FOO_BAR); + assert res != null; + assert res.equals(FOO_BAR) : "Res was " + res; + + Resource r = new Resource(1234); + r.setName("A resource"); + AlertDefinition def = new AlertDefinition(); + def.setResource(r); + al = new Alert(def, System.currentTimeMillis()); + + tr = new TokenReplacer(al); + res = tr.replaceTokens("<% test.fix%><%resource.id%>"); + assert res!=null; + assert res.equals(TokenReplacer.THE_QUICK_BROWN_FOX_JUMPS_OVER_THE_LAZY_DOG+"1234"); + } + +}

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
39
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

rhq-commits February 2010