[rhq] Branch 'as7plugin' - 8 commits - modules/enterprise
by Heiko W. Rupp
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 | 86 +++++++---
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
21 files changed, 201 insertions(+), 101 deletions(-)
New commits:
commit ae5428243c5ae6639e3acac97ae476ad05b4f825
Merge: 40c5ede 15a53e5
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Thu Apr 28 10:48:43 2011 +0200
Merge branch 'master' into as7plugin
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 40c5eded43cd9e4d6050c9ca5ecbd06ddd1cd5b1
Merge: 9dc32bc f50680d
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed Apr 27 21:33:14 2011 +0200
Merge branch 'master' into as7plugin
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);
13 years
[rhq] Branch 'release-4.0.0' - modules/enterprise
by Heiko W. Rupp
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties | 86 +++++++---
1 file changed, 63 insertions(+), 23 deletions(-)
New commits:
commit 1bc94394eb58cf626d436577ee30618318047232
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.
13 years
[rhq] Branch 'ie-fragment-fix' - 9 commits - modules/enterprise modules/plugins
by ips
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.
13 years
[rhq] Branch 'ie-fragment-fix' - modules/enterprise
by ips
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertFormatUtility.java | 1
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentListView.java | 73 ++--
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentView.java | 25 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationListView.java | 77 ++--
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java | 23 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionListView.java | 39 +-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/AboutModalWindow.java | 1
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/Link.java | 101 ++++++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/ViewLink.java | 62 ---
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/CanvasField.java | 89 +++++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/EnhancedListGrid.java | 85 +++++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/EscapedHtmlCellFormatter.java | 19 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java | 8
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/TableSection.java | 64 +--
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/ViewLinkField.java | 54 +++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tagging/TagEditorView.java | 9
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformSummaryPortlet.java | 20 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedResourcesPortlet.java | 24 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java | 17 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/GeneralProperties.java | 7
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/AncestryUtil.java | 8
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDetailsView.java | 16
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/AlertDefinitionReportView.java | 166 ++++++----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ResourceInstallReport.java | 39 +-
25 files changed, 694 insertions(+), 336 deletions(-)
New commits:
commit 471497cc81108613590d680db5e5b012b2934d3e
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Wed Apr 27 18:23:46 2011 -0400
more work on converting raw HTML links to ViewLink widgets
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertFormatUtility.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertFormatUtility.java
index 26a2477..e81d57e 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertFormatUtility.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertFormatUtility.java
@@ -210,6 +210,7 @@ public class AlertFormatUtility {
AlertDefinition recoveryAlertDefinition = alert.getRecoveryAlertDefinition();
if (recoveryAlertDefinition != null && recoveryAlertDefinition.getId() != 0) {
int resourceId = alert.getAlertDefinition().getResource().getId();
+ // TODO (ips, 04/27/11): Can the below URL be converted over to a coregui URL?
String otherAlertDef = "<a href=\"/alerts/Config.do?mode=viewRoles&id=" + resourceId + "&ad="
+ recoveryAlertDefinition.getId() + "\">" + recoveryAlertDefinition.getName() + "</a>";
recoveryInfo = MSG.view_alert_common_tab_conditions_recovery_enabled(otherAlertDef);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentListView.java
index b2763d9..d9d2d3d 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentListView.java
@@ -1,6 +1,6 @@
/*
* RHQ Management Platform
- * Copyright (C) 2005-2010 Red Hat, Inc.
+ * Copyright (C) 2005-2011 Red Hat, Inc.
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
@@ -28,7 +28,6 @@ import com.smartgwt.client.data.Criteria;
import com.smartgwt.client.types.ListGridFieldType;
import com.smartgwt.client.widgets.events.DoubleClickEvent;
import com.smartgwt.client.widgets.events.DoubleClickHandler;
-import com.smartgwt.client.widgets.grid.CellFormatter;
import com.smartgwt.client.widgets.grid.ListGrid;
import com.smartgwt.client.widgets.grid.ListGridField;
import com.smartgwt.client.widgets.grid.ListGridRecord;
@@ -39,10 +38,11 @@ import org.rhq.core.domain.bundle.BundleDeploymentStatus;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.ErrorMessageWindow;
import org.rhq.enterprise.gui.coregui.client.LinkManager;
-import org.rhq.enterprise.gui.coregui.client.bundle.list.BundleVersionDataSource;
+import org.rhq.enterprise.gui.coregui.client.components.ViewLink;
import org.rhq.enterprise.gui.coregui.client.components.table.EscapedHtmlCellFormatter;
import org.rhq.enterprise.gui.coregui.client.components.table.Table;
import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter;
+import org.rhq.enterprise.gui.coregui.client.components.table.ViewLinkField;
import org.rhq.enterprise.gui.coregui.client.util.StringUtility;
/**
@@ -62,12 +62,33 @@ public class BundleDeploymentListView extends Table<BundleDeploymentDataSource>
@Override
protected void configureTable() {
ListGridField idField = new ListGridField(BundleDeploymentDataSource.FIELD_ID, MSG.common_title_id());
- ListGridField nameField = new ListGridField(BundleDeploymentDataSource.FIELD_NAME, MSG
+ ListGridField nameField;
+ // only users that are authorized can see deployments
+ if (canManageBundles) {
+ nameField = new ViewLinkField(BundleDeploymentDataSource.FIELD_NAME, MSG.view_bundle_deploy_name()) {
+ protected ViewLink getViewLink(ListGrid grid, ListGridRecord record) {
+ String linkText = StringUtility.escapeHtml(record.getAttribute(BundleDeploymentDataSource.FIELD_NAME));
+ String viewPath = getBundleDeploymentLink(record);
+ return new ViewLink(extendLocatorId("ViewLink"), linkText, viewPath);
+ }
+ };
+ } else {
+ nameField = new ListGridField(BundleDeploymentDataSource.FIELD_NAME, MSG
.view_bundle_deploy_name());
+ nameField.setCellFormatter(new EscapedHtmlCellFormatter());
+ }
ListGridField descriptionField = new ListGridField(BundleDeploymentDataSource.FIELD_DESCRIPTION, MSG
.common_title_description());
- ListGridField bundleVersionField = new ListGridField(BundleDeploymentDataSource.FIELD_BUNDLE_VERSION_VERSION,
- MSG.view_bundle_bundleVersion());
+ ViewLinkField bundleVersionField = new ViewLinkField(BundleDeploymentDataSource.FIELD_BUNDLE_VERSION_VERSION,
+ MSG.view_bundle_bundleVersion()) {
+ protected ViewLink getViewLink(ListGrid grid, ListGridRecord record) {
+ String linkText = record.getAttribute(BundleDeploymentDataSource.FIELD_BUNDLE_VERSION_VERSION);
+ String viewPath = LinkManager.getBundleVersionLink(record
+ .getAttributeAsInt(BundleDeploymentDataSource.FIELD_BUNDLE_ID), record
+ .getAttributeAsInt(BundleDeploymentDataSource.FIELD_BUNDLE_VERSION_ID));
+ return new ViewLink(extendLocatorId("ViewLink"), linkText, viewPath);
+ }
+ };
ListGridField statusField = new ListGridField(BundleDeploymentDataSource.FIELD_STATUS, MSG
.common_title_status());
ListGridField deployTimeField = new ListGridField(BundleDeploymentDataSource.FIELD_DEPLOY_TIME, MSG
@@ -75,34 +96,8 @@ public class BundleDeploymentListView extends Table<BundleDeploymentDataSource>
TimestampCellFormatter.prepareDateField(deployTimeField);
deployTimeField.setType(ListGridFieldType.DATE);
- // only users that are authorized can see deployments
- if (canManageBundles) {
- nameField.setCellFormatter(new CellFormatter() {
- public String format(Object value, ListGridRecord record, int i, int i1) {
- return "<a href=\""
- + LinkManager.getBundleDeploymentLink(record
- .getAttributeAsInt(BundleDeploymentDataSource.FIELD_BUNDLE_ID), record
- .getAttributeAsInt(BundleDeploymentDataSource.FIELD_ID)) + "\">"
- + StringUtility.escapeHtml(String.valueOf(value))
- + "</a>";
- }
- });
- } else {
- nameField.setCellFormatter(new EscapedHtmlCellFormatter());
- }
-
descriptionField.setCellFormatter(new EscapedHtmlCellFormatter());
- bundleVersionField.setCellFormatter(new CellFormatter() {
- public String format(Object o, ListGridRecord record, int i, int i1) {
- return "<a href=\""
- + LinkManager.getBundleVersionLink(record
- .getAttributeAsInt(BundleDeploymentDataSource.FIELD_BUNDLE_ID), record
- .getAttributeAsInt(BundleDeploymentDataSource.FIELD_BUNDLE_VERSION_ID)) + "\">"
- + String.valueOf(o) + "</a>";
- }
- });
-
HashMap<String, String> statusIcons = new HashMap<String, String>();
statusIcons.put(BundleDeploymentStatus.PENDING.name(), "subsystems/bundle/install-loader.gif");
statusIcons.put(BundleDeploymentStatus.IN_PROGRESS.name(), "subsystems/bundle/install-loader.gif");
@@ -140,13 +135,19 @@ public class BundleDeploymentListView extends Table<BundleDeploymentDataSource>
ListGrid listGrid = (ListGrid) event.getSource();
ListGridRecord[] selectedRows = listGrid.getSelection();
if (selectedRows != null && selectedRows.length == 1) {
- String selectedId = selectedRows[0].getAttribute(BundleVersionDataSource.FIELD_BUNDLE_ID);
- String selectedVersionId = selectedRows[0].getAttribute(BundleVersionDataSource.FIELD_ID);
- CoreGUI.goToView(LinkManager.getBundleDeploymentLink(Integer.valueOf(selectedId), Integer
- .valueOf(selectedVersionId)));
+ ListGridRecord selectedRecord = selectedRows[0];
+ String viewPath = getBundleDeploymentLink(selectedRecord);
+ CoreGUI.goToView(viewPath);
}
}
});
}
}
+
+ private static String getBundleDeploymentLink(ListGridRecord record) {
+ return LinkManager.getBundleDeploymentLink(record
+ .getAttributeAsInt(BundleDeploymentDataSource.FIELD_BUNDLE_ID), record
+ .getAttributeAsInt(BundleDeploymentDataSource.FIELD_ID));
+ }
+
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentView.java
index e220cfc..58b5664 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentView.java
@@ -1,6 +1,6 @@
/*
* RHQ Management Platform
- * Copyright (C) 2005-2010 Red Hat, Inc.
+ * Copyright (C) 2005-2011 Red Hat, Inc.
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
@@ -41,7 +41,6 @@ import com.smartgwt.client.widgets.form.fields.LinkItem;
import com.smartgwt.client.widgets.form.fields.StaticTextItem;
import com.smartgwt.client.widgets.form.fields.events.ClickEvent;
import com.smartgwt.client.widgets.form.fields.events.ClickHandler;
-import com.smartgwt.client.widgets.grid.CellFormatter;
import com.smartgwt.client.widgets.grid.ListGrid;
import com.smartgwt.client.widgets.grid.ListGridField;
import com.smartgwt.client.widgets.grid.ListGridRecord;
@@ -67,13 +66,14 @@ import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.ErrorMessageWindow;
import org.rhq.enterprise.gui.coregui.client.ImageManager;
import org.rhq.enterprise.gui.coregui.client.LinkManager;
-import org.rhq.enterprise.gui.coregui.client.ViewId;
import org.rhq.enterprise.gui.coregui.client.ViewPath;
import org.rhq.enterprise.gui.coregui.client.bundle.revert.BundleRevertWizard;
import org.rhq.enterprise.gui.coregui.client.components.HeaderLabel;
+import org.rhq.enterprise.gui.coregui.client.components.ViewLink;
import org.rhq.enterprise.gui.coregui.client.components.buttons.BackButton;
import org.rhq.enterprise.gui.coregui.client.components.table.Table;
import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter;
+import org.rhq.enterprise.gui.coregui.client.components.table.ViewLinkField;
import org.rhq.enterprise.gui.coregui.client.components.tagging.TagEditorView;
import org.rhq.enterprise.gui.coregui.client.components.tagging.TagsChangedCallback;
import org.rhq.enterprise.gui.coregui.client.gwt.BundleGWTServiceAsync;
@@ -112,7 +112,7 @@ public class BundleDeploymentView extends LocatableVLayout implements Bookmarkab
statusIcons.put(BundleDeploymentStatus.SUCCESS.name(), "subsystems/bundle/Ok_11.png");
}
- private void viewBundleDeployment(BundleDeployment bundleDeployment, ViewId current) {
+ private void viewBundleDeployment(BundleDeployment bundleDeployment) {
// Whenever a new view request comes in, make sure to clean house to avoid ID conflicts for sub-widgets
this.destroyMembers();
@@ -344,16 +344,15 @@ public class BundleDeploymentView extends LocatableVLayout implements Bookmarkab
resourceIcon.setWidth(40);
// resource field
- ListGridField resource = new ListGridField("resource", MSG.common_title_platform());
+ ViewLinkField resource = new ViewLinkField("resource", MSG.common_title_platform()) {
+ protected ViewLink getViewLink(ListGrid grid, ListGridRecord record) {
+ String resourceUrl = LinkManager.getResourceLink(record.getAttributeAsInt("resourceId"));
+ String linkText = StringUtility.escapeHtml(record.getAttribute("resource"));
+ return new ViewLink(extendLocatorId("ViewLink"), linkText, resourceUrl);
+ }
+ };
resource.setAutoFitWidth(true);
resource.setAutoFitWidthApproach(AutoFitWidthApproach.BOTH);
- resource.setCellFormatter(new CellFormatter() {
- public String format(Object value, ListGridRecord listGridRecord, int i, int i1) {
- return "<a href=\"" + LinkManager.getResourceLink(listGridRecord.getAttributeAsInt("resourceId"))
- + "\">" + StringUtility.escapeHtml(String.valueOf(value)) + "</a>";
-
- }
- });
// resource version field
ListGridField resourceVersion = new ListGridField("resourceVersion", MSG.view_bundle_deploy_operatingSystem());
@@ -456,7 +455,7 @@ public class BundleDeploymentView extends LocatableVLayout implements Bookmarkab
public void onSuccess(PageList<BundleResourceDeployment> result) {
deployment.setResourceDeployments(result);
- viewBundleDeployment(deployment, viewPath.getCurrent());
+ viewBundleDeployment(deployment);
}
});
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationListView.java
index bbd20f6..2e94600 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationListView.java
@@ -1,6 +1,6 @@
/*
* RHQ Management Platform
- * Copyright (C) 2005-2010 Red Hat, Inc.
+ * Copyright (C) 2005-2011 Red Hat, Inc.
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
@@ -28,7 +28,6 @@ import com.smartgwt.client.data.Criteria;
import com.smartgwt.client.types.ListGridFieldType;
import com.smartgwt.client.widgets.events.DoubleClickEvent;
import com.smartgwt.client.widgets.events.DoubleClickHandler;
-import com.smartgwt.client.widgets.grid.CellFormatter;
import com.smartgwt.client.widgets.grid.ListGrid;
import com.smartgwt.client.widgets.grid.ListGridField;
import com.smartgwt.client.widgets.grid.ListGridRecord;
@@ -36,8 +35,10 @@ import com.smartgwt.client.widgets.grid.ListGridRecord;
import org.rhq.core.domain.bundle.BundleDeploymentStatus;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.LinkManager;
+import org.rhq.enterprise.gui.coregui.client.components.ViewLink;
import org.rhq.enterprise.gui.coregui.client.components.table.Table;
import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter;
+import org.rhq.enterprise.gui.coregui.client.components.table.ViewLinkField;
import org.rhq.enterprise.gui.coregui.client.util.StringUtility;
/**
@@ -58,13 +59,36 @@ public class BundleDestinationListView extends Table<BundleDestinationDataSource
@Override
protected void configureTable() {
ListGridField idField = new ListGridField(BundleDestinationDataSource.FIELD_ID, MSG.common_title_id());
- ListGridField nameField = new ListGridField(BundleDestinationDataSource.FIELD_NAME, MSG.common_title_name());
+ ViewLinkField nameField = new ViewLinkField(BundleDestinationDataSource.FIELD_NAME, MSG.common_title_name()) {
+ protected ViewLink getViewLink(ListGrid grid, ListGridRecord record) {
+ String bundleName = record.getAttribute(BundleDestinationDataSource.FIELD_NAME);
+ String linkText = StringUtility.escapeHtml(bundleName);
+ String viewPath = getBundleDestinationLink(record);
+ return new ViewLink(extendLocatorId("ViewLink"), linkText, viewPath);
+ }
+ };
ListGridField descriptionField = new ListGridField(BundleDestinationDataSource.FIELD_DESCRIPTION, MSG
.common_title_description());
- ListGridField bundleNameField = new ListGridField(BundleDestinationDataSource.FIELD_BUNDLE_NAME, MSG
- .view_bundle_bundle());
- ListGridField groupNameField = new ListGridField(BundleDestinationDataSource.FIELD_GROUP_NAME, MSG
- .view_bundle_dest_group());
+ ViewLinkField bundleNameField = new ViewLinkField(BundleDestinationDataSource.FIELD_BUNDLE_NAME, MSG
+ .view_bundle_bundle()) {
+ protected ViewLink getViewLink(ListGrid grid, ListGridRecord record) {
+ String bundleName = record.getAttribute(BundleDestinationDataSource.FIELD_BUNDLE_NAME);
+ String linkText = StringUtility.escapeHtml(bundleName);
+ Integer bundleId = record.getAttributeAsInt(BundleDestinationDataSource.FIELD_BUNDLE_ID);
+ String viewPath = LinkManager.getBundleLink(bundleId);
+ return new ViewLink(extendLocatorId("ViewLink"), linkText, viewPath);
+ }
+ };
+ ViewLinkField groupNameField = new ViewLinkField(BundleDestinationDataSource.FIELD_GROUP_NAME, MSG
+ .view_bundle_dest_group()) {
+ protected ViewLink getViewLink(ListGrid grid, ListGridRecord record) {
+ String groupName = record.getAttribute(BundleDestinationDataSource.FIELD_GROUP_NAME);
+ String linkText = StringUtility.escapeHtml(groupName);
+ Integer groupId = record.getAttributeAsInt(BundleDestinationDataSource.FIELD_GROUP_ID);
+ String viewPath = LinkManager.getResourceGroupLink(groupId);
+ return new ViewLink(extendLocatorId("ViewLink"), linkText, viewPath);
+ }
+ };
ListGridField deployDirField = new ListGridField(BundleDestinationDataSource.FIELD_DEPLOY_DIR, MSG
.view_bundle_dest_deployDir());
ListGridField latestDeploymentVersionField = new ListGridField(
@@ -77,31 +101,6 @@ public class BundleDestinationListView extends Table<BundleDestinationDataSource
latestDeploymentDateField.setType(ListGridFieldType.DATE);
TimestampCellFormatter.prepareDateField(latestDeploymentDateField);
- nameField.setCellFormatter(new CellFormatter() {
- public String format(Object value, ListGridRecord listGridRecord, int i, int i1) {
- Integer bundleId = listGridRecord.getAttributeAsInt(BundleDestinationDataSource.FIELD_BUNDLE_ID);
- Integer bundleDestId = listGridRecord.getAttributeAsInt(BundleDestinationDataSource.FIELD_ID);
- return "<a href=\"" + LinkManager.getBundleDestinationLink(bundleId, bundleDestId) + "\">"
- + StringUtility.escapeHtml(value.toString()) + "</a>";
- }
- });
-
- groupNameField.setCellFormatter(new CellFormatter() {
- public String format(Object value, ListGridRecord listGridRecord, int i, int i1) {
- Integer groupId = listGridRecord.getAttributeAsInt(BundleDestinationDataSource.FIELD_GROUP_ID);
- return "<a href=\"" + LinkManager.getResourceGroupLink(groupId) + "\">"
- + StringUtility.escapeHtml(value.toString()) + "</a>";
- }
- });
-
- bundleNameField.setCellFormatter(new CellFormatter() {
- public String format(Object value, ListGridRecord listGridRecord, int i, int i1) {
- Integer bid = listGridRecord.getAttributeAsInt(BundleDestinationDataSource.FIELD_BUNDLE_ID);
- return "<a href=\"" + LinkManager.getBundleLink(bid) + "\">"
- + StringUtility.escapeHtml(value.toString()) + "</a>";
- }
- });
-
HashMap<String, String> statusIcons = new HashMap<String, String>();
statusIcons.put(BundleDeploymentStatus.PENDING.name(), "subsystems/bundle/install-loader.gif");
statusIcons.put(BundleDeploymentStatus.IN_PROGRESS.name(), "subsystems/bundle/install-loader.gif");
@@ -133,12 +132,18 @@ public class BundleDestinationListView extends Table<BundleDestinationDataSource
ListGrid listGrid = (ListGrid) event.getSource();
ListGridRecord[] selectedRows = listGrid.getSelection();
if (selectedRows != null && selectedRows.length == 1) {
- String selectedId = selectedRows[0].getAttribute(BundleDestinationDataSource.FIELD_BUNDLE_ID);
- String selectedDestId = selectedRows[0].getAttribute(BundleDestinationDataSource.FIELD_ID);
- CoreGUI.goToView(LinkManager.getBundleDestinationLink(Integer.valueOf(selectedId), Integer
- .valueOf(selectedDestId)));
+ ListGridRecord selectedRecord = selectedRows[0];
+ String viewPath = getBundleDestinationLink(selectedRecord);
+ CoreGUI.goToView(viewPath);
}
}
});
}
+
+ private static String getBundleDestinationLink(ListGridRecord record) {
+ Integer bundleId = record.getAttributeAsInt(BundleDestinationDataSource.FIELD_BUNDLE_ID);
+ Integer bundleDestId = record.getAttributeAsInt(BundleDestinationDataSource.FIELD_ID);
+ return LinkManager.getBundleDestinationLink(bundleId, bundleDestId);
+ }
+
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java
index bf9db3e..b0313bc 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java
@@ -25,6 +25,7 @@ import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.data.Criteria;
import com.smartgwt.client.types.Alignment;
import com.smartgwt.client.types.ListGridFieldType;
+import com.smartgwt.client.widgets.Canvas;
import com.smartgwt.client.widgets.events.DoubleClickEvent;
import com.smartgwt.client.widgets.events.DoubleClickHandler;
import com.smartgwt.client.widgets.grid.CellFormatter;
@@ -32,6 +33,7 @@ import com.smartgwt.client.widgets.grid.ListGrid;
import com.smartgwt.client.widgets.grid.ListGridField;
import com.smartgwt.client.widgets.grid.ListGridRecord;
+import com.smartgwt.client.widgets.layout.HLayout;
import org.rhq.core.domain.authz.Permission;
import org.rhq.core.domain.bundle.Bundle;
import org.rhq.core.domain.bundle.composite.BundleWithLatestVersionComposite;
@@ -41,7 +43,9 @@ import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.LinkManager;
import org.rhq.enterprise.gui.coregui.client.bundle.create.BundleCreateWizard;
import org.rhq.enterprise.gui.coregui.client.bundle.deploy.BundleDeployWizard;
+import org.rhq.enterprise.gui.coregui.client.components.ViewLink;
import org.rhq.enterprise.gui.coregui.client.components.table.AbstractTableAction;
+import org.rhq.enterprise.gui.coregui.client.components.table.CanvasField;
import org.rhq.enterprise.gui.coregui.client.components.table.Table;
import org.rhq.enterprise.gui.coregui.client.components.table.TableActionEnablement;
import org.rhq.enterprise.gui.coregui.client.gwt.BundleGWTServiceAsync;
@@ -85,15 +89,18 @@ public class BundlesListView extends Table<BundlesWithLatestVersionDataSource> {
idField.setType(ListGridFieldType.INTEGER);
idField.setWidth("50");
- ListGridField nameField = new ListGridField(BundlesWithLatestVersionDataSource.FIELD_NAME, MSG
- .common_title_name());
- nameField.setWidth("33%");
- nameField.setCellFormatter(new CellFormatter() {
- public String format(Object value, ListGridRecord record, int i, int i1) {
- return "<a href=\"" + record.getAttribute(BundlesWithLatestVersionDataSource.FIELD_NAMELINK) + "\">"
- + StringUtility.escapeHtml(String.valueOf(value)) + "</a>";
+ CanvasField nameField = new CanvasField(BundlesWithLatestVersionDataSource.FIELD_NAME, MSG
+ .common_title_name()) {
+ protected Canvas createCanvas(ListGrid grid, ListGridRecord record) {
+ HLayout hLayout = createHLayout(grid);
+ String name = record.getAttribute(BundlesWithLatestVersionDataSource.FIELD_NAME);
+ String nameLink = record.getAttribute(BundlesWithLatestVersionDataSource.FIELD_NAMELINK);
+ ViewLink viewLink = new ViewLink(extendLocatorId("ViewLink"), StringUtility.escapeHtml(name), nameLink);
+ hLayout.addMember(viewLink);
+ return hLayout;
}
- });
+ };
+ nameField.setWidth("33%");
ListGridField descField = new ListGridField(BundlesWithLatestVersionDataSource.FIELD_DESCRIPTION, MSG
.common_title_description());
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionListView.java
index 10e1e43..29c9744 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionListView.java
@@ -1,6 +1,6 @@
/*
* RHQ Management Platform
- * Copyright (C) 2005-2010 Red Hat, Inc.
+ * Copyright (C) 2005-2011 Red Hat, Inc.
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
@@ -24,16 +24,19 @@ package org.rhq.enterprise.gui.coregui.client.bundle.version;
import com.smartgwt.client.data.Criteria;
import com.smartgwt.client.types.SelectionStyle;
+import com.smartgwt.client.widgets.Canvas;
import com.smartgwt.client.widgets.events.DoubleClickEvent;
import com.smartgwt.client.widgets.events.DoubleClickHandler;
-import com.smartgwt.client.widgets.grid.CellFormatter;
import com.smartgwt.client.widgets.grid.ListGrid;
import com.smartgwt.client.widgets.grid.ListGridField;
import com.smartgwt.client.widgets.grid.ListGridRecord;
+import com.smartgwt.client.widgets.layout.HLayout;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.LinkManager;
import org.rhq.enterprise.gui.coregui.client.bundle.list.BundleVersionDataSource;
+import org.rhq.enterprise.gui.coregui.client.components.ViewLink;
+import org.rhq.enterprise.gui.coregui.client.components.table.CanvasField;
import org.rhq.enterprise.gui.coregui.client.components.table.Table;
/**
@@ -60,15 +63,17 @@ public class BundleVersionListView extends Table<BundleVersionDataSource> {
protected void configureTable() {
ListGridField idField = new ListGridField(FIELD_ID, MSG.common_title_id());
- ListGridField versionField = new ListGridField(BundleVersionDataSource.FIELD_VERSION, MSG
- .common_title_version());
- versionField.setCellFormatter(new CellFormatter() {
- public String format(Object o, ListGridRecord listGridRecord, int i, int i1) {
- Integer _bundleId = listGridRecord.getAttributeAsInt("bundleId");
- Integer _bvId = listGridRecord.getAttributeAsInt("id");
- return "<a href=\"" + LinkManager.getBundleVersionLink(_bundleId, _bvId) + "\">" + o + "</a>";
+ CanvasField versionField = new CanvasField(BundleVersionDataSource.FIELD_VERSION, MSG
+ .common_title_version()) {
+ protected Canvas createCanvas(ListGrid grid, ListGridRecord record) {
+ HLayout hLayout = createHLayout(grid);
+ String viewPath = getBundleVersionViewPath(record);
+ ViewLink viewLink = new ViewLink(extendLocatorId("ViewLink"),
+ record.getAttribute(BundleVersionDataSource.FIELD_VERSION), viewPath);
+ hLayout.addMember(viewLink);
+ return hLayout;
}
- });
+ };
ListGridField nameField = new ListGridField(BundleVersionDataSource.FIELD_NAME, MSG.common_title_name());
@@ -92,12 +97,18 @@ public class BundleVersionListView extends Table<BundleVersionDataSource> {
ListGrid listGrid = (ListGrid) event.getSource();
ListGridRecord[] selectedRows = listGrid.getSelection();
if (selectedRows != null && selectedRows.length == 1) {
- String selectedId = selectedRows[0].getAttribute(BundleVersionDataSource.FIELD_BUNDLE_ID);
- String selectedVersionId = selectedRows[0].getAttribute(BundleVersionDataSource.FIELD_ID);
- CoreGUI.goToView(LinkManager.getBundleVersionLink(Integer.valueOf(selectedId), Integer
- .valueOf(selectedVersionId)));
+ ListGridRecord selectedRecord = selectedRows[0];
+ String viewPath = getBundleVersionViewPath(selectedRecord);
+ CoreGUI.goToView(viewPath);
}
}
});
}
+
+ private static String getBundleVersionViewPath(ListGridRecord record) {
+ Integer bundleId = record.getAttributeAsInt(BundleVersionDataSource.FIELD_BUNDLE_ID);
+ Integer bundleVersionId = record.getAttributeAsInt(BundleVersionDataSource.FIELD_ID);
+ return LinkManager.getBundleVersionLink(bundleId, bundleVersionId);
+ }
+
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/AboutModalWindow.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/AboutModalWindow.java
index 5687c75..ef723db 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/AboutModalWindow.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/AboutModalWindow.java
@@ -102,6 +102,7 @@ public class AboutModalWindow extends LocatableWindow {
contentPane.setPadding(15);
contentPane.setMembersMargin(25);
+ // TODO: Replace the below raw HTML w/ GWT widgets.
HTMLFlow htmlFlow = new HTMLFlow();
String html = "<span class=\"DisplaySubhead\">\n" + " <a href=\"" + PRODUCT_INFO.getUrl() + "\" title=\""
+ PRODUCT_INFO.getFullName() + " " + MSG.view_aboutBox_homepage() + "\" target=\"_blank\">"
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/Link.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/Link.java
new file mode 100644
index 0000000..240779a
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/Link.java
@@ -0,0 +1,101 @@
+/*
+ * RHQ Management Platform
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.enterprise.gui.coregui.client.components;
+
+import com.smartgwt.client.widgets.events.ClickHandler;
+import com.smartgwt.client.widgets.events.MouseOutEvent;
+import com.smartgwt.client.widgets.events.MouseOutHandler;
+import com.smartgwt.client.widgets.events.MouseOverEvent;
+import com.smartgwt.client.widgets.events.MouseOverHandler;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHTMLFlow;
+
+/**
+ * A link.
+ *
+ * @author Ian Springer
+ */
+public class Link extends LocatableHTMLFlow {
+
+ private static final String DEFAULT_MOUSE_OUT_STYLE_NAME = "viewLink";
+ private static final String DEFAULT_MOUSE_OVER_STYLE_NAME = "viewLinkHover";
+
+ private String mouseOverStyleName;
+ private String mouseOutStyleName;
+
+ public Link(String locatorId, String linkText, ClickHandler clickHandler) {
+ super(locatorId);
+
+ this.mouseOutStyleName = DEFAULT_MOUSE_OUT_STYLE_NAME;
+ this.mouseOverStyleName = DEFAULT_MOUSE_OVER_STYLE_NAME;
+
+ setWidth100();
+ setHeight(25);
+ setContents(linkText);
+
+ addClickHandler(clickHandler);
+
+ addMouseOverHandler(new MouseOverHandler() {
+ public void onMouseOver(MouseOverEvent event) {
+ if (mouseOutStyleName != null && mouseOverStyleName != null) {
+ setStyleName(mouseOverStyleName);
+ markForRedraw();
+ }
+ }
+ });
+
+ addMouseOutHandler(new MouseOutHandler() {
+ public void onMouseOut(MouseOutEvent event) {
+ if (mouseOutStyleName != null && mouseOverStyleName != null) {
+ setStyleName(mouseOutStyleName);
+ markForRedraw();
+ }
+ }
+ });
+ }
+
+ @Override
+ protected void onInit() {
+ super.onInit();
+
+ setStyleName(getMouseOutStyleName());
+ }
+
+ public String getMouseOverStyleName() {
+ return this.mouseOverStyleName;
+ }
+
+ public void setMouseOverStyleName(String mouseOverStyleName) {
+ this.mouseOverStyleName = mouseOverStyleName;
+ }
+
+ public String getMouseOutStyleName() {
+ return this.mouseOutStyleName;
+ }
+
+ public void setMouseOutStyleName(String mouseOutStyleName) {
+ this.mouseOutStyleName = mouseOutStyleName;
+ }
+
+ @Override
+ public String toString() {
+ return super.toString() + "[" + getContents() + " -> ?]";
+ }
+
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/ViewLink.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/ViewLink.java
index 459c4d9..5446a8c 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/ViewLink.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/ViewLink.java
@@ -34,77 +34,23 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHTMLFlow;
*
* @author Ian Springer
*/
-public class ViewLink extends LocatableHTMLFlow {
-
- private static final String DEFAULT_MOUSE_OUT_STYLE_NAME = "viewLink";
- private static final String DEFAULT_MOUSE_OVER_STYLE_NAME = "viewLinkHover";
+public class ViewLink extends Link {
private String viewPath;
- private String mouseOverStyleName;
- private String mouseOutStyleName;
public ViewLink(String locatorId, String linkText, final String viewPath) {
- super(locatorId);
-
- this.viewPath = viewPath;
- this.mouseOutStyleName = DEFAULT_MOUSE_OUT_STYLE_NAME;
- this.mouseOverStyleName = DEFAULT_MOUSE_OVER_STYLE_NAME;
-
- setWidth100();
- setHeight(25);
- setContents(linkText);
-
- addClickHandler(new ClickHandler() {
+ super(locatorId, linkText, new ClickHandler() {
public void onClick(ClickEvent event) {
CoreGUI.goToView(viewPath);
}
});
- addMouseOverHandler(new MouseOverHandler() {
- public void onMouseOver(MouseOverEvent event) {
- if (mouseOutStyleName != null && mouseOverStyleName != null) {
- setStyleName(mouseOverStyleName);
- markForRedraw();
- }
- }
- });
-
- addMouseOutHandler(new MouseOutHandler() {
- public void onMouseOut(MouseOutEvent event) {
- if (mouseOutStyleName != null && mouseOverStyleName != null) {
- setStyleName(mouseOutStyleName);
- markForRedraw();
- }
- }
- });
- }
-
- @Override
- protected void onInit() {
- super.onInit();
-
- setStyleName(getMouseOutStyleName());
- }
-
- public String getMouseOverStyleName() {
- return this.mouseOverStyleName;
- }
-
- public void setMouseOverStyleName(String mouseOverStyleName) {
- this.mouseOverStyleName = mouseOverStyleName;
- }
-
- public String getMouseOutStyleName() {
- return this.mouseOutStyleName;
- }
-
- public void setMouseOutStyleName(String mouseOutStyleName) {
- this.mouseOutStyleName = mouseOutStyleName;
+ this.viewPath = viewPath;
}
@Override
public String toString() {
- return super.toString() + "[" + getContents() + " -> " + this.viewPath + "]";
+ return getClass().getName() + "[" + getContents() + " -> " + this.viewPath + "]";
}
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/CanvasField.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/CanvasField.java
new file mode 100644
index 0000000..b28e51f
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/CanvasField.java
@@ -0,0 +1,89 @@
+/*
+ * RHQ Management Platform
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.enterprise.gui.coregui.client.components.table;
+
+import com.google.gwt.core.client.JavaScriptObject;
+import com.smartgwt.client.types.Overflow;
+import com.smartgwt.client.widgets.Canvas;
+import com.smartgwt.client.widgets.grid.ListGrid;
+import com.smartgwt.client.widgets.grid.ListGridField;
+import com.smartgwt.client.widgets.grid.ListGridRecord;
+import com.smartgwt.client.widgets.layout.HLayout;
+
+/**
+ * Formats a cell value as a SmartGWT canvas.
+ */
+public abstract class CanvasField extends ListGridField {
+
+ protected CanvasField() {
+ }
+
+ protected CanvasField(JavaScriptObject jsObj) {
+ super(jsObj);
+ }
+
+ protected CanvasField(String name) {
+ super(name);
+ }
+
+ protected CanvasField(String name, int width) {
+ super(name, width);
+ }
+
+ protected CanvasField(String name, String title) {
+ super(name, title);
+ }
+
+ protected CanvasField(String name, String title, int width) {
+ super(name, title, width);
+ }
+
+ protected CanvasField(ListGridField field) {
+ super(field.getName(), field.getTitle());
+
+ setWidth(field.getWidth());
+ // TODO: clone other commonly used fields
+ }
+
+ /**
+ * TODO
+ *
+ * @param grid
+ * @param record
+ * @return
+ */
+ protected abstract Canvas createCanvas(ListGrid grid, ListGridRecord record);
+
+ protected HLayout createHLayout(ListGrid grid) {
+ HLayout component = new HLayout();
+ component.setWidth100();
+ // TODO: is this the best way to deal w/ height?
+ component.setHeight(25);
+ component.setMargin(grid.getCellPadding());
+ component.setOverflow(Overflow.HIDDEN);
+ return component;
+ }
+
+ @Override
+ public String toString() {
+ return getClass().getName() + "[name=" + getName() + ", title=" + getTitle() + "]";
+ }
+
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/EnhancedListGrid.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/EnhancedListGrid.java
new file mode 100644
index 0000000..b383443
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/EnhancedListGrid.java
@@ -0,0 +1,85 @@
+/*
+ * RHQ Management Platform
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.enterprise.gui.coregui.client.components.table;
+
+import com.smartgwt.client.widgets.Canvas;
+import com.smartgwt.client.widgets.grid.CellFormatter;
+import com.smartgwt.client.widgets.grid.ListGridField;
+import com.smartgwt.client.widgets.grid.ListGridRecord;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableListGrid;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * A subclass of ListGrid that provides generic enhancements.
+ *
+ * @author Ian Springer
+ */
+public class EnhancedListGrid extends LocatableListGrid {
+
+ private Map<String, ListGridField> originalFields;
+
+ public EnhancedListGrid(String locatorId) {
+ super(locatorId);
+ }
+
+ @Override
+ public void setFields(ListGridField... fields) {
+ super.setFields(fields);
+
+ this.originalFields = new HashMap<String, ListGridField>();
+ if (fields != null) {
+ for (ListGridField field : fields) {
+ this.originalFields.put(field.getName(), field);
+ if (field instanceof CanvasField) {
+ setShowRecordComponents(true);
+ setShowRecordComponentsByCell(true);
+ // This is a workaround for a SmartGWT bug.
+ field.setCellFormatter(new CellFormatter() {
+ public String format(Object value, ListGridRecord record, int rowNum, int colNum) {
+ return "";
+ }
+ });
+ }
+ }
+ }
+ }
+
+ /**
+ * @see CanvasField
+ */
+ @Override
+ protected Canvas createRecordComponent(ListGridRecord record, Integer colNum) {
+ if (getShowRecordComponents() != null && !getShowRecordComponents()) {
+ return null;
+ }
+
+ ListGridField field = getField(colNum);
+ ListGridField originalField = this.originalFields.get(field.getName());
+ if (originalField instanceof CanvasField) {
+ CanvasField canvasField = (CanvasField)originalField;
+ return canvasField.createCanvas(this, record);
+ } else {
+ return null;
+ }
+ }
+
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/EscapedHtmlCellFormatter.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/EscapedHtmlCellFormatter.java
index c60236c..a441a50 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/EscapedHtmlCellFormatter.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/EscapedHtmlCellFormatter.java
@@ -1,3 +1,22 @@
+/*
+ * RHQ Management Platform
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
package org.rhq.enterprise.gui.coregui.client.components.table;
import com.smartgwt.client.widgets.grid.CellFormatter;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java
index c15cb4f..dbc318c 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java
@@ -106,7 +106,7 @@ public class Table<DS extends RPCDataSource> extends LocatableHLayout implements
private Canvas titleComponent;
private TableFilter filterForm;
- private ListGrid listGrid;
+ private EnhancedListGrid listGrid;
private Label tableInfo;
private List<String> headerIcons = new ArrayList<String>();
@@ -273,8 +273,8 @@ public class Table<DS extends RPCDataSource> extends LocatableHLayout implements
contents.addMember(listGrid);
}
- protected LocatableListGrid createListGrid(String locatorId) {
- return new LocatableListGrid(locatorId);
+ protected EnhancedListGrid createListGrid(String locatorId) {
+ return new EnhancedListGrid(locatorId);
}
protected SelectionStyle getDefaultSelectionStyle() {
@@ -671,7 +671,7 @@ public class Table<DS extends RPCDataSource> extends LocatableHLayout implements
this.dataSource = dataSource;
}
- public ListGrid getListGrid() {
+ public EnhancedListGrid getListGrid() {
return listGrid;
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/TableSection.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/TableSection.java
index 49ca4b8..4b49302 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/TableSection.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/TableSection.java
@@ -37,6 +37,7 @@ import com.smartgwt.client.widgets.grid.CellFormatter;
import com.smartgwt.client.widgets.grid.ListGrid;
import com.smartgwt.client.widgets.grid.ListGridField;
import com.smartgwt.client.widgets.grid.ListGridRecord;
+import com.smartgwt.client.widgets.layout.HLayout;
import com.smartgwt.client.widgets.layout.Layout;
import com.smartgwt.client.widgets.layout.VLayout;
@@ -48,8 +49,6 @@ import org.rhq.enterprise.gui.coregui.client.components.ViewLink;
import org.rhq.enterprise.gui.coregui.client.components.buttons.BackButton;
import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
import org.rhq.enterprise.gui.coregui.client.util.StringUtility;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHLayout;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableListGrid;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
@@ -142,11 +141,25 @@ public abstract class TableSection<DS extends RPCDataSource> extends Table<DS> i
ListGridField field = (grid != null) ? grid.getField(getDetailsLinkColumnName()) : null;
if (field != null) {
//field.setCellFormatter(getDetailsLinkColumnCellFormatter());
- field.setCellFormatter(new CellFormatter() {
- public String format(Object value, ListGridRecord record, int rowNum, int colNum) {
- return "";
+
+ CanvasField canvasField = new CanvasField(field) {
+ protected Canvas createCanvas(ListGrid grid, ListGridRecord record) {
+ HLayout hLayout = createHLayout(grid);
+ Integer recordId = getId(record);
+ String detailsViewPath = getBasePath() + "/" + recordId;
+ String recordValue = record.getAttribute(getDetailsLinkColumnName());
+ String formattedValue = (escapeHtmlInDetailsLinkColumn) ? StringUtility.escapeHtml(recordValue.toString())
+ : recordValue.toString();
+ ViewLink viewLink = new ViewLink(extendLocatorId("ViewLink"), formattedValue, detailsViewPath);
+ hLayout.addMember(viewLink);
+ return hLayout;
}
- });
+ };
+
+ int fieldIndex = grid.getFieldNum(field.getName());
+ ListGridField[] fields = grid.getFields();
+ fields[fieldIndex] = canvasField;
+ grid.setFields(fields);
}
setListGridDoubleClickHandler(new DoubleClickHandler() {
@@ -397,43 +410,4 @@ public abstract class TableSection<DS extends RPCDataSource> extends Table<DS> i
}
}
- @Override
- protected LocatableListGrid createListGrid(String locatorId) {
- return new TableSectionListGrid(locatorId);
- }
-
- class TableSectionListGrid extends LocatableListGrid {
- public TableSectionListGrid(String locatorId) {
- super(locatorId);
-
- if (isDetailsEnabled() && getDetailsLinkColumnName() != null) {
- setShowRecordComponents(true);
- setShowRecordComponentsByCell(true);
- }
- }
-
- @Override
- protected Canvas createRecordComponent(ListGridRecord record, Integer colNum) {
- Layout component;
- String fieldName = this.getFieldName(colNum);
- if (fieldName.equals(getDetailsLinkColumnName())) {
- component = new LocatableHLayout(extendLocatorId(fieldName + getRecordIndex(record)));
- component.setWidth100();
- component.setHeight(25);
- component.setMargin(getCellPadding());
- component.setOverflow(Overflow.HIDDEN);
- Integer recordId = getId(record);
- String detailsViewPath = getBasePath() + "/" + recordId;
- String recordValue = record.getAttribute(getDetailsLinkColumnName());
- String formattedValue = (escapeHtmlInDetailsLinkColumn) ? StringUtility.escapeHtml(recordValue.toString())
- : recordValue.toString();
- ViewLink viewLink = new ViewLink(extendLocatorId("ViewLink"), formattedValue, detailsViewPath);
- component.addMember(viewLink);
- } else {
- component = null;
- }
- return component;
- }
- }
-
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/ViewLinkField.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/ViewLinkField.java
new file mode 100644
index 0000000..b91d48c
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/ViewLinkField.java
@@ -0,0 +1,54 @@
+package org.rhq.enterprise.gui.coregui.client.components.table;
+
+import com.google.gwt.core.client.JavaScriptObject;
+import com.smartgwt.client.widgets.Canvas;
+import com.smartgwt.client.widgets.grid.ListGrid;
+import com.smartgwt.client.widgets.grid.ListGridField;
+import com.smartgwt.client.widgets.grid.ListGridRecord;
+import com.smartgwt.client.widgets.layout.HLayout;
+import org.rhq.enterprise.gui.coregui.client.components.ViewLink;
+
+/**
+ * @author Ian Springer
+ */
+public abstract class ViewLinkField extends CanvasField {
+
+ protected ViewLinkField() {
+ super();
+ }
+
+ protected ViewLinkField(JavaScriptObject jsObj) {
+ super(jsObj);
+ }
+
+ protected ViewLinkField(String name) {
+ super(name);
+ }
+
+ protected ViewLinkField(String name, int width) {
+ super(name, width);
+ }
+
+ protected ViewLinkField(String name, String title) {
+ super(name, title);
+ }
+
+ protected ViewLinkField(String name, String title, int width) {
+ super(name, title, width);
+ }
+
+ @Override
+ protected Canvas createCanvas(ListGrid grid, ListGridRecord record) {
+ HLayout hLayout = createHLayout(grid);
+ ViewLink viewLink = getViewLink(grid, record);
+ hLayout.addMember(viewLink);
+ return hLayout;
+ }
+
+ protected abstract ViewLink getViewLink(ListGrid grid, ListGridRecord record);
+
+ protected ViewLinkField(ListGridField field) {
+ super(field);
+ }
+
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tagging/TagEditorView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tagging/TagEditorView.java
index ac289a2..2f31612 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tagging/TagEditorView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tagging/TagEditorView.java
@@ -51,7 +51,9 @@ import org.rhq.core.domain.util.PageList;
import org.rhq.core.domain.util.PageOrdering;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.LinkManager;
+import org.rhq.enterprise.gui.coregui.client.components.ViewLink;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
+import org.rhq.enterprise.gui.coregui.client.util.StringUtility;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDialog;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHLayout;
@@ -165,10 +167,9 @@ public class TagEditorView extends LocatableLayout {
tagLayout.setHeight(18);
tagLayout.setHeight(16);
- HTMLFlow tagString = new HTMLFlow("<a href=\"" + LinkManager.getTagLink(tag.toString()) + "\">"
- + tag.toString() + "</a>");
- tagString.setAutoWidth();
- tagLayout.addMember(tagString);
+ ViewLink viewLink = new ViewLink(tagLayout.extendLocatorId("ViewLink"),
+ StringUtility.escapeHtml(tag.toString()), LinkManager.getTagLink(tag.toString()));
+ tagLayout.addMember(viewLink);
if (!readOnly) {
final LayoutSpacer spacer = new LayoutSpacer();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformSummaryPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformSummaryPortlet.java
index 6f38d63..831993c 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformSummaryPortlet.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformSummaryPortlet.java
@@ -29,7 +29,7 @@ import com.smartgwt.client.types.Overflow;
import com.smartgwt.client.widgets.Canvas;
import com.smartgwt.client.widgets.HTMLFlow;
import com.smartgwt.client.widgets.Img;
-import com.smartgwt.client.widgets.grid.CellFormatter;
+import com.smartgwt.client.widgets.grid.ListGrid;
import com.smartgwt.client.widgets.grid.ListGridField;
import com.smartgwt.client.widgets.grid.ListGridRecord;
import com.smartgwt.client.widgets.layout.HLayout;
@@ -46,6 +46,8 @@ import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.LinkManager;
+import org.rhq.enterprise.gui.coregui.client.components.ViewLink;
+import org.rhq.enterprise.gui.coregui.client.components.table.ViewLinkField;
import org.rhq.enterprise.gui.coregui.client.components.view.ViewName;
import org.rhq.enterprise.gui.coregui.client.dashboard.Portlet;
import org.rhq.enterprise.gui.coregui.client.dashboard.PortletViewFactory;
@@ -55,6 +57,7 @@ import org.rhq.enterprise.gui.coregui.client.gwt.MeasurementDataGWTServiceAsync;
import org.rhq.enterprise.gui.coregui.client.gwt.ResourceTypeGWTServiceAsync;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField;
import org.rhq.enterprise.gui.coregui.client.util.MeasurementConverterClient;
+import org.rhq.enterprise.gui.coregui.client.util.StringUtility;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableListGrid;
/**
@@ -119,15 +122,14 @@ public class PlatformSummaryPortlet extends LocatableListGrid implements Portlet
}
private void buildUI() {
-
- ListGridField nameField = new ListGridField(ResourceDataSourceField.NAME.propertyName(), MSG
- .common_title_name());
- nameField.setCellFormatter(new CellFormatter() {
- public String format(Object o, ListGridRecord listGridRecord, int i, int i1) {
- return "<a href=\"" + LinkManager.getResourceLink(listGridRecord.getAttributeAsInt("id")) + "\">" + o
- + "</a>";
+ ViewLinkField nameField = new ViewLinkField(ResourceDataSourceField.NAME.propertyName(), MSG
+ .common_title_name()) {
+ protected ViewLink getViewLink(ListGrid grid, ListGridRecord record) {
+ String resourceUrl = LinkManager.getResourceLink(record.getAttributeAsInt("id"));
+ String linkText = StringUtility.escapeHtml(record.getAttribute(ResourceDataSourceField.NAME.propertyName()));
+ return new ViewLink(extendLocatorId("ViewLink"), linkText, resourceUrl);
}
- });
+ };
nameField.setWidth("20%");
setFields(nameField);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedResourcesPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedResourcesPortlet.java
index d6b61d2..91289ba 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedResourcesPortlet.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedResourcesPortlet.java
@@ -30,14 +30,18 @@ import com.smartgwt.client.widgets.form.DynamicForm;
import com.smartgwt.client.widgets.form.events.SubmitValuesEvent;
import com.smartgwt.client.widgets.form.events.SubmitValuesHandler;
import com.smartgwt.client.widgets.form.fields.SelectItem;
-import com.smartgwt.client.widgets.grid.CellFormatter;
+import com.smartgwt.client.widgets.grid.ListGrid;
import com.smartgwt.client.widgets.grid.ListGridField;
import com.smartgwt.client.widgets.grid.ListGridRecord;
+import com.smartgwt.client.widgets.layout.HLayout;
import com.smartgwt.client.widgets.tree.TreeGrid;
import org.rhq.core.domain.configuration.PropertySimple;
import org.rhq.core.domain.dashboard.DashboardPortlet;
+import org.rhq.enterprise.gui.coregui.client.LinkManager;
import org.rhq.enterprise.gui.coregui.client.components.HeaderLabel;
+import org.rhq.enterprise.gui.coregui.client.components.ViewLink;
+import org.rhq.enterprise.gui.coregui.client.components.table.CanvasField;
import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter;
import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet;
import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortletUtil;
@@ -45,6 +49,7 @@ import org.rhq.enterprise.gui.coregui.client.dashboard.CustomSettingsPortlet;
import org.rhq.enterprise.gui.coregui.client.dashboard.Portlet;
import org.rhq.enterprise.gui.coregui.client.dashboard.PortletViewFactory;
import org.rhq.enterprise.gui.coregui.client.dashboard.PortletWindow;
+import org.rhq.enterprise.gui.coregui.client.util.StringUtility;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
public class RecentlyAddedResourcesPortlet extends LocatableVLayout implements CustomSettingsPortlet,
@@ -87,13 +92,18 @@ public class RecentlyAddedResourcesPortlet extends LocatableVLayout implements C
treeGrid.setResizeFieldsInRealTime(true);
treeGrid.setTreeFieldTitle("Resource Name");
- ListGridField resourceNameField = new ListGridField("name", MSG.common_title_resource_name());
-
- resourceNameField.setCellFormatter(new CellFormatter() {
- public String format(Object o, ListGridRecord listGridRecord, int i, int i1) {
- return "<a href=\"#Resource/" + listGridRecord.getAttribute("id") + "\">" + String.valueOf(o) + "</a>";
+ CanvasField resourceNameField = new CanvasField("name", MSG.common_title_resource_name()) {
+ protected Canvas createCanvas(ListGrid grid, ListGridRecord record) {
+ HLayout hLayout = createHLayout(grid);
+ int resourceId = record.getAttributeAsInt("id");
+ String resourceName = record.getAttribute("name");
+ String resourceViewPath = LinkManager.getResourceLink(resourceId);
+ ViewLink viewLink = new ViewLink(extendLocatorId("ViewLink"), StringUtility.escapeHtml(resourceName),
+ resourceViewPath);
+ hLayout.addMember(viewLink);
+ return hLayout;
}
- });
+ };
ListGridField timestampField = new ListGridField("timestamp", MSG.common_title_timestamp());
TimestampCellFormatter.prepareDateField(timestampField);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java
index 10daf03..3d2c15d 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java
@@ -54,7 +54,6 @@ import com.smartgwt.client.widgets.form.fields.events.ChangedEvent;
import com.smartgwt.client.widgets.form.fields.events.ChangedHandler;
import com.smartgwt.client.widgets.form.fields.events.FormItemClickHandler;
import com.smartgwt.client.widgets.form.fields.events.FormItemIconClickEvent;
-import com.smartgwt.client.widgets.grid.CellFormatter;
import com.smartgwt.client.widgets.grid.HoverCustomizer;
import com.smartgwt.client.widgets.grid.ListGrid;
import com.smartgwt.client.widgets.grid.ListGridField;
@@ -73,8 +72,10 @@ import org.rhq.enterprise.gui.coregui.client.LinkManager;
import org.rhq.enterprise.gui.coregui.client.PermissionsLoadedListener;
import org.rhq.enterprise.gui.coregui.client.PermissionsLoader;
import org.rhq.enterprise.gui.coregui.client.ViewPath;
+import org.rhq.enterprise.gui.coregui.client.components.ViewLink;
import org.rhq.enterprise.gui.coregui.client.components.table.EscapedHtmlCellFormatter;
import org.rhq.enterprise.gui.coregui.client.components.table.Table;
+import org.rhq.enterprise.gui.coregui.client.components.table.ViewLinkField;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupsDataSource;
import org.rhq.enterprise.gui.coregui.client.inventory.groups.definitions.GroupDefinitionExpressionBuilder.AddExpressionHandler;
@@ -249,16 +250,14 @@ public class SingleGroupDefinitionView extends LocatableVLayout implements Bookm
idField.setType(ListGridFieldType.INTEGER);
idField.setWidth("50");
- ListGridField nameField = new ListGridField(NAME.propertyName(), NAME.title());
- nameField.setWidth("*");
- nameField.setCellFormatter(new CellFormatter() {
- @Override
- public String format(Object value, ListGridRecord record, int rowNum, int colNum) {
- String linkName = record.getAttributeAsString(NAME.propertyName());
+ ViewLinkField nameField = new ViewLinkField(NAME.propertyName(), NAME.title()) {
+ protected ViewLink getViewLink(ListGrid grid, ListGridRecord record) {
+ String linkName = StringUtility.escapeHtml(record.getAttributeAsString(NAME.propertyName()));
String linkUrl = LinkManager.getResourceGroupLink(record.getAttributeAsInt("id"));
- return "<a href=\"" + linkUrl + "\">" + StringUtility.escapeHtml(linkName) + "</a>";
+ return new ViewLink(extendLocatorId("ViewLink"), linkName, linkUrl);
}
- });
+ };
+ nameField.setWidth("*");
ListGridField descriptionField = new ListGridField(DESCRIPTION.propertyName(), DESCRIPTION.title());
descriptionField.setWidth("300");
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/GeneralProperties.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/GeneralProperties.java
index 045c1ef..fc7486a 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/GeneralProperties.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/GeneralProperties.java
@@ -24,6 +24,7 @@ import java.util.List;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.types.Alignment;
import com.smartgwt.client.widgets.HTMLFlow;
+import com.smartgwt.client.widgets.form.fields.CanvasItem;
import com.smartgwt.client.widgets.form.fields.FormItem;
import com.smartgwt.client.widgets.form.fields.StaticTextItem;
import com.smartgwt.client.widgets.layout.HLayout;
@@ -34,6 +35,7 @@ import org.rhq.core.domain.resource.group.ResourceGroup;
import org.rhq.core.domain.resource.group.composite.ResourceGroupComposite;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.LinkManager;
+import org.rhq.enterprise.gui.coregui.client.components.ViewLink;
import org.rhq.enterprise.gui.coregui.client.components.form.CheckboxEditableFormItem;
import org.rhq.enterprise.gui.coregui.client.components.form.EditableFormItem;
import org.rhq.enterprise.gui.coregui.client.components.form.EnhancedDynamicForm;
@@ -237,12 +239,13 @@ public class GeneralProperties extends LocatableVLayout {
formItems.add(lastModifiedByItem);
if (isDynaGroup) {
- StaticTextItem groupDefinitionItem = new StaticTextItem("groupDefinition", MSG
+ CanvasItem groupDefinitionItem = new CanvasItem("groupDefinition", MSG
.view_group_summary_groupDefinition());
GroupDefinition groupDefinition = group.getGroupDefinition();
String groupDefinitionUrl = LinkManager.getGroupDefinitionLink(groupDefinition.getId());
String groupDefinitionName = StringUtility.escapeHtml(groupDefinition.getName());
- groupDefinitionItem.setValue("<a href=\"" + groupDefinitionUrl + "\">" + groupDefinitionName + "</a>");
+ ViewLink viewLink = new ViewLink(extendLocatorId("ViewLink"), groupDefinitionName, groupDefinitionUrl);
+ groupDefinitionItem.setCanvas(viewLink);
formItems.add(groupDefinitionItem);
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/AncestryUtil.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/AncestryUtil.java
index 50fe917..b451c0e 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/AncestryUtil.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/AncestryUtil.java
@@ -58,12 +58,12 @@ public abstract class AncestryUtil {
private static final String TITLE_PLATFORM = CoreGUI.getMessages().common_title_platform() + ": ";
/**
- * Convienence method that creates a standard ancestry ListGridField.
+ * Convenience method that creates a standard ancestry ListGridField.
+ *
* @return ancestry field
*/
public static ListGridField setupAncestryListGridField() {
- ListGridField ancestryField;
- ancestryField = new ListGridField(AncestryUtil.RESOURCE_ANCESTRY, CoreGUI.getMessages().common_title_ancestry());
+ ListGridField ancestryField = new ListGridField(AncestryUtil.RESOURCE_ANCESTRY, CoreGUI.getMessages().common_title_ancestry());
ancestryField.setAlign(Alignment.LEFT);
ancestryField.setCellAlign(Alignment.LEFT);
setupAncestryListGridFieldCellFormatter(ancestryField);
@@ -72,7 +72,7 @@ public abstract class AncestryUtil {
}
/**
- * Convienence method that creates a standard ancestry ListGridField where the field already exists
+ * Convenience method that creates a standard ancestry ListGridField where the field already exists
* in the given list grid.
*
* @return ancestry field
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDetailsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDetailsView.java
index 6c21b83..b94f59b 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDetailsView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDetailsView.java
@@ -23,10 +23,13 @@ import java.util.List;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.widgets.Canvas;
+import com.smartgwt.client.widgets.HTMLFlow;
import com.smartgwt.client.widgets.Label;
+import com.smartgwt.client.widgets.form.fields.CanvasItem;
import com.smartgwt.client.widgets.form.fields.FormItem;
import com.smartgwt.client.widgets.form.fields.StaticTextItem;
+import com.smartgwt.client.widgets.layout.HLayout;
import org.rhq.core.domain.configuration.definition.ConfigurationDefinition;
import org.rhq.core.domain.criteria.ResourceOperationHistoryCriteria;
import org.rhq.core.domain.operation.GroupOperationHistory;
@@ -38,6 +41,7 @@ import org.rhq.core.domain.resource.composite.ResourceComposite;
import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.LinkManager;
+import org.rhq.enterprise.gui.coregui.client.components.ViewLink;
import org.rhq.enterprise.gui.coregui.client.components.configuration.ConfigurationEditor;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.operation.history.AbstractOperationHistoryDetailsView;
@@ -81,13 +85,17 @@ public class ResourceOperationHistoryDetailsView extends AbstractOperationHistor
GroupOperationHistory groupOperationHistory = operationHistory.getGroupOperationHistory();
if (groupOperationHistory != null) {
- StaticTextItem groupOperationHistoryItem = new StaticTextItem(
+ CanvasItem groupOperationHistoryItem = new CanvasItem(
ResourceOperationHistoryDataSource.Field.GROUP_OPERATION_HISTORY, "Parent Group Execution");
+ HLayout hLayout = new HLayout();
String groupOperationHistoryUrl = LinkManager.getGroupOperationHistoryLink(groupOperationHistory.getGroup()
.getId(), groupOperationHistory.getId());
- String value = "<a href=\"" + groupOperationHistoryUrl + "\">" + groupOperationHistory.getId()
- + "</a> (on group '" + groupOperationHistory.getGroup().getName() + "')";
- groupOperationHistoryItem.setValue(value);
+ ViewLink viewLink = new ViewLink(extendLocatorId("ViewLink"), String.valueOf(groupOperationHistory.getId()),
+ groupOperationHistoryUrl);
+ hLayout.addMember(viewLink);
+ HTMLFlow html = new HTMLFlow("(on group '" + groupOperationHistory.getGroup().getName() + "')");
+ hLayout.addMember(html);
+ groupOperationHistoryItem.setCanvas(hLayout);
items.add(groupOperationHistoryItem);
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java
index 6ec69f5..70fdc4c 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java
@@ -29,8 +29,6 @@ import com.smartgwt.client.widgets.Img;
import com.smartgwt.client.widgets.events.ClickEvent;
import com.smartgwt.client.widgets.events.ClickHandler;
import com.smartgwt.client.widgets.layout.HLayout;
-import com.smartgwt.client.widgets.layout.Layout;
-import com.smartgwt.client.widgets.layout.VLayout;
import com.smartgwt.client.widgets.toolbar.ToolStrip;
import org.rhq.enterprise.gui.coregui.client.UserSessionManager;
@@ -43,7 +41,6 @@ import org.rhq.enterprise.gui.coregui.client.dashboard.DashboardsView;
import org.rhq.enterprise.gui.coregui.client.help.HelpView;
import org.rhq.enterprise.gui.coregui.client.inventory.InventoryView;
import org.rhq.enterprise.gui.coregui.client.report.ReportTopView;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHLayout;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHStack;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableLabel;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/AlertDefinitionReportView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/AlertDefinitionReportView.java
index cb5f03f..23c6546 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/AlertDefinitionReportView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/AlertDefinitionReportView.java
@@ -11,16 +11,18 @@ import com.smartgwt.client.data.DSResponse;
import com.smartgwt.client.data.DataSourceField;
import com.smartgwt.client.data.Record;
import com.smartgwt.client.data.fields.DataSourceTextField;
+import com.smartgwt.client.widgets.Canvas;
+import com.smartgwt.client.widgets.HTMLFlow;
+import com.smartgwt.client.widgets.events.ClickEvent;
+import com.smartgwt.client.widgets.events.ClickHandler;
import com.smartgwt.client.widgets.events.DoubleClickEvent;
import com.smartgwt.client.widgets.events.DoubleClickHandler;
-import com.smartgwt.client.widgets.grid.CellFormatter;
import com.smartgwt.client.widgets.grid.HoverCustomizer;
import com.smartgwt.client.widgets.grid.ListGrid;
import com.smartgwt.client.widgets.grid.ListGridField;
import com.smartgwt.client.widgets.grid.ListGridRecord;
-import com.smartgwt.client.widgets.grid.events.RecordClickEvent;
-import com.smartgwt.client.widgets.grid.events.RecordClickHandler;
+import com.smartgwt.client.widgets.layout.HLayout;
import org.rhq.core.domain.alert.AlertDefinition;
import org.rhq.core.domain.criteria.AlertDefinitionCriteria;
import org.rhq.core.domain.criteria.ResourceCriteria;
@@ -31,6 +33,9 @@ import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.LinkManager;
import org.rhq.enterprise.gui.coregui.client.alert.definitions.AbstractAlertDefinitionsDataSource;
+import org.rhq.enterprise.gui.coregui.client.components.Link;
+import org.rhq.enterprise.gui.coregui.client.components.ViewLink;
+import org.rhq.enterprise.gui.coregui.client.components.table.CanvasField;
import org.rhq.enterprise.gui.coregui.client.components.table.Table;
import org.rhq.enterprise.gui.coregui.client.components.view.ViewName;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
@@ -38,7 +43,6 @@ import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository.TypesLoadedCallback;
import org.rhq.enterprise.gui.coregui.client.util.StringUtility;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/**
* A tabular report that shows alert definitions on all resources in inventory.
@@ -117,30 +121,103 @@ public class AlertDefinitionReportView extends Table<AlertDefinitionReportView.D
// hide the created/modified fields, we don't need to show them by default
// add cell formatter on the name field so we can make it a link
- for (ListGridField field : fields) {
+ for (int i = 0, fieldsSize = fields.size(); i < fieldsSize; i++) {
+ ListGridField field = fields.get(i);
String fieldName = field.getName();
if (fieldName.equals(FIELD_CTIME) || fieldName.equals(FIELD_MTIME)) {
field.setHidden(true);
} else if (fieldName.equals(FIELD_NAME)) {
- field.setCellFormatter(new CellFormatter() {
- @Override
- public String format(Object value, ListGridRecord record, int rowNum, int colNum) {
+ CanvasField canvasField = new CanvasField(field) {
+ protected Canvas createCanvas(ListGrid grid, ListGridRecord record) {
+ HLayout hLayout = createHLayout(grid);
AlertDefinition alertDef = copyValues(record);
int resourceId = alertDef.getResource().getId();
int alertDefId = alertDef.getId();
String link = LinkManager.getSubsystemAlertDefinitionLink(resourceId, alertDefId);
- return "<a href=\"" + link + "\">" + StringUtility.escapeHtml(alertDef.getName()) + "</a>";
+ ViewLink viewLink = new ViewLink(extendLocatorId("ViewLink"),
+ StringUtility.escapeHtml(alertDef.getName()), link);
+ hLayout.addMember(viewLink);
+ return hLayout;
}
- });
+ };
+ fields.set(i, canvasField);
}
}
// add more columns
- ListGridField parentField = new ListGridField(FIELD_PARENT, MSG.view_alerts_field_parent());
- parentField.setWidth(100);
+ CanvasField parentField = new CanvasField(FIELD_PARENT, MSG.view_alerts_field_parent(), 100) {
+ protected Canvas createCanvas(ListGrid grid, final ListGridRecord record) {
+ HLayout hLayout = createHLayout(grid);
+
+ final AlertDefinition alertDef = copyValues(record);
+ boolean hasParent;
+ String linkText;
+ if (alertDef.getParentId() != null && alertDef.getParentId() > 0) {
+ // has a parent template alertdef
+ hasParent = true;
+ linkText = "Template Alert";
+ } else if (alertDef.getGroupAlertDefinition() != null) {
+ // has a parent group alertdef
+ hasParent = true;
+ linkText = "Group Alert";
+ } else {
+ hasParent = false;
+ linkText = null;
+ }
+ if (hasParent) {
+ // we only display a link if we really have a parent.
+ // if we have a template parent, we have to get the resource's type and go to the template page for that type
+ // if we have a group parent, we can directly go to the group's alert def page
+ Link link = new Link("Link", linkText, new ClickHandler() {
+ public void onClick(ClickEvent event) {
+ if (alertDef.getParentId() != null && alertDef.getParentId() > 0) {
+ // has a parent template alertdef
+ final Integer templateId = alertDef.getParentId();
+ final Integer resourceId = alertDef.getResource().getId();
+
+ ResourceCriteria resCriteria = new ResourceCriteria();
+ resCriteria.addFilterId(resourceId);
+ resCriteria.fetchResourceType(true);
+
+ GWTServiceLookup.getResourceService().findResourcesByCriteria(resCriteria,
+ new AsyncCallback<PageList<Resource>>() {
+ @Override
+ public void onSuccess(PageList<Resource> result) {
+ if (result == null || result.size() != 1) {
+ CoreGUI.getErrorHandler().handleError(
+ MSG.view_reports_alertDefinitions_resTypeLoadError());
+ } else {
+ int typeId = result.get(0).getResourceType().getId();
+ CoreGUI.goToView(LinkManager.getAdminTemplatesLink() + "/Alert/" + typeId + "/"
+ + templateId);
+ }
+ }
+
+ @Override
+ public void onFailure(Throwable caught) {
+ CoreGUI.getErrorHandler().handleError(
+ MSG.view_reports_alertDefinitions_resTypeLoadError(), caught);
+ }
+ });
+
+ } else if (alertDef.getGroupAlertDefinition() != null) {
+ // has a parent group alertdef
+ AlertDefinition groupAlertDef = alertDef.getGroupAlertDefinition();
+ CoreGUI.goToView(LinkManager.getResourceGroupLink(groupAlertDef.getResourceGroup().getId())
+ + "/Alerts/Definitions/" + groupAlertDef.getId());
+ }
+ }
+ });
+ hLayout.addMember(link);
+ } else {
+ hLayout.addMember(new HTMLFlow(MSG.common_val_na()));
+ }
+
+ return hLayout;
+ }
+ };
parentField.setShowHover(true);
parentField.setHoverCustomizer(new HoverCustomizer() {
- @Override
public String hoverHTML(Object value, ListGridRecord record, int rowNum, int colNum) {
if (record.getAttribute(FIELD_PARENT) != null) {
return MSG.view_reports_alertDefinitions_parentHover();
@@ -148,59 +225,20 @@ public class AlertDefinitionReportView extends Table<AlertDefinitionReportView.D
return MSG.common_val_na();
}
});
- parentField.addRecordClickHandler(new RecordClickHandler() {
- @Override
- public void onRecordClick(RecordClickEvent event) {
- // we only do something if we really have a parent.
- // if we have a template parent, we have to get the resource's type and go to the template page for that type
- // if we have a group parent, we can directly go to the group's alert def page
- Record record = event.getRecord();
- AlertDefinition alertDef = copyValues(record);
- if (alertDef.getParentId() != null && alertDef.getParentId().intValue() > 0) {
- final Integer templateId = alertDef.getParentId().intValue();
- final Integer resourceId = alertDef.getResource().getId();
-
- ResourceCriteria resCriteria = new ResourceCriteria();
- resCriteria.addFilterId(resourceId);
- resCriteria.fetchResourceType(true);
-
- GWTServiceLookup.getResourceService().findResourcesByCriteria(resCriteria,
- new AsyncCallback<PageList<Resource>>() {
- @Override
- public void onSuccess(PageList<Resource> result) {
- if (result == null || result.size() != 1) {
- CoreGUI.getErrorHandler().handleError(
- MSG.view_reports_alertDefinitions_resTypeLoadError());
- } else {
- int typeId = result.get(0).getResourceType().getId();
- CoreGUI.goToView(LinkManager.getAdminTemplatesLink() + "/Alert/" + typeId + "/"
- + templateId);
- }
- }
-
- @Override
- public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError(
- MSG.view_reports_alertDefinitions_resTypeLoadError(), caught);
- }
- });
- } else if (alertDef.getGroupAlertDefinition() != null) {
- AlertDefinition groupAlertDef = alertDef.getGroupAlertDefinition();
- CoreGUI.goToView(LinkManager.getResourceGroupLink(groupAlertDef.getResourceGroup().getId())
- + "/Alerts/Definitions/" + groupAlertDef.getId());
- }
- }
- });
fields.add(parentField);
- ListGridField resourceField = new ListGridField(FIELD_RESOURCE, MSG.common_title_resource());
- resourceField.setCellFormatter(new CellFormatter() {
- public String format(Object value, ListGridRecord listGridRecord, int i, int i1) {
- String url = LinkManager
- .getResourceLink(listGridRecord.getAttributeAsInt(AncestryUtil.RESOURCE_ID));
- return SeleniumUtility.getLocatableHref(url, StringUtility.escapeHtml(value.toString()), null);
+ CanvasField resourceField = new CanvasField(FIELD_RESOURCE, MSG.common_title_resource()) {
+ protected Canvas createCanvas(ListGrid grid, ListGridRecord record) {
+ HLayout hLayout = createHLayout(grid);
+ Integer resourceId = record.getAttributeAsInt(AncestryUtil.RESOURCE_ID);
+ String url = LinkManager.getResourceLink(resourceId);
+ String resourceName = record.getAttribute(FIELD_RESOURCE);
+ ViewLink viewLink = new ViewLink(extendLocatorId("ViewLink"),
+ StringUtility.escapeHtml(resourceName), url);
+ hLayout.addMember(viewLink);
+ return hLayout;
}
- });
+ };
resourceField.setShowHover(true);
resourceField.setHoverCustomizer(new HoverCustomizer() {
public String hoverHTML(Object value, ListGridRecord listGridRecord, int rowNum, int colNum) {
@@ -258,7 +296,7 @@ public class AlertDefinitionReportView extends Table<AlertDefinitionReportView.D
DataSourceField resourceField = new DataSourceTextField(FIELD_RESOURCE);
fields.add(resourceField);
- DataSourceField parentField = new DataSourceTextField(FIELD_RESOURCE);
+ DataSourceField parentField = new DataSourceTextField(FIELD_PARENT);
fields.add(parentField);
return fields;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ResourceInstallReport.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ResourceInstallReport.java
index f1fa548..caf8e8d 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ResourceInstallReport.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ResourceInstallReport.java
@@ -9,20 +9,24 @@ import com.smartgwt.client.data.DSRequest;
import com.smartgwt.client.data.DSResponse;
import com.smartgwt.client.data.Record;
import com.smartgwt.client.types.ListGridFieldType;
+import com.smartgwt.client.widgets.Canvas;
+import com.smartgwt.client.widgets.HTMLFlow;
import com.smartgwt.client.widgets.events.DoubleClickEvent;
import com.smartgwt.client.widgets.events.DoubleClickHandler;
-import com.smartgwt.client.widgets.grid.CellFormatter;
import com.smartgwt.client.widgets.grid.HoverCustomizer;
import com.smartgwt.client.widgets.grid.ListGrid;
import com.smartgwt.client.widgets.grid.ListGridField;
import com.smartgwt.client.widgets.grid.ListGridRecord;
+import com.smartgwt.client.widgets.layout.HLayout;
import org.rhq.core.domain.resource.ResourceCategory;
import org.rhq.core.domain.resource.composite.ResourceInstallCount;
import org.rhq.enterprise.gui.coregui.client.BookmarkableView;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.ImageManager;
import org.rhq.enterprise.gui.coregui.client.ViewPath;
+import org.rhq.enterprise.gui.coregui.client.components.ViewLink;
+import org.rhq.enterprise.gui.coregui.client.components.table.CanvasField;
import org.rhq.enterprise.gui.coregui.client.components.table.Table;
import org.rhq.enterprise.gui.coregui.client.components.view.ViewName;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
@@ -30,6 +34,7 @@ import org.rhq.enterprise.gui.coregui.client.gwt.ResourceGWTServiceAsync;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceSearchView;
import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
+import org.rhq.enterprise.gui.coregui.client.util.StringUtility;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
/**
@@ -113,7 +118,21 @@ public class ResourceInstallReport extends LocatableVLayout implements Bookmarka
@Override
protected void configureTable() {
- ListGridField fieldTypeName = new ListGridField(DataSource.Field.TYPENAME, MSG.common_title_resource_type());
+ CanvasField fieldTypeName = new CanvasField(DataSource.Field.TYPENAME, MSG.common_title_resource_type()) {
+ protected Canvas createCanvas(ListGrid grid, ListGridRecord record) {
+ HLayout hLayout = createHLayout(grid);
+ String typeName = record.getAttribute(DataSource.Field.TYPENAME);
+ String url = getResourceTypeTableUrl(record);
+ if (url != null) {
+ ViewLink viewLink = new ViewLink(extendLocatorId("ViewLink"), typeName, url);
+ hLayout.addMember(viewLink);
+ } else {
+ HTMLFlow html = new HTMLFlow(typeName);
+ hLayout.addMember(html);
+ }
+ return hLayout;
+ }
+ };
ListGridField fieldPlugin = new ListGridField(DataSource.Field.TYPEPLUGIN, MSG.common_title_plugin());
ListGridField fieldCategory = new ListGridField(DataSource.Field.CATEGORY, MSG.common_title_category());
ListGridField fieldVersion = new ListGridField(DataSource.Field.VERSION, MSG.common_title_version());
@@ -125,18 +144,6 @@ public class ResourceInstallReport extends LocatableVLayout implements Bookmarka
fieldVersion.setWidth("*");
fieldCount.setWidth("10%");
- fieldTypeName.setCellFormatter(new CellFormatter() {
- @Override
- public String format(Object value, ListGridRecord record, int rowNum, int colNum) {
- String url = getResourceTypeTableUrl(record);
- if (url == null) {
- return value.toString();
- }
-
- return "<a href=\"" + url + "\">" + value + "</a>";
- }
- });
-
fieldCategory.setType(ListGridFieldType.ICON);
fieldCategory.setShowValueIconOnly(true);
HashMap<String, String> categoryIcons = new HashMap<String, String>(3);
@@ -165,8 +172,8 @@ public class ResourceInstallReport extends LocatableVLayout implements Bookmarka
@Override
public void onDoubleClick(DoubleClickEvent event) {
ListGrid lg = (ListGrid) event.getSource();
- ListGridRecord selected = lg.getSelectedRecord();
- String url = getResourceTypeTableUrl(selected);
+ ListGridRecord selectedRecord = lg.getSelectedRecord();
+ String url = getResourceTypeTableUrl(selectedRecord);
if (url != null) {
CoreGUI.goToView(url);
}
13 years
[rhq] Branch 'release-4.0.0-test-build' - modules/common modules/core modules/enterprise modules/helpers modules/plugins modules/pom.xml modules/test-utils pom.xml
by John Sanda
modules/common/ant-bundle/pom.xml | 2 +-
modules/common/filetemplate-bundle/pom.xml | 2 +-
modules/common/jboss-as/pom.xml | 2 +-
modules/common/pom.xml | 2 +-
modules/core/client-api/pom.xml | 2 +-
modules/core/comm-api/pom.xml | 2 +-
modules/core/dbutils/pom.xml | 2 +-
modules/core/domain/pom.xml | 2 +-
modules/core/gui/pom.xml | 2 +-
modules/core/native-system/pom.xml | 2 +-
modules/core/plugin-api/pom.xml | 2 +-
modules/core/plugin-container/pom.xml | 2 +-
modules/core/plugin-validator/pom.xml | 2 +-
modules/core/plugindoc/pom.xml | 2 +-
modules/core/pom.xml | 2 +-
modules/core/util/pom.xml | 2 +-
modules/enterprise/agent/pom.xml | 2 +-
modules/enterprise/agentupdate/pom.xml | 2 +-
modules/enterprise/binding/pom.xml | 4 ++--
modules/enterprise/comm/pom.xml | 2 +-
modules/enterprise/gui/base-perspective-jar/pom.xml | 2 +-
modules/enterprise/gui/base-perspective-war/pom.xml | 2 +-
modules/enterprise/gui/content_http-war/pom.xml | 2 +-
modules/enterprise/gui/coregui/pom.xml | 2 +-
modules/enterprise/gui/installer-war/pom.xml | 2 +-
modules/enterprise/gui/pom.xml | 2 +-
modules/enterprise/gui/portal-war/pom.xml | 2 +-
modules/enterprise/pom.xml | 2 +-
modules/enterprise/remoting/cli/pom.xml | 2 +-
modules/enterprise/remoting/client-api/pom.xml | 2 +-
modules/enterprise/remoting/client-deps/pom.xml | 2 +-
modules/enterprise/remoting/pom.xml | 2 +-
modules/enterprise/remoting/webservices/pom.xml | 2 +-
modules/enterprise/server/client-api/pom.xml | 4 ++--
modules/enterprise/server/container-lib/pom.xml | 2 +-
modules/enterprise/server/container/pom.xml | 2 +-
modules/enterprise/server/ear/pom.xml | 2 +-
modules/enterprise/server/jar/pom.xml | 2 +-
modules/enterprise/server/plugins/alert-cli/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-email/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-irc/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-log4j/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-microblog/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-mobicents/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-operations/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-roles/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-snmp/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-subject/pom.xml | 4 ++--
modules/enterprise/server/plugins/ant-bundle/pom.xml | 2 +-
modules/enterprise/server/plugins/cobbler/pom.xml | 4 ++--
modules/enterprise/server/plugins/disk/pom.xml | 2 +-
modules/enterprise/server/plugins/filetemplate-bundle/pom.xml | 2 +-
modules/enterprise/server/plugins/groovy-script/pom.xml | 4 ++--
modules/enterprise/server/plugins/jboss-software/pom.xml | 2 +-
modules/enterprise/server/plugins/packagetype-cli/pom.xml | 4 ++--
modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml | 2 +-
modules/enterprise/server/plugins/perspectives/core/pom.xml | 2 +-
modules/enterprise/server/plugins/pom.xml | 2 +-
modules/enterprise/server/plugins/rhnhosted/pom.xml | 2 +-
modules/enterprise/server/plugins/url/pom.xml | 2 +-
modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml | 2 +-
modules/enterprise/server/plugins/yum/pom.xml | 2 +-
modules/enterprise/server/safe-invoker/pom.xml | 2 +-
modules/enterprise/server/sars/agent-sar/pom.xml | 2 +-
modules/enterprise/server/sars/pom.xml | 2 +-
modules/enterprise/server/xml-schemas/pom.xml | 2 +-
modules/helpers/bundleGen/pom.xml | 4 ++--
modules/helpers/perftest-support/pom.xml | 4 ++--
modules/helpers/pom.xml | 2 +-
modules/helpers/rtfilter/pom.xml | 2 +-
modules/plugins/aliases/pom.xml | 2 +-
modules/plugins/ant-bundle/pom.xml | 2 +-
modules/plugins/apache/pom.xml | 2 +-
modules/plugins/augeas/pom.xml | 2 +-
modules/plugins/byteman/pom.xml | 2 +-
modules/plugins/cobbler/pom.xml | 2 +-
modules/plugins/cron/pom.xml | 2 +-
modules/plugins/database/pom.xml | 2 +-
modules/plugins/filetemplate-bundle/pom.xml | 2 +-
modules/plugins/grub/pom.xml | 2 +-
modules/plugins/hadoop/pom.xml | 2 +-
modules/plugins/hibernate/pom.xml | 2 +-
modules/plugins/hosts/pom.xml | 2 +-
modules/plugins/hudson/pom.xml | 4 ++--
modules/plugins/iis/pom.xml | 2 +-
modules/plugins/irc/pom.xml | 2 +-
modules/plugins/jboss-as-5/pom.xml | 2 +-
modules/plugins/jboss-as/pom.xml | 2 +-
modules/plugins/jboss-cache-v3/pom.xml | 2 +-
modules/plugins/jboss-cache/pom.xml | 2 +-
modules/plugins/jmx/pom.xml | 2 +-
modules/plugins/kickstart/pom.xml | 2 +-
modules/plugins/mysql/pom.xml | 2 +-
modules/plugins/netservices/pom.xml | 2 +-
modules/plugins/oracle/pom.xml | 2 +-
modules/plugins/pattern-generator/pom.xml | 2 +-
modules/plugins/perftest/pom.xml | 2 +-
modules/plugins/platform/pom.xml | 2 +-
modules/plugins/pom.xml | 2 +-
modules/plugins/postfix/pom.xml | 2 +-
modules/plugins/postgres/pom.xml | 2 +-
modules/plugins/rhq-agent/pom.xml | 2 +-
modules/plugins/rhq-server/pom.xml | 2 +-
modules/plugins/samba/pom.xml | 2 +-
modules/plugins/script/pom.xml | 2 +-
modules/plugins/script2/pom.xml | 2 +-
modules/plugins/snmptrapd/pom.xml | 2 +-
modules/plugins/sshd/pom.xml | 2 +-
modules/plugins/sudoers/pom.xml | 2 +-
modules/plugins/tomcat/pom.xml | 2 +-
modules/plugins/twitter/pom.xml | 2 +-
modules/plugins/validate-all-plugins/pom.xml | 2 +-
modules/plugins/virt/pom.xml | 2 +-
modules/pom.xml | 2 +-
modules/test-utils/pom.xml | 2 +-
pom.xml | 2 +-
116 files changed, 134 insertions(+), 134 deletions(-)
New commits:
commit 94e9024f1a5aa7066af101f909f70f922efef102
Author: John Sanda <jsanda(a)redhat.com>
Date: Wed Apr 27 16:47:51 2011 -0400
[maven-release-plugin] prepare for next development iteration
diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml
index 68376c1..313d189 100644
--- a/modules/common/ant-bundle/pom.xml
+++ b/modules/common/ant-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/common/filetemplate-bundle/pom.xml b/modules/common/filetemplate-bundle/pom.xml
index 8acf1a4..222403c 100644
--- a/modules/common/filetemplate-bundle/pom.xml
+++ b/modules/common/filetemplate-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml
index 5eb3908..4a6909b 100644
--- a/modules/common/jboss-as/pom.xml
+++ b/modules/common/jboss-as/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/common/pom.xml b/modules/common/pom.xml
index 74332c1..29fb134 100644
--- a/modules/common/pom.xml
+++ b/modules/common/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml
index 8d7f37f..a7f1999 100644
--- a/modules/core/client-api/pom.xml
+++ b/modules/core/client-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml
index 06d39ca..d988423 100644
--- a/modules/core/comm-api/pom.xml
+++ b/modules/core/comm-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
index d994b09..212dc11 100644
--- a/modules/core/dbutils/pom.xml
+++ b/modules/core/dbutils/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml
index 97987f8..d47458f 100644
--- a/modules/core/domain/pom.xml
+++ b/modules/core/domain/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml
index 621c9ed..b88e04b 100644
--- a/modules/core/gui/pom.xml
+++ b/modules/core/gui/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml
index 07892d2..8cacc8e 100644
--- a/modules/core/native-system/pom.xml
+++ b/modules/core/native-system/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml
index 1ceac2e..8f8382b 100644
--- a/modules/core/plugin-api/pom.xml
+++ b/modules/core/plugin-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml
index 5547cee..08f6c84 100644
--- a/modules/core/plugin-container/pom.xml
+++ b/modules/core/plugin-container/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml
index 19917da..bfedcf1 100644
--- a/modules/core/plugin-validator/pom.xml
+++ b/modules/core/plugin-validator/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/plugindoc/pom.xml b/modules/core/plugindoc/pom.xml
index 1c7801b..2c18207 100644
--- a/modules/core/plugindoc/pom.xml
+++ b/modules/core/plugindoc/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index d559f75..d22acdc 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml
index 7280bf5..136f9db 100644
--- a/modules/core/util/pom.xml
+++ b/modules/core/util/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml
index de7e58f..085042f 100644
--- a/modules/enterprise/agent/pom.xml
+++ b/modules/enterprise/agent/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml
index 6884431..be70655 100644
--- a/modules/enterprise/agentupdate/pom.xml
+++ b/modules/enterprise/agentupdate/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/binding/pom.xml b/modules/enterprise/binding/pom.xml
index 7e0bb1e..48bae2d 100644
--- a/modules/enterprise/binding/pom.xml
+++ b/modules/enterprise/binding/pom.xml
@@ -3,11 +3,11 @@
<parent>
<artifactId>rhq-enterprise-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-script-bindings</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
<name>RHQ Script Bindings</name>
<description>Abstraction of different facilities and default configurations for script bindings</description>
diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml
index 65c46ac..e03e8cb 100644
--- a/modules/enterprise/comm/pom.xml
+++ b/modules/enterprise/comm/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/base-perspective-jar/pom.xml b/modules/enterprise/gui/base-perspective-jar/pom.xml
index 6153758..3d0852a 100644
--- a/modules/enterprise/gui/base-perspective-jar/pom.xml
+++ b/modules/enterprise/gui/base-perspective-jar/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/base-perspective-war/pom.xml b/modules/enterprise/gui/base-perspective-war/pom.xml
index 3cdf696..d2fd85c 100644
--- a/modules/enterprise/gui/base-perspective-war/pom.xml
+++ b/modules/enterprise/gui/base-perspective-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/content_http-war/pom.xml b/modules/enterprise/gui/content_http-war/pom.xml
index 95d6d9a..e915555 100644
--- a/modules/enterprise/gui/content_http-war/pom.xml
+++ b/modules/enterprise/gui/content_http-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-gui-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml
index 919225f..0fe1bfb 100644
--- a/modules/enterprise/gui/coregui/pom.xml
+++ b/modules/enterprise/gui/coregui/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/installer-war/pom.xml b/modules/enterprise/gui/installer-war/pom.xml
index 2e73df5..8499b18 100644
--- a/modules/enterprise/gui/installer-war/pom.xml
+++ b/modules/enterprise/gui/installer-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml
index 3720ac0..f8ca5d2 100644
--- a/modules/enterprise/gui/pom.xml
+++ b/modules/enterprise/gui/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml
index b9091c9..b82ff6b 100644
--- a/modules/enterprise/gui/portal-war/pom.xml
+++ b/modules/enterprise/gui/portal-war/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml
index 550921e..d785c54 100644
--- a/modules/enterprise/pom.xml
+++ b/modules/enterprise/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml
index a9109cc..16ad01c 100644
--- a/modules/enterprise/remoting/cli/pom.xml
+++ b/modules/enterprise/remoting/cli/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/client-api/pom.xml b/modules/enterprise/remoting/client-api/pom.xml
index bc9ae9e..aa8bb79 100644
--- a/modules/enterprise/remoting/client-api/pom.xml
+++ b/modules/enterprise/remoting/client-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/client-deps/pom.xml b/modules/enterprise/remoting/client-deps/pom.xml
index 5112932..4e0c3b8 100644
--- a/modules/enterprise/remoting/client-deps/pom.xml
+++ b/modules/enterprise/remoting/client-deps/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/pom.xml b/modules/enterprise/remoting/pom.xml
index 1855c3d..7299a24 100644
--- a/modules/enterprise/remoting/pom.xml
+++ b/modules/enterprise/remoting/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/webservices/pom.xml b/modules/enterprise/remoting/webservices/pom.xml
index 02dddf7..08a6920 100644
--- a/modules/enterprise/remoting/webservices/pom.xml
+++ b/modules/enterprise/remoting/webservices/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/client-api/pom.xml b/modules/enterprise/server/client-api/pom.xml
index c49cfd9..9d68a09 100644
--- a/modules/enterprise/server/client-api/pom.xml
+++ b/modules/enterprise/server/client-api/pom.xml
@@ -5,13 +5,13 @@
<parent>
<artifactId>rhq-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-server-client-api</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
<name>RHQ Enterprise Server Client API</name>
<description>The implementation of the client API when accessing the server locally</description>
diff --git a/modules/enterprise/server/container-lib/pom.xml b/modules/enterprise/server/container-lib/pom.xml
index c235e01..6bacdf8 100644
--- a/modules/enterprise/server/container-lib/pom.xml
+++ b/modules/enterprise/server/container-lib/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/container/pom.xml b/modules/enterprise/server/container/pom.xml
index c4042b0..63c230b 100644
--- a/modules/enterprise/server/container/pom.xml
+++ b/modules/enterprise/server/container/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml
index bacc248..e07e22c 100644
--- a/modules/enterprise/server/ear/pom.xml
+++ b/modules/enterprise/server/ear/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml
index 8c2b0e8..d711eee 100644
--- a/modules/enterprise/server/jar/pom.xml
+++ b/modules/enterprise/server/jar/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/plugins/alert-cli/pom.xml b/modules/enterprise/server/plugins/alert-cli/pom.xml
index e94f31f..0e57513 100644
--- a/modules/enterprise/server/plugins/alert-cli/pom.xml
+++ b/modules/enterprise/server/plugins/alert-cli/pom.xml
@@ -3,11 +3,11 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
<artifactId>alert-cli</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
<name>RHQ Enterprise Server CLI Script Alert Plugin</name>
<description>An alert sender able to execute an arbitrary CLI script as a response to an alert</description>
diff --git a/modules/enterprise/server/plugins/alert-email/pom.xml b/modules/enterprise/server/plugins/alert-email/pom.xml
index c38d63f..b61f303 100644
--- a/modules/enterprise/server/plugins/alert-email/pom.xml
+++ b/modules/enterprise/server/plugins/alert-email/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq.server</groupId>
<artifactId>alert-email</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
<name>RHQ Enterprise Server Email Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-irc/pom.xml b/modules/enterprise/server/plugins/alert-irc/pom.xml
index 17849cd..d2d8e61 100644
--- a/modules/enterprise/server/plugins/alert-irc/pom.xml
+++ b/modules/enterprise/server/plugins/alert-irc/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-irc</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
<name>RHQ Enterprise Server IRC Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-log4j/pom.xml b/modules/enterprise/server/plugins/alert-log4j/pom.xml
index 5bb4247..a1fdacf 100644
--- a/modules/enterprise/server/plugins/alert-log4j/pom.xml
+++ b/modules/enterprise/server/plugins/alert-log4j/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-log4j</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
<name>RHQ Enterprise Server Log4J Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-microblog/pom.xml b/modules/enterprise/server/plugins/alert-microblog/pom.xml
index 2df04ca..ffa9738 100644
--- a/modules/enterprise/server/plugins/alert-microblog/pom.xml
+++ b/modules/enterprise/server/plugins/alert-microblog/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-microblog</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
<name>RHQ Enterprise Server Microblog Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-mobicents/pom.xml b/modules/enterprise/server/plugins/alert-mobicents/pom.xml
index 29d156f..196af5a 100644
--- a/modules/enterprise/server/plugins/alert-mobicents/pom.xml
+++ b/modules/enterprise/server/plugins/alert-mobicents/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-mobicents</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
<name>RHQ Enterprise Server Mobicents Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-operations/pom.xml b/modules/enterprise/server/plugins/alert-operations/pom.xml
index 3928ab7..d5c3922 100644
--- a/modules/enterprise/server/plugins/alert-operations/pom.xml
+++ b/modules/enterprise/server/plugins/alert-operations/pom.xml
@@ -2,14 +2,14 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-operations</artifactId>
<packaging>jar</packaging>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
<name>RHQ Enterprise Server Opertions Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-roles/pom.xml b/modules/enterprise/server/plugins/alert-roles/pom.xml
index f281938..9d01093 100644
--- a/modules/enterprise/server/plugins/alert-roles/pom.xml
+++ b/modules/enterprise/server/plugins/alert-roles/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-roles</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
<name>RHQ Enterprise Server Roles Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-snmp/pom.xml b/modules/enterprise/server/plugins/alert-snmp/pom.xml
index 2d16a30..dddfb8b 100644
--- a/modules/enterprise/server/plugins/alert-snmp/pom.xml
+++ b/modules/enterprise/server/plugins/alert-snmp/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-snmp</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
<name>RHQ Enterprise Server SNMP Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-subject/pom.xml b/modules/enterprise/server/plugins/alert-subject/pom.xml
index 3c704c4..d5647c1 100644
--- a/modules/enterprise/server/plugins/alert-subject/pom.xml
+++ b/modules/enterprise/server/plugins/alert-subject/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-subject</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
<name>RHQ Enterprise Server Subject Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/ant-bundle/pom.xml b/modules/enterprise/server/plugins/ant-bundle/pom.xml
index ab4d547..9e70e72 100644
--- a/modules/enterprise/server/plugins/ant-bundle/pom.xml
+++ b/modules/enterprise/server/plugins/ant-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/cobbler/pom.xml b/modules/enterprise/server/plugins/cobbler/pom.xml
index 90a1fbd..c6b360f 100644
--- a/modules/enterprise/server/plugins/cobbler/pom.xml
+++ b/modules/enterprise/server/plugins/cobbler/pom.xml
@@ -4,14 +4,14 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>rhq-serverplugin-cobbler</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
<name>RHQ Enterprise Server Cobbler Plugin</name>
diff --git a/modules/enterprise/server/plugins/disk/pom.xml b/modules/enterprise/server/plugins/disk/pom.xml
index b90bfff..2983096 100644
--- a/modules/enterprise/server/plugins/disk/pom.xml
+++ b/modules/enterprise/server/plugins/disk/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml
index 2321329..3a77bd2 100644
--- a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml
+++ b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/groovy-script/pom.xml b/modules/enterprise/server/plugins/groovy-script/pom.xml
index da6c6b2..27bb4ee 100644
--- a/modules/enterprise/server/plugins/groovy-script/pom.xml
+++ b/modules/enterprise/server/plugins/groovy-script/pom.xml
@@ -4,14 +4,14 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>groovy-script-server-plugin</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
<name>RHQ Enterprise Server Groovy Script Plugin</name>
diff --git a/modules/enterprise/server/plugins/jboss-software/pom.xml b/modules/enterprise/server/plugins/jboss-software/pom.xml
index b8d4818..2cec96c 100644
--- a/modules/enterprise/server/plugins/jboss-software/pom.xml
+++ b/modules/enterprise/server/plugins/jboss-software/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/packagetype-cli/pom.xml b/modules/enterprise/server/plugins/packagetype-cli/pom.xml
index 14ed593..fc6d661 100644
--- a/modules/enterprise/server/plugins/packagetype-cli/pom.xml
+++ b/modules/enterprise/server/plugins/packagetype-cli/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>packagetype-cli</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
<name>RHQ Enterprise Server CLI Package Type Plugin</name>
diff --git a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml
index 4fa056a..aaa2ae6 100644
--- a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml
+++ b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
<relativePath>../../../../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/plugins/perspectives/core/pom.xml b/modules/enterprise/server/plugins/perspectives/core/pom.xml
index fc2a43b..1bc2df8 100644
--- a/modules/enterprise/server/plugins/perspectives/core/pom.xml
+++ b/modules/enterprise/server/plugins/perspectives/core/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
<relativePath>../../../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml
index cbf8bdd..fda4fa7 100644
--- a/modules/enterprise/server/plugins/pom.xml
+++ b/modules/enterprise/server/plugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/plugins/rhnhosted/pom.xml b/modules/enterprise/server/plugins/rhnhosted/pom.xml
index 034c9cc..10c717a 100644
--- a/modules/enterprise/server/plugins/rhnhosted/pom.xml
+++ b/modules/enterprise/server/plugins/rhnhosted/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/url/pom.xml b/modules/enterprise/server/plugins/url/pom.xml
index 250221a..427accb 100644
--- a/modules/enterprise/server/plugins/url/pom.xml
+++ b/modules/enterprise/server/plugins/url/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml
index 7dda98b..e1e370b 100644
--- a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml
+++ b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/yum/pom.xml b/modules/enterprise/server/plugins/yum/pom.xml
index 867e9b1..c706970 100644
--- a/modules/enterprise/server/plugins/yum/pom.xml
+++ b/modules/enterprise/server/plugins/yum/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/safe-invoker/pom.xml b/modules/enterprise/server/safe-invoker/pom.xml
index 42e7e32..328cb09 100644
--- a/modules/enterprise/server/safe-invoker/pom.xml
+++ b/modules/enterprise/server/safe-invoker/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/sars/agent-sar/pom.xml b/modules/enterprise/server/sars/agent-sar/pom.xml
index 268c0f1..ca8f421 100644
--- a/modules/enterprise/server/sars/agent-sar/pom.xml
+++ b/modules/enterprise/server/sars/agent-sar/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-sars-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/sars/pom.xml b/modules/enterprise/server/sars/pom.xml
index 7a53930..1bdc286 100644
--- a/modules/enterprise/server/sars/pom.xml
+++ b/modules/enterprise/server/sars/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/xml-schemas/pom.xml b/modules/enterprise/server/xml-schemas/pom.xml
index 07639dc..4b7b9bd 100644
--- a/modules/enterprise/server/xml-schemas/pom.xml
+++ b/modules/enterprise/server/xml-schemas/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/helpers/bundleGen/pom.xml b/modules/helpers/bundleGen/pom.xml
index efa2b65..39c59f0 100644
--- a/modules/helpers/bundleGen/pom.xml
+++ b/modules/helpers/bundleGen/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-helpers</artifactId>
<groupId>org.rhq.helpers</groupId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq.helpers</groupId>
<artifactId>bundleGen</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
<build>
<plugins>
diff --git a/modules/helpers/perftest-support/pom.xml b/modules/helpers/perftest-support/pom.xml
index a775164..dfca572 100644
--- a/modules/helpers/perftest-support/pom.xml
+++ b/modules/helpers/perftest-support/pom.xml
@@ -3,11 +3,11 @@
<parent>
<artifactId>rhq-helpers</artifactId>
<groupId>org.rhq.helpers</groupId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq.helpers</groupId>
<artifactId>perftest-support</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
<name>Performance Testing Support</name>
<description>To support performance testing, this is a basic tool to support extracting and later reimporting of
data from/to a database.
diff --git a/modules/helpers/pom.xml b/modules/helpers/pom.xml
index 3f03893..4b633f5 100644
--- a/modules/helpers/pom.xml
+++ b/modules/helpers/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml
index 1126654..435286a 100644
--- a/modules/helpers/rtfilter/pom.xml
+++ b/modules/helpers/rtfilter/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq.helpers</groupId>
<artifactId>rhq-helpers</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml
index fccf457..5a80015 100644
--- a/modules/plugins/aliases/pom.xml
+++ b/modules/plugins/aliases/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml
index b76dd57..de6075c 100644
--- a/modules/plugins/ant-bundle/pom.xml
+++ b/modules/plugins/ant-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml
index 489f541..8de2d23 100644
--- a/modules/plugins/apache/pom.xml
+++ b/modules/plugins/apache/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml
index e1ac6eb..af07702 100644
--- a/modules/plugins/augeas/pom.xml
+++ b/modules/plugins/augeas/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/byteman/pom.xml b/modules/plugins/byteman/pom.xml
index 388faeb..1b23882 100644
--- a/modules/plugins/byteman/pom.xml
+++ b/modules/plugins/byteman/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml
index 4d517eb..8bfdeea 100644
--- a/modules/plugins/cobbler/pom.xml
+++ b/modules/plugins/cobbler/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml
index 1cf2e21..ec14f28 100644
--- a/modules/plugins/cron/pom.xml
+++ b/modules/plugins/cron/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml
index 45e57af..099fdd6 100644
--- a/modules/plugins/database/pom.xml
+++ b/modules/plugins/database/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/filetemplate-bundle/pom.xml b/modules/plugins/filetemplate-bundle/pom.xml
index bcaae3f..f055861 100644
--- a/modules/plugins/filetemplate-bundle/pom.xml
+++ b/modules/plugins/filetemplate-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml
index f1ebfd8..112c581 100644
--- a/modules/plugins/grub/pom.xml
+++ b/modules/plugins/grub/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/hadoop/pom.xml b/modules/plugins/hadoop/pom.xml
index cd82cae..fad5fd0 100644
--- a/modules/plugins/hadoop/pom.xml
+++ b/modules/plugins/hadoop/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml
index 3fb7b20..38b45c9 100644
--- a/modules/plugins/hibernate/pom.xml
+++ b/modules/plugins/hibernate/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.rhq</groupId>
<!-- Bypass the jopr-plugins-parent which can not have children. It must build after the plugins in order to execute integration tests on them. -->
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml
index cde548e..da058ee 100644
--- a/modules/plugins/hosts/pom.xml
+++ b/modules/plugins/hosts/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml
index 137f8af..dbc972f 100644
--- a/modules/plugins/hudson/pom.xml
+++ b/modules/plugins/hudson/pom.xml
@@ -6,12 +6,12 @@
<parent>
<artifactId>rhq-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-hudson-plugin</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>RHQ Hudson Plugin</name>
diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml
index 8081699..4b44b48 100644
--- a/modules/plugins/iis/pom.xml
+++ b/modules/plugins/iis/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/irc/pom.xml b/modules/plugins/irc/pom.xml
index 382b7c4..552d3d6 100644
--- a/modules/plugins/irc/pom.xml
+++ b/modules/plugins/irc/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>rhq-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml
index 2779755..6dfe25a 100644
--- a/modules/plugins/jboss-as-5/pom.xml
+++ b/modules/plugins/jboss-as-5/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml
index ed166c7..f74f357 100644
--- a/modules/plugins/jboss-as/pom.xml
+++ b/modules/plugins/jboss-as/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jboss-cache-v3/pom.xml b/modules/plugins/jboss-cache-v3/pom.xml
index d293deb..7858853 100644
--- a/modules/plugins/jboss-cache-v3/pom.xml
+++ b/modules/plugins/jboss-cache-v3/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml
index d5eeedf..7d3833b 100644
--- a/modules/plugins/jboss-cache/pom.xml
+++ b/modules/plugins/jboss-cache/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml
index d58242e..1b383ed 100644
--- a/modules/plugins/jmx/pom.xml
+++ b/modules/plugins/jmx/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/kickstart/pom.xml b/modules/plugins/kickstart/pom.xml
index 1bd4513..b2265f9 100644
--- a/modules/plugins/kickstart/pom.xml
+++ b/modules/plugins/kickstart/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml
index d289583..f22caf8 100644
--- a/modules/plugins/mysql/pom.xml
+++ b/modules/plugins/mysql/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml
index 6cb3690..ea24a5d 100644
--- a/modules/plugins/netservices/pom.xml
+++ b/modules/plugins/netservices/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml
index f72abd4..94d0517 100644
--- a/modules/plugins/oracle/pom.xml
+++ b/modules/plugins/oracle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/pattern-generator/pom.xml b/modules/plugins/pattern-generator/pom.xml
index ffe3cd1..e8fcfe1 100644
--- a/modules/plugins/pattern-generator/pom.xml
+++ b/modules/plugins/pattern-generator/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.TEST</version><!-- TODO adjust RHQ version -->
+ <version>4.0.1-SNAPSHOT</version><!-- TODO adjust RHQ version -->
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml
index 6a0443e..89b903f 100644
--- a/modules/plugins/perftest/pom.xml
+++ b/modules/plugins/perftest/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml
index 3565b72..5251175 100644
--- a/modules/plugins/platform/pom.xml
+++ b/modules/plugins/platform/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml
index 0e2de0c..cda812e 100644
--- a/modules/plugins/pom.xml
+++ b/modules/plugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml
index 99e144e..7eff98e 100644
--- a/modules/plugins/postfix/pom.xml
+++ b/modules/plugins/postfix/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml
index 60982b5..08f9d48 100644
--- a/modules/plugins/postgres/pom.xml
+++ b/modules/plugins/postgres/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml
index adc498f..c1d7c26 100644
--- a/modules/plugins/rhq-agent/pom.xml
+++ b/modules/plugins/rhq-agent/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml
index 383bc86..f6085c6 100644
--- a/modules/plugins/rhq-server/pom.xml
+++ b/modules/plugins/rhq-server/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml
index adcfa59..3a35487 100644
--- a/modules/plugins/samba/pom.xml
+++ b/modules/plugins/samba/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml
index 005a79c..6e0e0bb 100644
--- a/modules/plugins/script/pom.xml
+++ b/modules/plugins/script/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/script2/pom.xml b/modules/plugins/script2/pom.xml
index ed6444e..49d9a88 100644
--- a/modules/plugins/script2/pom.xml
+++ b/modules/plugins/script2/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml
index a34fcf2..0de4591 100644
--- a/modules/plugins/snmptrapd/pom.xml
+++ b/modules/plugins/snmptrapd/pom.xml
@@ -2,7 +2,7 @@
<parent>
<artifactId>rhq-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml
index 91d87cf..862b260 100644
--- a/modules/plugins/sshd/pom.xml
+++ b/modules/plugins/sshd/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml
index fbeaaf1..ae42746 100644
--- a/modules/plugins/sudoers/pom.xml
+++ b/modules/plugins/sudoers/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml
index 752f27d..81cc832 100644
--- a/modules/plugins/tomcat/pom.xml
+++ b/modules/plugins/tomcat/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml
index a1e9a9e..b6a799f 100644
--- a/modules/plugins/twitter/pom.xml
+++ b/modules/plugins/twitter/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/validate-all-plugins/pom.xml b/modules/plugins/validate-all-plugins/pom.xml
index c5f4dae..aec6468 100644
--- a/modules/plugins/validate-all-plugins/pom.xml
+++ b/modules/plugins/validate-all-plugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/virt/pom.xml b/modules/plugins/virt/pom.xml
index 3ebe414..f6d8bdd 100644
--- a/modules/plugins/virt/pom.xml
+++ b/modules/plugins/virt/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/pom.xml b/modules/pom.xml
index 5121e56..d6a87a8 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml
index 143007f..d4f3d06 100644
--- a/modules/test-utils/pom.xml
+++ b/modules/test-utils/pom.xml
@@ -7,7 +7,7 @@
<parent>
<artifactId>rhq-modules-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<artifactId>test-utils</artifactId>
diff --git a/pom.xml b/pom.xml
index 8942256..80a54ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0.TEST</version>
+ <version>4.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>RHQ</name>
13 years
[rhq] Changes to 'refs/tags/RHQ_4_0_0_TEST'
by John Sanda
Tag 'RHQ_4_0_0_TEST' created by John Sanda <jsanda(a)redhat.com> at 2011-04-27 20:47 +0000
[maven-release-plugin] copy for tag RHQ_4_0_0_TEST
Changes since RHQ_4_0_0_Beta1:
Filip Drabek (4):
BZ-669542 - Deploying exploded WAR to JBoss EAP 5 throws NPE operation fails
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
JAXB adapter for Map<Integer,String>
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
Heiko W. Rupp (14):
Introduce new command 'stdin' that allows to give control back to the user.
Allow setting a resource-config
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
Fix an exception, add an alias for 'set res', rename 'src' to 'rcs', implement 'pcs'.
Factor out Command enum and History handling.
Be more relaxed when parsing the input.
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
BZ 693700 - prevent NPE for empty <c:list-property/>
Put resource context into a local variable for later use.
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
BZ-698320 Make '=' stateful, as otherwise the counter is not reset when the condition is not true.
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
Some more translations.
Add the pattern generator plugin
Ian Springer (67):
[maven-release-plugin] prepare for next development iteration
format resource category names correctly and extract the formatting logic to a new ResourceCategoryCellFormatter class (https://bugzilla.redhat.com/show_bug.cgi?id=673505)
users without MANAGED_SECURITY can no longer create or delete roles (https://bugzilla.redhat.com/show_bug.cgi?id=682710)
fix bug where clicking on Reset button on user or role edit view would result in an exception (https://bugzilla.redhat.com/show_bug.cgi?id=677421)
fix so role details view can again be reached by selecting a role from the roles list view (https://bugzilla.redhat.com/show_bug.cgi?id=683429)
fix a few small typos
make sure resource config edit view gracefully handles the case where the user tries to save a config that has no changes
fix regression on res op history details view where op results were not being displayed; add column headers to properties tables rendered by config editor
ambiguously named autogroup nodes in resource tree are now disambiguated by appending the plugin name (e.g. "JBossAS Servers (JBossAS5 plugin)")
fix bug that was preventing changing boolean property values within a map within a list (https://bugzilla.redhat.com/show_bug.cgi?id=661899)
config editor now throws a prop changed event at init if one or more props have invalid values (most commonly this happens when the props have a non-null erroMessage field)
some changes to locators in Table sub-widgets to make sure locators are hierarchal
implement "perfect caching" for GWT-compiled URLs (https://bugzilla.redhat.com/show_bug.cgi?id=617729)
support plugin JARs whose MANIFEST.MF is not the 2nd entry of the JAR (fix for https://bugzilla.redhat.com/show_bug.cgi?id=682116)
misc minor
make sure config editor renders everything appropriately when in read-only mode (https://bugzilla.redhat.com/show_bug.cgi?id=680233)
fix editing of group config props via modal member value editor (https://bugzilla.redhat.com/show_bug.cgi?id=690483)
fix a bunch of group config editor bugs including https://bugzilla.redhat.com/show_bug.cgi?id=680229
remove unused http://www.dyn-web.com/ javascript code (https://bugzilla.redhat.com/show_bug.cgi?id=536549)
escape or sanitize HTML in user-controlled text, which could be used for XSS attacks
...
make sure only users w/ group inventory perm can edit group general props (https://bugzilla.redhat.com/show_bug.cgi?id=692842); escape HTML resource/group props when they're displayed as static text
more HTML escaping
add some more HTML escaping to bundle views (includes fix for https://bugzilla.redhat.com/show_bug.cgi?id=676768)
fix bug in config editor that was causing inputs for optional props to get disabled upon that input losing focus
fix NPE that occurred when you edited an existing list-o-maps member map and then clicked the member map editor modal's OK button
on new op schedule page, select mode=calendar and run=now by default and change title of Save button to "Schedule"; fix bug where read-only prop values were displayed as " "
fix bug in checkboxes for implied-read resource perms in permissions editor (https://bugzilla.redhat.com/show_bug.cgi?id=683852)
add hibernate-annotations.jar to the CLI's lib dir, so users can compile custom RHQ remote clients using CLI/lib/*.jar as the compile classpath (https://bugzilla.redhat.com/show_bug.cgi?id=683136)
escape HTML in names and descriptions on groupdef list and details views (https://bugzilla.redhat.com/show_bug.cgi?id=691547)
fix exception caused by different format for recentResources user pref between portal-war and coregui (https://bugzilla.redhat.com/show_bug.cgi?id=693411)
class i missed in a commit yesterday
minor fix to config of gwt plugin
only display HTML within the message portlet's content if the logged-in user is rhqadmin; otherwise escape HTML to prevent XSS attacks (https://bugzilla.redhat.com/show_bug.cgi?id=636734)
on Administration view, gray out left menu items if current user does not have the required global perm; add authz checks to buttons on alert template list view; do not display JSF menu bar on JSF error pages; add HTML escaping of alertdef names and descriptions for XSS prevention
pretty up header and desc of Help and Test top views
a new async execution framework providing a simple API for parallel or serial execution of a set of async ops + a new test view that demonstrates its usage
return implicit, not explicit, resource and grou perms in PermissionsLoader
make About box locatable; fix issue where in Help section where once the About box was closed, clicking on the About left menu item would not redisplay the About box
fix two compile errors caused by API changes in ResourceFactoryManagerLocal
fix config editor bug causing boolean props w/ null values to be rendered as false rather than unset; use setValue(), rather than setDefaultValue(), when initializing FormItems for simple props in config editor; add ctrl-alt-t hot key for going to #Test view
fix a bug in TableSection where a redundant refresh was done on the initial rendering of the Table
move log stmt into else block where it should be
add test to remote PS client that demonstrates how setting a prop to null does not work right
refactor Table.refresh() to make it more straightforward
drop support for "gecko" user-agent, which represents FF 1.x
update ResourceConfigurationUpdateCriteria to require CONFIGURE_READ perm (should fix https://bugzilla.redhat.com/show_bug.cgi?id=696648)
don't call isRemoved() on managed props with null values when updating a managed component's config, and don't bother setting default values defined on managed props in the RHQ configdef (at least improves the issue described by https://bugzilla.redhat.com/show_bug.cgi?id=694660)
Resource version and location fields are no longer filtered by ResourceGWTServiceImpl; added support for these fields to ResourceDataSource, ResourceCompositeDataSource, and ResourceSearchView (in ResourceSearchView, location field is hidden by default, but version field is not); hide plugin field by default in ResourceSearchView, since the plugin name can be found via either the Name tooltip or the Ancestry tooltip; add hideField() method to Table
add ctime, itime, mtime, modifiedBy, and resourceKey fields to resource summary header and resource list/search view (https://bugzilla.redhat.com/show_bug.cgi?id=696741)
show prop description for a list-of-maps prop as tooltip when user hovers over the prop name (https://bugzilla.redhat.com/show_bug.cgi?id=696750)
add various missing i18n; fix widths of columns on event list view; when loading TaggedView, look up global perms in order to pass them into subviews
make all objectName, nameTemplate, and descriptionTemplate plugin config props readOnly in rhq-agent and rhq-server plugins, since we don't want to allow the user to edit those props
load alertdef desc in Alerts datasource so it can be displayed on the alert details view (https://bugzilla.redhat.com/show_bug.cgi?id=697060)
ask for confirmation before deleting groupdefs (https://bugzilla.redhat.com/show_bug.cgi?id=697065)
escape HTML in Notes column in op schedule list view (https://bugzilla.redhat.com/show_bug.cgi?id=697136)
update the group resource config job so that is updates the group update status from in-progress to success or failure once all member updates have completed (https://bugzilla.redhat.com/show_bug.cgi?id=697061)
for exceptions that are caught during attempts to schedule system jobs, log e.toString(), rather than e.getMessage(), so the exception class name is included in the log message
reverse sort config updates by id on group config history view (https://bugzilla.redhat.com/show_bug.cgi?id=697691)
get operations menu items working off tree group context menus (https://bugzilla.redhat.com/show_bug.cgi?id=698465)
cancel the message clearing timer if it's not null at top of MessageBar.onMessage() to prevent the timer from clearing the newly fired message prematurely (https://bugzilla.redhat.com/show_bug.cgi?id=698704)
display a transient message to inform the user when auto-selecting perms implied by a perm the user has just selected (https://bugzilla.redhat.com/show_bug.cgi?id=698475)
don't allow deselection of perms whose selection is implied by existing selection of MANAGE_SECURITY or MANAGE_INVENTORY (rest of fix for https://bugzilla.redhat.com/show_bug.cgi?id=698475)
in perm editor, don't allow deselection of CONFIGURE_READ if CONFIGURE_WRITE is selected (https://bugzilla.redhat.com/show_bug.cgi?id=698475)
fix ability to delete resource and group operation history items (https://bugzilla.redhat.com/show_bug.cgi?id=698720)
potential fix for https://bugzilla.redhat.com/show_bug.cgi?id=697590
update smartgwt war archetype to use SmartGWT 2.4 and bump up its version from 1.0.2 to 1.0.3
Jay Shaughnessy (81):
Fix dep version problem presumably left from a release build.
First pass at precomputed ancestry as opposed to on-demand disambiguation.
Remove obsolete method.
More Disambiguation (D12N) work
Convert the Problem Resources portlet to use ancestry-based disambiguation.
Disambiguation - More work on ProblemResourcesPortlet
Disambiguation Work - Operations
Disambiguation - Fix issue where ancestry was not assigned to Server
Some misc minor cleanup.
Fix a problem with a D12N link
Take ancestry out of the CLI summary fields, it's an encoded value.
Resource Ancestry (Disambiguation) Work
Reduce verbosity on some Alert Condition text display. The 'Exceeds' is
Try and improve portlet layout by better lining up recent/sched columns.
Add Ancestry (Disambiguation) to Alert Def Subsystem View
Ancestry (Disambiguation) for Resource and Plugin config history
Ancestry (Disambiguation) Work
Ancestry (Disambiguation) Work
Ancestry (Disambiguation) Work
Ancestry (Disambiguation) Work
Add Ancestry (Disambiguation) to Alert Def Subsystem View
Ancestry (Disambiguation) for Resource and Plugin config history
Ancestry (Disambiguation) Work
Ancestry (Disambiguation) Work
Ancestry (Disambiguation) Work
Ancestry (Disambiguation) Work
Ancestry (Disambiguation) Work
Switching tabs quickly in the resource detail view could result in a
Rendering of JSF monitor (avail) pages failed if the resource type had no
Re-establish working metric graphs in the GraphPortlet (SmallGraph)
Fix and enhance various selectors
Add AncestryUtil entry point for getting resource hover without using a
Metric Graph Portlet Work
Resource/Group dash AutoRefreshPortlets were continuing to refresh even
More Tabbing Fun
trivial: add import lost in merge
Selenium - Make the Login and Registration dialogs locatable.
ResourceGroupTree navigation work
Resource Ancestry (Disambiguation) Work
remove link to unavailable package in jdoc
Fix several issues in Alerts Portlets
AlertHistoryView fixes
Protect against NPE and improve hover text.
Fix a null protection issue.
Fix an issue when performing direct navigation to bookmarkable subtab views.
Button Enablement Work
Global Dash/Portlet work
Work on issues revolving around direct navigation to either a resource/group
Fix Locatable issue with login dialog box, make it always be the same
Fix locatable issue for wizards. Make sure the dialog window is locatable
Work on Operation History Portlets and Views
More Op portlet tweaks
Remove unnecessary fetch of resource type children in the
Fix an issue with direct autogroup navigation [BZ 694628]
[BZ 694641 - Able to perform url navigation after logout]
[BZ 694892 - Non-Perm user error loading about box]
Alert Definition Work
Fix related to [BZ 680167]
A fix to eliminate duplicate refresh of table data (commit abc7cd665aa8a)
Finish work for [BZ 696667 - Some list views require refresh for initial population]
A workaround fix for [BZ 696740 - Resource tree not always expanding in detail view]
Two Fixes to CriteriaQueryGenerator. Both affecting Non-permissioned user
[BZ 697098 - Several views show implicit members for compatible recursive groups]
[BZ 697080 - ancestry hover throws exception in operation schedule resource list]
make wizard message locatable for QE team
[BZ 685015 - group operation history details throws exception]
[BZ 697610 - plugin and resource group config views still use old Resource disambiguation mechanism]
Finish removal of legacy DisambiguationReport code from CoreGUI. Remove
[BZ 695753 - Cannot view traits for any resource on monitoring tab]
related to [BZ 697098]
[BZ 697937 - alert definition view shows invalid alert defs]
[BZ 697665 - need to disambiguate Reports>SuspectMetrics table]
[BZ 697699 - Firefox pegs CPU at 100% for > 20 seconds]
[BZ 697581 - Discovery Queue view is missing a Refresh button]
[BZ 698314 - need to hit refresh button to see recent operations]
[BZ 697484 - Reports->Configuration History: Sorting on Ancestry column throws exception]
More work on column sorting problems [BZ https://bugzilla.redhat.com/show_bug.cgi?id=697484]
make sure initial data load happens for portlet.
Make sure the slsb calls are wrapped in try/catch and throw
Don't trap throwables, let them get passed up so we can detect problems
[BZ 699542 - Intermittent Serialization issues with Hibernate types]
John Mazzitelli (169):
make pretty the Reports>CPU/Memory utilization (which is also a dashboard "Platform Summary" portlet)
gwt-i-fy the reports>inventory summary page
fix these two queries - need to filter out all non-committed resources
add link to first cell with type name
allow for owners of search bar to prepopulate the search box with a default search string
enhance the search bar
prepopulate some of the search bars
i18n
add the concept of a non-binding filter to criteria API. need this for alert definition criteria
impl reports>alert defs
Merge commit 'origin/master' into group-fixes
fix error message
inventory summary query doesn't lend itself to show only resources user is authorized for. it requires MANAGE_INVENTORY
remove category columns - the icons already tell us the category
Merge commit 'origin/master' into group-fixes
put the category icon to the left of name to be consistent with everything else
Merge commit 'origin/master' into group-fixes
add new deps due to the new alerts cli work
rearrange .classpath so its more orderly
Merge commit 'origin/master' into group-fixes
get stack traces to show up prettier in message center dialog window
Merge commit 'origin/master' into group-fixes
avoid exception when refreshing a group page and no node was selected
add a "refresh" button on the standalone window so its easier to quickly get the new data
encapulate the Object[] query results in a small inner pojo to make the code more understandable
add a "refresh" button on the standalone window so its easier to quickly get the new data
bz 683108 - make sys config view more tolerant of configs not set but where we have defaults
bz 683108 - make sys config view more tolerant of configs not set but where we have defaults
fix the buildTree recursive method - it was losing child nodes
working on the group tree
Merge commit 'origin/master' into group-fixes
fix table refresh so it maintains the initial criteria even when entering additional search criteria from the search bar
fix table refresh so it maintains the initial criteria even when entering additional search criteria from the search bar
add some code to make debugging cluster tree easier
get cluster tree nodes' ID and parentID fields set appropriately
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq.git into group-fixes
make sure to sort the tree leaves
clean up the tree - sort it better, provide different icons for subcats and auto-type groups, make the expand/collapse icons be the same as that of the individual resource tree
do not allow user to select non-cluster nodes in group tree
ignore right mouse clicks on nodes that don't have a context menu
forgot to remove this debug statement
double clicking row now goes to the resource alert def page
fix problem that has to do with copying criteria. need to be careful when criteria includes primitive attribute types as well as Object
this field is hidden, avoid NPE by not setting cell formatter
do not allow user to sort on cpu/memory/swap columns.. though it would be nice, the way the data is collected and stored client side means we have some work to get sorting to properly function
Merge branch 'group-fixes'
show when a cluster node represents less than the full group size
i18n the group category name in the summary subtitle
trivial - add comments, reword the group node tooltip message
BZ 535272 - resource keys may have characters that need to be escaped.
Merge commit 'origin/master' into group-fixes
BZ 684864 - fix enum array processing - the parsing was broken before.
avoid cryptic array index out of bounds error when the hosts plugin can't find the hosts file (seen this on windows where /etc/hosts isn't valid path)
fix the events history ui - provide i18n with icons - show hover for full name of source, pretty up details view
the operation history list is not sorted and sometimes the ordering is ad-hoc.
i see this fail one in a blue moon and still can't figure out why. I tried to replicate and step thru with debugger, and it works.
make win32 event log collection more fault tolerant - catch exceptions better and don't try to do things with event logs when we aren't collecting events (i.e. do null checks)
BZ 664126 - concurrent calls to setResourceError need separate transactions
support -Pdev when building safe-invoker
fix up skeleton plugin example. bump up version number and add the new manual add facet
Merge commit 'origin/master'
the operation history list is not sorted and sometimes the ordering is ad-hoc.
i see this fail one in a blue moon and still can't figure out why. I tried to replicate and step thru with debugger, and it works.
make win32 event log collection more fault tolerant - catch exceptions better and don't try to do things with event logs when we aren't collecting events (i.e. do null checks)
BZ 664126 - concurrent calls to setResourceError need separate transactions
support -Pdev when building safe-invoker
fix up skeleton plugin example. bump up version number and add the new manual add facet
BZ 534186 - be able to discover new resources from children deep in the hierarchy
manually adding a resource may take some time to complete, give 5m max
in the gui ui - we are losing the plugin exception message that tells us why the manual add failed
Merge commit 'origin/master'
BZ 688679 - correlate server side exceptions with gwt client exception messages. make sure we log the exceptions on server side because gwt error messages some times are not helpful
Merge commit 'origin/master'
BZ 688000 - we cannot recurse over HashSet fields because HashSet$KeySet doesn't support addAll and thus the old code threw an UnsupportedOperationException.
BZ 681355 - message center enhancements. you can now clear the messages via the top "Clear All Messages" menu item.
add separator
this is a locatable class, so it should be implementing Locatable interface
add javadoc
BZ 681355 new window message center
reuse the message center window - don't keep re-creating it.
BZ 560760 don't allow the user to edit alert defs
BZ 682304 - change the RPCDataSource generic template to accept a Criteria type so we can implement a strongly typed getFetchCriteria on all datasources.
the Configuration History reports view barfs when sorting on Resource column (and other ways).
BZ 556960 - provide a more descriptive confirmation message when uninventorying resources.
create utility methods that create ancestry listgridfields in a single place AncestryUtil
BZ 689922 add a sort override since our ancestry fields are named "resourceAncestry" but the true field is "ancestry".
BZ 690110 - group tree context menu resource config link is fixed
be able to view details of the current message in the message bar via right-mouse context menu
remove unused, obsolete code
BZ 688915 refactor the tag editor so it doesn't disappear after adding a third tag.
don't allow tags to be added/removed if you don't have permission
BZ 689951 - message center window's list grid needed to be refreshed in order to have its rows be selectable
BZ 535572 - we don't want to support the agent talking to the server over the http or https transport protocol, so remove them from the options.
forgot these two classes as part of the datasource refactoring to have separate getFetchCriteria method
BZ 609135 - fix the favorites button so its context menu is popped up
be able to not specify a width. this isn't used today, but can be in the future - just pass in a negative width
remove the ~, which was our old marker we used to use
be more fault tolerant of invalid portlets that might be in the DB.
BZ 675153 - fix confirm message
be able to clear out ResourcErrors for a particular resource.
add generic type info
suppress warnings due to the fact that subclass has different datasource types than the superclass
remove unused static API. we have a different way of getting group member views
BZ 535384 - criteria needed to add search expression from the filter field in order for the search bar to work for any view using this ResourceComposite data source
in our GWT UI, the alert and event severity filters are represented with a drop down selection menu containing one checkbox for each severity enum (alert: hi, med, lo; event: debug, info, warn, et...).
- shrink the global alerts indicator to just be the icon
add a refresh button on the right so a user can call CoreGUI.refresh().
- remove refresh button
BZ 691978 - fix tag cloud view - you can now delete tags. prettied up the UI as well
fix selenium locator conflicts
fix message center time
add a convienence method that prepares a list grid field as a data field, complete wiht a hover and a standard time format
quick fix to ctime field
normally don't need to pass in the attrib name explicitly since the name of the field is normally the same as the attrib name
quick fix some more columns and hovers
format more cols
protect against null attribute value
group def interval spinner should step every 1m
fix fields
fix notificaton log tab
unsure if this does anything- but I still can't get the hover to work - no idea why
fix col format and hover
fix col format
format cols
format col
BZ 610791 - hide the event tracking bar in the monitor graphs jsf page since its broken. we'll fix this kind of display when we move the graph page to gwt
BZ 692299 - correct the resource link
BZ 640396 - when you change the name of a resource or group, the title bar header name also changes now
BZ 691526 - log the error properly when setting favorite fails
make consistent the name for the "platform summary", "cpu and memory utilization"
BZ 689561 - have config description say that the units are in seconds
format date col
make the timestamp col a link to the details
BZ 691504 - timeline now links to the new GWT UI where appropriate
BZ 691504
add subject to the first param of the find create/delete resource history as I think this might require authz in the future plus these are going to be remote apis that gwt clients access, so we need to require subject auth
add the two history find methods to the remote interface
add to webservices API
add create/delete history retreival API to gwt service
start of the child history page
show details on double click
can't figure out workaround to smartgwt bug - don't use date range editor, just a spinner for past N days
public opinion says remove this question box before exit
no need for the tree load to pull in operation data
BZ 694537, 693886 - do not double load
support creating child resources that do not have resource config definition
BZ 680312 - do not null out parent resource in the delete history item so the child history ui can see what was deleted
since the two action buttons for create/import children are at the botto fo the screen, popup the context menu above the buttons, not below, to avoid them getting clipped
fix typo in dependsOnGroup name
add to our #Test page some iframes to the sql, hibernate and other test jsps useful to devs
BZ 680167 - this doesn't fully fix the issue, but what this does is ensure we don't refresh CoreGUI if we are setting/storing recent resource/group preferences
why is the remote stats class in the i18n test package? move it up to the test package
implement a datasource stats debug window. control-alt-s brings up the window.
somewhat related to BZ 680167 - make the plugin config history page sorted on ID just as the config history page is
remove obsolete server config props.
BZ 697559 - make sure our GWT interface declares "throws" clause
BZ 69758 - set the alert condition option to min/max/avg for baseline alerts
BZ: 697559 - make sure all GWT interfaces explicitly declare "throws RuntimeException"
BZ 696778 - no need for this long label - the button itself tells you what it is.
BZ 696995 - make sure events metadata is cached
BZ 698137 - correct some places I missed during last refactor of some legacy code
add new version tests to ensure 4.0.0 comes after Beta1 and Snapshot
make sure SNAPSHOT < Beta1 < Release/GA
part of BZ 697001 - this corrects some edge cases around timing out group and resource operation histories that are in inprogress state that need to be flipped to failed state.
BZ 697001 - make sure we re-attach related resource histories when updating group history. without this a hibernate transient object exception occurs.
BZ 697001 - cancel all res. operations after a failure if the group op schedule has halt-on-error set.
BZ 697699 - do not set autoFitData on the listgrid - it appears to trigger a bug in smartgwt when the list is empty
BZ 700158 - i18n wizard's step x of y message
set the log level to debug for this one message
John Sanda (26):
[BZ 683859] Remove parent link to deleted reference is not accessible by parent
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
Squahshing 13 commits from ec2 branch
Updating version of cloud server plugin
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
[BZ 677349] Adding logic to avoid deadlock during PC initialization
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
[BZ 683545] scan plugins directory after deleting plugin and fix purge logic
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
[BZ 690430] Adding support for disabling SSL cert verification
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
[BZ 690430,690412] Adding additional logging for SSL exceptions
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
Fixing typo/spelling error
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
[BZ 690430] Removing plugin config for disabling cert validation
Documenting rhq.sync-endpoint-address and setting it to default of false
[BZ 691773] Make sure agent scanner always clears the scanned jar files
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
Further parameterizeing dbreset script
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
Parameterizing tests so they can be run on hudson
Moving surefire plugin configuration outside of profiles
Adding a temporary hack for zipping up all plugins (agent and server)
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
[maven-release-plugin] prepare release RHQ_4_0_0_TEST
Lukas Krejci (14):
Try hard to limit the size of SenderResult in the CLI alert notif to 4k. Improve the error messages captured from the script run.
BZ 689833 - be able to match the main server with snmp index even in the case of multiple listen addresses.
BZ 689833 - restoring the original behavior of getMainServerSampleAddress().
BZ 689833 - fixing the discovery regression. The original fix for this bug caused the discovery to be unable to determine the name to use for the localhost entry.
BZ 694476 - We now correctly determine the runtime configuration of the apache server
BZ 694476 - the user is now only expected to list the non-standard module mappings instead of all modules in the plugin config. This enables a clear and simple upgrade path from previous versions.
BZ 694476 - Adding support for the IfVersion directive in detecting the runtime configuration.
Including the resource version in the data sent from the server to the agent during inventory sync. This will make sure that the version is set at all times a resource component is started.
The process info can be null if the apache process cannot be found. Check for that fact during runtime info extraction.
Be more robust when determining the apache server version. Use either the resource context or directly the binary info if the version is unavailable in the resource context.
Make the apache vhost resource upgrade process as robust as possible:
BZ 698760, BZ 698756 - polishing the repo details page.
BZ 698767 - only show the sync button in the repo list page if the user is a repo manager.
BZ 697858 - include the resource type resolution in the package type list on the repo details page.
Simeon Pinder (71):
group alert dash commit:
abstractMeasurementRangeEditor and associated UI widget changes.
i)shared portlet config cleanup
BZ-682755: change code to eliminate race condition during ldap reg & case insensitive logins
Oob portlet for groups.
Event counts portlet for groups.
missing i18n message GroupEvents and refactor.
enabling recent metrics activity as a portlet.
-fix OperationHistoryCriteria to tak multiple operation stati
missing i18n message.
Forgot message.properties.
removing bad filteroverride.
missing i18n message GroupEvents and refactor.
enabling recent metrics activity as a portlet.
-fix OperationHistoryCriteria to tak multiple operation stati
missing i18n message.
Forgot message.properties.
removing bad filteroverride.
adding package history portlet.
change opHistoryCriteria filter from stati to statuses.
adding bundle deployment portlet.
some group portlet code cleanup.
exclude portlets already on dashboard available 'add' menu.
i)enable Resource* Activity portlets
fixing small alert icon method in ImageManager to be consistent with other subsystems.
some missing documentation.
initial commit of TestLdapSetting dev-tool for setup/debug of LDAP-RHQ integrations
i)D12N problem with Group alerts portlet.
i)fix problem with time range not reloading settings correctly
some portlet cleanup.
i)conditionally render available dash portlets based on group/resource
define default portlet ordering for res and group portlets.
i)edit config bug ii)fix dashboard edit mode on init iii)display messages.
i)fix for MeasurementRangeEditor alignment issue
i)moved portlet dashboard to first activitytab. Still trailing dashboard reset issue
fix/enforce unmodifiable PortletFactory mapping data.
fix resourceOps link issue.
time range refresh fixes.
i)removing D12N column from ResourceAlertsPortlet.
i)fix portlets autogroup issue
BZ 689992: adding ability to update start/stop max times for jbossAs5 plugin.
i)fix for default portlet list for mixed groups
i)number Resource/Group*Portlet refresh/redraw fixes
BZ 689993: enable start/stop WAIT_MAX for AS4 and Tomcat server components.
enable refresh for config changes and hide refresh button for portlets.
remove redundant header for recentAlerts, trim space around operations portlet widget.
Adding missing ConfigUpdates portlet:
fix invalid ConfigUpdate criteria values when querying on created/ctime.
add resource configuration updates portlet.
modify default portlet arangements to include config updates where necessary.
update portlet table view message to better reflect criteria filtering.
remove old activityView2 tabs.
remove config-updates portlet unless compatible grp.
i)modify table empty/populated messages for portlets to indicate matching results.
adding npe check.
i)several refresh issues
update default message for resource ops portlet.
i)Cleanup of Group/Resource* portlets.
trim queries from GroupOperationsPortlet.
fix locator issue with Group/Res events portlets.
Locator id fixes i)Auto refresh locator was too restrictive as included parent ids like 10071
BZ 696751: enable missing reload when saving system configuration settings.
BZ 698137: one more change necessary. The struts tag attempts to instantiate the class
inital commit for iframing metrics/charting:
i)Disable parent & resource links in portal.war for display in coregui
some links cleanup and removal of traliing colon.
enable MMSR for resource>monitor>tables. Group has different iframe impl.
697586: removing jquery reference in CoreGui.html. Dashboard single metric graphs and Activity sparklines continue to work.
-converted iframe of Group>Monitor>Table page to gwt.
pkg history group/resource portlet link fix.
widening the iframe window a little more for better viewing.
---
.classpath | 310
etc/dev-utils/TestLdapSettings.java | 640
etc/m2/smartgwt-war-archetype/pom.xml | 2
etc/m2/smartgwt-war-archetype/src/main/resources/archetype-resources/pom.xml | 6
etc/samples/skeleton-plugin/pom.xml | 2
etc/samples/skeleton-plugin/src/main/java/org/rhq/sample/skeletonplugin/SamplePluginDiscoveryComponent.java | 47
etc/samples/skeleton-plugin/src/main/resources/META-INF/rhq-plugin.xml | 1
modules/common/ant-bundle/pom.xml | 2
modules/common/filetemplate-bundle/pom.xml | 2
modules/common/jboss-as/pom.xml | 2
modules/common/pom.xml | 2
modules/core/client-api/pom.xml | 2
modules/core/client-api/src/main/java/org/rhq/core/clientapi/descriptor/PluginTransformer.java | 27
modules/core/comm-api/pom.xml | 2
modules/core/dbutils/pom.xml | 29
modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/ResourceAncestryUpgradeTask.java | 95
modules/core/dbutils/src/main/scripts/dbsetup/inventory-schema.xml | 2
modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml | 7
modules/core/domain/pom.xml | 2
modules/core/domain/src/main/java/org/rhq/core/domain/configuration/ResourceConfigurationUpdate.java | 6
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AbstractConfigurationUpdateCriteria.java | 16
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertCriteria.java | 9
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertDefinitionCriteria.java | 69
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/Criteria.java | 18
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/MeasurementDataTraitCriteria.java | 6
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/OperationHistoryCriteria.java | 10
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceConfigurationUpdateCriteria.java | 14
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceCriteria.java | 7
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceOperationHistoryCriteria.java | 21
modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementOOB.java | 45
modules/core/domain/src/main/java/org/rhq/core/domain/measurement/composite/MeasurementOOBComposite.java | 27
modules/core/domain/src/main/java/org/rhq/core/domain/measurement/ui/MetricDisplayConstants.java | 22
modules/core/domain/src/main/java/org/rhq/core/domain/operation/GroupOperationHistory.java | 4
modules/core/domain/src/main/java/org/rhq/core/domain/operation/OperationHistory.java | 6
modules/core/domain/src/main/java/org/rhq/core/domain/operation/OperationScheduleEntity.java | 10
modules/core/domain/src/main/java/org/rhq/core/domain/operation/composite/ResourceOperationLastCompletedComposite.java | 27
modules/core/domain/src/main/java/org/rhq/core/domain/operation/composite/ResourceOperationScheduleComposite.java | 28
modules/core/domain/src/main/java/org/rhq/core/domain/plugin/Plugin.java | 28
modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java | 100
modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceAncestryFormat.java | 49
modules/core/domain/src/main/java/org/rhq/core/domain/resource/composite/ProblemResourceComposite.java | 193
modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/ClusterKey.java | 1
modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/composite/ClusterFlyweight.java | 92
modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/composite/ClusterKeyFlyweight.java | 21
modules/core/domain/src/main/java/org/rhq/core/domain/tagging/compsite/TagReportComposite.java | 7
modules/core/gui/pom.xml | 2
modules/core/native-system/pom.xml | 2
modules/core/plugin-api/pom.xml | 2
modules/core/plugin-container/pom.xml | 2
modules/core/plugin-container/src/main/java/org/rhq/core/pc/PluginContainer.java | 43
modules/core/plugin-container/src/main/java/org/rhq/core/pc/StandaloneContainer.java | 269
modules/core/plugin-container/src/main/java/org/rhq/core/pc/event/EventContextImpl.java | 14
modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/RuntimeDiscoveryExecutor.java | 47
modules/core/plugin-container/src/main/java/org/rhq/core/pc/standaloneContainer/Command.java | 99
modules/core/plugin-container/src/main/java/org/rhq/core/pc/standaloneContainer/History.java | 147
modules/core/plugin-validator/pom.xml | 2
modules/core/plugindoc/pom.xml | 2
modules/core/pom.xml | 2
modules/core/util/pom.xml | 2
modules/core/util/src/main/java/org/rhq/core/util/exception/ThrowableUtil.java | 93
modules/core/util/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java | 169
modules/core/util/src/test/java/org/rhq/core/util/exception/ThrowableUtilTest.java | 15
modules/enterprise/agent/pom.xml | 2
modules/enterprise/agent/src/etc/rhq-agent-wrapper-ec2 | 122
modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentManagement.java | 4
modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentManagementMBean.java | 2
modules/enterprise/agentupdate/pom.xml | 2
modules/enterprise/binding/pom.xml | 4
modules/enterprise/binding/src/main/java/org/rhq/bindings/SandboxedScriptEngine.java | 20
modules/enterprise/binding/src/main/java/org/rhq/bindings/engine/JsEngineInitializer.java | 22
modules/enterprise/binding/src/main/java/org/rhq/bindings/engine/ScriptEngineInitializer.java | 17
modules/enterprise/comm/pom.xml | 2
modules/enterprise/gui/base-perspective-jar/pom.xml | 2
modules/enterprise/gui/base-perspective-war/pom.xml | 2
modules/enterprise/gui/content_http-war/pom.xml | 2
modules/enterprise/gui/coregui/pom.xml | 14
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java | 219
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/Footer.java | 92
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ImageManager.java | 91
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java | 50
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java | 15
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/PermissionsLoader.java | 42
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/UserSessionManager.java | 17
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java | 21
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/SystemSettingsView.java | 24
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsEditor.java | 65
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleEditView.java | 10
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleLdapGroupSelector.java | 47
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleSubjectSelector.java | 11
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesDataSource.java | 33
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesView.java | 125
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/ResourceTypeTreeView.java | 215
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/TemplateSchedulesDataSource.java | 7
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/TemplateSchedulesView.java | 21
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/SubjectRoleSelector.java | 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UserEditView.java | 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersDataSource.java | 26
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersView.java | 71
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java | 220
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDetailsView.java | 46
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertHistoryView.java | 86
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertPortletConfigurationDataSource.java | 240
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertPortletDataSource.java | 168
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsDataSource.java | 26
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsView.java | 61
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionsEditor.java | 39
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GeneralPropertiesAlertDefinitionForm.java | 70
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GroupAlertDefinitionsDataSource.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GroupAlertDefinitionsView.java | 9
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/NewConditionEditor.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/NotificationsAlertDefinitionForm.java | 11
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceAlertDefinitionsDataSource.java | 15
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceAlertDefinitionsView.java | 9
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SingleAlertDefinitionView.java | 40
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SystemRolesNotificationSenderForm.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SystemUsersNotificationSenderForm.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/TemplateAlertDefinitionsDataSource.java | 8
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/TemplateAlertDefinitionsView.java | 32
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/BundleSelector.java | 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDistroFileStep.java | 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/SelectBundleStep.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/selection/PlatformResourceGroupSelector.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentDataSource.java | 40
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentListView.java | 20
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentView.java | 21
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleResourceDeploymentHistoryListView.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/resource/BundleResourceDeploymentDataSource.java | 30
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationDataSource.java | 70
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationListView.java | 25
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java | 11
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleVersionDataSource.java | 41
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java | 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesDataSource.java | 35
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java | 16
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesWithLatestVersionDataSource.java | 46
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/revert/GetRevertInfoStep.java | 16
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/tree/BundleTreeDataSource.java | 23
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionListView.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/AboutModalWindow.java | 34
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/buttons/AuthorizedButton.java | 78
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java | 408
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/GroupConfigurationEditor.java | 378
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/PropertyValueChangeEvent.java | 20
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/AbstractRecordEditor.java | 1
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/EditableFormItem.java | 268
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/EnhancedDynamicForm.java | 11
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/EnumSelectItem.java | 48
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/SearchBarItem.java | 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/SimpleEditableFormItem.java | 345
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/SimpleEditableTextAreaFormItem.java | 53
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/lookup/ResourceLookupComboBoxItem.java | 29
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/AbstractMeasurementRangeEditor.java | 341
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/CustomConfigMeasurementRangeEditor.java | 197
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/MeasurementRangeEditor.java | 211
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/UserPreferencesMeasurementRangeEditor.java | 56
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java | 41
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/sorter/ReorderableList.java | 19
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/SubTabLayout.java | 8
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/TwoLevelTabSet.java | 27
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/AuthorizedTableAction.java | 95
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/EscapedHtmlCellFormatter.java | 19
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/IconField.java | 76
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/RecordExtractor.java | 38
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/ResourceAuthorizedTableAction.java | 101
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/ResourceCategoryCellFormatter.java | 54
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java | 212
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/TableSection.java | 76
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/TimestampCellFormatter.java | 79
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tagging/TagEditorView.java | 255
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tagging/TaggingDataSource.java | 28
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tree/EnhancedTreeNode.java | 17
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/trigger/JobTriggerEditor.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardView.java | 9
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/content/repository/tree/ContentRepositoryTreeDataSource.java | 12
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/AutoRefreshPortlet.java | 13
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/AutoRefreshPortletUtil.java | 72
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardView.java | 237
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardsView.java | 109
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletFactory.java | 223
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletWindow.java | 48
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/PortletConfigurationEditorComponent.java | 372
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupAlertsPortlet.java | 80
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupBundleDeploymentsPortlet.java | 287
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupConfigurationUpdatesPortlet.java | 535
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupEventsPortlet.java | 322
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java | 523
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOobsPortlet.java | 289
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOperationsPortlet.java | 510
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupPkgHistoryPortlet.java | 285
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/groups/graph/ResourceGroupGraphPortlet.java | 201
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/queue/AutodiscoveryPortlet.java | 42
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/FavoriteResourcesPortlet.java | 52
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/GraphPortlet.java | 181
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceGraphPortlet.java | 181
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformMetricDataSource.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformSummaryPortlet.java | 101
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/AbstractRecentAlertsPortlet.java | 402
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/PortletAlertSelector.java | 97
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/RecentAlertsPortlet.java | 645
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedResourceDS.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedResourcesPortlet.java | 59
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/AbstractOperationHistoryPortlet.java | 394
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationHistoryPortlet.java | 48
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationSchedulePortlet.java | 358
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationsPortlet.java | 475
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/problems/ProblemResourcesPortlet.java | 81
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceAlertsPortlet.java | 71
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceBundleDeploymentsPortlet.java | 153
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceConfigurationUpdatesPortlet.java | 317
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceEventsPortlet.java | 178
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceMetricsPortlet.java | 341
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceOobsPortlet.java | 149
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceOperationsPortlet.java | 62
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourcePkgHistoryPortlet.java | 151
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/summary/InventorySummaryPortlet.java | 57
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/util/MessagePortlet.java | 22
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/footer/FavoritesButton.java | 278
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/AgentGWTService.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/AlertDefinitionGWTService.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/AuthorizationGWTService.java | 14
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ConfigurationGWTService.java | 14
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ContentGWTService.java | 24
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/EventGWTService.java | 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/GWTServiceLookup.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/OperationGWTService.java | 15
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceGWTService.java | 19
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/SubjectGWTService.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/SystemGWTService.java | 10
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/help/HelpView.java | 27
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java | 43
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMeasurementDataTraitDataSource.java | 24
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMeasurementScheduleCompositeDataSource.java | 12
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMeasurementScheduleDataSource.java | 11
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricGraphView.java | 351
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/AbstractTwoLevelTabSetView.java | 86
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryDataSource.java | 52
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryDetailsView.java | 46
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryListView.java | 148
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDataSource.java | 56
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDetailsView.java | 94
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleListView.java | 8
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java | 274
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeDatasource.java | 37
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeDetailsView.java | 26
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeHistoryView.java | 125
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java | 8
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java | 63
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupsDataSource.java | 10
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/GroupDefinitionDataSource.java | 17
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/GroupDefinitionListView.java | 40
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java | 35
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/CustomResourceGroupTreeGrid.java | 68
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/GeneralProperties.java | 118
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupContextMenu.java | 72
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java | 39
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTitleBar.java | 30
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTopView.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeContextMenu.java | 11
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java | 463
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/GroupResourceConfigurationDataSource.java | 106
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/GroupResourceConfigurationEditView.java | 62
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationMembers.java | 112
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationSettings.java | 66
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationTable.java | 99
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/GroupPluginConfigurationEditView.java | 77
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationMembers.java | 110
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationSettings.java | 69
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationTable.java | 29
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/MembersView.java | 21
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/ResourceGroupMembershipView.java | 31
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/ResourceGroupResourceSelector.java | 55
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/ResourceGroupMetricGraphView.java | 134
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/schedules/SchedulesDataSource.java | 7
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMeasurementTableDataSource.java | 175
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMeasurementTableView.java | 77
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMembersHealthView.java | 96
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/traits/TraitsDataSource.java | 62
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/traits/TraitsDetailView.java | 23
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/traits/TraitsView.java | 21
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/history/GroupMemberResourceOperationHistoryListView.java | 62
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/history/GroupOperationHistoryDataSource.java | 48
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/history/GroupOperationHistoryDetailsView.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/history/GroupOperationHistoryListView.java | 9
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleDataSource.java | 13
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleDetailsView.java | 99
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/ActivityView.java | 862 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/ActivityView2.java | 221
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/AncestryUtil.java | 392
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeDataSource.java | 155
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeSearchView.java | 32
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDataSourceField.java | 19
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java | 94
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java | 192
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ChildHistoryDetails.java | 202
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ChildHistoryView.java | 343
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/OverviewForm.java | 370
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java | 26
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceErrorsDataSource.java | 106
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceErrorsView.java | 189
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java | 42
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTopView.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java | 62
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java | 150
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryDataSource.java | 71
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryView.java | 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryDataSource.java | 89
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationEditView.java | 23
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationEditView.java | 8
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationHistoryDataSource.java | 85
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/GraphListView.java | 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricGraphView.java | 156
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceScheduledMetricDatasource.java | 39
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/SmallGraphView.java | 380
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/calltime/CallTimeDataSource.java | 11
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MeasurementTableDataSource.java | 13
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MeasurementTableView.java | 49
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDataSource.java | 130
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDetailsView.java | 52
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryListView.java | 13
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/schedule/ResourceOperationScheduleDataSource.java | 31
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/Activity2View.java | 203
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/ActivityView.java | 834 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/OverviewForm.java | 332
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/ResourceErrorsDataSource.java | 122
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/ResourceErrorsView.java | 80
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/discovery/ResourceAutodiscoveryView.java | 13
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/AbstractResourceFactoryWizard.java | 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryConfigurationStep.java | 30
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryCreateWizard.java | 8
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryImportWizard.java | 24
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/ResourceGroupSelector.java | 46
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/ResourceSelector.java | 31
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/SingleResourceGroupSelector.java | 65
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java | 14
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/OperationHistoryDataSource.java | 462
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/OperationHistoryView.java | 241
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/RecentOperationsDataSource.java | 270
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/ScheduledOperationsDataSource.java | 213
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/AlertDefinitionReportView.java | 311
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ReportTopView.java | 25
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ResourceInstallReport.java | 256
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/measurement/MeasurementOOBDataSource.java | 135
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/measurement/MeasurementOOBView.java | 30
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/operation/SubsystemOperationHistoryListView.java | 73
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TagCloudView.java | 125
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java | 95
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/resource/ProblemResourcesDataSource.java | 191
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/resource/disambiguation/ReportDecorator.java | 141
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/FlexSearchBar.java | 13
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestDataSourceResponseStatisticsView.java | 406
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestRemoteServiceStatisticsView.java | 348
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestTopView.java | 93
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestUserPreferencesView.java | 171
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/async/TestAsyncView.java | 114
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/configuration/TestConfigurationFactory.java | 42
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/configuration/TestConfigurationView.java | 20
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/configuration/TestGroupConfigurationView.java | 8
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/i18n/TestRemoteServiceStatisticsView.java | 348
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/ErrorHandler.java | 58
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/GwtRelativeDurationConverter.java | 8
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java | 75
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/StringUtility.java | 65
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/TreeUtility.java | 21
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/async/AbstractCompoundAsyncOperation.java | 120
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/async/AsyncOperation.java | 31
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/async/AsyncOperationCallback.java | 34
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/async/CompoundAsyncOperationException.java | 47
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/async/ParallelCompoundAsyncOperation.java | 40
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/async/SerialCompoundAsyncOperation.java | 73
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/Message.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageBar.java | 82
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenter.java | 26
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenterView.java | 454
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/MeasurementUserPreferences.java | 36
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/UserPreferences.java | 26
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/rpc/DataSourceResponseStatistics.java | 64
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/Locatable.java | 26
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableHTMLFlow.java | 34
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableIButton.java | 26
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/filter/CacheControlFilter.java | 76
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AbstractGWTServiceImpl.java | 32
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AgentGWTServiceImpl.java | 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AlertDefinitionGWTServiceImpl.java | 31
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AlertGWTServiceImpl.java | 25
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AlertTemplateGWTServiceImpl.java | 10
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AuthorizationGWTServiceImpl.java | 21
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AvailabilityGWTServiceImpl.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/BundleGWTServiceImpl.java | 46
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ClusterGWTServiceImpl.java | 8
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ConfigurationGWTServiceImpl.java | 151
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ContentGWTServiceImpl.java | 18
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/DashboardGWTServiceImpl.java | 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/EventGWTServiceImpl.java | 23
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/GroupAlertDefinitionGWTServiceImpl.java | 10
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/GroupDefinitionExpressionBuilderGWTServiceImpl.java | 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/MeasurementChartsGWTServiceImpl.java | 12
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/MeasurementDataGWTServiceImpl.java | 59
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/MeasurementScheduleGWTServiceImpl.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ObjectFilter.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/OperationGWTServiceImpl.java | 185
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/PluginGWTServiceImpl.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/RemoteInstallGWTServiceImpl.java | 14
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/RepoGWTServiceImpl.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceBossGWTServiceImpl.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGWTServiceImpl.java | 163
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGroupGWTServiceImpl.java | 30
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceTypeGWTServiceImpl.java | 10
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/RoleGWTServiceImpl.java | 14
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/SearchGWTServiceImpl.java | 14
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/SubjectGWTServiceImpl.java | 33
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/SystemGWTServiceImpl.java | 20
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/TagGWTServiceImpl.java | 20
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/util/SerialUtility.java | 20
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml | 13
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 220
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties | 247
modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.css | 7
modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html | 4
modules/enterprise/gui/coregui/src/main/webapp/WEB-INF/web.xml | 9
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/alert/Flag_blue_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/js/jquery-1.4.4.js | 7179 ----------
modules/enterprise/gui/installer-war/pom.xml | 15
modules/enterprise/gui/installer-war/src/test/java/org/rhq/enterprise/installer/DBInstallatonTest.java | 17
modules/enterprise/gui/pom.xml | 2
modules/enterprise/gui/portal-war/pom.xml | 2
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/plugin/InstalledPluginsUIBean.java | 23
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/CreateNewPackageUIBean.java | 17
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/ListReposUIBean.java | 6
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/CreateNewPackageChildResourceUIBean.java | 9
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/DetermineChildResourceCreationTypeUIBean.java | 5
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/ListCreateResourceHistoryUIBean.java | 4
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/ListDeleteResourceHistoryUIBean.java | 4
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/ParamConstants.java | 2
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/WebUserPreferences.java | 49
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/measurement/graphs/EventsTimelineUIBean.java | 3
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/startup/StartupServlet.java | 46
modules/enterprise/gui/portal-war/src/main/webapp/js/popup.js | 119
modules/enterprise/gui/portal-war/src/main/webapp/portal/MainLayout.jsp | 10
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventAlertJSON.jsp | 2
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventConfigJSON.jsp | 2
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventContentJSON.jsp | 4
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventCreateDeleteChildJSON.jsp | 10
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventEventsJSON.jsp | 4
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventOperationsJSON.jsp | 2
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventPluginConfigJSON.jsp | 2
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/visibility/ChartLegend.jsp | 8
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/visibility/ChartParams.jsp | 5
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/visibility/CompareMetrics.jsp | 37
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/visibility/DashCharts.jsp | 4
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/visibility/MetricsDisplayRows.jsp | 14
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/visibility/ParticipatingResources.jsp | 16
modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/error.xhtml | 1
modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/monitor/events/data-plain.xhtml | 4
modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/listRepos-plain.xhtml | 2
modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repo-plain.xhtml | 12
modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repo.xhtml | 4
modules/enterprise/pom.xml | 2
modules/enterprise/remoting/cli/pom.xml | 3
modules/enterprise/remoting/cli/src/main/scripts/rhq-client.build.xml | 1
modules/enterprise/remoting/client-api/pom.xml | 2
modules/enterprise/remoting/client-deps/pom.xml | 2
modules/enterprise/remoting/pom.xml | 2
modules/enterprise/remoting/webservices/pom.xml | 2
modules/enterprise/server/client-api/pom.xml | 4
modules/enterprise/server/container-lib/pom.xml | 2
modules/enterprise/server/container/pom.xml | 40
modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml | 30
modules/enterprise/server/container/src/main/shell/zip_all_plugins | 4
modules/enterprise/server/ear/pom.xml | 2
modules/enterprise/server/ear/src/main/resources/alert-email-template.txt | 47
modules/enterprise/server/jar/pom.xml | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBean.java | 18
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java | 43
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/model/AlertConditionOperator.java | 12
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SubjectManagerBean.java | 24
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/prefs/SubjectPreferencesBase.java | 12
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/instance/ServerManagerBean.java | 15
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/instance/ServerManagerLocal.java | 9
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/instance/SyncEndpointAddressException.java | 20
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java | 48
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerLocal.java | 3
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/job/GroupPluginConfigurationUpdateJob.java | 8
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/job/GroupResourceConfigurationUpdateJob.java | 10
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/metadata/ConfigurationMetadataManagerBean.java | 14
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/AgentPluginScanner.java | 23
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java | 75
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryServerServiceImpl.java | 18
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/jaxb/WebServiceMapAdapter.java | 51
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBean.java | 9
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementProblemManagerBean.java | 4
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/GroupOperationJob.java | 11
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationJob.java | 6
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerBean.java | 60
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/activator/context/ResourceActivationContext.java | 6
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/AbstractJobWrapper.java | 10
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/AbstractTypeServerPluginContainer.java | 1
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ConcurrentJobWrapper.java | 9
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ScheduledJobInvocationContext.java | 70
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/StatefulJobWrapper.java | 9
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/StatefulScheduledJobInvocationContext.java | 65
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java | 50
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerLocal.java | 49
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerRemote.java | 43
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java | 235
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerLocal.java | 28
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerRemote.java | 22
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/cluster/ClusterManagerBean.java | 154
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBean.java | 36
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginManagerLocal.java | 38
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBean.java | 14
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/PurgePluginsJob.java | 43
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/GroupSearchAssistant.java | 8
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/ResourceSearchAssistant.java | 12
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/GroupSearchTranslator.java | 5
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/ResourceSearchTranslator.java | 4
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerBean.java | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerLocal.java | 3
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerRemote.java | 14
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java | 33
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesManagerBean.java | 40
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/core/plugin/DatabaseAndFilePluginDeploymentTest.java | 41
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest.java | 3
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/test/ResourceFactoryManagerBeanTest.java | 11
modules/enterprise/server/plugins/alert-cli/pom.xml | 6
modules/enterprise/server/plugins/alert-cli/src/main/java/org/rhq/enterprise/server/plugins/alertCli/CliSender.java | 49
modules/enterprise/server/plugins/alert-email/pom.xml | 4
modules/enterprise/server/plugins/alert-irc/pom.xml | 4
modules/enterprise/server/plugins/alert-log4j/pom.xml | 4
modules/enterprise/server/plugins/alert-microblog/pom.xml | 4
modules/enterprise/server/plugins/alert-mobicents/pom.xml | 4
modules/enterprise/server/plugins/alert-operations/pom.xml | 4
modules/enterprise/server/plugins/alert-roles/pom.xml | 4
modules/enterprise/server/plugins/alert-snmp/pom.xml | 4
modules/enterprise/server/plugins/alert-subject/pom.xml | 4
modules/enterprise/server/plugins/ant-bundle/pom.xml | 2
modules/enterprise/server/plugins/cloud/pom.xml | 146
modules/enterprise/server/plugins/cloud/src/main/java/org/rhq/enterprise/server/plugins/cloud/CloudServerPluginComponent.java | 193
modules/enterprise/server/plugins/cloud/src/main/resources/META-INF/rhq-serverplugin.xml | 57
modules/enterprise/server/plugins/cobbler/pom.xml | 4
modules/enterprise/server/plugins/disk/pom.xml | 2
modules/enterprise/server/plugins/filetemplate-bundle/pom.xml | 2
modules/enterprise/server/plugins/groovy-script/pom.xml | 4
modules/enterprise/server/plugins/jboss-software/pom.xml | 2
modules/enterprise/server/plugins/packagetype-cli/pom.xml | 4
modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml | 2
modules/enterprise/server/plugins/perspectives/core/pom.xml | 2
modules/enterprise/server/plugins/pom.xml | 2
modules/enterprise/server/plugins/rhnhosted/pom.xml | 2
modules/enterprise/server/plugins/url/pom.xml | 2
modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml | 2
modules/enterprise/server/plugins/yum/pom.xml | 2
modules/enterprise/server/safe-invoker/pom.xml | 59
modules/enterprise/server/safe-invoker/src/main/java/org/rhq/enterprise/server/util/HibernateDetachUtility.java | 143
modules/enterprise/server/sars/agent-sar/pom.xml | 2
modules/enterprise/server/sars/pom.xml | 2
modules/enterprise/server/xml-schemas/pom.xml | 2
modules/helpers/bundleGen/pom.xml | 4
modules/helpers/perftest-support/pom.xml | 4
modules/helpers/pluginGen/src/main/resources/component.ftl | 3
modules/helpers/pom.xml | 2
modules/helpers/rtfilter/pom.xml | 2
modules/jopr/etc/jbas5-jnp-client/client.sh | 12
modules/jopr/etc/jbas5-jnp-client/src/main/java/test/RmiClient.java | 26
modules/plugins/aliases/pom.xml | 2
modules/plugins/ant-bundle/pom.xml | 2
modules/plugins/apache/pom.xml | 2
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheServerComponent.java | 72
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheServerDiscoveryComponent.java | 172
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheVirtualHostServiceComponent.java | 198
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheVirtualHostServiceDiscoveryComponent.java | 257
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/AugeasConfigurationApache.java | 6
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/AugeasTreeBuilderApache.java | 2
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/parser/ApacheDirective.java | 21
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/parser/ApacheDirectiveTree.java | 10
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/parser/ApacheParserImpl.java | 2
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/ApacheBinaryInfo.java | 68
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/HttpdAddressUtility.java | 185
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/RuntimeApacheConfiguration.java | 304
modules/plugins/apache/src/main/java/org/rhq/plugins/www/util/WWWUtils.java | 73
modules/plugins/apache/src/main/resources/META-INF/rhq-plugin.xml | 28
modules/plugins/augeas/pom.xml | 2
modules/plugins/augeas/src/main/java/org/rhq/augeas/config/AugeasConfigurationSimple.java | 2
modules/plugins/augeas/src/main/java/org/rhq/augeas/util/Glob.java | 48
modules/plugins/augeas/src/main/java/org/rhq/plugins/augeas/AugeasConfigurationComponent.java | 2
modules/plugins/augeas/src/main/java/org/rhq/plugins/augeas/AugeasConfigurationDiscoveryComponent.java | 2
modules/plugins/augeas/src/main/java/org/rhq/rhqtransform/impl/PluginDescriptorBasedAugeasConfiguration.java | 2
modules/plugins/byteman/pom.xml | 2
modules/plugins/cobbler/pom.xml | 2
modules/plugins/cron/pom.xml | 2
modules/plugins/database/pom.xml | 2
modules/plugins/filetemplate-bundle/pom.xml | 2
modules/plugins/grub/pom.xml | 2
modules/plugins/hadoop/pom.xml | 2
modules/plugins/hibernate/pom.xml | 2
modules/plugins/hosts/pom.xml | 2
modules/plugins/hosts/src/main/java/org/rhq/plugins/hosts/helper/NonAugeasHostsConfigurationDelegate.java | 21
modules/plugins/hudson/pom.xml | 4
modules/plugins/iis/pom.xml | 2
modules/plugins/irc/pom.xml | 2
modules/plugins/jboss-as-5/pom.xml | 2
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerOperationsDelegate.java | 1056 -
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerPluginConfigurationProperties.java | 4
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/deploy/ManagedComponentDeployer.java | 64
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/util/ConversionUtils.java | 67
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/util/DeploymentUtils.java | 50
modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml | 12
modules/plugins/jboss-as/pom.xml | 2
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASServerComponent.java | 2
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASServerOperationsDelegate.java | 78
modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml | 13
modules/plugins/jboss-cache-v3/pom.xml | 2
modules/plugins/jboss-cache/pom.xml | 2
modules/plugins/jmx/pom.xml | 2
modules/plugins/kickstart/pom.xml | 2
modules/plugins/mysql/pom.xml | 2
modules/plugins/netservices/pom.xml | 2
modules/plugins/oracle/pom.xml | 2
modules/plugins/pattern-generator/pom.xml | 169
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/perftest/pom.xml | 2
modules/plugins/platform/pom.xml | 2
modules/plugins/platform/src/main/java/org/rhq/plugins/platform/WindowsPlatformComponent.java | 25
modules/plugins/platform/src/main/java/org/rhq/plugins/platform/win/Win32EventLogDelegate.java | 122
modules/plugins/pom.xml | 3
modules/plugins/postfix/pom.xml | 2
modules/plugins/postgres/pom.xml | 2
modules/plugins/rhq-agent/pom.xml | 2
modules/plugins/rhq-agent/src/main/java/org/rhq/plugins/agent/AgentServerComponent.java | 3
modules/plugins/rhq-agent/src/main/resources/META-INF/rhq-plugin.xml | 54
modules/plugins/rhq-server/pom.xml | 2
modules/plugins/rhq-server/src/main/resources/META-INF/rhq-plugin.xml | 43
modules/plugins/samba/pom.xml | 2
modules/plugins/script/pom.xml | 2
modules/plugins/script2/pom.xml | 2
modules/plugins/snmptrapd/pom.xml | 2
modules/plugins/sshd/pom.xml | 2
modules/plugins/sudoers/pom.xml | 2
modules/plugins/tomcat/pom.xml | 2
modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerComponent.java | 2
modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerOperationsDelegate.java | 27
modules/plugins/tomcat/src/main/resources/META-INF/rhq-plugin.xml | 13
modules/plugins/twitter/pom.xml | 2
modules/plugins/validate-all-plugins/pom.xml | 2
modules/plugins/virt/pom.xml | 2
modules/pom.xml | 2
modules/test-utils/pom.xml | 2
pom.xml | 14
650 files changed, 30340 insertions(+), 19527 deletions(-)
---
13 years
[rhq] Branch 'release-4.0.0-test-build' - modules/common modules/core modules/enterprise modules/helpers modules/plugins modules/pom.xml modules/test-utils pom.xml
by John Sanda
modules/common/ant-bundle/pom.xml | 2
modules/common/filetemplate-bundle/pom.xml | 2
modules/common/jboss-as/pom.xml | 2
modules/common/pom.xml | 2
modules/core/client-api/pom.xml | 2
modules/core/comm-api/pom.xml | 2
modules/core/dbutils/pom.xml | 2
modules/core/domain/pom.xml | 2
modules/core/gui/pom.xml | 2
modules/core/native-system/pom.xml | 2
modules/core/plugin-api/pom.xml | 2
modules/core/plugin-container/pom.xml | 2
modules/core/plugin-validator/pom.xml | 2
modules/core/plugindoc/pom.xml | 2
modules/core/pom.xml | 2
modules/core/util/pom.xml | 2
modules/enterprise/agent/pom.xml | 2
modules/enterprise/agentupdate/pom.xml | 2
modules/enterprise/binding/pom.xml | 4 -
modules/enterprise/comm/pom.xml | 2
modules/enterprise/gui/base-perspective-jar/pom.xml | 2
modules/enterprise/gui/base-perspective-war/pom.xml | 2
modules/enterprise/gui/content_http-war/pom.xml | 2
modules/enterprise/gui/coregui/pom.xml | 2
modules/enterprise/gui/installer-war/pom.xml | 2
modules/enterprise/gui/pom.xml | 2
modules/enterprise/gui/portal-war/pom.xml | 2
modules/enterprise/pom.xml | 2
modules/enterprise/remoting/cli/pom.xml | 2
modules/enterprise/remoting/client-api/pom.xml | 2
modules/enterprise/remoting/client-deps/pom.xml | 2
modules/enterprise/remoting/pom.xml | 2
modules/enterprise/remoting/webservices/pom.xml | 2
modules/enterprise/server/client-api/pom.xml | 4 -
modules/enterprise/server/container-lib/pom.xml | 2
modules/enterprise/server/container/pom.xml | 4 -
modules/enterprise/server/ear/pom.xml | 2
modules/enterprise/server/jar/pom.xml | 2
modules/enterprise/server/plugins/alert-cli/pom.xml | 4 -
modules/enterprise/server/plugins/alert-email/pom.xml | 4 -
modules/enterprise/server/plugins/alert-irc/pom.xml | 4 -
modules/enterprise/server/plugins/alert-log4j/pom.xml | 4 -
modules/enterprise/server/plugins/alert-microblog/pom.xml | 4 -
modules/enterprise/server/plugins/alert-mobicents/pom.xml | 4 -
modules/enterprise/server/plugins/alert-operations/pom.xml | 4 -
modules/enterprise/server/plugins/alert-roles/pom.xml | 4 -
modules/enterprise/server/plugins/alert-snmp/pom.xml | 4 -
modules/enterprise/server/plugins/alert-subject/pom.xml | 4 -
modules/enterprise/server/plugins/ant-bundle/pom.xml | 2
modules/enterprise/server/plugins/cobbler/pom.xml | 4 -
modules/enterprise/server/plugins/disk/pom.xml | 2
modules/enterprise/server/plugins/filetemplate-bundle/pom.xml | 2
modules/enterprise/server/plugins/groovy-script/pom.xml | 4 -
modules/enterprise/server/plugins/jboss-software/pom.xml | 2
modules/enterprise/server/plugins/packagetype-cli/pom.xml | 4 -
modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml | 2
modules/enterprise/server/plugins/perspectives/core/pom.xml | 2
modules/enterprise/server/plugins/pom.xml | 2
modules/enterprise/server/plugins/rhnhosted/pom.xml | 2
modules/enterprise/server/plugins/url/pom.xml | 2
modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml | 2
modules/enterprise/server/plugins/yum/pom.xml | 2
modules/enterprise/server/safe-invoker/pom.xml | 2
modules/enterprise/server/sars/agent-sar/pom.xml | 2
modules/enterprise/server/sars/pom.xml | 2
modules/enterprise/server/xml-schemas/pom.xml | 2
modules/helpers/bundleGen/pom.xml | 4 -
modules/helpers/perftest-support/pom.xml | 4 -
modules/helpers/pom.xml | 2
modules/helpers/rtfilter/pom.xml | 2
modules/plugins/aliases/pom.xml | 2
modules/plugins/ant-bundle/pom.xml | 2
modules/plugins/apache/pom.xml | 2
modules/plugins/augeas/pom.xml | 2
modules/plugins/byteman/pom.xml | 2
modules/plugins/cobbler/pom.xml | 2
modules/plugins/cron/pom.xml | 2
modules/plugins/database/pom.xml | 2
modules/plugins/filetemplate-bundle/pom.xml | 2
modules/plugins/grub/pom.xml | 2
modules/plugins/hadoop/pom.xml | 2
modules/plugins/hibernate/pom.xml | 2
modules/plugins/hosts/pom.xml | 2
modules/plugins/hudson/pom.xml | 4 -
modules/plugins/iis/pom.xml | 2
modules/plugins/irc/pom.xml | 2
modules/plugins/jboss-as-5/pom.xml | 2
modules/plugins/jboss-as/pom.xml | 2
modules/plugins/jboss-cache-v3/pom.xml | 2
modules/plugins/jboss-cache/pom.xml | 2
modules/plugins/jmx/pom.xml | 2
modules/plugins/kickstart/pom.xml | 2
modules/plugins/mysql/pom.xml | 2
modules/plugins/netservices/pom.xml | 2
modules/plugins/oracle/pom.xml | 2
modules/plugins/pattern-generator/pom.xml | 34 +++-------
modules/plugins/perftest/pom.xml | 2
modules/plugins/platform/pom.xml | 2
modules/plugins/pom.xml | 2
modules/plugins/postfix/pom.xml | 2
modules/plugins/postgres/pom.xml | 2
modules/plugins/rhq-agent/pom.xml | 2
modules/plugins/rhq-server/pom.xml | 2
modules/plugins/samba/pom.xml | 2
modules/plugins/script/pom.xml | 2
modules/plugins/script2/pom.xml | 2
modules/plugins/snmptrapd/pom.xml | 2
modules/plugins/sshd/pom.xml | 2
modules/plugins/sudoers/pom.xml | 2
modules/plugins/tomcat/pom.xml | 2
modules/plugins/twitter/pom.xml | 2
modules/plugins/validate-all-plugins/pom.xml | 2
modules/plugins/virt/pom.xml | 2
modules/pom.xml | 2
modules/test-utils/pom.xml | 2
pom.xml | 2
116 files changed, 146 insertions(+), 156 deletions(-)
New commits:
commit 2ccd32b643287c34fba907f6c8737378ffea38c3
Author: John Sanda <jsanda(a)redhat.com>
Date: Wed Apr 27 16:47:35 2011 -0400
[maven-release-plugin] prepare release RHQ_4_0_0_TEST
diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml
index 71f43e7..68376c1 100644
--- a/modules/common/ant-bundle/pom.xml
+++ b/modules/common/ant-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/common/filetemplate-bundle/pom.xml b/modules/common/filetemplate-bundle/pom.xml
index 1c84528..8acf1a4 100644
--- a/modules/common/filetemplate-bundle/pom.xml
+++ b/modules/common/filetemplate-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml
index 110c8a1..5eb3908 100644
--- a/modules/common/jboss-as/pom.xml
+++ b/modules/common/jboss-as/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/common/pom.xml b/modules/common/pom.xml
index bb61b03..74332c1 100644
--- a/modules/common/pom.xml
+++ b/modules/common/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml
index e5ea9a1..8d7f37f 100644
--- a/modules/core/client-api/pom.xml
+++ b/modules/core/client-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml
index f52e92d..06d39ca 100644
--- a/modules/core/comm-api/pom.xml
+++ b/modules/core/comm-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
index 50ad317..d994b09 100644
--- a/modules/core/dbutils/pom.xml
+++ b/modules/core/dbutils/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml
index 2b84a8b..97987f8 100644
--- a/modules/core/domain/pom.xml
+++ b/modules/core/domain/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml
index 884e360..621c9ed 100644
--- a/modules/core/gui/pom.xml
+++ b/modules/core/gui/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml
index eb11f1a..07892d2 100644
--- a/modules/core/native-system/pom.xml
+++ b/modules/core/native-system/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml
index 18846ad..1ceac2e 100644
--- a/modules/core/plugin-api/pom.xml
+++ b/modules/core/plugin-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml
index ad82fe0..5547cee 100644
--- a/modules/core/plugin-container/pom.xml
+++ b/modules/core/plugin-container/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml
index 5adfabf..19917da 100644
--- a/modules/core/plugin-validator/pom.xml
+++ b/modules/core/plugin-validator/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/plugindoc/pom.xml b/modules/core/plugindoc/pom.xml
index 2e5c467..1c7801b 100644
--- a/modules/core/plugindoc/pom.xml
+++ b/modules/core/plugindoc/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 2bafeac..d559f75 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml
index a080670..7280bf5 100644
--- a/modules/core/util/pom.xml
+++ b/modules/core/util/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml
index 76c9071..de7e58f 100644
--- a/modules/enterprise/agent/pom.xml
+++ b/modules/enterprise/agent/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml
index 2d1ea0b..6884431 100644
--- a/modules/enterprise/agentupdate/pom.xml
+++ b/modules/enterprise/agentupdate/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/binding/pom.xml b/modules/enterprise/binding/pom.xml
index 5b4ee27..7e0bb1e 100644
--- a/modules/enterprise/binding/pom.xml
+++ b/modules/enterprise/binding/pom.xml
@@ -3,11 +3,11 @@
<parent>
<artifactId>rhq-enterprise-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-script-bindings</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
<name>RHQ Script Bindings</name>
<description>Abstraction of different facilities and default configurations for script bindings</description>
diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml
index c029f62..65c46ac 100644
--- a/modules/enterprise/comm/pom.xml
+++ b/modules/enterprise/comm/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/base-perspective-jar/pom.xml b/modules/enterprise/gui/base-perspective-jar/pom.xml
index 4d79169..6153758 100644
--- a/modules/enterprise/gui/base-perspective-jar/pom.xml
+++ b/modules/enterprise/gui/base-perspective-jar/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/base-perspective-war/pom.xml b/modules/enterprise/gui/base-perspective-war/pom.xml
index 877f9f5..3cdf696 100644
--- a/modules/enterprise/gui/base-perspective-war/pom.xml
+++ b/modules/enterprise/gui/base-perspective-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/content_http-war/pom.xml b/modules/enterprise/gui/content_http-war/pom.xml
index 57a30b9..95d6d9a 100644
--- a/modules/enterprise/gui/content_http-war/pom.xml
+++ b/modules/enterprise/gui/content_http-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-gui-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml
index 7cff82b..919225f 100644
--- a/modules/enterprise/gui/coregui/pom.xml
+++ b/modules/enterprise/gui/coregui/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/installer-war/pom.xml b/modules/enterprise/gui/installer-war/pom.xml
index 7ea2401..2e73df5 100644
--- a/modules/enterprise/gui/installer-war/pom.xml
+++ b/modules/enterprise/gui/installer-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml
index f81b4c2..3720ac0 100644
--- a/modules/enterprise/gui/pom.xml
+++ b/modules/enterprise/gui/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml
index 808b267..b9091c9 100644
--- a/modules/enterprise/gui/portal-war/pom.xml
+++ b/modules/enterprise/gui/portal-war/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml
index b6461ea..550921e 100644
--- a/modules/enterprise/pom.xml
+++ b/modules/enterprise/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml
index 370f509..a9109cc 100644
--- a/modules/enterprise/remoting/cli/pom.xml
+++ b/modules/enterprise/remoting/cli/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/client-api/pom.xml b/modules/enterprise/remoting/client-api/pom.xml
index 872ac37..bc9ae9e 100644
--- a/modules/enterprise/remoting/client-api/pom.xml
+++ b/modules/enterprise/remoting/client-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/client-deps/pom.xml b/modules/enterprise/remoting/client-deps/pom.xml
index 1630e51..5112932 100644
--- a/modules/enterprise/remoting/client-deps/pom.xml
+++ b/modules/enterprise/remoting/client-deps/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/pom.xml b/modules/enterprise/remoting/pom.xml
index b7a9a46..1855c3d 100644
--- a/modules/enterprise/remoting/pom.xml
+++ b/modules/enterprise/remoting/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/webservices/pom.xml b/modules/enterprise/remoting/webservices/pom.xml
index 097e3c2..02dddf7 100644
--- a/modules/enterprise/remoting/webservices/pom.xml
+++ b/modules/enterprise/remoting/webservices/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/client-api/pom.xml b/modules/enterprise/server/client-api/pom.xml
index fc4d0e7..c49cfd9 100644
--- a/modules/enterprise/server/client-api/pom.xml
+++ b/modules/enterprise/server/client-api/pom.xml
@@ -5,13 +5,13 @@
<parent>
<artifactId>rhq-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-server-client-api</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
<name>RHQ Enterprise Server Client API</name>
<description>The implementation of the client API when accessing the server locally</description>
diff --git a/modules/enterprise/server/container-lib/pom.xml b/modules/enterprise/server/container-lib/pom.xml
index 2376311..c235e01 100644
--- a/modules/enterprise/server/container-lib/pom.xml
+++ b/modules/enterprise/server/container-lib/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/container/pom.xml b/modules/enterprise/server/container/pom.xml
index 4905ef7..c4042b0 100644
--- a/modules/enterprise/server/container/pom.xml
+++ b/modules/enterprise/server/container/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
@@ -204,7 +204,7 @@
<property name="rhq.server.enable.ws" value="${rhq.server.enable.ws}" />
<property name="jbossws-native-dist.version" value="${jbossws-native-dist.version}" />
- <property name="rhq.sync.endpoint-address" value="${rhq.sync.endpoint-address}"/>
+ <property name="rhq.sync.endpoint-address" value="${rhq.sync.endpoint-address}" />
</ant>
</tasks>
</configuration>
diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml
index 220eee6..bacc248 100644
--- a/modules/enterprise/server/ear/pom.xml
+++ b/modules/enterprise/server/ear/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml
index 5b9ff73..8c2b0e8 100644
--- a/modules/enterprise/server/jar/pom.xml
+++ b/modules/enterprise/server/jar/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/plugins/alert-cli/pom.xml b/modules/enterprise/server/plugins/alert-cli/pom.xml
index 96b129a..e94f31f 100644
--- a/modules/enterprise/server/plugins/alert-cli/pom.xml
+++ b/modules/enterprise/server/plugins/alert-cli/pom.xml
@@ -3,11 +3,11 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.rhq</groupId>
<artifactId>alert-cli</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
<name>RHQ Enterprise Server CLI Script Alert Plugin</name>
<description>An alert sender able to execute an arbitrary CLI script as a response to an alert</description>
diff --git a/modules/enterprise/server/plugins/alert-email/pom.xml b/modules/enterprise/server/plugins/alert-email/pom.xml
index 54891ae..c38d63f 100644
--- a/modules/enterprise/server/plugins/alert-email/pom.xml
+++ b/modules/enterprise/server/plugins/alert-email/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq.server</groupId>
<artifactId>alert-email</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
<name>RHQ Enterprise Server Email Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-irc/pom.xml b/modules/enterprise/server/plugins/alert-irc/pom.xml
index d9e695c..17849cd 100644
--- a/modules/enterprise/server/plugins/alert-irc/pom.xml
+++ b/modules/enterprise/server/plugins/alert-irc/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-irc</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
<name>RHQ Enterprise Server IRC Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-log4j/pom.xml b/modules/enterprise/server/plugins/alert-log4j/pom.xml
index a270432..5bb4247 100644
--- a/modules/enterprise/server/plugins/alert-log4j/pom.xml
+++ b/modules/enterprise/server/plugins/alert-log4j/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-log4j</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
<name>RHQ Enterprise Server Log4J Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-microblog/pom.xml b/modules/enterprise/server/plugins/alert-microblog/pom.xml
index 3ebc711..2df04ca 100644
--- a/modules/enterprise/server/plugins/alert-microblog/pom.xml
+++ b/modules/enterprise/server/plugins/alert-microblog/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-microblog</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
<name>RHQ Enterprise Server Microblog Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-mobicents/pom.xml b/modules/enterprise/server/plugins/alert-mobicents/pom.xml
index 21a353d..29d156f 100644
--- a/modules/enterprise/server/plugins/alert-mobicents/pom.xml
+++ b/modules/enterprise/server/plugins/alert-mobicents/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-mobicents</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
<name>RHQ Enterprise Server Mobicents Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-operations/pom.xml b/modules/enterprise/server/plugins/alert-operations/pom.xml
index 8be5518..3928ab7 100644
--- a/modules/enterprise/server/plugins/alert-operations/pom.xml
+++ b/modules/enterprise/server/plugins/alert-operations/pom.xml
@@ -2,14 +2,14 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-operations</artifactId>
<packaging>jar</packaging>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
<name>RHQ Enterprise Server Opertions Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-roles/pom.xml b/modules/enterprise/server/plugins/alert-roles/pom.xml
index 390b329..f281938 100644
--- a/modules/enterprise/server/plugins/alert-roles/pom.xml
+++ b/modules/enterprise/server/plugins/alert-roles/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-roles</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
<name>RHQ Enterprise Server Roles Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-snmp/pom.xml b/modules/enterprise/server/plugins/alert-snmp/pom.xml
index 7b494d7..2d16a30 100644
--- a/modules/enterprise/server/plugins/alert-snmp/pom.xml
+++ b/modules/enterprise/server/plugins/alert-snmp/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-snmp</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
<name>RHQ Enterprise Server SNMP Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-subject/pom.xml b/modules/enterprise/server/plugins/alert-subject/pom.xml
index 635aa9c..3c704c4 100644
--- a/modules/enterprise/server/plugins/alert-subject/pom.xml
+++ b/modules/enterprise/server/plugins/alert-subject/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-subject</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
<name>RHQ Enterprise Server Subject Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/ant-bundle/pom.xml b/modules/enterprise/server/plugins/ant-bundle/pom.xml
index 13260a0..ab4d547 100644
--- a/modules/enterprise/server/plugins/ant-bundle/pom.xml
+++ b/modules/enterprise/server/plugins/ant-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/cobbler/pom.xml b/modules/enterprise/server/plugins/cobbler/pom.xml
index b58a7ae..90a1fbd 100644
--- a/modules/enterprise/server/plugins/cobbler/pom.xml
+++ b/modules/enterprise/server/plugins/cobbler/pom.xml
@@ -4,14 +4,14 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>rhq-serverplugin-cobbler</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
<name>RHQ Enterprise Server Cobbler Plugin</name>
diff --git a/modules/enterprise/server/plugins/disk/pom.xml b/modules/enterprise/server/plugins/disk/pom.xml
index 34f0e08..b90bfff 100644
--- a/modules/enterprise/server/plugins/disk/pom.xml
+++ b/modules/enterprise/server/plugins/disk/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml
index ebf0154..2321329 100644
--- a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml
+++ b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/groovy-script/pom.xml b/modules/enterprise/server/plugins/groovy-script/pom.xml
index e3c202b..da6c6b2 100644
--- a/modules/enterprise/server/plugins/groovy-script/pom.xml
+++ b/modules/enterprise/server/plugins/groovy-script/pom.xml
@@ -4,14 +4,14 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>groovy-script-server-plugin</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
<name>RHQ Enterprise Server Groovy Script Plugin</name>
diff --git a/modules/enterprise/server/plugins/jboss-software/pom.xml b/modules/enterprise/server/plugins/jboss-software/pom.xml
index 659622f..b8d4818 100644
--- a/modules/enterprise/server/plugins/jboss-software/pom.xml
+++ b/modules/enterprise/server/plugins/jboss-software/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/packagetype-cli/pom.xml b/modules/enterprise/server/plugins/packagetype-cli/pom.xml
index bb8019d..14ed593 100644
--- a/modules/enterprise/server/plugins/packagetype-cli/pom.xml
+++ b/modules/enterprise/server/plugins/packagetype-cli/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>packagetype-cli</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
<name>RHQ Enterprise Server CLI Package Type Plugin</name>
diff --git a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml
index f695982..4fa056a 100644
--- a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml
+++ b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
<relativePath>../../../../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/plugins/perspectives/core/pom.xml b/modules/enterprise/server/plugins/perspectives/core/pom.xml
index 287d62e..fc2a43b 100644
--- a/modules/enterprise/server/plugins/perspectives/core/pom.xml
+++ b/modules/enterprise/server/plugins/perspectives/core/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
<relativePath>../../../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml
index 2ebb23e..cbf8bdd 100644
--- a/modules/enterprise/server/plugins/pom.xml
+++ b/modules/enterprise/server/plugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/plugins/rhnhosted/pom.xml b/modules/enterprise/server/plugins/rhnhosted/pom.xml
index 1c8d17c..034c9cc 100644
--- a/modules/enterprise/server/plugins/rhnhosted/pom.xml
+++ b/modules/enterprise/server/plugins/rhnhosted/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/url/pom.xml b/modules/enterprise/server/plugins/url/pom.xml
index 56adc17..250221a 100644
--- a/modules/enterprise/server/plugins/url/pom.xml
+++ b/modules/enterprise/server/plugins/url/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml
index 3ec9918..7dda98b 100644
--- a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml
+++ b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/yum/pom.xml b/modules/enterprise/server/plugins/yum/pom.xml
index f22634e..867e9b1 100644
--- a/modules/enterprise/server/plugins/yum/pom.xml
+++ b/modules/enterprise/server/plugins/yum/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/safe-invoker/pom.xml b/modules/enterprise/server/safe-invoker/pom.xml
index 94b88bb..42e7e32 100644
--- a/modules/enterprise/server/safe-invoker/pom.xml
+++ b/modules/enterprise/server/safe-invoker/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/sars/agent-sar/pom.xml b/modules/enterprise/server/sars/agent-sar/pom.xml
index b1c400f..268c0f1 100644
--- a/modules/enterprise/server/sars/agent-sar/pom.xml
+++ b/modules/enterprise/server/sars/agent-sar/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-sars-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/sars/pom.xml b/modules/enterprise/server/sars/pom.xml
index 4ed8677..7a53930 100644
--- a/modules/enterprise/server/sars/pom.xml
+++ b/modules/enterprise/server/sars/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/xml-schemas/pom.xml b/modules/enterprise/server/xml-schemas/pom.xml
index 5dfa3a0..07639dc 100644
--- a/modules/enterprise/server/xml-schemas/pom.xml
+++ b/modules/enterprise/server/xml-schemas/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/helpers/bundleGen/pom.xml b/modules/helpers/bundleGen/pom.xml
index 49b64f7..efa2b65 100644
--- a/modules/helpers/bundleGen/pom.xml
+++ b/modules/helpers/bundleGen/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-helpers</artifactId>
<groupId>org.rhq.helpers</groupId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq.helpers</groupId>
<artifactId>bundleGen</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
<build>
<plugins>
diff --git a/modules/helpers/perftest-support/pom.xml b/modules/helpers/perftest-support/pom.xml
index b3085a3..a775164 100644
--- a/modules/helpers/perftest-support/pom.xml
+++ b/modules/helpers/perftest-support/pom.xml
@@ -3,11 +3,11 @@
<parent>
<artifactId>rhq-helpers</artifactId>
<groupId>org.rhq.helpers</groupId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.rhq.helpers</groupId>
<artifactId>perftest-support</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
<name>Performance Testing Support</name>
<description>To support performance testing, this is a basic tool to support extracting and later reimporting of
data from/to a database.
diff --git a/modules/helpers/pom.xml b/modules/helpers/pom.xml
index 15126b3..3f03893 100644
--- a/modules/helpers/pom.xml
+++ b/modules/helpers/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml
index 612f9cd..1126654 100644
--- a/modules/helpers/rtfilter/pom.xml
+++ b/modules/helpers/rtfilter/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq.helpers</groupId>
<artifactId>rhq-helpers</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml
index 4e89419..fccf457 100644
--- a/modules/plugins/aliases/pom.xml
+++ b/modules/plugins/aliases/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml
index 887eb25..b76dd57 100644
--- a/modules/plugins/ant-bundle/pom.xml
+++ b/modules/plugins/ant-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml
index 0cfa72c..489f541 100644
--- a/modules/plugins/apache/pom.xml
+++ b/modules/plugins/apache/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml
index 48528ba..e1ac6eb 100644
--- a/modules/plugins/augeas/pom.xml
+++ b/modules/plugins/augeas/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/byteman/pom.xml b/modules/plugins/byteman/pom.xml
index d4111a3..388faeb 100644
--- a/modules/plugins/byteman/pom.xml
+++ b/modules/plugins/byteman/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml
index bfd354f..4d517eb 100644
--- a/modules/plugins/cobbler/pom.xml
+++ b/modules/plugins/cobbler/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml
index eaf87a7..1cf2e21 100644
--- a/modules/plugins/cron/pom.xml
+++ b/modules/plugins/cron/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml
index 4b0ec48..45e57af 100644
--- a/modules/plugins/database/pom.xml
+++ b/modules/plugins/database/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/filetemplate-bundle/pom.xml b/modules/plugins/filetemplate-bundle/pom.xml
index 32503ea..bcaae3f 100644
--- a/modules/plugins/filetemplate-bundle/pom.xml
+++ b/modules/plugins/filetemplate-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml
index 02f0c58..f1ebfd8 100644
--- a/modules/plugins/grub/pom.xml
+++ b/modules/plugins/grub/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/hadoop/pom.xml b/modules/plugins/hadoop/pom.xml
index 4179f3d..cd82cae 100644
--- a/modules/plugins/hadoop/pom.xml
+++ b/modules/plugins/hadoop/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml
index 1775ae1..3fb7b20 100644
--- a/modules/plugins/hibernate/pom.xml
+++ b/modules/plugins/hibernate/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.rhq</groupId>
<!-- Bypass the jopr-plugins-parent which can not have children. It must build after the plugins in order to execute integration tests on them. -->
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml
index e9f147d..cde548e 100644
--- a/modules/plugins/hosts/pom.xml
+++ b/modules/plugins/hosts/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml
index 71c974a..137f8af 100644
--- a/modules/plugins/hudson/pom.xml
+++ b/modules/plugins/hudson/pom.xml
@@ -6,12 +6,12 @@
<parent>
<artifactId>rhq-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-hudson-plugin</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
<packaging>jar</packaging>
<name>RHQ Hudson Plugin</name>
diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml
index b58b28c..8081699 100644
--- a/modules/plugins/iis/pom.xml
+++ b/modules/plugins/iis/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/irc/pom.xml b/modules/plugins/irc/pom.xml
index df8ea6b..382b7c4 100644
--- a/modules/plugins/irc/pom.xml
+++ b/modules/plugins/irc/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>rhq-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml
index 1e9183e..2779755 100644
--- a/modules/plugins/jboss-as-5/pom.xml
+++ b/modules/plugins/jboss-as-5/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml
index 94e111a..ed166c7 100644
--- a/modules/plugins/jboss-as/pom.xml
+++ b/modules/plugins/jboss-as/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jboss-cache-v3/pom.xml b/modules/plugins/jboss-cache-v3/pom.xml
index 070ed5e..d293deb 100644
--- a/modules/plugins/jboss-cache-v3/pom.xml
+++ b/modules/plugins/jboss-cache-v3/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml
index 4d15790..d5eeedf 100644
--- a/modules/plugins/jboss-cache/pom.xml
+++ b/modules/plugins/jboss-cache/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml
index 57d44c0..d58242e 100644
--- a/modules/plugins/jmx/pom.xml
+++ b/modules/plugins/jmx/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/kickstart/pom.xml b/modules/plugins/kickstart/pom.xml
index dd0035e..1bd4513 100644
--- a/modules/plugins/kickstart/pom.xml
+++ b/modules/plugins/kickstart/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml
index cfbb26e..d289583 100644
--- a/modules/plugins/mysql/pom.xml
+++ b/modules/plugins/mysql/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml
index 1987cfb..6cb3690 100644
--- a/modules/plugins/netservices/pom.xml
+++ b/modules/plugins/netservices/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml
index e6d37b9..f72abd4 100644
--- a/modules/plugins/oracle/pom.xml
+++ b/modules/plugins/oracle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/pattern-generator/pom.xml b/modules/plugins/pattern-generator/pom.xml
index afd78d2..ffe3cd1 100644
--- a/modules/plugins/pattern-generator/pom.xml
+++ b/modules/plugins/pattern-generator/pom.xml
@@ -1,15 +1,11 @@
-<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"
- >
+<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 -->
+ <version>4.0.0.TEST</version><!-- TODO adjust RHQ version -->
</parent>
<groupId>org.rhq</groupId>
@@ -21,7 +17,7 @@
<properties>
<scm.module.path>TODO</scm.module.path>
- <rhq.version>4.0.0-SNAPSHOT</rhq.version> <!-- TODO adjust, see above too -->
+ <rhq.version>4.0.0.TEST</rhq.version> <!-- TODO adjust, see above too -->
</properties>
<build>
@@ -61,11 +57,10 @@
<phase>compile</phase>
<configuration>
<tasks>
- <mkdir dir="${rhq.deploymentDir}"/>
- <property name="deployment.file"
- location="${rhq.deploymentDir}/${project.build.finalName}.jar"/>
+ <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}"/>
+ <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" />
</tasks>
</configuration>
<goals>
@@ -78,18 +73,14 @@
<phase>package</phase>
<configuration>
<tasks>
- <property name="deployment.file"
- location="${rhq.deploymentDir}/${project.build.finalName}.jar"/>
+ <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}">
+ <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}">
<patternset>
- <include name="META-INF/**"/>
+ <include name="META-INF/**" />
</patternset>
</unjar>
- <jar destfile="${deployment.file}"
- manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF"
- update="true">
+ <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true">
</jar>
</tasks>
</configuration>
@@ -103,10 +94,9 @@
<phase>clean</phase>
<configuration>
<tasks>
- <property name="deployment.file"
- location="${rhq.deploymentDir}/${project.build.finalName}.jar"/>
+ <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" />
<echo>*** Deleting ${deployment.file}...</echo>
- <delete file="${deployment.file}"/>
+ <delete file="${deployment.file}" />
</tasks>
</configuration>
<goals>
diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml
index a84f95d..6a0443e 100644
--- a/modules/plugins/perftest/pom.xml
+++ b/modules/plugins/perftest/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml
index ed3f654..3565b72 100644
--- a/modules/plugins/platform/pom.xml
+++ b/modules/plugins/platform/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml
index b1eec53..0e2de0c 100644
--- a/modules/plugins/pom.xml
+++ b/modules/plugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml
index b4c9c4c..99e144e 100644
--- a/modules/plugins/postfix/pom.xml
+++ b/modules/plugins/postfix/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml
index 0e5b102..60982b5 100644
--- a/modules/plugins/postgres/pom.xml
+++ b/modules/plugins/postgres/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml
index 37dfc09..adc498f 100644
--- a/modules/plugins/rhq-agent/pom.xml
+++ b/modules/plugins/rhq-agent/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml
index 60c4245..383bc86 100644
--- a/modules/plugins/rhq-server/pom.xml
+++ b/modules/plugins/rhq-server/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml
index 00be871..adcfa59 100644
--- a/modules/plugins/samba/pom.xml
+++ b/modules/plugins/samba/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml
index 3627ab7..005a79c 100644
--- a/modules/plugins/script/pom.xml
+++ b/modules/plugins/script/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/script2/pom.xml b/modules/plugins/script2/pom.xml
index d6fa9c4..ed6444e 100644
--- a/modules/plugins/script2/pom.xml
+++ b/modules/plugins/script2/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml
index e0750eb..a34fcf2 100644
--- a/modules/plugins/snmptrapd/pom.xml
+++ b/modules/plugins/snmptrapd/pom.xml
@@ -2,7 +2,7 @@
<parent>
<artifactId>rhq-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml
index f00f113..91d87cf 100644
--- a/modules/plugins/sshd/pom.xml
+++ b/modules/plugins/sshd/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml
index 8a88bb4..fbeaaf1 100644
--- a/modules/plugins/sudoers/pom.xml
+++ b/modules/plugins/sudoers/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml
index 37d52a1..752f27d 100644
--- a/modules/plugins/tomcat/pom.xml
+++ b/modules/plugins/tomcat/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml
index 1993f61..a1e9a9e 100644
--- a/modules/plugins/twitter/pom.xml
+++ b/modules/plugins/twitter/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/validate-all-plugins/pom.xml b/modules/plugins/validate-all-plugins/pom.xml
index 4f1c4c3..c5f4dae 100644
--- a/modules/plugins/validate-all-plugins/pom.xml
+++ b/modules/plugins/validate-all-plugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/virt/pom.xml b/modules/plugins/virt/pom.xml
index c16d198..3ebe414 100644
--- a/modules/plugins/virt/pom.xml
+++ b/modules/plugins/virt/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/pom.xml b/modules/pom.xml
index f760f66..5121e56 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml
index cb02492..143007f 100644
--- a/modules/test-utils/pom.xml
+++ b/modules/test-utils/pom.xml
@@ -7,7 +7,7 @@
<parent>
<artifactId>rhq-modules-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
</parent>
<artifactId>test-utils</artifactId>
diff --git a/pom.xml b/pom.xml
index 3c49e2d..8942256 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.TEST</version>
<packaging>pom</packaging>
<name>RHQ</name>
13 years
[rhq] modules/enterprise
by Jay Shaughnessy
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
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
13 years
[rhq] modules/enterprise
by Heiko W. Rupp
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties | 86 +++++++---
1 file changed, 63 insertions(+), 23 deletions(-)
New commits:
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.
13 years
[rhq] modules/enterprise
by Jay Shaughnessy
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 ++
15 files changed, 127 insertions(+), 70 deletions(-)
New commits:
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();
}
});
13 years