modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardView.java
| 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletWindow.java
| 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupBundleDeploymentsPortlet.java
| 20
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupConfigurationUpdatesPortlet.java
| 28
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupEventsPortlet.java
| 23
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java
| 19
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOobsPortlet.java
| 19
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOperationsPortlet.java
| 27
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupPkgHistoryPortlet.java
| 20
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationSchedulePortlet.java
| 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceBundleDeploymentsPortlet.java
| 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceConfigurationUpdatesPortlet.java
| 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceEventsPortlet.java
| 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceMetricsPortlet.java
| 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceOobsPortlet.java
| 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourcePkgHistoryPortlet.java
| 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java
| 2
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
| 1
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
| 326 +++++-----
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java
| 4
modules/enterprise/server/safe-invoker/src/main/java/org/rhq/enterprise/server/util/HibernateDetachUtility.java
| 8
modules/plugins/pattern-generator/pom.xml
| 179 +++++
modules/plugins/pattern-generator/src/main/java/org/rhq/plugins/pattern/PatternComponent.java
| 97 ++
modules/plugins/pattern-generator/src/main/java/org/rhq/plugins/pattern/PatternDiscovery.java
| 39 +
modules/plugins/pattern-generator/src/main/resources/META-INF/rhq-plugin.xml
| 26
modules/plugins/pom.xml
| 1
26 files changed, 674 insertions(+), 210 deletions(-)
New commits:
commit fcf19cc8052f95230c9cacbd9bab0f5e60445578
Merge: 471497c 15a53e5
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Wed Apr 27 18:25:35 2011 -0400
Merge branch 'master' into ie-fragment-fix
commit 15a53e58c10ba129ce0dd5b569aea1944de6836a
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Apr 27 16:06:30 2011 -0400
[BZ 699842 - ORA-00907: missing right parenthesis]
This is actually a fix to workaround HHH-3096 where hibernate generates
invalid SQL for "Select Count(entity)" if entity has a composite key.
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java
index 9b8c2ec..4bf2bae 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java
@@ -306,13 +306,13 @@ public final class CriteriaQueryGenerator {
return EnumType.STRING; // catch-all
}
- // for testing purposes only, should use getQuery(EntityManager) or
getCountQuery(EntityManager) instead
public String getQueryString(boolean countQuery) {
StringBuilder results = new StringBuilder();
results.append("SELECT ");
if (countQuery) {
if (groupByClause == null) { // non-grouped method
-
results.append("COUNT(").append(alias).append(")").append(NL);
+ // use count(*) instead of count(alias) due to
https://bugzilla.redhat.com/show_bug.cgi?id=699842
+ results.append("COUNT(*)").append(NL);
} else {
// gets the count of the number of aggregate/grouped rows
// NOTE: this only works when the groupBy is a single element, as opposed
to a list of elements
commit f50680d02410d1da4665d9741003d061817cb716
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed Apr 27 21:18:04 2011 +0200
Some more translations.
diff --git
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
index 667f040..dfaf432 100644
---
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
+++
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
@@ -162,6 +162,8 @@ common_msg_deleteConfirm = Are you sure you want to delete the #
selected {0}?~
common_msg_emphasizedNotePrefix = Achtung:
common_msg_loading = Laden...
common_msg_noItemsToShow=Keine Einträge vorhanden
+common_msg_step_x_of_y = Schritt {0} von {1}
+
# Common Values
#--------------
@@ -194,8 +196,8 @@ common_calendar_december_short=Dez
# Record Editor
#--------------
-widget_recordEditor_title_view = Anzeigen {0} [{1}]~
-widget_recordEditor_title_edit = Bearbeiten {0} [{1}]~
+widget_recordEditor_title_view = Anzeigen {0} [{1}]
+widget_recordEditor_title_edit = Bearbeiten {0} [{1}]
widget_recordEditor_title_new = Neue {0} anlegen
# // dup in common
widget_recordEditor_label_loading = Laden...
@@ -370,7 +372,7 @@ dataSource_problemResources_error_fetchFailure = Konnte die Liste der
Ressourcen
# Recent Operations
#----------------------------
dataSource_recentOperations_field_resource = Ressource
-dataSource_recentOperations_field_location = ort
+dataSource_recentOperations_field_location = Ort
dataSource_recentOperations_field_operation = Operation
dataSource_recentOperations_field_time = Zeitpunkt
dataSource_recentOperations_field_status = Status
@@ -399,7 +401,6 @@ dataSource_configurationHistory_error_fetchFailure = Konnte den
Verlauf der Ress
# Resource Errors
#-------------------------
dataSource_resourceErrors_field_summary = Zsuammenfassung
-dataSource_resourceErrors_field_detail = Detailierte Nachricht
dataSource_resourceErrors_field_errorType = Fehlertyp
dataSource_resourceErrors_field_timeOccured = Zeitpunkt
dataSource_resourceErrors_error_fetchFailure = Konnte die spezifischen Fehler für die
Ressource mit id [{0}] nicht laden.
@@ -448,9 +449,9 @@ view_adminRoles_failLdapGroupsRole = Failed to load LDAP groups
available for ro
view_adminRoles_failRoles = Konnte die Rollen nicht laden.
view_adminRoles_globalPerms = Applikationsweite Rechte
view_adminRoles_ldapGroups = LDAP-Gruppen
-view_adminRoles_ldapGroupsReadOnly = LDAP group data is read only~
+view_adminRoles_ldapGroupsReadOnly = LDAP Gruppendaten können nur gelesen werden
view_adminRoles_noItems = Keine Einträge vorhanden
-view_adminRoles_noLdap = The LDAP security integration is not configured. To configure
LDAP go to <a {0}>{1}</a>.~
+view_adminRoles_noLdap = Die LDAP-Integration ist nicht konfiguriert. Um LDAP zu
konfigurieren, wechseln sie zu <a {0}>{1}</a>.
view_adminRoles_perms = Rechte
view_adminRoles_resourcePerms = Rechte auf Ressourcen
view_adminRoles_roleAdded = Rolle [{0}] hinzugefügt
@@ -492,8 +493,8 @@ view_remoteAgentInstall_success = Agent installation complete~
view_remoteAgentInstall_updateStatus = Update Status~
#==================== Alerts ======================
-view_alerts_table_title_group=Group Alert History~
-view_alerts_table_title_resource=Resource Alert History~
+view_alerts_table_title_group=Verlauf Gruppen-Alarme
+view_alerts_table_title_resource=Verlauf Ressourcen-Alarme
view_alerts_table_filter_priority=Filter nach Priorität
view_alerts_field_created_time=Erstellungszeitpunkt
view_alerts_field_modified_time=Zuletzt geändert
@@ -531,13 +532,13 @@ view_alert_definitions_table_title_group=Alarm-Definitionen für
Gruppen
view_alert_definitions_table_title_resource=Alarm-Definitionen für Ressourcen
view_alert_definitions_loadFailed=Failed to fetch alert definition data~
view_alert_definitions_loadFailed_single=Failed to fetch data for alert definition with
id {0}~
-view_alert_definitions_enable_confirm=Enable the selected alert definition(s)?~
+view_alert_definitions_enable_confirm=Die auusgewählten Alarm-Definitionen aktivieren?
view_alert_definitions_enable_success=Successfully enabled {0} alert definitions~
view_alert_definitions_enable_failure=Failed to enable the selected alert definitions~
-view_alert_definitions_disable_confirm=Disable the selected alert definition(s)?~
+view_alert_definitions_disable_confirm=Die ausgewählten Alram-Definitionen deaktivieren?
view_alert_definitions_disable_success=Successfully disabled {0} alert definitions~
view_alert_definitions_disable_failure=Failed to disable the selected alert definitions~
-view_alert_definitions_delete_confirm=Delete the selected alert definition(s)?~
+view_alert_definitions_delete_confirm=Die ausgewählten Alarm-Definitionen löschen?
view_alert_definitions_delete_success=Successfully deleted {0} alert definitions~
view_alert_definitions_delete_failure=Failed to deleted the selected alert definitions~
view_alert_definitions_create_success=Alarm-Definition erfolgreich angelegt
@@ -928,13 +929,7 @@ view_groupConfigEdit_valsDiffForProp = Member Values for Property
[{0}]~
view_leftNav_unknownPage = Unknown page name [{0}] for section [{1}] - URL is invalid.~
view_measure_nan = --keine Daten verfügbar--~
-view_measureRange_day = 1 Tag
-view_measureRange_days = {0} Tage
-view_measureRange_hour = 1 Stunde
-view_measureRange_hours = {0} Stunden
view_measureRange_last = Letzte
-view_measureRange_minutes = {0} Minuten
-view_measureRange_range = Zeitraum
view_measureRange_simple = Einfach...
view_selector_assigned = Zugewiesen {0}
@@ -964,7 +959,6 @@ view_upload_error_results = Error uploading file, unexpected results:
[{0}]~
view_upload_inProgress = Can not submit, upload is currently in progress~
view_upload_prompt_1 = [{0}] File to Upload~
view_upload_prompt_2 = File to Upload~
-view_upload_tooltip_1 = Select a file to upload, then click Upload or Next~
view_upload_tooltip_2 = File upload had previously failed~
view_upload_success = File successfully uploaded~
view_upload_upload = Hochladen
@@ -972,13 +966,13 @@ view_upload_uploadFile = UploadFile~
# Group Create Wizard
view_groupCreateWizard_membersStepName=Wählen Sie die Gruppenmitglieder aus
-view_groupCreateWizard_createStepName=Group Settings~
+view_groupCreateWizard_createStepName=Einstellungen für die Gruppe
view_groupCreateWizard_createStep_recursive=Rekursiv
view_groupCreateWizard_title=Gruppe anlegen
view_groupCreateWizard_windowTitle=Gruppe anlegen
view_groupCreateWizard_createFailure=Konnte die Ressourcen-Gruppe nicht anlegen
-view_groupCreateWizard_createSuccessful_concise=Sie haben eine neue Ressourcen-Gruppe
angelegt. [<a href="{0}">Gruppe ansehen</a>]~
-view_groupCreateWizard_createSuccessful_full=You have created a new [{0}] resource group
with the name [{1}] that contains [{2}] member resources~
+view_groupCreateWizard_createSuccessful_concise=Sie haben eine neue Ressourcen-Gruppe
angelegt. [<a href="{0}">Gruppe ansehen</a>]
+view_groupCreateWizard_createSuccessful_full=Sie haben eine neue [{0}] Gruppe mit dem
Namen [{1}] mit [{2}] Ressourcen angelegt.
# Resource Type / Plugin View/Datasources
view_type_resourceTypes=Ressourcen-Typen
@@ -1489,7 +1483,6 @@ common_title_resourceGroups=Ressourcen-Gruppen
common_title_server=Server
common_title_service=Dienste
common_title_users=Benutzer
-dataSource_operationHistory_startedTime=Startzeitpunkt
view_tabs_common_agent=Agent
common_title_bundle=Bundle
common_title_bundles=Bundles
@@ -1497,7 +1490,6 @@ common_val_n1st={0}er
common_val_n2nd={0}er
common_val_n3rd={0}er
common_val_nth={0}er
-dataSource_operationHistory_operationName=Name der Operation
view_autoDiscoveryQ_deleted=Gelöscht
view_adminRoles_permissions_globalPermissions=Globale Rechte
view_adminRoles_permissions_resourcePermissions=Rechte für Ressourcen
@@ -1683,6 +1675,54 @@ view_operationScheduleDetails_enterParametersBelow=Geben Sie die
Parameter unten
view_operationScheduleDetails_field_description=Beschreibung
view_operationScheduleDetails_field_parameters=Parameter
view_operationScheduleDetails_noParameters=Diese Operation benötigt keine Parameter.
+common_button_schedule=Planen
+common_button_set=Setzen
+common_status_deferred=Verzögert
+common_status_nochange=Keine Änderung
+common_status_partial=partiell
+common_title_compare_metrics=Metriken vergleichen
+common_title_config_update_status=Status aktualisieren
+common_title_dateRange=Zeitraum
+common_title_members_reporting=Anzahl berichtender Mitglieder
+common_title_group_member_health=Zustand der Gruppenmitglieder
+common_title_numeric_metrics=Numerische Metriken
+dataSource_operationHistory_field_createdTime=Erstellungszeitpunkt
+dataSource_operationHistory_field_operationName=Name der Operation
+dataSource_operationHistory_field_startedTime=Startzeitpunkt
+dataSource_operationHistory_field_subject=Ersteller
+dataSource_operationSchedule_field_description=Notizen
+dataSource_operationSchedule_field_nextFireTime=Nächste Ausführung
+dataSource_operationSchedule_field_operationDisplayName=Operation
+dataSource_operationSchedule_field_operationName=Operation
+dataSource_operationSchedule_field_subject=Eigentümer
+dataSource_operationSchedule_field_timeout=Timeout (in Sekunden)
+dataSource_resourceErrors_clickStatusIcon=Für mehr Details auf das Icon klicken
+dataSource_resourceErrors_deleteFailure=Konnte die Ressourcen-Fehler nicht löschen
+dataSource_resourceErrors_deleteSuccess=Sie haben erfolgreich [{0}]
Ressourcen-Fehlermeldungen gelöscht.
+group_tree_partialClusterTooltip={0} der {1} Gruppenmitglieder haben eine
''{2}'' Ressource
+view_adminTemplates_servers=Server
+view_adminTemplates_platforms=Platformen
+view_alert_definition_condition_editor_delete_confirm=Die ausgewählte(n)
Alarm-Bedingung(en) löschen?
+view_bundle_fileListView_md5=MD5
+view_bundle_fileListView_sha256=SHA256
+view_group_detail_failRecursiveChange=Konnte die Einstellung ''Rekursiv''
für die Gruppe [{0}] nicht aktualisieren
+view_group_detail_recursiveChange=Sie haben erfolgreich die
''Rekursiv''-Einstellung für die Gruppe [{0}] geändert.
+view_groupInventoryMembers_button_updateMembership=Mitgliedschaft aktualisieren...
+view_groupInventoryMembers_title_updateMembership=Mitgliedschaft aktualisieren
+view_measureRange_start=Zeitraum - Start
+view_measureTable_chartMetricValues=Graphen für ausgewählte Metriken anzeigen
+view_measureTable_getLive=Aktuellen Wert holen
+view_messageCenter_maxMessages=Alle Nachrichten
+view_resource_monitor_table_alerts=Alarme
+view_resource_monitor_table_avg=Durchschnitt
+view_resource_monitor_table_last=Letzter
+view_resource_monitor_table_max=Maximum
+view_resource_monitor_table_min=Minimum
+view_table_matchingRows=Zutreffende Zeilen: {0} (ausgewählt: {1})
+view_tabs_common_activity=Aktivität
+view_tabs_common_group_members=Gruppenmitglieder
+view_tabs_common_schedule=Zeitplan
+widget_resourceFactoryWizard_editConfigStep_nothingToDo=Es gibt keine Konfiguration, die
Sie für diese Ressource bearbeiten können.
commit c8592e93580faac85a0a482d1db8b86c38086e17
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Apr 27 12:57:16 2011 -0400
[BZ 700176 - Several refresh issues in resource portlets]
There were a variety of contributing factors. In several cases the
resource portlets were not resetting the "loading" flag on initialization
which prevented subsequent refreshes from doing any work. And several
were locally caching config data that could go stale.
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletWindow.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletWindow.java
index e8d51d1..530ed35 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletWindow.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletWindow.java
@@ -95,9 +95,12 @@ public class PortletWindow extends LocatableWindow {
};
private ClickHandler refreshHandler = new ClickHandler() {
+
@SuppressWarnings("unchecked")
public void onClick(ClickEvent clickEvent) {
- if (PortletWindow.this.view instanceof Table) {
+ if (PortletWindow.this.view instanceof AutoRefreshPortlet) {
+ ((AutoRefreshPortlet) PortletWindow.this.view).refresh();
+ } else if (PortletWindow.this.view instanceof Table) {
((Table) PortletWindow.this.view).refresh();
} else {
((Canvas) PortletWindow.this.view).redraw();
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupBundleDeploymentsPortlet.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupBundleDeploymentsPortlet.java
index f54ea54..944b674 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupBundleDeploymentsPortlet.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupBundleDeploymentsPortlet.java
@@ -70,8 +70,6 @@ public class GroupBundleDeploymentsPortlet extends LocatableVLayout
implements C
protected LocatableCanvas recentBundleDeployContent = new LocatableCanvas(
extendLocatorId("RecentBundleDeployments"));
protected boolean currentlyLoading = false;
- protected Configuration portletConfig = null;
- protected DashboardPortlet storedPortlet;
// A non-displayed, persisted identifier for the portlet
public static final String KEY = "GroupBundleDeployments";
@@ -123,8 +121,8 @@ public class GroupBundleDeploymentsPortlet extends LocatableVLayout
implements C
if ((null == storedPortlet) || (null == storedPortlet.getConfiguration())) {
return;
}
- this.storedPortlet = storedPortlet;
- portletConfig = storedPortlet.getConfiguration();
+
+ Configuration portletConfig = storedPortlet.getConfiguration();
//lazy init any elements not yet configured.
for (String key :
PortletConfigurationEditorComponent.CONFIG_PROPERTY_INITIALIZATION.keySet()) {
@@ -154,6 +152,9 @@ public class GroupBundleDeploymentsPortlet extends LocatableVLayout
implements C
@Override
public DynamicForm getCustomSettingsForm() {
+ final DashboardPortlet storedPortlet = this.portletWindow.getStoredPortlet();
+ final Configuration portletConfig = storedPortlet.getConfiguration();
+
LocatableDynamicForm customSettings = new
LocatableDynamicForm(extendLocatorId("customSettings"));
LocatableVLayout page = new
LocatableVLayout(customSettings.extendLocatorId("page"));
//build editor form container
@@ -170,12 +171,13 @@ public class GroupBundleDeploymentsPortlet extends LocatableVLayout
implements C
public void onSubmitValues(SubmitValuesEvent event) {
//results count
- portletConfig =
AbstractActivityView.saveResultCounterSettings(resultCountSelector, portletConfig);
+ Configuration updatedConfig =
AbstractActivityView.saveResultCounterSettings(resultCountSelector,
+ portletConfig);
//persist
- storedPortlet.setConfiguration(portletConfig);
+ storedPortlet.setConfiguration(updatedConfig);
configure(portletWindow, storedPortlet);
- loadData();
+ refresh();
}
});
@@ -187,6 +189,8 @@ public class GroupBundleDeploymentsPortlet extends LocatableVLayout
implements C
/** Fetches recent bundle deployment information and updates the DynamicForm instance
with details.
*/
protected void getRecentBundleDeployments() {
+ final DashboardPortlet storedPortlet = this.portletWindow.getStoredPortlet();
+ final Configuration portletConfig = storedPortlet.getConfiguration();
final int groupId = this.groupId;
GroupBundleDeploymentCriteria criteria = new GroupBundleDeploymentCriteria();
@@ -256,8 +260,8 @@ public class GroupBundleDeploymentsPortlet extends LocatableVLayout
implements C
}
recentBundleDeployContent.addChild(column);
recentBundleDeployContent.markForRedraw();
- markForRedraw();
currentlyLoading = false;
+ markForRedraw();
}
});
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupConfigurationUpdatesPortlet.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupConfigurationUpdatesPortlet.java
index c36b320..f4fa675 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupConfigurationUpdatesPortlet.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupConfigurationUpdatesPortlet.java
@@ -106,8 +106,6 @@ public class GroupConfigurationUpdatesPortlet extends LocatableVLayout
implement
protected Canvas containerCanvas;
protected Timer refreshTimer;
- protected DashboardPortlet storedPortlet;
- protected Configuration portletConfig;
private ResourceGroupComposite groupComposite;
protected boolean portletConfigInitialized = false;
protected boolean currentlyLoading = false;
@@ -155,8 +153,8 @@ public class GroupConfigurationUpdatesPortlet extends LocatableVLayout
implement
if ((null == storedPortlet) || (null == storedPortlet.getConfiguration())) {
return;
}
- this.storedPortlet = storedPortlet;
- portletConfig = storedPortlet.getConfiguration();
+
+ Configuration portletConfig = storedPortlet.getConfiguration();
//lazy init any elements not yet configured.
for (String key :
PortletConfigurationEditorComponent.CONFIG_PROPERTY_INITIALIZATION.keySet()) {
@@ -173,6 +171,8 @@ public class GroupConfigurationUpdatesPortlet extends LocatableVLayout
implement
@Override
public DynamicForm getCustomSettingsForm() {
+ final DashboardPortlet storedPortlet = this.portletWindow.getStoredPortlet();
+ final Configuration portletConfig = storedPortlet.getConfiguration();
LocatableDynamicForm customSettings = new
LocatableDynamicForm(extendLocatorId("customSettings"));
LocatableVLayout page = new
LocatableVLayout(customSettings.extendLocatorId("page"));
//build editor form container
@@ -201,8 +201,6 @@ public class GroupConfigurationUpdatesPortlet extends LocatableVLayout
implement
@Override
public void onSubmitValues(SubmitValuesEvent event) {
- String selectedValue;
-
// //result sort order
// selectedValue =
resultSortSelector.getValue().toString();
// if ((selectedValue.trim().isEmpty()) ||
(selectedValue.equalsIgnoreCase(PageOrdering.DESC.name()))) {//then desc
@@ -211,21 +209,20 @@ public class GroupConfigurationUpdatesPortlet extends
LocatableVLayout implement
// portletConfig.put(new
PropertySimple(Constant.RESULT_SORT_ORDER, PageOrdering.ASC));
// }
//config status
- portletConfig =
AbstractActivityView.saveConfigUpdateStatusSelectorSettings(resultStatusSelector,
- portletConfig);
+ Configuration updatedConfig =
AbstractActivityView.saveConfigUpdateStatusSelectorSettings(
+ resultStatusSelector, portletConfig);
//result count
- portletConfig =
AbstractActivityView.saveResultCounterSettings(resultCountSelector, portletConfig);
+ updatedConfig =
AbstractActivityView.saveResultCounterSettings(resultCountSelector, updatedConfig);
//time range settings
- portletConfig =
AbstractActivityView.saveMeasurementRangeEditorSettings(measurementRangeEditor,
- portletConfig);
+ updatedConfig =
AbstractActivityView.saveMeasurementRangeEditorSettings(measurementRangeEditor,
+ updatedConfig);
//persist and reload portlet
storedPortlet.setConfiguration(portletConfig);
configure(portletWindow, storedPortlet);
- // refresh();
- redraw();
+ refresh();
}
});
form.markForRedraw();
@@ -297,6 +294,9 @@ public class GroupConfigurationUpdatesPortlet extends LocatableVLayout
implement
}
protected void loadData() {
+ final DashboardPortlet storedPortlet = this.portletWindow.getStoredPortlet();
+ final Configuration portletConfig = storedPortlet.getConfiguration();
+
//populate composite data
//locate resourceGroupRef
ResourceGroupCriteria criteria = new ResourceGroupCriteria();
@@ -352,7 +352,7 @@ public class GroupConfigurationUpdatesPortlet extends LocatableVLayout
implement
groupComposite);
}
- //update table for portlet display.
+ //update table for portlet display.
groupHistoryTable.setDataSource(new
GroupConfigurationUdpatesCriteriaDataSource(portletConfig,
groupId));
groupHistoryTable.setShowHeader(false);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupEventsPortlet.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupEventsPortlet.java
index f88774f..9b5fb96 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupEventsPortlet.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupEventsPortlet.java
@@ -88,8 +88,6 @@ public class GroupEventsPortlet extends LocatableVLayout implements
CustomSettin
private int groupId = -1;
protected LocatableCanvas recentEventsContent = new
LocatableCanvas(extendLocatorId("RecentEvents"));
protected boolean currentlyLoading = false;
- protected Configuration portletConfig = null;
- protected DashboardPortlet storedPortlet;
public GroupEventsPortlet(String locatorId) {
super(locatorId);
@@ -126,8 +124,8 @@ public class GroupEventsPortlet extends LocatableVLayout implements
CustomSettin
if ((null == storedPortlet) || (null == storedPortlet.getConfiguration())) {
return;
}
- this.storedPortlet = storedPortlet;
- portletConfig = storedPortlet.getConfiguration();
+
+ Configuration portletConfig = storedPortlet.getConfiguration();
//lazy init any elements not yet configured.
for (String key :
PortletConfigurationEditorComponent.CONFIG_PROPERTY_INITIALIZATION.keySet()) {
@@ -159,6 +157,9 @@ public class GroupEventsPortlet extends LocatableVLayout implements
CustomSettin
final LocatableDynamicForm customSettings = new
LocatableDynamicForm(extendLocatorId("customSettings"));
LocatableVLayout page = new
LocatableVLayout(customSettings.extendLocatorId("page"));
+ final DashboardPortlet storedPortlet = this.portletWindow.getStoredPortlet();
+ final Configuration portletConfig = storedPortlet.getConfiguration();
+
//add range selector
final CustomConfigMeasurementRangeEditor measurementRangeEditor =
PortletConfigurationEditorComponent
.getMeasurementRangeEditor(portletConfig);
@@ -170,14 +171,13 @@ public class GroupEventsPortlet extends LocatableVLayout implements
CustomSettin
public void onSubmitValues(SubmitValuesEvent event) {
//persist the measurement range selections
- portletConfig =
AbstractActivityView.saveMeasurementRangeEditorSettings(measurementRangeEditor,
- portletConfig);
+ Configuration updatedConfig =
AbstractActivityView.saveMeasurementRangeEditorSettings(
+ measurementRangeEditor, portletConfig);
//persist
- storedPortlet.setConfiguration(portletConfig);
+ storedPortlet.setConfiguration(updatedConfig);
configure(portletWindow, storedPortlet);
- redraw();
- customSettings.markForRedraw();
+ refresh();
}
});
page.addMember(measurementRangeEditor);
@@ -193,6 +193,9 @@ public class GroupEventsPortlet extends LocatableVLayout implements
CustomSettin
long end = System.currentTimeMillis();
long start = end - (24 * 60 * 60 * 1000);
+ final DashboardPortlet storedPortlet = this.portletWindow.getStoredPortlet();
+ final Configuration portletConfig = storedPortlet.getConfiguration();
+
//result timeframe if enabled
PropertySimple property = portletConfig.getSimple(Constant.METRIC_RANGE_ENABLE);
if (Boolean.valueOf(property.getBooleanValue())) {//then proceed setting
@@ -287,8 +290,8 @@ public class GroupEventsPortlet extends LocatableVLayout implements
CustomSettin
}
recentEventsContent.addChild(column);
recentEventsContent.markForRedraw();
- markForRedraw();
setCurrentlyRefreshing(false);
+ markForRedraw();
}
});
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java
index 7198004..1c5b526 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java
@@ -84,8 +84,6 @@ public class GroupMetricsPortlet extends LocatableVLayout implements
CustomSetti
private int groupId = -1;
protected LocatableCanvas recentMeasurementsContent = new
LocatableCanvas(extendLocatorId("RecentMetrics"));
protected boolean currentlyLoading = false;
- protected Configuration portletConfig = null;
- protected DashboardPortlet storedPortlet;
protected String baseViewPath = "";
protected long start = -1;
protected long end = -1;
@@ -148,8 +146,8 @@ public class GroupMetricsPortlet extends LocatableVLayout implements
CustomSetti
if ((null == storedPortlet) || (null == storedPortlet.getConfiguration())) {
return;
}
- this.storedPortlet = storedPortlet;
- portletConfig = storedPortlet.getConfiguration();
+
+ Configuration portletConfig = storedPortlet.getConfiguration();
//lazy init any elements not yet configured.
for (String key :
PortletConfigurationEditorComponent.CONFIG_PROPERTY_INITIALIZATION.keySet()) {
@@ -185,6 +183,8 @@ public class GroupMetricsPortlet extends LocatableVLayout implements
CustomSetti
LocatableDynamicForm customSettings = new
LocatableDynamicForm(extendLocatorId("customSettings"));
//embed range editor in it own container
LocatableVLayout page = new
LocatableVLayout(customSettings.extendLocatorId("page"));
+ final DashboardPortlet storedPortlet = this.portletWindow.getStoredPortlet();
+ final Configuration portletConfig = storedPortlet.getConfiguration();
final CustomConfigMeasurementRangeEditor measurementRangeEditor =
PortletConfigurationEditorComponent
.getMeasurementRangeEditor(portletConfig);
@@ -193,13 +193,13 @@ public class GroupMetricsPortlet extends LocatableVLayout implements
CustomSetti
@Override
public void onSubmitValues(SubmitValuesEvent event) {
//retrieve range editor values
- portletConfig =
AbstractActivityView.saveMeasurementRangeEditorSettings(measurementRangeEditor,
- portletConfig);
+ Configuration updatedConfig =
AbstractActivityView.saveMeasurementRangeEditorSettings(
+ measurementRangeEditor, portletConfig);
//persist
- storedPortlet.setConfiguration(portletConfig);
+ storedPortlet.setConfiguration(updatedConfig);
configure(portletWindow, storedPortlet);
- loadData();
+ refresh();
}
});
page.addMember(measurementRangeEditor);
@@ -212,6 +212,9 @@ public class GroupMetricsPortlet extends LocatableVLayout implements
CustomSetti
* digits.
*/
protected void getRecentMetrics() {
+ final DashboardPortlet storedPortlet = this.portletWindow.getStoredPortlet();
+ final Configuration portletConfig = storedPortlet.getConfiguration();
+
//display container
final VLayout column = new VLayout();
column.setHeight(10);//pack
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOobsPortlet.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOobsPortlet.java
index 69ee7ee..aa1fdca 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOobsPortlet.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOobsPortlet.java
@@ -74,8 +74,6 @@ public class GroupOobsPortlet extends LocatableVLayout implements
CustomSettings
private int groupId = -1;
protected LocatableCanvas recentOobContent = new
LocatableCanvas(extendLocatorId("RecentOobs"));
protected boolean currentlyLoading = false;
- protected Configuration portletConfig = null;
- protected DashboardPortlet storedPortlet;
// set on initial configuration, the window for this portlet view.
protected PortletWindow portletWindow;
@@ -122,8 +120,8 @@ public class GroupOobsPortlet extends LocatableVLayout implements
CustomSettings
if ((null == storedPortlet) || (null == storedPortlet.getConfiguration())) {
return;
}
- this.storedPortlet = storedPortlet;
- portletConfig = storedPortlet.getConfiguration();
+
+ Configuration portletConfig = storedPortlet.getConfiguration();
//lazy init any elements not yet configured.
for (String key :
PortletConfigurationEditorComponent.CONFIG_PROPERTY_INITIALIZATION.keySet()) {
@@ -153,6 +151,9 @@ public class GroupOobsPortlet extends LocatableVLayout implements
CustomSettings
@Override
public DynamicForm getCustomSettingsForm() {
+ final DashboardPortlet storedPortlet = this.portletWindow.getStoredPortlet();
+ final Configuration portletConfig = storedPortlet.getConfiguration();
+
LocatableDynamicForm customSettings = new
LocatableDynamicForm(extendLocatorId("customSettings"));
LocatableVLayout page = new
LocatableVLayout(customSettings.extendLocatorId("page"));
//build editor form container
@@ -169,12 +170,13 @@ public class GroupOobsPortlet extends LocatableVLayout implements
CustomSettings
public void onSubmitValues(SubmitValuesEvent event) {
//results count
- portletConfig =
AbstractActivityView.saveResultCounterSettings(resultCountSelector, portletConfig);
+ Configuration updatedConfig =
AbstractActivityView.saveResultCounterSettings(resultCountSelector,
+ portletConfig);
//persist
- storedPortlet.setConfiguration(portletConfig);
+ storedPortlet.setConfiguration(updatedConfig);
configure(portletWindow, storedPortlet);
- loadData();
+ refresh();
}
});
@@ -187,6 +189,9 @@ public class GroupOobsPortlet extends LocatableVLayout implements
CustomSettings
* oob change details.
*/
protected void getRecentOobs() {
+ final DashboardPortlet storedPortlet = this.portletWindow.getStoredPortlet();
+ final Configuration portletConfig = storedPortlet.getConfiguration();
+
final int groupId = this.groupId;
int resultCount = 5;//default to
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOperationsPortlet.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOperationsPortlet.java
index 196b55d..9606874 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOperationsPortlet.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOperationsPortlet.java
@@ -103,8 +103,6 @@ public class GroupOperationsPortlet extends LocatableVLayout
implements CustomSe
protected Canvas containerCanvas;
protected Timer refreshTimer;
- protected DashboardPortlet storedPortlet;
- protected Configuration portletConfig;
protected int groupId;
protected boolean portletConfigInitialized = false;
private ResourceGroupComposite groupComposite;
@@ -117,7 +115,7 @@ public class GroupOperationsPortlet extends LocatableVLayout
implements CustomSe
this.locatorId = locatorId;
//figure out which page we're loading
String currentPage = History.getToken();
- String[] elements = currentPage.split("/");
+ //String[] elements = currentPage.split("/");
int groupId = AbstractActivityView.groupIdLookup(currentPage);
this.groupId = groupId;
//populate basepath
@@ -134,6 +132,9 @@ public class GroupOperationsPortlet extends LocatableVLayout
implements CustomSe
}
private void loadData() {
+ final DashboardPortlet storedPortlet = this.portletWindow.getStoredPortlet();
+ final Configuration portletConfig = storedPortlet.getConfiguration();
+
//populate composite data
//locate resourceGroupRef
ResourceGroupCriteria criteria = new ResourceGroupCriteria();
@@ -189,8 +190,8 @@ public class GroupOperationsPortlet extends LocatableVLayout
implements CustomSe
child.destroy();
}
recentOperationsContent.addChild(groupOperations);
- recentOperationsContent.markForRedraw();
currentlyRefreshing = false;
+ recentOperationsContent.markForRedraw();
}
});
}
@@ -218,8 +219,8 @@ public class GroupOperationsPortlet extends LocatableVLayout
implements CustomSe
if ((null == storedPortlet) || (null == storedPortlet.getConfiguration())) {
return;
}
- this.storedPortlet = storedPortlet;
- portletConfig = storedPortlet.getConfiguration();
+
+ Configuration portletConfig = storedPortlet.getConfiguration();
//lazy init any elements not yet configured.
for (String key :
PortletConfigurationEditorComponent.CONFIG_PROPERTY_INITIALIZATION.keySet()) {
@@ -236,6 +237,9 @@ public class GroupOperationsPortlet extends LocatableVLayout
implements CustomSe
@Override
public DynamicForm getCustomSettingsForm() {
+ final DashboardPortlet storedPortlet = this.portletWindow.getStoredPortlet();
+ final Configuration portletConfig = storedPortlet.getConfiguration();
+
LocatableDynamicForm customSettings = new
LocatableDynamicForm(extendLocatorId("customSettings"));
LocatableVLayout page = new
LocatableVLayout(customSettings.extendLocatorId("page"));
//build editor form container
@@ -265,23 +269,24 @@ public class GroupOperationsPortlet extends LocatableVLayout
implements CustomSe
public void onSubmitValues(SubmitValuesEvent event) {
//result count
- portletConfig =
AbstractActivityView.saveResultCounterSettings(resultCountSelector, portletConfig);
+ Configuration updatedConfig =
AbstractActivityView.saveResultCounterSettings(resultCountSelector,
+ portletConfig);
//time range configuration
- portletConfig =
AbstractActivityView.saveMeasurementRangeEditorSettings(measurementRangeEditor,
+ updatedConfig =
AbstractActivityView.saveMeasurementRangeEditorSettings(measurementRangeEditor,
portletConfig);
//operation priority
- portletConfig =
AbstractActivityView.saveOperationStatusSelectorSettings(operationStatusSelector,
+ updatedConfig =
AbstractActivityView.saveOperationStatusSelectorSettings(operationStatusSelector,
portletConfig);
//persist and reload portlet
- storedPortlet.setConfiguration(portletConfig);
+ storedPortlet.setConfiguration(updatedConfig);
configure(portletWindow, storedPortlet);
//resynch the config object in the datasource
groupOperations.setDatasource(new
GroupOperationsCriteriaDataSource(portletConfig));
//apply latest settings to the visible result set
- redraw();
+ refresh();
}
});
form.markForRedraw();
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupPkgHistoryPortlet.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupPkgHistoryPortlet.java
index 7e02ec9..742c0a7 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupPkgHistoryPortlet.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupPkgHistoryPortlet.java
@@ -71,8 +71,6 @@ public class GroupPkgHistoryPortlet extends LocatableVLayout implements
CustomSe
private int groupId = -1;
protected LocatableCanvas recentPkgHistoryContent = new
LocatableCanvas(extendLocatorId("RecentPkgHistory"));
protected boolean currentlyLoading = false;
- protected Configuration portletConfig = null;
- protected DashboardPortlet storedPortlet;
public static final String ID = "id";
@@ -120,8 +118,8 @@ public class GroupPkgHistoryPortlet extends LocatableVLayout
implements CustomSe
if ((null == storedPortlet) || (null == storedPortlet.getConfiguration())) {
return;
}
- this.storedPortlet = storedPortlet;
- portletConfig = storedPortlet.getConfiguration();
+
+ Configuration portletConfig = storedPortlet.getConfiguration();
//lazy init any elements not yet configured.
for (String key :
PortletConfigurationEditorComponent.CONFIG_PROPERTY_INITIALIZATION.keySet()) {
@@ -151,6 +149,9 @@ public class GroupPkgHistoryPortlet extends LocatableVLayout
implements CustomSe
@Override
public DynamicForm getCustomSettingsForm() {
+ final DashboardPortlet storedPortlet = this.portletWindow.getStoredPortlet();
+ final Configuration portletConfig = storedPortlet.getConfiguration();
+
LocatableDynamicForm customSettings = new
LocatableDynamicForm(extendLocatorId("customSettings"));
LocatableVLayout page = new
LocatableVLayout(customSettings.extendLocatorId("page"));
//build editor form container
@@ -167,12 +168,13 @@ public class GroupPkgHistoryPortlet extends LocatableVLayout
implements CustomSe
public void onSubmitValues(SubmitValuesEvent event) {
//results count
- portletConfig =
AbstractActivityView.saveResultCounterSettings(resultCountSelector, portletConfig);
+ Configuration updatedConfig =
AbstractActivityView.saveResultCounterSettings(resultCountSelector,
+ portletConfig);
//persist
- storedPortlet.setConfiguration(portletConfig);
+ storedPortlet.setConfiguration(updatedConfig);
configure(portletWindow, storedPortlet);
- loadData();
+ refresh();
}
});
@@ -184,6 +186,8 @@ public class GroupPkgHistoryPortlet extends LocatableVLayout
implements CustomSe
/** Fetches recent package history information and updates the DynamicForm instance
with details.
*/
protected void getRecentPkgHistory() {
+ final DashboardPortlet storedPortlet = this.portletWindow.getStoredPortlet();
+ final Configuration portletConfig = storedPortlet.getConfiguration();
final int groupId = this.groupId;
InstalledPackageHistoryCriteria criteria = new
InstalledPackageHistoryCriteria();
@@ -255,8 +259,8 @@ public class GroupPkgHistoryPortlet extends LocatableVLayout
implements CustomSe
}
recentPkgHistoryContent.addChild(column);
recentPkgHistoryContent.markForRedraw();
- markForRedraw();
currentlyLoading = false;
+ markForRedraw();
}
});
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationSchedulePortlet.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationSchedulePortlet.java
index 3d7521d..b26405b 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationSchedulePortlet.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationSchedulePortlet.java
@@ -289,10 +289,9 @@ public class OperationSchedulePortlet extends LocatableVLayout
implements Custom
new PropertySimple(OPERATIONS_RANGE_SCHEDULED_ENABLED, form
.getValue(OPERATIONS_RANGE_SCHEDULED_ENABLED)));
}
-
+ storedPortlet.setConfiguration(storedPortlet.getConfiguration());
configure(portletWindow, storedPortlet);
-
- redraw();
+ refresh();
}
});
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceBundleDeploymentsPortlet.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceBundleDeploymentsPortlet.java
index 72a2449..be2dc7c 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceBundleDeploymentsPortlet.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceBundleDeploymentsPortlet.java
@@ -27,8 +27,10 @@ import com.smartgwt.client.widgets.form.fields.StaticTextItem;
import com.smartgwt.client.widgets.layout.VLayout;
import org.rhq.core.domain.bundle.BundleDeployment;
+import org.rhq.core.domain.configuration.Configuration;
import org.rhq.core.domain.configuration.PropertySimple;
import org.rhq.core.domain.criteria.ResourceBundleDeploymentCriteria;
+import org.rhq.core.domain.dashboard.DashboardPortlet;
import org.rhq.core.domain.util.PageControl;
import org.rhq.core.domain.util.PageList;
import org.rhq.core.domain.util.PageOrdering;
@@ -76,6 +78,8 @@ public class ResourceBundleDeploymentsPortlet extends
GroupBundleDeploymentsPort
*/
@Override
protected void getRecentBundleDeployments() {
+ final DashboardPortlet storedPortlet = this.portletWindow.getStoredPortlet();
+ final Configuration portletConfig = storedPortlet.getConfiguration();
final int resourceId = this.resourceId;
ResourceBundleDeploymentCriteria criteria = new
ResourceBundleDeploymentCriteria();
@@ -104,6 +108,7 @@ public class ResourceBundleDeploymentsPortlet extends
GroupBundleDeploymentsPort
public void onFailure(Throwable caught) {
Log.debug("Error retrieving installed bundle deployments for
resource [" + resourceId + "]:"
+ caught.getMessage());
+ currentlyLoading = false;
}
@Override
@@ -146,6 +151,7 @@ public class ResourceBundleDeploymentsPortlet extends
GroupBundleDeploymentsPort
column.markForRedraw();
recentBundleDeployContent.addChild(column);
recentBundleDeployContent.markForRedraw();
+ currentlyLoading = false;
markForRedraw();
}
});
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceConfigurationUpdatesPortlet.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceConfigurationUpdatesPortlet.java
index 4ab8396..f9b2d9d 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceConfigurationUpdatesPortlet.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceConfigurationUpdatesPortlet.java
@@ -35,6 +35,7 @@ import org.rhq.core.domain.configuration.PropertySimple;
import org.rhq.core.domain.configuration.ResourceConfigurationUpdate;
import org.rhq.core.domain.criteria.ResourceConfigurationUpdateCriteria;
import org.rhq.core.domain.criteria.ResourceCriteria;
+import org.rhq.core.domain.dashboard.DashboardPortlet;
import org.rhq.core.domain.resource.composite.ResourceComposite;
import org.rhq.core.domain.util.PageControl;
import org.rhq.core.domain.util.PageList;
@@ -98,6 +99,8 @@ public class ResourceConfigurationUpdatesPortlet extends
GroupConfigurationUpdat
@Override
protected void loadData() {
+ final DashboardPortlet storedPortlet = this.portletWindow.getStoredPortlet();
+ final Configuration portletConfig = storedPortlet.getConfiguration();
//populate composite data
//locate resourceRef
ResourceCriteria criteria = new ResourceCriteria();
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceEventsPortlet.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceEventsPortlet.java
index 7ceef8c..eb52924 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceEventsPortlet.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceEventsPortlet.java
@@ -28,7 +28,9 @@ import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.widgets.Canvas;
import com.smartgwt.client.widgets.form.fields.StaticTextItem;
+import org.rhq.core.domain.configuration.Configuration;
import org.rhq.core.domain.configuration.PropertySimple;
+import org.rhq.core.domain.dashboard.DashboardPortlet;
import org.rhq.core.domain.event.EventSeverity;
import org.rhq.enterprise.gui.coregui.client.ImageManager;
import org.rhq.enterprise.gui.coregui.client.LinkManager;
@@ -77,6 +79,8 @@ public class ResourceEventsPortlet extends GroupEventsPortlet {
*/
@Override
protected void getRecentEventUpdates() {
+ final DashboardPortlet storedPortlet = this.portletWindow.getStoredPortlet();
+ final Configuration portletConfig = storedPortlet.getConfiguration();
final int resourceId = this.resourceId;
long end = System.currentTimeMillis();
long start = end - (24 * 60 * 60 * 1000);
@@ -120,6 +124,7 @@ public class ResourceEventsPortlet extends GroupEventsPortlet {
@Override
public void onFailure(Throwable caught) {
Log.debug("Error retrieving event counts for resource [" +
resourceId + "]:" + caught.getMessage());
+ setCurrentlyRefreshing(false);
}
@Override
@@ -171,6 +176,7 @@ public class ResourceEventsPortlet extends GroupEventsPortlet {
child.destroy();
}
recentEventsContent.addChild(column);
+ setCurrentlyRefreshing(false);
recentEventsContent.markForRedraw();
}
});
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceMetricsPortlet.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceMetricsPortlet.java
index 1adc6f3..0adf94b 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceMetricsPortlet.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceMetricsPortlet.java
@@ -38,8 +38,10 @@ import com.smartgwt.client.widgets.form.fields.events.ClickEvent;
import com.smartgwt.client.widgets.form.fields.events.ClickHandler;
import com.smartgwt.client.widgets.layout.VLayout;
+import org.rhq.core.domain.configuration.Configuration;
import org.rhq.core.domain.configuration.PropertySimple;
import org.rhq.core.domain.criteria.ResourceCriteria;
+import org.rhq.core.domain.dashboard.DashboardPortlet;
import org.rhq.core.domain.measurement.MeasurementDefinition;
import org.rhq.core.domain.measurement.composite.MeasurementDataNumericHighLowComposite;
import org.rhq.core.domain.resource.Resource;
@@ -97,6 +99,8 @@ public class ResourceMetricsPortlet extends GroupMetricsPortlet {
*/
@Override
protected void getRecentMetrics() {
+ final DashboardPortlet storedPortlet = this.portletWindow.getStoredPortlet();
+ final Configuration portletConfig = storedPortlet.getConfiguration();
//display container
final VLayout column = new VLayout();
column.setHeight(10);//pack
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceOobsPortlet.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceOobsPortlet.java
index a6c8005..a2dc372 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceOobsPortlet.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceOobsPortlet.java
@@ -28,7 +28,9 @@ import com.smartgwt.client.widgets.form.fields.events.ClickEvent;
import com.smartgwt.client.widgets.form.fields.events.ClickHandler;
import com.smartgwt.client.widgets.layout.VLayout;
+import org.rhq.core.domain.configuration.Configuration;
import org.rhq.core.domain.configuration.PropertySimple;
+import org.rhq.core.domain.dashboard.DashboardPortlet;
import org.rhq.core.domain.measurement.composite.MeasurementOOBComposite;
import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.gui.coregui.client.components.FullHTMLPane;
@@ -76,6 +78,8 @@ public class ResourceOobsPortlet extends GroupOobsPortlet {
*/
@Override
protected void getRecentOobs() {
+ final DashboardPortlet storedPortlet = this.portletWindow.getStoredPortlet();
+ final Configuration portletConfig = storedPortlet.getConfiguration();
final int resourceId = this.resourceId;
int resultCount = 5;//default to
@@ -96,6 +100,7 @@ public class ResourceOobsPortlet extends GroupOobsPortlet {
public void onFailure(Throwable caught) {
Log.debug("Error retrieving out of bound metrics for resource
[" + resourceId + "]:"
+ caught.getMessage());
+ currentlyLoading = false;
}
@Override
@@ -142,6 +147,7 @@ public class ResourceOobsPortlet extends GroupOobsPortlet {
child.destroy();
}
recentOobContent.addChild(column);
+ currentlyLoading = false;
recentOobContent.markForRedraw();
}
});
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourcePkgHistoryPortlet.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourcePkgHistoryPortlet.java
index 6071704..0d91bd2 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourcePkgHistoryPortlet.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourcePkgHistoryPortlet.java
@@ -25,9 +25,11 @@ import com.smartgwt.client.widgets.Canvas;
import com.smartgwt.client.widgets.form.fields.StaticTextItem;
import com.smartgwt.client.widgets.layout.VLayout;
+import org.rhq.core.domain.configuration.Configuration;
import org.rhq.core.domain.configuration.PropertySimple;
import org.rhq.core.domain.content.InstalledPackageHistory;
import org.rhq.core.domain.criteria.InstalledPackageHistoryCriteria;
+import org.rhq.core.domain.dashboard.DashboardPortlet;
import org.rhq.core.domain.util.PageControl;
import org.rhq.core.domain.util.PageList;
import org.rhq.core.domain.util.PageOrdering;
@@ -74,6 +76,8 @@ public class ResourcePkgHistoryPortlet extends GroupPkgHistoryPortlet {
*/
@Override
protected void getRecentPkgHistory() {
+ final DashboardPortlet storedPortlet = this.portletWindow.getStoredPortlet();
+ final Configuration portletConfig = storedPortlet.getConfiguration();
final int resourceId = this.resourceId;
InstalledPackageHistoryCriteria criteria = new
InstalledPackageHistoryCriteria();
@@ -101,6 +105,7 @@ public class ResourcePkgHistoryPortlet extends GroupPkgHistoryPortlet
{
public void onFailure(Throwable caught) {
Log.debug("Error retrieving installed package history for group
[" + resourceId + "]:"
+ caught.getMessage());
+ currentlyLoading = false;
}
@Override
@@ -144,6 +149,7 @@ public class ResourcePkgHistoryPortlet extends GroupPkgHistoryPortlet
{
}
recentPkgHistoryContent.addChild(column);
recentPkgHistoryContent.markForRedraw();
+ currentlyLoading = false;
markForRedraw();
}
});
commit b40f968a004a227fbdd98ed0a8a3b6cb07610776
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Wed Apr 27 12:55:24 2011 -0400
set the log level to debug for this one message
diff --git
a/modules/enterprise/server/safe-invoker/src/main/java/org/rhq/enterprise/server/util/HibernateDetachUtility.java
b/modules/enterprise/server/safe-invoker/src/main/java/org/rhq/enterprise/server/util/HibernateDetachUtility.java
index deddb02..6cea6b8 100644
---
a/modules/enterprise/server/safe-invoker/src/main/java/org/rhq/enterprise/server/util/HibernateDetachUtility.java
+++
b/modules/enterprise/server/safe-invoker/src/main/java/org/rhq/enterprise/server/util/HibernateDetachUtility.java
@@ -93,9 +93,11 @@ public class HibernateDetachUtility {
return;
} else {
- // TODO: this can be tuned down to debug after we're done evaluating this
logic
- LOG.warn("UNEQUAL IDENTITY HASHCODE [" + valueIdentity +
"]\n\tCurrent : " + value.getClass().getName()
- + "\n\t" + value + "\n\tPrevious: " +
checkedObject.getClass().getName() + "\n\t" + checkedObject);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("UNEQUAL IDENTITY HASHCODE [" + valueIdentity +
"]\n\tCurrent : "
+ + value.getClass().getName() + "\n\t" + value +
"\n\tPrevious: "
+ + checkedObject.getClass().getName() + "\n\t" +
checkedObject);
+ }
}
if (value instanceof Object[]) {
commit 512eb56e0f87b42a7e0f2592fcc4069479ea5593
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Wed Apr 27 12:00:43 2011 -0400
BZ 700158 - i18n wizard's step x of y message
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardView.java
index cdfd98b..6b82ade 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardView.java
@@ -219,8 +219,8 @@ public class WizardView extends LocatableVLayout {
// a valid step, continue
currentStep = stepIndex;
- // TODO: i18n
- stepLabel.setContents("Step " + (stepIndex + 1) + " of " +
wizardSteps.size());
+ stepLabel.setContents(MSG.common_msg_step_x_of_y(String.valueOf(stepIndex + 1),
String.valueOf(wizardSteps
+ .size())));
stepLabel.setWrap(false);
WizardStep step = wizardSteps.get(currentStep);
diff --git
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
index e586fe3..01045ce 100644
---
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
+++
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
@@ -230,6 +230,7 @@ common_msg_loading = Loading...
common_msg_noItemsToShow = No items to show
common_msg_notYetImplemented = Not Yet Implemented
common_msg_see_more = see more...
+common_msg_step_x_of_y = Step {0} of {1}
# Common Values
#--------------
commit 7ca9bf695f0ce8e7bd360ecca6e1b65f92dc7d0c
Author: Simeon Pinder <spinder(a)redhat.com>
Date: Wed Apr 27 11:27:04 2011 -0400
widening the iframe window a little more for better viewing.
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java
index 1ffc4db..c1f1042 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java
@@ -672,7 +672,7 @@ public abstract class AbstractActivityView extends LocatableVLayout
implements R
setShowCloseButton(true);
setIsModal(true);
setShowModalMask(true);
- setWidth(850);
+ setWidth(900);
setHeight(650);
setShowResizer(true);
setCanDragResize(true);
commit 0086a6972af8645766363fa42ea6a38ac16ea2dc
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed Apr 27 16:12:23 2011 +0200
Add the pattern generator plugin
diff --git a/modules/plugins/pattern-generator/pom.xml
b/modules/plugins/pattern-generator/pom.xml
new file mode 100644
index 0000000..afd78d2
--- /dev/null
+++ b/modules/plugins/pattern-generator/pom.xml
@@ -0,0 +1,179 @@
+<project
+
xmlns="http://maven.apache.org/POM/4.0.0"
+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd"
+ >
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-plugins-parent</artifactId>
+ <version>4.0.0-SNAPSHOT</version><!-- TODO adjust RHQ version
-->
+ </parent>
+
+ <groupId>org.rhq</groupId>
+ <artifactId>pattern-plugin</artifactId>
+ <packaging>jar</packaging>
+
+ <name>RHQ pattern Plugin</name>
+ <description>Generate metrics that follow given patterns</description>
+
+ <properties>
+ <scm.module.path>TODO</scm.module.path>
+ <rhq.version>4.0.0-SNAPSHOT</rhq.version> <!-- TODO adjust, see
above too -->
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+
+
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>dev</id>
+
+ <properties>
+ <rhq.rootDir>../../..</rhq.rootDir>
+
<rhq.containerDir>${rhq.rootDir}/${rhq.defaultDevContainerPath}</rhq.containerDir>
+
<rhq.deploymentDir>${rhq.containerDir}/jbossas/server/default/deploy/${rhq.earName}/rhq-downloads/rhq-plugins</rhq.deploymentDir>
+ </properties>
+
+ <build>
+ <plugins>
+
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <executions>
+
+ <execution>
+ <id>deploy</id>
+ <phase>compile</phase>
+ <configuration>
+ <tasks>
+ <mkdir
dir="${rhq.deploymentDir}"/>
+ <property name="deployment.file"
+
location="${rhq.deploymentDir}/${project.build.finalName}.jar"/>
+ <echo>*** Updating
${deployment.file}...</echo>
+ <jar destfile="${deployment.file}"
basedir="${project.build.outputDirectory}"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+
+ <execution>
+ <id>deploy-jar-meta-inf</id>
+ <phase>package</phase>
+ <configuration>
+ <tasks>
+ <property name="deployment.file"
+
location="${rhq.deploymentDir}/${project.build.finalName}.jar"/>
+ <echo>*** Updating META-INF dir in
${deployment.file}...</echo>
+ <unjar
src="${project.build.directory}/${project.build.finalName}.jar"
+
dest="${project.build.outputDirectory}">
+ <patternset>
+ <include
name="META-INF/**"/>
+ </patternset>
+ </unjar>
+ <jar destfile="${deployment.file}"
+
manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF"
+ update="true">
+ </jar>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+
+ <execution>
+ <id>undeploy</id>
+ <phase>clean</phase>
+ <configuration>
+ <tasks>
+ <property name="deployment.file"
+
location="${rhq.deploymentDir}/${project.build.finalName}.jar"/>
+ <echo>*** Deleting
${deployment.file}...</echo>
+ <delete
file="${deployment.file}"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+
+ </executions>
+ </plugin>
+
+ </plugins>
+ </build>
+
+ </profile>
+ </profiles>
+
+
+ <repositories>
+ <repository>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <id>jboss</id>
+ <name>JBoss Repository</name>
+
<
url>https://repository.jboss.org/nexus/content/groups/public/</url>
+ </repository>
+ <!-- TODO add your own maven repositories here (if needed) -->
+ </repositories>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <id>jboss</id>
+ <name>JBoss Plugin Repository</name>
+
<
url>https://repository.jboss.org/nexus/content/groups/public/</url>
+ </pluginRepository>
+ </pluginRepositories>
+
+
+ <dependencies>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>${commons-logging.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-core-domain</artifactId>
+ <version>${rhq.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-core-plugin-api</artifactId>
+ <version>${rhq.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-core-native-system</artifactId>
+ <version>${rhq.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- TODO add your dependencies here -->
+
+ </dependencies>
+</project>
\ No newline at end of file
diff --git
a/modules/plugins/pattern-generator/src/main/java/org/rhq/plugins/pattern/PatternComponent.java
b/modules/plugins/pattern-generator/src/main/java/org/rhq/plugins/pattern/PatternComponent.java
new file mode 100644
index 0000000..5ac3304
--- /dev/null
+++
b/modules/plugins/pattern-generator/src/main/java/org/rhq/plugins/pattern/PatternComponent.java
@@ -0,0 +1,97 @@
+
+package org.rhq.plugins.pattern;
+
+import java.util.Date;
+import java.util.Set;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException;
+import org.rhq.core.domain.measurement.AvailabilityType;
+import org.rhq.core.domain.measurement.MeasurementDataNumeric;
+import org.rhq.core.domain.measurement.MeasurementReport;
+import org.rhq.core.domain.measurement.MeasurementScheduleRequest;
+import org.rhq.core.pluginapi.inventory.ResourceComponent;
+import org.rhq.core.pluginapi.inventory.ResourceContext;
+import org.rhq.core.pluginapi.measurement.MeasurementFacet;
+
+@SuppressWarnings("unused")
+public class PatternComponent implements ResourceComponent, MeasurementFacet
+{
+ private final Log log = LogFactory.getLog(this.getClass());
+
+ int count = 0;
+ int number = 0; // We start with returning zeros
+ int[] wanted = new int[2];
+
+ /**
+ * Return availability of this resource
+ * @see org.rhq.core.pluginapi.inventory.ResourceComponent#getAvailability()
+ */
+ public AvailabilityType getAvailability() {
+ return AvailabilityType.UP;
+ }
+
+
+ /**
+ * Start the resource connection
+ * @see
org.rhq.core.pluginapi.inventory.ResourceComponent#start(org.rhq.core.pluginapi.inventory.ResourceContext)
+ */
+ public void start(ResourceContext context) throws InvalidPluginConfigurationException
{
+
+ Configuration conf = context.getPluginConfiguration();
+ String tmp = conf.getSimpleValue("ones","1");
+ int wantedOnes = Integer.parseInt(tmp);
+ if (wantedOnes<1)
+ throw new InvalidPluginConfigurationException("Ones must be >
0");
+ tmp = conf.getSimpleValue("zeros","1");
+ int wantedZeros = Integer.parseInt(tmp);
+ if (wantedZeros<1)
+ throw new InvalidPluginConfigurationException("Zeros must be >
0");
+
+ wanted[0] = wantedZeros;
+ wanted[1] = wantedOnes;
+ }
+
+
+ /**
+ * Tear down the resource connection
+ * @see org.rhq.core.pluginapi.inventory.ResourceComponent#stop()
+ */
+ public void stop() {
+ // Nothing to do.
+ }
+
+
+
+ /**
+ * Gather "measurement" data - actually a series of 1s and 0s starting with
0.
+ * @see
org.rhq.core.pluginapi.measurement.MeasurementFacet#getValues(org.rhq.core.domain.measurement.MeasurementReport,
java.util.Set)
+ */
+ public void getValues(MeasurementReport report,
Set<MeasurementScheduleRequest> metrics) throws Exception {
+
+ for (MeasurementScheduleRequest req : metrics) {
+ if (req.getName().equals("pattern1")) {
+
+ double val;
+
+ val = (double) number;
+
+ if (number==1)
+ System.out.println("XX 1 _ " + new Date());
+
+ count++;
+ // enough of this? Flip over to the other number and reset the series.
+ if (count>=wanted[number]) {
+ number = 1-number;
+ count=0;
+ }
+
+ MeasurementDataNumeric res = new MeasurementDataNumeric(req, val);
+ report.addData(res);
+ }
+ }
+ }
+}
diff --git
a/modules/plugins/pattern-generator/src/main/java/org/rhq/plugins/pattern/PatternDiscovery.java
b/modules/plugins/pattern-generator/src/main/java/org/rhq/plugins/pattern/PatternDiscovery.java
new file mode 100644
index 0000000..cf2b1ac
--- /dev/null
+++
b/modules/plugins/pattern-generator/src/main/java/org/rhq/plugins/pattern/PatternDiscovery.java
@@ -0,0 +1,39 @@
+package org.rhq.plugins.pattern;
+
+import java.util.HashSet;
+import java.util.Set;
+import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails;
+import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent;
+import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext;
+
+
+/**
+ * Discovery class
+ */
+@SuppressWarnings("unused")
+public class PatternDiscovery implements ResourceDiscoveryComponent
+{
+
+ /**
+ * Run the auto-discovery
+ */
+ public Set<DiscoveredResourceDetails>
discoverResources(ResourceDiscoveryContext discoveryContext) throws Exception {
+ Set<DiscoveredResourceDetails> discoveredResources = new
HashSet<DiscoveredResourceDetails>(1);
+
+
+ DiscoveredResourceDetails detail = new DiscoveredResourceDetails(
+ discoveryContext.getResourceType(), // ResourceType
+ "pattern",
+ "pattern",
+ "1.1",
+ "Generate metrics that follow a pattern",
+ discoveryContext.getDefaultPluginConfiguration(),
+ null
+ );
+
+
+ // Add to return values
+ discoveredResources.add(detail);
+ return discoveredResources;
+ }
+}
\ No newline at end of file
diff --git a/modules/plugins/pattern-generator/src/main/resources/META-INF/rhq-plugin.xml
b/modules/plugins/pattern-generator/src/main/resources/META-INF/rhq-plugin.xml
new file mode 100644
index 0000000..c3ad075
--- /dev/null
+++ b/modules/plugins/pattern-generator/src/main/resources/META-INF/rhq-plugin.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<plugin name="pattern-generator"
+ displayName="pattern-generator Plugin"
+ description="Devs plugin that generates metrics that follow patterns"
+ package="org.rhq.plugins.pattern"
+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="urn:xmlns:rhq-plugin"
+ xmlns:c="urn:xmlns:rhq-configuration">
+
+
+ <server name="pattern"
+ discovery="PatternDiscovery"
+ class="PatternComponent"
+ singleton="true"
+ >
+
+ <plugin-configuration>
+ <c:simple-property name="ones" description="Number of ones
in a row" type="integer" default="1"/>
+ <c:simple-property name="zeros" description="Number of
zeros in a row" type="integer" default="2"/>
+ </plugin-configuration>
+
+ <metric property="pattern1" displayName="Pattern 1 metric"
defaultInterval="60000" displayType="summary"
defaultOn="true"/>
+
+ </server>
+
+</plugin>
\ No newline at end of file
diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml
index f39e509..b1eec53 100644
--- a/modules/plugins/pom.xml
+++ b/modules/plugins/pom.xml
@@ -191,6 +191,7 @@
<module>twitter</module>
<module>virt</module>
<module>kickstart</module>
+ <module>pattern-generator</module>
</modules>
</profile>
commit 277a5dd0b06aad80fe420b45b86cf18601e84e03
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed Apr 27 15:28:09 2011 +0200
Some more translations.
diff --git
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
index 805d4bf..667f040 100644
---
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
+++
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
@@ -72,7 +72,7 @@ common_title_add_column=Spalte hinzufügen
common_title_add_portlet=Portlet hinzufügen
common_title_alert_range=Alert Range~
common_title_availability = Verfügbar
-common_title_average_metrics=Dursch. Anzahl Metriken pro Minute
+common_title_average_metrics=Durchsch. Anzahl Metriken pro Minute
common_title_available_resources=Verfügbare Ressourcen
common_title_background=Hintergrund
common_title_category = Kategorie
@@ -144,7 +144,6 @@ common_title_status=Status
common_title_summary=Zusammenfassung
common_title_tag_cloud=Tag-Wolke
common_title_the=Die
-common_title_summary_counts=Summary Counts~
common_title_timestamp =Zeitpunkt
common_title_total=Total
common_title_type = Typ
@@ -426,7 +425,6 @@ view_adminTopology_remoteAgentInstall = Installation entfernter
Agenten
view_adminTopology_servers = Server
view_adminConfig_downloads = Downloads
-view_adminConfig_license = Lizenz
view_adminConfig_plugins = Plugins
view_adminConfig_systemSettings = Systemeinstellungen
view_adminConfig_templates = Voreinstellungen
@@ -501,40 +499,36 @@ view_alerts_field_created_time=Erstellungszeitpunkt
view_alerts_field_modified_time=Zuletzt geändert
view_alerts_field_enabled=Aktiviert
view_alerts_field_ack_time=Zeitpunkt Bestätigung
-view_alerts_field_ack_subject=Bestätigender benutzer
+view_alerts_field_ack_subject=Bestätigender Benutzer
view_alerts_field_ack_status=Status
-view_alerts_field_ack_status_empty=Noch nicht bestätigt
-view_alerts_field_ack_status_filled={0} bestätigt am {1}
view_alerts_field_name=Name
view_alerts_field_condition_text=Bedingung(en)
-view_alerts_field_condition_text_none=No Conditions~
-view_alerts_field_condition_text_many=Multiple Conditions~
-view_alerts_field_condition_value=Condition Value~
-view_alerts_field_resource=Ressource
+view_alerts_field_condition_text_none=Keine Bedingungen
+view_alerts_field_condition_text_many=Mehrere Bedingungen
+view_alerts_field_condition_value=Bedingung
view_alerts_field_priority=Priorität
-view_alerts_field_parent=Parent~
+view_alerts_field_parent=Eltern
view_alerts_field_protected=Geschützt
view_alerts_field_protected_tooltip=If true, this definition is protected from being
changed by the parent definition. In other words, the parent definition settings will not
override this definition.~
-view_alerts_loadFailed=Failed to fetch alerts data~
-view_alerts_delete_confirm=Delete the selected alert(s)?~
-view_alerts_delete_confirm_all=Delete all alerts from this source?~
-view_alerts_delete_success=Successfully deleted {0} alerts~
-view_alerts_delete_failure=Failed to delete alerts with id''s: {0}~
-view_alerts_delete_failure_all=Failed to delete all alerts from this source~
+view_alerts_loadFailed=Konnte die Daten für die Alarme nicht laden
+view_alerts_delete_confirm=Die ausgewählten Alarme löschen?
+view_alerts_delete_confirm_all=Alle Alarme aus dieser Quele löschen?
+view_alerts_delete_success=Erfolgreich {0} Alarme gelöscht
+view_alerts_delete_failure=Konnte die Alarme mit den IDs {0} nicht löschen
+view_alerts_delete_failure_all=Löschen aller Alarme dieser Quelle fehlgeschlagen
view_alerts_ack_confirm=Die ausgewählten Alarme bestätigen?
view_alerts_ack_confirm_all=Alle Alarme dieser Quelle bestätigen?
-view_alerts_ack_success=Successfully acknowledged {0} alerts~
-view_alerts_ack_failure=Failed to acknowledge alerts with id''s: {0}~
-view_alerts_ack_failure_all=Failed to acknowledge all alerts from this source~
-view_alert_details_loadFailed=Failed to fetch alert details~
-view_alert_details_breadcrumb=Details
+view_alerts_ack_success=Erfolgreich {0} Alarme bestätigt
+view_alerts_ack_failure=Bestätigen der Alarme mit den IDs {0} fehlgeschlagen
+view_alerts_ack_failure_all=Bestätigung aller Alarme deiser Quelle fehlgeschlagen
+view_alert_details_loadFailed=Laden der Details für den Alarm fehlgeschlagen
view_alert_details_field_ack_by=Bestätigt durch
view_alert_details_field_ack_at=Bestätigt um
-view_alert_details_field_recovery_info=Recovery Info~
-view_alert_definition_for_type=View Template~
+view_alert_details_field_recovery_info=Info zur Erholung
+view_alert_definition_for_type=Vorlage ansehen
view_alert_definition_for_group=View Group Definition~
-view_alert_definitions_table_title_group=Group Alert Definitions~
-view_alert_definitions_table_title_resource=Resource Alert Definitions~
+view_alert_definitions_table_title_group=Alarm-Definitionen für Gruppen
+view_alert_definitions_table_title_resource=Alarm-Definitionen für Ressourcen
view_alert_definitions_loadFailed=Failed to fetch alert definition data~
view_alert_definitions_loadFailed_single=Failed to fetch data for alert definition with
id {0}~
view_alert_definitions_enable_confirm=Enable the selected alert definition(s)?~
@@ -546,31 +540,31 @@ view_alert_definitions_disable_failure=Failed to disable the
selected alert defi
view_alert_definitions_delete_confirm=Delete the selected alert definition(s)?~
view_alert_definitions_delete_success=Successfully deleted {0} alert definitions~
view_alert_definitions_delete_failure=Failed to deleted the selected alert definitions~
-view_alert_definitions_create_success=Alert definition successfully created~
-view_alert_definitions_create_failure=Alert definition creation failed~
-view_alert_definitions_update_success=Alert definition successfully updated~
-view_alert_definitions_update_failure=Alert definition update failed~
-view_alert_definition_condition_editor_option_label=Condition Type~
+view_alert_definitions_create_success=Alarm-Definition erfolgreich angelegt
+view_alert_definitions_create_failure=Anlegen der Alarm-Definition fehlgeschlagen
+view_alert_definitions_update_success=Alarm-Definition erfolgreich aktualisiert
+view_alert_definitions_update_failure=Aktualisieren der Alarm-Definition fehlgeschlagen
+view_alert_definition_condition_editor_option_label=Typ der Bedingung
view_alert_definition_condition_editor_option_availability=Änderung der Verfügbarkeit
-view_alert_definition_condition_editor_option_metric_threshold=Measurement Absolute Value
Threshold~
-view_alert_definition_condition_editor_option_metric_baseline=Measurement Baseline
Threshold~
-view_alert_definition_condition_editor_option_metric_change=Measurement Value Change~
+view_alert_definition_condition_editor_option_metric_threshold=Absoluter
Metrikschwellwert
+view_alert_definition_condition_editor_option_metric_baseline=Schwelle des Referenzbands
+view_alert_definition_condition_editor_option_metric_change=Wert der Metrik ändert sich
view_alert_definition_condition_editor_option_metric_calltime_threshold=Call Time Value
Threshold~
-view_alert_definition_condition_editor_option_metric_calltime_change=Call Time Value
Change~
-view_alert_definition_condition_editor_option_metric_trait_change=Trait Value Change~
-view_alert_definition_condition_editor_option_operation=Operation Execution~
-view_alert_definition_condition_editor_option_resource_configuration=Resource
Configuration Change~
+view_alert_definition_condition_editor_option_metric_calltime_change=Änderung des
Call-Time-Werts
+view_alert_definition_condition_editor_option_metric_trait_change=Änderung des
Trait-Werts
+view_alert_definition_condition_editor_option_operation=Ausführung der Operation
+view_alert_definition_condition_editor_option_resource_configuration=Änderung der
Konfiguration der Ressource
view_alert_definition_condition_editor_option_event=Event Detection~
view_alert_definition_condition_editor_avilability_tooltip=Specify the availability state
change that will trigger the condition.~
-view_alert_definition_condition_editor_avilability_value=Verfügbarkeit~
+view_alert_definition_condition_editor_avilability_value=Verfügbarkeit
view_alert_definition_condition_editor_avilability_option_up=Wird verfügbar
view_alert_definition_condition_editor_avilability_option_down=Wird unverfügbar
view_alert_definition_condition_editor_metric_common_definition_not_found=Should have
found metric definition - something is wrong~
view_alert_definition_condition_editor_metric_threshold_tooltip=Specify the threshold
value that, when violated, triggers the condition. The value you specify is an absolute
value with an optional units specifier.~
view_alert_definition_condition_editor_metric_threshold_name=Metrik
-view_alert_definition_condition_editor_metric_threshold_value=Metric Value~
+view_alert_definition_condition_editor_metric_threshold_value=Wert der Metrik
view_alert_definition_condition_editor_metric_threshold_value_tooltip=The threshold value
of the metric that will trigger the condition when compared using the selected
comparator.~
-view_alert_definition_condition_editor_metric_threshold_comparator=Comparator~
+view_alert_definition_condition_editor_metric_threshold_comparator=Komparator
view_alert_definition_condition_editor_metric_threshold_comparator_less=Kleiner als
view_alert_definition_condition_editor_metric_threshold_comparator_equal=Gleich
view_alert_definition_condition_editor_metric_threshold_comparator_greater=Größer als
@@ -578,18 +572,18 @@
view_alert_definition_condition_editor_metric_threshold_comparator_tooltip=How a
view_alert_definition_condition_editor_metric_baseline_tooltip=Specify the baseline value
that must be violated to trigger the condition. The value you specify is a percentage of
the given baseline value.~
view_alert_definition_condition_editor_metric_baseline_percentage=Baseline Percentage~
view_alert_definition_condition_editor_metric_baseline_percentage_tooltip=A collected
metric value will trigger this condition when compared to this percentage of the selected
baseline value using the selected comparator~
-view_alert_definition_condition_editor_metric_baseline_value=Baseline~
+view_alert_definition_condition_editor_metric_baseline_value=Referenzband~
view_alert_definition_condition_editor_metric_change_tooltip=Specify the metric whose
value must change to trigger the condition.~
view_alert_definition_condition_editor_metric_calltime_threshold_tooltip=Specify the
calltime threshold value that, when violated, triggers the condition. The value you
specify is an absolute value with an optional units specifier. You also must specify which
calltime limit to compare the value with (minimum, maximum or average calltime value).~
view_alert_definition_condition_editor_metric_calltime_common_name=Call Time Metric~
view_alert_definition_condition_editor_metric_calltime_common_limit=Call Time Limit~
view_alert_definition_condition_editor_metric_calltime_common_limit_tooltip=The calltime
limit value that is to be compared with the given value~
-view_alert_definition_condition_editor_metric_calltime_common_regex=Regular Expression~
+view_alert_definition_condition_editor_metric_calltime_common_regex=Regulärer Ausdruck
view_alert_definition_condition_editor_metric_calltime_common_regex_tooltip=If specified,
this is a regular expression that must match a call destination in order to trigger the
condition.~
-view_alert_definition_condition_editor_metric_calltime_common_comparator=Comparator~
-view_alert_definition_condition_editor_metric_calltime_common_comparator_shrinks=Shrinks~
-view_alert_definition_condition_editor_metric_calltime_common_comparator_grows=Grows~
-view_alert_definition_condition_editor_metric_calltime_common_comparator_changes=Changes~
+view_alert_definition_condition_editor_metric_calltime_common_comparator=Komparator
+view_alert_definition_condition_editor_metric_calltime_common_comparator_shrinks=Schrumpft
+view_alert_definition_condition_editor_metric_calltime_common_comparator_grows=Wächst
+view_alert_definition_condition_editor_metric_calltime_common_comparator_changes=Ändert
sich
view_alert_definition_condition_editor_metric_calltime_common_comparator_tooltip=How a
collected calltime value should be compared to the given calltime limit~
view_alert_definition_condition_editor_metric_calltime_threshold_value=Call Time Value~
view_alert_definition_condition_editor_metric_calltime_threshold_value_tooltip=The
threshold value of the metric that will trigger the condition when compared using the
selected comparator.~
@@ -621,11 +615,11 @@ view_alert_definition_condition_editor_common_max=Maximum
view_alert_definition_notification_editor_title_add=Benachrichtigung hinzufügen
view_alert_definition_notification_editor_title_edit=Benachrichtigung bearbeiten
view_alert_definition_notification_editor_sender=Notification Sender~
-view_alert_definition_notification_editor_none_available=No alert senders available~
+view_alert_definition_notification_editor_none_available=Keine Alarm-Sender verfügbar
view_alert_definition_notification_editor_loadFailed=Cannot get alert senders~
view_alert_definition_notification_editor_loadFailed_single=Cannot get alert sender
configuration definition~
view_alert_definition_notification_editor_saveFailed=Cannot save the notification
configuration~
-view_alert_definition_notification_editor_field_sender=Sender~
+view_alert_definition_notification_editor_field_sender=Sender
view_alert_definition_notification_editor_field_configuration=Konfiguration
view_alert_definition_notification_editor_field_configuration_not_loaded=Unbekannt
view_alert_definition_notification_editor_field_configuration_loadFailed=Failed to get
notification configuration preview~
@@ -657,12 +651,12 @@ view_alert_definition_notification_role_editor_saveFailed=Cannot
save the select
view_alert_definition_notification_user_editor_loadFailed=Cannot determine current users
- starting empty~
view_alert_definition_notification_user_editor_restoreFailed=Cannot use current users -
starting empty~
view_alert_definition_notification_user_editor_saveFailed=Cannot save the selected
users~
-view_alert_definition_recovery_editor_disable_when_fired=Disable When Fired~
+view_alert_definition_recovery_editor_disable_when_fired=Nach dem Auslösen inaktiv
schalten
view_alert_definition_recovery_editor_disable_when_fired_tooltip=Indicates if this alert
will be disabled after it fires. Once disabled, the alert can be manually re-enabled or a
recovery alert can be set up to automatically re-enable it. If this alert is a recovery
alert itself, this setting cannot be turned on.~
view_alert_definition_recovery_editor_recovery_alert=Recover Alert~
view_alert_definition_recovery_editor_recovery_alert_tooltip=The target alert that will
be recovered (i.e. re-enabled) after this alert triggers. Do not select an alert here if
you are not defining a recovery alert.~
view_alert_definition_recovery_editor_loadFailed=Cannot build recovery menu~
-view_alert_definition_recovery_editor_none_available=None~
+view_alert_definition_recovery_editor_none_available=Keiner
view_alert_common_tab_general=Allgemeine Eigenschaften
view_alert_common_tab_conditions=Bedingungen
view_alert_common_tab_conditions_modal_title=Bedingung hinzufügen
@@ -673,49 +667,49 @@ view_alert_common_tab_conditions_value=Wert
view_alert_common_tab_conditions_type_availability=Änderung der Verfügbarkeit
view_alert_common_tab_conditions_type_availability_down=Wurde unverfügbar
view_alert_common_tab_conditions_type_availability_up=Wurde wieder verfügbar
-view_alert_common_tab_conditions_type_metric_threshold=Metric Value Exceeds Threshold~
-view_alert_common_tab_conditions_type_metric_calltime_threshold=Call Time Value Exceeds
Threshold~
+view_alert_common_tab_conditions_type_metric_threshold=Metrik überschreitet Schwellwert
+view_alert_common_tab_conditions_type_metric_calltime_threshold=Call-Time überschreitet
Schwellwert
view_alert_common_tab_conditions_type_metric_calltime_destination=with call destination
matching~
-view_alert_common_tab_conditions_type_metric_calltime_change=Call Time Value Changes~
-view_alert_common_tab_conditions_type_metric_calltime_change_verb=by at least~
-view_alert_common_tab_conditions_type_metric_calltime_delta_grows=Grows~
-view_alert_common_tab_conditions_type_metric_calltime_delta_shrinks=Shrinks~
-view_alert_common_tab_conditions_type_metric_calltime_delta_other=Changes~
-view_alert_common_tab_conditions_type_metric_baseline=Metric Value Exceeds Baseline~
-view_alert_common_tab_conditions_type_metric_baseline_verb=of~
-view_alert_common_tab_conditions_type_metric_change=Metric Value Change~
-view_alert_common_tab_conditions_type_metric_trait_change=Trait Change~
-view_alert_common_tab_conditions_type_operation=Operation Execution~
-view_alert_common_tab_conditions_type_operation_status=with result status~
+view_alert_common_tab_conditions_type_metric_calltime_change=Call-Time-Wert ändert sich
+view_alert_common_tab_conditions_type_metric_calltime_change_verb=um mindestens
+view_alert_common_tab_conditions_type_metric_calltime_delta_grows=Wächst
+view_alert_common_tab_conditions_type_metric_calltime_delta_shrinks=Schrumpft
+view_alert_common_tab_conditions_type_metric_calltime_delta_other=Ändert sich
+view_alert_common_tab_conditions_type_metric_baseline=Metrik überschreitet Referenzband
+view_alert_common_tab_conditions_type_metric_baseline_verb=von
+view_alert_common_tab_conditions_type_metric_change=Wert der Metrik ändert sich
+view_alert_common_tab_conditions_type_metric_trait_change=Trait-Änderung
+view_alert_common_tab_conditions_type_operation=Ausführung der Operation
+view_alert_common_tab_conditions_type_operation_status=mit Ergebnis-Status
view_alert_common_tab_conditions_type_resource_configuration=Resource Configuration
Change~
view_alert_common_tab_conditions_type_event=Event Detection~
view_alert_common_tab_conditions_type_event_matching=with event source matching~
view_alert_common_tab_conditions_recovery_enabled=Triggered ''{0}'' to be
re-enabled~
-view_alert_common_tab_conditions_recovery_disabled=This alert caused its alert definition
to be disabled~
+view_alert_common_tab_conditions_recovery_disabled=Dieser Alarm hat seine Definition
deaktiviert.
view_alert_common_tab_notifications=Benachrichtigung
view_alert_common_tab_notifications_sender=Sender
view_alert_common_tab_notifications_status=Status
view_alert_common_tab_notifications_message=Nachricht
view_alert_common_tab_dampening=Dämpfung
view_alert_common_tab_dampening_category_none=Keine
-view_alert_common_tab_dampening_category_none_tooltip=Dampening is disabled. Every time
the condition set is true, an alert will be triggered.~
-view_alert_common_tab_dampening_category_consecutive_count=Consecutive~
-view_alert_common_tab_dampening_category_consecutive_count_tooltip=An alert is triggered
once every X occurrences the condition set is true consecutively.~
-view_alert_common_tab_dampening_category_partial_count=Last N Evaluations~
-view_alert_common_tab_dampening_category_partial_count_tooltip=An alert is triggered once
every X occurrences the condition set is true during the last N evaluations of the
condition set.~
-view_alert_common_tab_dampening_category_duration_count=Time Period~
-view_alert_common_tab_dampening_category_duration_count_tooltip=An alert is triggered
once every X occurrences the condition set is true within a given time period.~
-view_alert_common_tab_dampening_consecutive_occurrences_label=Occurrences~
-view_alert_common_tab_dampening_consecutive_occurrences_label_tooltip=The number of times
the condition set must be consecutively true before the alert is triggered~
-view_alert_common_tab_dampening_partial_occurrences_label=Occurrences~
-view_alert_common_tab_dampening_partial_occurrences_label_tooltip=The number of times the
condition set must be true during the last N evaluations before the alert is triggered.~
-view_alert_common_tab_dampening_partial_evalatuions_label=Evaluations~
-view_alert_common_tab_dampening_partial_evalatuions_label_tooltip=The total number of
times the condition set will be tested to see if the given number of occurrences are
true.~
-view_alert_common_tab_dampening_duration_occurrences_label=Occurrences~
-view_alert_common_tab_dampening_duration_occurrences_label_tooltip=The number of times
the condition set must be true during the given time period before the alert is
triggered.~
-view_alert_common_tab_dampening_duration_period_label=Time Period~
-view_alert_common_tab_dampening_duration_period_label_tooltip=The time span in which the
condition set will be tested to see if the given number of occurrences are true.~
-view_alert_common_tab_recovery=Recovery~
+view_alert_common_tab_dampening_category_none_tooltip=Dämpfung ist abgeschaltet. Jedes
Mal wenn die Bedingungen zutreffen wird ein Alarm ausgelöst.
+view_alert_common_tab_dampening_category_consecutive_count=Aufeinanderfolgend
+view_alert_common_tab_dampening_category_consecutive_count_tooltip=Ein Alarm wird
ausgelöst, wenn bei X aufeinanderfolgenden Werten die Bedingungen zutreffen.
+view_alert_common_tab_dampening_category_partial_count=Letzt N Auswertungen
+view_alert_common_tab_dampening_category_partial_count_tooltip=Ein Alarm wird ausgelöst,
wenn die Bedingungen X-Mal innerhalb der letzten N Werte zutreffen.
+view_alert_common_tab_dampening_category_duration_count=Zeitraum
+view_alert_common_tab_dampening_category_duration_count_tooltip=Ein Alarm wird ausgelöst,
wenn die Bedingungen X-Mal innerhalb des gegebenen Zeitraums zutreffen.
+view_alert_common_tab_dampening_consecutive_occurrences_label=Anzahl Vorkommen
+view_alert_common_tab_dampening_consecutive_occurrences_label_tooltip=Anzahl wie oft die
Bedingungen aufeinandefolgend wahr sein müssen, befor der Alarm ausgelöst wird.
+view_alert_common_tab_dampening_partial_occurrences_label=Anzahl Vorkommen
+view_alert_common_tab_dampening_partial_occurrences_label_tooltip=Anzahl wie oft die
Bedingungen innerhalb der letzten N Auswertungen wahr sein müssen, bevor der Alarm
ausgelöst wird.
+view_alert_common_tab_dampening_partial_evalatuions_label=Auswertungen
+view_alert_common_tab_dampening_partial_evalatuions_label_tooltip=Anzahl wie oft die
Bedingungen ausgewertet werden, um zu prüfen, ob sie 'Vorkommen' mal zutreffen.
+view_alert_common_tab_dampening_duration_occurrences_label=Anzahl Vorkommen
+view_alert_common_tab_dampening_duration_occurrences_label_tooltip=Anzahl wie oft die
Bedingungen im gegebenen Zeitraum zutreffen müssen, um den Alarm auszulösen.
+view_alert_common_tab_dampening_duration_period_label=Zeitraum
+view_alert_common_tab_dampening_duration_period_label_tooltip=Der Zeitraum in dem die
Bedingungen geprüft werden, ob sie 'Vorkommen' mal zutreffen.
+view_alert_common_tab_recovery=Erholung
view_alert_common_tab_invalid_condition_category=Invalid condition category - please
report this as a bug: {0}~
view_alert_common_tab_invalid_dampening_category=Invalid dampening category - please
report this as a bug: {0}~
view_alert_common_tab_invalid_time_units=Ungültige Zeiteinheit - bitte berichten Sie
diesen Fehler: {0}
@@ -730,18 +724,18 @@ view_autoDiscoveryQ_unignore=Ignorieren aufheben
view_autoDiscoveryQ_new=Neu
view_autoDiscoveryQ_newAndIgnored=Neu und Ignoriert
view_autoDiscoveryQ_importFailure=Konnte die Ressourcen nicht importieren
-view_autoDiscoveryQ_importSuccessful=You have successfully imported the selected
resources.~
-view_autoDiscoveryQ_ignoreFailure=Failed to ignore resources~
-view_autoDiscoveryQ_ignoreSuccessful=You have successfully ignored the selected
resources.~
-view_autoDiscoveryQ_unignoreFailure=Failed to unignore resources~
-view_autoDiscoveryQ_unignoreSuccessful=You have successfully unignored the selected
resources.~
-view_autoDiscoveryQ_noperm=(Required manage inventory permissions missing. See
Administrator to change)~
+view_autoDiscoveryQ_importSuccessful=Sie haben die ausgewählten Ressourcen erfolgreich
importiert
+view_autoDiscoveryQ_ignoreFailure=Konnte die Ressourcen nicht ignorieren
+view_autoDiscoveryQ_ignoreSuccessful=Sie haben die ausgewählten Ressourcen erfolgreich
ignoriert
+view_autoDiscoveryQ_unignoreFailure=Konnte das Ignorieren für die Ressourcen nicht
aufheben.
+view_autoDiscoveryQ_unignoreSuccessful=Sie haben erfolgreich das Ignorieren der
ausgewählten Ressourcen aufgehoben.
+view_autoDiscoveryQ_noperm=(Die erforderlichen "manage inventory" Rechte
fehlen. Kontaktieren Sie den Administrator)
view_autoDiscoveryQ_noItems=Keine Einträge gefunden
-view_autoDiscoveryQ_field_parentId=Parent ID~
+view_autoDiscoveryQ_field_parentId=Eltern-ID
view_autoDiscoveryQ_field_name=Ressourcen-Name
-view_autoDiscoveryQ_field_key=Resource Key~
-view_autoDiscoveryQ_field_discoveryTime=Discovery Time~
-view_autoDiscoveryQ_field_inventoryStatus=Inventory Status~
+view_autoDiscoveryQ_field_key=Ressourcen-Schlüssel
+view_autoDiscoveryQ_field_discoveryTime=Zeitpunkt des Auffindens
+view_autoDiscoveryQ_field_inventoryStatus=Inventar-Status
view_autoDiscoveryQ_loadFailure=Failed to load the inventory discovery queue~
#==================== Bundles ======================
@@ -759,7 +753,7 @@ view_bundle_bundleVersions=Bundle-Versionen
view_bundle_deploy=Deploy
view_bundle_deployed=Deployed
view_bundle_deployDir=Deploy-Verzeichnis
-view_bundle_deployments=Deployments~
+view_bundle_deployments=Deployments
view_bundle_destinations=Ziele
view_bundle_files=Dateien
view_bundle_latestVersion=Aktuelle Version
@@ -1006,11 +1000,7 @@ view_dashboards_title=Dashboard
view_dashboards_confirm1=Sind Sie sicher, dass Sie löschen möchten
view_dashboardsManager_error1=Failed to add new dashboard~
# // dup in common
-view_dashboardsManager_inventory_title=Inventarübersicht
-view_dashboardsManager_mashup_title=RHQ Neuigkeiten
-view_dashboardsManager_message_title=Willkommen bei RHQ
view_dashboardsManager_message_title_details=<h1>Willkommen bei
RHQ</h1>\n<p>Das RHQ-Projekt is an abstraction and plug-in based systems
management suite that provides extensible and integrated systems management for multiple
products and platforms across a set of core features. The project is designed with layered
modules that provide a flexible architecture for deployment. It delivers a core user
interface that delivers audited and historical management across an entire enterprise. A
Server/Agent architecture provides remote management and plugins implement all specific
support for managed products.</p>\n <p>This default dashboard can be edited by
clicking the (edit mode) button above.</p>~
-view_dashboardsManager_tagcloud_title=Tag-Wolke
view_portlet_autodiscovery_config_platform_selection = Number of platforms to display~
view_portlet_autodiscovery_help_msg = This portlet offers the ability to import newly
discovered resources into the inventory for monitoring and management or to ignore them
from further action.~
view_portlet_autodiscovery_title = Discovery-Warteschlange
@@ -1026,7 +1016,7 @@ view_portlet_graph_help_msg = This Portlet supports the graphing of
a resource m
view_portlet_graph_help_title = Graph Portlet~
view_portlet_graph_help_unconfigured=This graph is unconfigured, click the settings
button to configure.~
view_portlet_graph_title = Resource Graph~
-view_portlet_inventory_error1=Failed to retrieve inventory summary~
+view_portlet_inventory_error1=Konnte die Inventarübersicht nicht laden
view_portlet_mashup_config_title=MashupPorlet Configuration~
view_portlet_mashup_config_title_desc=The configuration settings for the mashup
portlet.~
view_portlet_mashup_help=This portlet can include a web page via an HTTP request into an
iframe on the dashboard.~
@@ -1034,7 +1024,7 @@ view_portlet_mashup_unconfigured=Page address not yet configured,
click the sett
view_portlet_message_config_title=MessagePortlet Configuration~
view_portlet_message_config_title_desc=The configuration settings for the message
portlet.~
view_portlet_message_help=This portlet can display an HTML message on the dashboard.~
-view_portlet_message_title=Message~
+view_portlet_message_title=Nachricht
view_portlet_message_unconfigured=Message not yet configured, click the settings button
to setup this portlet.~
view_portlet_operations_config_completed_maximum=Maximum number of Completed operations
to display.~
view_portlet_operations_config_completed_enable=Whether to enable completed operations
results grouping for dashboard.~
@@ -1064,7 +1054,7 @@ view_portlet_recentAlerts_config_priority_label = priority Alerts,~
view_portlet_recentAlerts_config_when=innerhalb der letzten
view_portlet_recentAlerts_help_msg = Displays recent alerts fired on resources visible to
the current user login.~
# // dup in common
-view_portlet_recentAlerts_title = Kürzliche Alarme
+view_portlet_recentAlerts_title = Frische Alarme
view_portlet_recentlyAdded_approved_platforms=recently approved platforms on dashboard.~
view_portlet_recentlyAdded_error1=Failed to load recently added resources~
view_portlet_recentlyAdded_help_msg=This portlet displays resources that have recently
been imported into the inventory.~
@@ -1076,11 +1066,9 @@ view_portlet_tagCloud_title=Tag-Wolke
#=================== Inventory =====================
view_inventory_adq = Discovery-Warteschlange
view_inventory_sectionHelp = In diesem Abschnitt können neu gefundene Ressourcen, sowie
Ressourcen und Gruppen im Inventar angesehen und verwaltet werden.
-view_inventory_cannotGetGlobalPerms = Could not determine global permissions - assuming
none.~
view_inventory_problemGroups=Gruppen mit Problemen
view_inventory_collectionInterval=Erfassungs-Intervall
view_inventory_mixed=gemischt
-view_inventory_downServers=Nicht-verfügbare Server
view_inventory_groups = Gruppen
view_inventory_allGroups = Alle Gruppen
view_inventory_allResources = Alle Ressourcen
@@ -1151,7 +1139,7 @@ view_tree_common_contextMenu_editPluginConfiguration=Edit [{0}]
Plugin Configura
view_tree_common_contextMenu_editResourceConfiguration=Edit [{0}] Resource
Configuration~
view_tree_common_contextMenu_operations=Operations~
view_tree_common_contextMenu_operations_loadFailed=Failure to start wizard for running
operations~
-view_tree_common_contextMenu_measurements=Measurements~
+view_tree_common_contextMenu_measurements=Metriken
view_tree_common_contextMenu_addChartToDashboard=Diagramm zum Dashboard [{0}] hinzufügen
view_tree_common_contextMenu_resourceGraph = Resource Metric Graph~
view_tree_common_contextMenu_groupGraph = Group Metric Graph~
@@ -1224,7 +1212,6 @@ view_dynagroup_expression=Ausdruck
view_dynagroup_recursive=Rekursiv
view_dynagroup_loadDefinitionFailure=Konnte die Gruppen-Definition [{0}] nicht laden
view_dynagroup_loadDefinitionMissing=There is no group definition with the ID of [{0}]~
-view_dynagroup_permUnknown=Could not determine if you have the proper permissions -
access is denied~
view_dynagroup_permDenied=You do not have permission to view group definitions~
view_dynagroup_definitions=DynaGroup-Definitionen
view_group_membership_saveFailure=Failed to update membership of group [{0}]~
@@ -1427,8 +1414,8 @@ view_aboutBox_version = Version:
#--------------
view_core_error_1 = Konnte keine Alarminformationen laden
view_core_loggedOut = Ausgeloggt
-view_core_recentAlerts = [{0}] kürzliche Alarme
-view_core_uncaught = Globally uncaught exception~
+view_core_recentAlerts = [{0}] frische Alarme
+view_core_uncaught = Es ist eine nicht abgefangene Ausnahme aufgetreten.
# Login
#--------------
@@ -1474,7 +1461,7 @@ common_title_address=Adresse
common_title_component_errors=Fehler der Komponente
common_title_show_more=Mehr anzeigen...
view_inventory_summary_agent_error1=Fehler beim Ermitteln des Agent, der dies Ressource
managt
-view_inventory_summary_agent_error2=Fehler beim Kontaktieren des Agent, der dies
Ressource managt
+view_inventory_summary_agent_error2=Fehler beim Kontaktieren des Agent, der diese
Ressource managt
view_inventory_summary_agent_fullEnpoint=Vollständiger Kommunikationsendpunkt
view_inventory_summary_agent_fullEnpoint_err1=Es ist kein entfernter Endpunkt mit dieser
Ressource assoziiert
view_inventory_summary_agent_last_title=Zeitpunkt des letzten Verfügbarkeitsberichts
@@ -1596,7 +1583,7 @@ widget_recordEditor_error_permissionCreate=Sie haben nicht die
nötigen Rechte,
widget_recordEditor_warn_validation=Ein oder mehrere Felder haben ungültige Werte. Diese
[{0}] kann nicht gesichert werden bis die Werte korrigiert wurden.
widget_resourceFactoryWizard_infoStep_loadFail=Konnte die verfügbaren Architekturen nicht
ermitteln
widget_typeCache_loadFail=Konnte die Metadaten für den Ressourcen-Typ nicht laden
-widget_typeTree_badTemplateType=Ungültige URL. Unbekannter Template-Type [{0}]
+widget_typeTree_badTemplateType=Ungültige URL. Unbekannter Vorlagen-Typ [{0}]
widget_typeTree_badTypeId=Ungültige URL. Unbekannte Ressource-Typ-ID [{0}]
widget_typeTree_loadFail=Konnte die Ressource-Typen nicht laden
dataSource_bundle_loadFailed=Konnte die Bundle-Daten nicht laden
@@ -1661,6 +1648,41 @@ view_alert_definition_notification_cliScript_editor_script=Skript
view_alert_definition_notification_cliScript_editor_thisUser=Aktueller Benutzer
view_autoDiscoveryQ_confirmSelect=Sollen auch die Kinder der Platform ausgewählt werden?
view_autoDiscoveryQ_showStatus=Zeige
+common_title_count=Anzahl
+common_title_resource_key=Ressourcen-Schlüssel
+common_title_resource_type=Ressourcen-Typ
+common_title_results_count=Anzahl Ergebnisse
+common_title_results_count_tooltip=Zeige diese Anzahl Ergebnisse an
+common_title_stop=Stop
+common_title_sort_order=Sortierreihenfolge
+common_title_sort_order_tooltip=Legt die Sortierreihenfolge für Ergebnisse fest.
+common_title_metric_chart=Metrik-Diagramm
+common_title_operation_status=Status der Operation
+common_title_recent_bundle_deployments=Kürzliche Bundle-Deployments
+common_title_recent_configuration_updates=Frische Konfigurationsaktualisierungen
+common_title_recent_event_counts=Anzahl frischer Events
+common_title_recent_measurements=Frische Messwerte
+common_title_recent_oob_metrics=Kürzlich aus dem Ruder gelaufene Metriken
+dataSource_users_invalidEmailAddress=Ungültige E-Mail-Adresse
+dataSource_users_passwordsDoNotMatch=Passworte stimmen nicht überein.
+view_alerts_field_ack_status_ack=Best.\\ ({0})
+view_alerts_field_ack_status_ackHover=Bestätigt durch {0} um {1}
+view_alerts_field_ack_status_noAck=Unbest.
+view_alerts_field_ack_status_noAckHover=Noch nicht bestätigt
+view_core_noRecentAlerts=Es liegen keine frischen Alarme vor
+view_dynagroup_compatible=Kompatible
+view_dynagroup_mixed=Gemischt
+view_inventory_summary_agent_error3=Sie haben nicht die Rechte, um die Details für diesen
Agent anzusehen.
+view_inventory_unavailableServers=Nichtverfügbare Server
+view_messageCenter_clearAllMessages=Alle Nachrichten löschen
+view_messageCenter_lastNMessages=Letzte {0} Nachrichten
+view_messageCenter_messageBarShowDetails=Details zeigen
+view_messageCenter_stackTraceFollows=--- STACK TRACE FOLGT ---
+view_operationHistoryDetails_noResults=Diese Operation liefert keine Ergebnisse zurück.
+view_operationScheduleDetails_enterParametersBelow=Geben Sie die Parameter unten an...
+view_operationScheduleDetails_field_description=Beschreibung
+view_operationScheduleDetails_field_parameters=Parameter
+view_operationScheduleDetails_noParameters=Diese Operation benötigt keine Parameter.