rhq-commits April 2013

rhq-commits@lists.fedorahosted.org

13 participants
225 discussions

[rhq] Branch 'bug/rhq-1' - 3 commits - modules/enterprise
by mazz 04 Apr '13

04 Apr '13

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/AutoRefreshPortlet.java | 22 -- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/AutoRefreshPortletUtil.java | 75 --------- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/AutoRefreshUtil.java | 76 ++++++++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/FavoriteGroupsPortlet.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupBundleDeploymentsPortlet.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupConfigurationUpdatesPortlet.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupEventsPortlet.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOobsPortlet.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOperationsPortlet.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupPkgHistoryPortlet.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/groups/graph/ResourceGroupD3GraphPortlet.java | 10 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/queue/AutodiscoveryPortlet.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/FavoriteResourcesPortlet.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceD3GraphPortlet.java | 9 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/AbstractRecentAlertsPortlet.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/drift/AbstractRecentDriftsPortlet.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedResourcesPortlet.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/AbstractOperationHistoryPortlet.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationSchedulePortlet.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/problems/ProblemResourcesPortlet.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/summary/InventorySummaryPortlet.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/AutoRefresh.java | 45 +++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractD3GraphListView.java | 34 ++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AvailabilityLineGraphType.java | 15 + modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java | 25 ++- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/ResourceGroupMetricD3GraphView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java | 14 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricD3Graph.java | 30 +++ 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_cs.properties | 1 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties | 1 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties | 1 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties | 1 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties | 1 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties | 1 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties | 1 38 files changed, 291 insertions(+), 180 deletions(-) New commits: commit 563d5bc3c7d944105a3fb7bdae1ed5f729bc49ae Merge: bef3bcf 5c8056d Author: John Mazzitelli <mazz(a)redhat.com> Date: Wed Apr 3 20:38:37 2013 -0400 Merge remote-tracking branch 'origin/master' into bug/rhq-1 commit 5c8056dad2e0bbc236ae98fa5483bf11e46d7912 Author: Mike Thompson <mithomps(a)redhat.com> Date: Wed Apr 3 15:31:37 2013 -0700 [BZ 948080] Add AutoRefresh capability to graphs other than portlet graphs. Refactored Auto refresh capability to be more generic so that it could be used for more than just portlets. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/AutoRefreshPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/AutoRefreshPortlet.java index e577230..c122620 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/AutoRefreshPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/AutoRefreshPortlet.java @@ -23,26 +23,16 @@ package org.rhq.enterprise.gui.coregui.client.dashboard; +import org.rhq.enterprise.gui.coregui.client.inventory.AutoRefresh; + /** + * An AutoRefreshPortlet has the capabilities of both a Portlet and AutoRefresh interface. + * * @author Simeon Pinder */ -public interface AutoRefreshPortlet extends Portlet { - - /** - * Each portlet implements to define the refresh cycle. Note that once refresh is started it - * should be canceled when the portlet goes out of scope (typically in an onDestroy() override). - */ - void startRefreshCycle(); +public interface AutoRefreshPortlet extends Portlet,AutoRefresh { - /** - * @return true if the portlet is currently responding to a refresh (i.e. reloading data). This can be used - * to ignore refresh requests until a prior request is completed. - */ - boolean isRefreshing(); + // All method signatures come from extension of parent Interfaces. - /** - * Refresh this portlet, reload data, redraw widgets, whatever is needed to refresh the portlet - */ - void refresh(); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/AutoRefreshPortletUtil.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/AutoRefreshPortletUtil.java deleted file mode 100644 index 8f0ca51..0000000 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/AutoRefreshPortletUtil.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2009 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -package org.rhq.enterprise.gui.coregui.client.dashboard; - -import com.google.gwt.user.client.Timer; -import com.smartgwt.client.widgets.Canvas; - -import org.rhq.enterprise.gui.coregui.client.UserSessionManager; -import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility; - -/** - * @author Jay Shaughnessy - */ -public class AutoRefreshPortletUtil { - - public static Timer startRefreshCycle(final AutoRefreshPortlet autoRefreshPortlet, - final Canvas autoRefreshPortletCanvas, Timer refreshTimer) { - - final int refreshInterval = UserSessionManager.getUserPreferences().getPageRefreshInterval(); - - //cancel any existing timer - if (null != refreshTimer) { - refreshTimer.cancel(); - refreshTimer = null; - } - - if (refreshInterval >= MeasurementUtility.MINUTES) { - - refreshTimer = new Timer() { - public void run() { - - // if the portlet is already refreshing or if the portlet is not currently on screen then - // don't bother doing the work. this protects against unnecessary or unwanted db queries - // being performed in the background. - if (!autoRefreshPortlet.isRefreshing() && autoRefreshPortletCanvas.isDrawn() - && autoRefreshPortletCanvas.isVisible()) { - - autoRefreshPortlet.refresh(); - } - } - }; - - refreshTimer.scheduleRepeating(refreshInterval); - } - - return refreshTimer; - } - - public static void onDestroy(final Canvas portlet, Timer refreshTimer) { - - if (refreshTimer != null) { - - refreshTimer.cancel(); - } - - } - -} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/AutoRefreshUtil.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/AutoRefreshUtil.java new file mode 100644 index 0000000..4c7a651 --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/AutoRefreshUtil.java @@ -0,0 +1,76 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2009 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +package org.rhq.enterprise.gui.coregui.client.dashboard; + +import com.google.gwt.user.client.Timer; +import com.smartgwt.client.widgets.Canvas; + +import org.rhq.enterprise.gui.coregui.client.UserSessionManager; +import org.rhq.enterprise.gui.coregui.client.inventory.AutoRefresh; +import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility; + +/** + * @author Jay Shaughnessy + */ +public class AutoRefreshUtil { + + public static Timer startRefreshCycle(final AutoRefresh autoRefresh, + final Canvas autoRefreshCanvas, Timer refreshTimer) { + + final int refreshInterval = UserSessionManager.getUserPreferences().getPageRefreshInterval(); + + //cancel any existing timer + if (null != refreshTimer) { + refreshTimer.cancel(); + refreshTimer = null; + } + + if (refreshInterval >= MeasurementUtility.MINUTES) { + + refreshTimer = new Timer() { + public void run() { + + // if the autoRefresh component is already refreshing or is not currently on screen then + // don't bother doing the work. this protects against unnecessary or unwanted db queries + // being performed in the background. + if (!autoRefresh.isRefreshing() && autoRefreshCanvas.isDrawn() + && autoRefreshCanvas.isVisible()) { + + autoRefresh.refresh(); + } + } + }; + + refreshTimer.scheduleRepeating(refreshInterval); + } + + return refreshTimer; + } + + public static void onDestroy(Timer refreshTimer) { + + if (refreshTimer != null) { + + refreshTimer.cancel(); + } + + } + +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/FavoriteGroupsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/FavoriteGroupsPortlet.java index 406c1fa..e9ab2c5 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/FavoriteGroupsPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/FavoriteGroupsPortlet.java @@ -38,7 +38,7 @@ import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.domain.dashboard.DashboardPortlet; import org.rhq.enterprise.gui.coregui.client.UserSessionManager; import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet; -import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortletUtil; +import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; 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; @@ -127,12 +127,12 @@ public class FavoriteGroupsPortlet extends ResourceGroupListView implements Auto } public void startRefreshCycle() { - refreshTimer = AutoRefreshPortletUtil.startRefreshCycle(this, this, refreshTimer); + refreshTimer = AutoRefreshUtil.startRefreshCycle(this, this, refreshTimer); } @Override protected void onDestroy() { - AutoRefreshPortletUtil.onDestroy(this, refreshTimer); + AutoRefreshUtil.onDestroy( refreshTimer); super.onDestroy(); } 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 71c4b6c..6432aa3 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 @@ -44,7 +44,7 @@ import org.rhq.core.domain.util.PageList; import org.rhq.core.domain.util.PageOrdering; import org.rhq.enterprise.gui.coregui.client.LinkManager; import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet; -import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortletUtil; +import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; 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; @@ -263,12 +263,12 @@ public class GroupBundleDeploymentsPortlet extends EnhancedVLayout implements Cu } public void startRefreshCycle() { - refreshTimer = AutoRefreshPortletUtil.startRefreshCycle(this, this, refreshTimer); + refreshTimer = AutoRefreshUtil.startRefreshCycle(this, this, refreshTimer); } @Override protected void onDestroy() { - AutoRefreshPortletUtil.onDestroy(this, refreshTimer); + AutoRefreshUtil.onDestroy(refreshTimer); super.onDestroy(); } 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 9966490..7c3bbb3 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 @@ -50,7 +50,7 @@ import org.rhq.core.domain.util.PageOrdering; import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.components.measurement.CustomConfigMeasurementRangeEditor; import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet; -import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortletUtil; +import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; 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; @@ -236,12 +236,12 @@ public class GroupConfigurationUpdatesPortlet extends EnhancedVLayout implements @Override public void startRefreshCycle() { - refreshTimer = AutoRefreshPortletUtil.startRefreshCycle(this, this, refreshTimer); + refreshTimer = AutoRefreshUtil.startRefreshCycle(this, this, refreshTimer); } @Override protected void onDestroy() { - AutoRefreshPortletUtil.onDestroy(this, refreshTimer); + AutoRefreshUtil.onDestroy(refreshTimer); super.onDestroy(); } 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 b62cfae..fc9205e 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 @@ -40,7 +40,7 @@ import org.rhq.enterprise.gui.coregui.client.ImageManager; import org.rhq.enterprise.gui.coregui.client.LinkManager; import org.rhq.enterprise.gui.coregui.client.components.measurement.CustomConfigMeasurementRangeEditor; import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet; -import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortletUtil; +import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; 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; @@ -288,12 +288,12 @@ public class GroupEventsPortlet extends EnhancedVLayout implements CustomSetting } public void startRefreshCycle() { - refreshTimer = AutoRefreshPortletUtil.startRefreshCycle(this, this, refreshTimer); + refreshTimer = AutoRefreshUtil.startRefreshCycle(this, this, refreshTimer); } @Override protected void onDestroy() { - AutoRefreshPortletUtil.onDestroy(this, refreshTimer); + AutoRefreshUtil.onDestroy(refreshTimer); super.onDestroy(); } 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 e3c45ec..e025bdc 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 @@ -59,7 +59,7 @@ import org.rhq.enterprise.gui.coregui.client.LinkManager; import org.rhq.enterprise.gui.coregui.client.components.FullHTMLPane; import org.rhq.enterprise.gui.coregui.client.components.measurement.CustomConfigMeasurementRangeEditor; import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet; -import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortletUtil; +import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; 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; @@ -517,7 +517,7 @@ public class GroupMetricsPortlet extends EnhancedVLayout implements CustomSettin @Override public void startRefreshCycle() { - refreshTimer = AutoRefreshPortletUtil.startRefreshCycle(this, this, refreshTimer); + refreshTimer = AutoRefreshUtil.startRefreshCycle(this, this, refreshTimer); //call out to 3rd party javascript lib BrowserUtility.graphSparkLines(); @@ -526,7 +526,7 @@ public class GroupMetricsPortlet extends EnhancedVLayout implements CustomSettin @Override protected void onDestroy() { - AutoRefreshPortletUtil.onDestroy(this, refreshTimer); + AutoRefreshUtil.onDestroy(refreshTimer); super.onDestroy(); } 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 00e8f3a..2be2613 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 @@ -43,7 +43,7 @@ import org.rhq.core.domain.measurement.composite.MeasurementOOBComposite; import org.rhq.core.domain.util.PageList; import org.rhq.enterprise.gui.coregui.client.components.FullHTMLPane; import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet; -import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortletUtil; +import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; 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; @@ -266,14 +266,14 @@ public class GroupOobsPortlet extends EnhancedVLayout implements CustomSettingsP } public void startRefreshCycle() { - refreshTimer = AutoRefreshPortletUtil.startRefreshCycle(this, this, refreshTimer); + refreshTimer = AutoRefreshUtil.startRefreshCycle(this, this, refreshTimer); recentOobContent.markForRedraw(); markForRedraw(); } @Override protected void onDestroy() { - AutoRefreshPortletUtil.onDestroy(this, refreshTimer); + AutoRefreshUtil.onDestroy(refreshTimer); super.onDestroy(); } 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 b75c572..09abd44 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 @@ -49,7 +49,7 @@ import org.rhq.core.domain.util.PageList; import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.components.measurement.CustomConfigMeasurementRangeEditor; import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet; -import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortletUtil; +import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; 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; @@ -304,12 +304,12 @@ public class GroupOperationsPortlet extends EnhancedVLayout implements CustomSet } public void startRefreshCycle() { - refreshTimer = AutoRefreshPortletUtil.startRefreshCycle(this, this, refreshTimer); + refreshTimer = AutoRefreshUtil.startRefreshCycle(this, this, refreshTimer); } @Override protected void onDestroy() { - AutoRefreshPortletUtil.onDestroy(this, refreshTimer); + AutoRefreshUtil.onDestroy(refreshTimer); super.onDestroy(); } 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 d8dc0a4..f6a89c3 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 @@ -42,7 +42,7 @@ import org.rhq.core.domain.util.PageControl; import org.rhq.core.domain.util.PageList; import org.rhq.core.domain.util.PageOrdering; import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet; -import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortletUtil; +import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; 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; @@ -260,12 +260,12 @@ public class GroupPkgHistoryPortlet extends EnhancedVLayout implements CustomSet } public void startRefreshCycle() { - refreshTimer = AutoRefreshPortletUtil.startRefreshCycle(this, this, refreshTimer); + refreshTimer = AutoRefreshUtil.startRefreshCycle(this, this, refreshTimer); } @Override protected void onDestroy() { - AutoRefreshPortletUtil.onDestroy(this, refreshTimer); + AutoRefreshUtil.onDestroy(refreshTimer); super.onDestroy(); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/groups/graph/ResourceGroupD3GraphPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/groups/graph/ResourceGroupD3GraphPortlet.java index 992df3f..279dfea 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/groups/graph/ResourceGroupD3GraphPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/groups/graph/ResourceGroupD3GraphPortlet.java @@ -18,7 +18,6 @@ */ package org.rhq.enterprise.gui.coregui.client.dashboard.portlets.inventory.groups.graph; -import com.google.gwt.user.client.Timer; import com.smartgwt.client.data.Criteria; import com.smartgwt.client.types.Overflow; import com.smartgwt.client.types.TitleOrientation; @@ -40,7 +39,7 @@ import org.rhq.enterprise.gui.coregui.client.components.form.SortedSelectItem; import org.rhq.enterprise.gui.coregui.client.components.selector.AssignedItemsChangedEvent; import org.rhq.enterprise.gui.coregui.client.components.selector.AssignedItemsChangedHandler; import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet; -import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortletUtil; +import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; 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; @@ -50,7 +49,6 @@ import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricSt import org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.ResourceGroupMetricD3GraphView; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.ResourceScheduledMetricDatasource; import org.rhq.enterprise.gui.coregui.client.inventory.resource.selection.SingleResourceGroupSelector; -import org.rhq.enterprise.gui.coregui.client.util.BrowserUtility; /** * @author Greg Hinkle @@ -66,7 +64,7 @@ public class ResourceGroupD3GraphPortlet extends ResourceGroupMetricD3GraphView // set on initial configuration, the window for this portlet view. private PortletWindow portletWindow; - private Timer refreshTimer; + public static final String CFG_RESOURCE_GROUP_ID = "resourceGroupId"; public static final String CFG_DEFINITION_ID = "definitionId"; @@ -205,12 +203,12 @@ public class ResourceGroupD3GraphPortlet extends ResourceGroupMetricD3GraphView } } public void startRefreshCycle() { - refreshTimer = AutoRefreshPortletUtil.startRefreshCycle(this, this, refreshTimer); + refreshTimer = AutoRefreshUtil.startRefreshCycle(this, this, refreshTimer); } @Override protected void onDestroy() { - AutoRefreshPortletUtil.onDestroy(this, refreshTimer); + AutoRefreshUtil.onDestroy(refreshTimer); super.onDestroy(); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/queue/AutodiscoveryPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/queue/AutodiscoveryPortlet.java index 22f0556..3c8b127 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/queue/AutodiscoveryPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/queue/AutodiscoveryPortlet.java @@ -33,7 +33,7 @@ import org.rhq.core.domain.common.EntityContext; import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.domain.dashboard.DashboardPortlet; import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet; -import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortletUtil; +import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; 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; @@ -204,12 +204,12 @@ public class AutodiscoveryPortlet extends ResourceAutodiscoveryView implements C } public void startRefreshCycle() { - refreshTimer = AutoRefreshPortletUtil.startRefreshCycle(this, this, refreshTimer); + refreshTimer = AutoRefreshUtil.startRefreshCycle(this, this, refreshTimer); } @Override protected void onDestroy() { - AutoRefreshPortletUtil.onDestroy(this, refreshTimer); + AutoRefreshUtil.onDestroy( refreshTimer); super.onDestroy(); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/FavoriteResourcesPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/FavoriteResourcesPortlet.java index 8bdbdfd..2aa99c9 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/FavoriteResourcesPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/FavoriteResourcesPortlet.java @@ -38,7 +38,7 @@ import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.domain.dashboard.DashboardPortlet; import org.rhq.enterprise.gui.coregui.client.UserSessionManager; import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet; -import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortletUtil; +import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; 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; @@ -130,12 +130,12 @@ public class FavoriteResourcesPortlet extends ResourceSearchView implements Auto } public void startRefreshCycle() { - refreshTimer = AutoRefreshPortletUtil.startRefreshCycle(this, this, refreshTimer); + refreshTimer = AutoRefreshUtil.startRefreshCycle(this, this, refreshTimer); } @Override protected void onDestroy() { - AutoRefreshPortletUtil.onDestroy(this, refreshTimer); + AutoRefreshUtil.onDestroy(refreshTimer); super.onDestroy(); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceD3GraphPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceD3GraphPortlet.java index 84c5c54..f461f25 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceD3GraphPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceD3GraphPortlet.java @@ -23,7 +23,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.rpc.AsyncCallback; import com.smartgwt.client.data.Criteria; import com.smartgwt.client.types.Overflow; @@ -48,7 +47,7 @@ import org.rhq.core.domain.util.PageList; import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.components.lookup.ResourceLookupComboBoxItem; import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet; -import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortletUtil; +import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; 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; @@ -61,7 +60,6 @@ import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.ResourceMetricD3Graph; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.ResourceScheduledMetricDatasource; import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository; -import org.rhq.enterprise.gui.coregui.client.util.BrowserUtility; import org.rhq.enterprise.gui.coregui.client.util.Log; import org.rhq.enterprise.server.measurement.util.MeasurementUtils; @@ -80,7 +78,6 @@ public class ResourceD3GraphPortlet extends ResourceMetricD3Graph implements Aut public static final String CFG_DEFINITION_ID = "definitionId"; // set on initial configuration, the window for this portlet view. private PortletWindow portletWindow; - private Timer refreshTimer; public ResourceD3GraphPortlet() { super(); @@ -306,12 +303,12 @@ public class ResourceD3GraphPortlet extends ResourceMetricD3Graph implements Aut } public void startRefreshCycle() { - refreshTimer = AutoRefreshPortletUtil.startRefreshCycle(this, this, refreshTimer); + refreshTimer = AutoRefreshUtil.startRefreshCycle(this, this, refreshTimer); } @Override protected void onDestroy() { - AutoRefreshPortletUtil.onDestroy(this, refreshTimer); + AutoRefreshUtil.onDestroy(refreshTimer); super.onDestroy(); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/AbstractRecentAlertsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/AbstractRecentAlertsPortlet.java index e6bd976..6075763 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/AbstractRecentAlertsPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/AbstractRecentAlertsPortlet.java @@ -39,7 +39,7 @@ import org.rhq.enterprise.gui.coregui.client.alert.AlertHistoryView; import org.rhq.enterprise.gui.coregui.client.components.measurement.CustomConfigMeasurementRangeEditor; 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; +import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; import org.rhq.enterprise.gui.coregui.client.dashboard.CustomSettingsPortlet; import org.rhq.enterprise.gui.coregui.client.dashboard.PortletWindow; import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.PortletConfigurationEditorComponent; @@ -295,7 +295,7 @@ public abstract class AbstractRecentAlertsPortlet extends AlertHistoryView imple } public void startRefreshCycle() { - refreshTimer = AutoRefreshPortletUtil.startRefreshCycle(this, this, refreshTimer); + refreshTimer = AutoRefreshUtil.startRefreshCycle(this, this, refreshTimer); } public boolean isRefreshing() { @@ -304,7 +304,7 @@ public abstract class AbstractRecentAlertsPortlet extends AlertHistoryView imple @Override protected void onDestroy() { - AutoRefreshPortletUtil.onDestroy(this, refreshTimer); + AutoRefreshUtil.onDestroy(refreshTimer); super.onDestroy(); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/drift/AbstractRecentDriftsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/drift/AbstractRecentDriftsPortlet.java index 85c0b92..319222c 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/drift/AbstractRecentDriftsPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/drift/AbstractRecentDriftsPortlet.java @@ -34,7 +34,7 @@ import org.rhq.core.domain.util.PageList; import org.rhq.core.domain.util.PageOrdering; import org.rhq.enterprise.gui.coregui.client.components.measurement.CustomConfigMeasurementRangeEditor; import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet; -import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortletUtil; +import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; import org.rhq.enterprise.gui.coregui.client.dashboard.CustomSettingsPortlet; import org.rhq.enterprise.gui.coregui.client.dashboard.PortletWindow; import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.PortletConfigurationEditorComponent; @@ -303,7 +303,7 @@ public abstract class AbstractRecentDriftsPortlet extends DriftHistoryView imple } public void startRefreshCycle() { - refreshTimer = AutoRefreshPortletUtil.startRefreshCycle(this, this, refreshTimer); + refreshTimer = AutoRefreshUtil.startRefreshCycle(this, this, refreshTimer); } public boolean isRefreshing() { @@ -312,7 +312,7 @@ public abstract class AbstractRecentDriftsPortlet extends DriftHistoryView imple @Override protected void onDestroy() { - AutoRefreshPortletUtil.onDestroy(this, refreshTimer); + AutoRefreshUtil.onDestroy(refreshTimer); super.onDestroy(); } 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 40d08d2..275932d 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 @@ -41,7 +41,7 @@ import org.rhq.core.domain.dashboard.DashboardPortlet; import org.rhq.enterprise.gui.coregui.client.components.HeaderLabel; 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; +import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; 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; @@ -253,12 +253,12 @@ public class RecentlyAddedResourcesPortlet extends EnhancedVLayout implements Cu } public void startRefreshCycle() { - refreshTimer = AutoRefreshPortletUtil.startRefreshCycle(this, this, refreshTimer); + refreshTimer = AutoRefreshUtil.startRefreshCycle(this, this, refreshTimer); } @Override protected void onDestroy() { - AutoRefreshPortletUtil.onDestroy(this, refreshTimer); + AutoRefreshUtil.onDestroy(refreshTimer); super.onDestroy(); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/AbstractOperationHistoryPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/AbstractOperationHistoryPortlet.java index 83a89fb..2a8a520 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/AbstractOperationHistoryPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/AbstractOperationHistoryPortlet.java @@ -33,7 +33,7 @@ import org.rhq.core.domain.util.PageOrdering; import org.rhq.enterprise.gui.coregui.client.LinkManager; import org.rhq.enterprise.gui.coregui.client.components.measurement.CustomConfigMeasurementRangeEditor; import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet; -import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortletUtil; +import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; import org.rhq.enterprise.gui.coregui.client.dashboard.CustomSettingsPortlet; import org.rhq.enterprise.gui.coregui.client.dashboard.PortletWindow; import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.PortletConfigurationEditorComponent; @@ -270,7 +270,7 @@ public abstract class AbstractOperationHistoryPortlet extends OperationHistoryVi } public void startRefreshCycle() { - refreshTimer = AutoRefreshPortletUtil.startRefreshCycle(this, this, refreshTimer); + refreshTimer = AutoRefreshUtil.startRefreshCycle(this, this, refreshTimer); } public boolean isRefreshing() { @@ -286,7 +286,7 @@ public abstract class AbstractOperationHistoryPortlet extends OperationHistoryVi @Override protected void onDestroy() { - AutoRefreshPortletUtil.onDestroy(this, refreshTimer); + AutoRefreshUtil.onDestroy(refreshTimer); super.onDestroy(); } 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 80c991b..949df1a 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 @@ -47,7 +47,7 @@ import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.LinkManager; 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; +import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; 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; @@ -377,12 +377,12 @@ public class OperationSchedulePortlet extends EnhancedVLayout implements CustomS } public void startRefreshCycle() { - refreshTimer = AutoRefreshPortletUtil.startRefreshCycle(this, this, refreshTimer); + refreshTimer = AutoRefreshUtil.startRefreshCycle(this, this, refreshTimer); } @Override protected void onDestroy() { - AutoRefreshPortletUtil.onDestroy(this, refreshTimer); + AutoRefreshUtil.onDestroy(refreshTimer); super.onDestroy(); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/problems/ProblemResourcesPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/problems/ProblemResourcesPortlet.java index 7562953..518ac29 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/problems/ProblemResourcesPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/problems/ProblemResourcesPortlet.java @@ -53,7 +53,7 @@ import org.rhq.enterprise.gui.coregui.client.components.table.IconField; import org.rhq.enterprise.gui.coregui.client.components.table.Table; import org.rhq.enterprise.gui.coregui.client.components.table.TableWidget; import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet; -import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortletUtil; +import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; 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; @@ -336,12 +336,12 @@ public class ProblemResourcesPortlet extends Table<ProblemResourcesDataSource> i } public void startRefreshCycle() { - refreshTimer = AutoRefreshPortletUtil.startRefreshCycle(this, this, refreshTimer); + refreshTimer = AutoRefreshUtil.startRefreshCycle(this, this, refreshTimer); } @Override protected void onDestroy() { - AutoRefreshPortletUtil.onDestroy(this, refreshTimer); + AutoRefreshUtil.onDestroy(refreshTimer); super.onDestroy(); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/summary/InventorySummaryPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/summary/InventorySummaryPortlet.java index b9bdc5c..6c05c9b 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/summary/InventorySummaryPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/summary/InventorySummaryPortlet.java @@ -43,7 +43,7 @@ import org.rhq.core.domain.dashboard.DashboardPortlet; import org.rhq.core.domain.resource.InventorySummary; import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet; -import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortletUtil; +import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; 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; @@ -161,12 +161,12 @@ public class InventorySummaryPortlet extends EnhancedVLayout implements AutoRefr } public void startRefreshCycle() { - refreshTimer = AutoRefreshPortletUtil.startRefreshCycle(this, this, refreshTimer); + refreshTimer = AutoRefreshUtil.startRefreshCycle(this, this, refreshTimer); } @Override protected void onDestroy() { - AutoRefreshPortletUtil.onDestroy(this, refreshTimer); + AutoRefreshUtil.onDestroy(refreshTimer); super.onDestroy(); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/AutoRefresh.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/AutoRefresh.java new file mode 100644 index 0000000..b2ae5e8 --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/AutoRefresh.java @@ -0,0 +1,45 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.coregui.client.inventory; + +/** + * @author Simeon Pinder + * @author Mike Thompson + */ +public interface AutoRefresh { + + /** + * Each item implements to define the refresh cycle. Note that once refresh is started it + * should be canceled when the portlet goes out of scope (typically in an onDestroy() override). + */ + void startRefreshCycle(); + + /** + * @return true if the widget is currently responding to a refresh (i.e. reloading data). This can be used + * to ignore refresh requests until a prior request is completed. + */ + boolean isRefreshing(); + + /** + * Refresh this widget, reload data, redraw widgets, whatever is needed to refresh the page + */ + void refresh(); + + +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractD3GraphListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractD3GraphListView.java index 12ff64f..d682a24 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractD3GraphListView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractD3GraphListView.java @@ -20,12 +20,15 @@ package org.rhq.enterprise.gui.coregui.client.inventory.common; import java.util.List; +import com.google.gwt.user.client.Timer; import com.smartgwt.client.widgets.Label; import org.rhq.core.domain.common.EntityContext; import org.rhq.core.domain.measurement.Availability; import org.rhq.core.domain.resource.group.composite.ResourceGroupAvailability; import org.rhq.enterprise.gui.coregui.client.components.measurement.UserPreferencesMeasurementRangeEditor; +import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; +import org.rhq.enterprise.gui.coregui.client.inventory.AutoRefresh; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.avail.AvailabilityD3Graph; import org.rhq.enterprise.gui.coregui.client.util.async.CountDownLatch; import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout; @@ -34,17 +37,21 @@ import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout; * Provide the shared stuff for create GraphListViews like Availability graphs * and User Preferences pickers for the date range. */ -public abstract class AbstractD3GraphListView extends EnhancedVLayout { +public abstract class AbstractD3GraphListView extends EnhancedVLayout implements AutoRefresh { + protected static int SINGLE_CHART_HEIGHT = 225; + protected static int MULTI_CHART_HEIGHT = 195; protected List<Availability> availabilityList; protected List<ResourceGroupAvailability> groupAvailabilityList; protected AvailabilityD3Graph availabilityGraph; protected static Label loadingLabel = new Label(MSG.common_msg_loading()); protected UserPreferencesMeasurementRangeEditor measurementRangeEditor; protected boolean showAvailabilityGraph = false; + protected Timer refreshTimer; public AbstractD3GraphListView() { super(); measurementRangeEditor = new UserPreferencesMeasurementRangeEditor(); + startRefreshCycle(); } public abstract void redrawGraphs(); @@ -52,4 +59,29 @@ public abstract class AbstractD3GraphListView extends EnhancedVLayout { protected abstract void queryAvailability(final EntityContext context, Long startTime, Long endTime, final CountDownLatch countDownLatch); + + @Override + public void startRefreshCycle() { + refreshTimer = AutoRefreshUtil.startRefreshCycle(this, this, refreshTimer); + } + + @Override + protected void onDestroy() { + AutoRefreshUtil.onDestroy( refreshTimer); + + super.onDestroy(); + } + + @Override + public boolean isRefreshing() { + return false; + } + + //Custom refresh operation as we are not directly extending Table + @Override + public void refresh() { + if (isVisible() && !isRefreshing()) { + redrawGraphs(); + } + } } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java index 251f5f9..2818b86 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java @@ -40,6 +40,7 @@ public abstract class AbstractMetricD3GraphView extends EnhancedVLayout { private int entityId; private int definitionId; private HTMLFlow graphDiv = null; + protected Timer refreshTimer; public AbstractMetricD3GraphView() { super(); @@ -73,7 +74,8 @@ public abstract class AbstractMetricD3GraphView extends EnhancedVLayout { + " <pattern id=\"downStripes\" patternUnits=\"userSpaceOnUse\" x=\"0\" y=\"0\"" + " width=\"6\" height=\"3\">" + " <path d=\"M 0 0 6 0\" style=\"stroke:#ff8a9a; fill:none;\"/>" - + " </pattern>" + "</defs>"; + + " </pattern>" + + "</defs>"; } @Override diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java index d49b533..1d88a64 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java @@ -38,6 +38,7 @@ import org.rhq.core.domain.resource.group.ResourceGroup; import org.rhq.core.domain.resource.group.composite.ResourceGroupAvailability; import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; +import org.rhq.enterprise.gui.coregui.client.inventory.AutoRefresh; import org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractD3GraphListView; import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AvailabilityLineGraphType; import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricGraphData; @@ -52,7 +53,7 @@ import org.rhq.enterprise.gui.coregui.client.util.async.CountDownLatch; * Build the Group version of the View that shows the individual graph views. * @author Mike Thompson */ -public final class D3GroupGraphListView extends AbstractD3GraphListView { +public final class D3GroupGraphListView extends AbstractD3GraphListView implements AutoRefresh{ private ResourceGroup resourceGroup; private VLayout graphsVLayout; @@ -83,15 +84,21 @@ public final class D3GroupGraphListView extends AbstractD3GraphListView { graphsVLayout.setWidth100(); if (resourceGroup != null) { - redrawGraphs(); + buildGraphs(); } addMember(graphsVLayout); } + + public void redrawGraphs() { + this.onDraw(); + availabilityGraph.drawJsniChart(); + } + /** * Build whatever graph metrics (MeasurementDefinitions) are defined for the resource. */ - public void redrawGraphs() { + private void buildGraphs() { queryAvailability(EntityContext.forGroup(resourceGroup), measurementRangeEditor.getStartTime(), measurementRangeEditor.getEndTime(), null); @@ -140,8 +147,11 @@ public final class D3GroupGraphListView extends AbstractD3GraphListView { for (List<MeasurementDataNumericHighLowComposite> data : result) { buildIndividualGraph(measurementDefinitions.get(i++), data); } - availabilityGraph.setGroupAvailabilityList(groupAvailabilityList); - availabilityGraph.drawJsniChart(); + // There is a weird timing case when availabilityGraph can be null + if (availabilityGraph != null) { + availabilityGraph.setGroupAvailabilityList(groupAvailabilityList); + availabilityGraph.drawJsniChart(); + } } } }); @@ -188,10 +198,13 @@ public final class D3GroupGraphListView extends AbstractD3GraphListView { ResourceMetricD3Graph graphView = new ResourceMetricD3Graph(graph); graphView.setWidth("95%"); - graphView.setHeight(225); + graphView.setHeight(MULTI_CHART_HEIGHT); if(graphsVLayout != null){ graphsVLayout.addMember(graphView); } } + + + } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/ResourceGroupMetricD3GraphView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/ResourceGroupMetricD3GraphView.java index 815aeed..a436aa0 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/ResourceGroupMetricD3GraphView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/ResourceGroupMetricD3GraphView.java @@ -42,6 +42,8 @@ import org.rhq.enterprise.server.measurement.util.MeasurementUtils; public class ResourceGroupMetricD3GraphView extends AbstractMetricD3GraphView { + + public ResourceGroupMetricD3GraphView(AbstractGraph graph) { super(graph); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java index 2b6a2f2..4a64509 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java @@ -64,8 +64,6 @@ import org.rhq.enterprise.gui.coregui.client.util.async.CountDownLatch; public class D3GraphListView extends AbstractD3GraphListView { private static int NUM_ASYNC_CALLS = 2; // wait for X async calls in Latch - private static int SINGLE_CHART_HEIGHT = 225; - private static int MULTI_CHART_HEIGHT = 195; private Resource resource; private Set<Integer> definitionIds = null; @@ -174,10 +172,8 @@ public class D3GraphListView extends AbstractD3GraphListView { @Override public void onSuccess(List<Availability> availList) { - if (Log.isDebugEnabled()) { - Log.debug("\nSuccessfully queried availability in: " + Log.debug("\nSuccessfully queried availability in: " + (System.currentTimeMillis() - timerStart) + " ms."); - } availabilityList = availList; if (countDownLatch != null) { countDownLatch.countDown(); @@ -301,14 +297,8 @@ public class D3GraphListView extends AbstractD3GraphListView { public void onSuccess(PageList<MeasurementOOBComposite> measurementOOBComposites) { measurementOOBCompositeList = measurementOOBComposites; - Log.debug("\nSuccessfully queried OOB data in: " + (System.currentTimeMillis() - startTime) + Log.debug("\nSuccessfully queried "+measurementOOBCompositeList.size() +" OOB records in: " + (System.currentTimeMillis() - startTime) + " ms."); - Log.debug("OOB Data size: " + measurementOOBCompositeList.size()); - if (null != measurementOOBCompositeList) { - for (MeasurementOOBComposite measurementOOBComposite : measurementOOBComposites) { - //Log.debug("measurementOOBComposite = " + measurementOOBComposite); - } - } countDownLatch.countDown(); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricD3Graph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricD3Graph.java index 036237b..93c99d3 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricD3Graph.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricD3Graph.java @@ -18,6 +18,8 @@ */ package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring; +import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; +import org.rhq.enterprise.gui.coregui.client.inventory.AutoRefresh; import org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractMetricD3GraphView; import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph; import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.HasD3MetricJsniChart; @@ -25,7 +27,7 @@ import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.HasD3Met /** * A D3 graph implementation for graphing Resource metrics. */ -public class ResourceMetricD3Graph extends AbstractMetricD3GraphView { +public class ResourceMetricD3Graph extends AbstractMetricD3GraphView { /** * This constructor is for the use case in the Dashboard where we dont actually @@ -38,6 +40,7 @@ public class ResourceMetricD3Graph extends AbstractMetricD3GraphView { public ResourceMetricD3Graph(AbstractGraph graph) { super(graph); + //startRefreshCycle(); } @@ -56,4 +59,29 @@ public class ResourceMetricD3Graph extends AbstractMetricD3GraphView { } +// @Override +// public void startRefreshCycle() { +// refreshTimer = AutoRefreshUtil.startRefreshCycle(this, this, refreshTimer); +// } +// +// @Override +// protected void onDestroy() { +// AutoRefreshUtil.onDestroy( refreshTimer); +// +// super.onDestroy(); +// } +// +// @Override +// public boolean isRefreshing() { +// return false; +// } +// +// //Custom refresh operation as we are not directly extending Table +// @Override +// public void refresh() { +// if (isVisible() && !isRefreshing()) { +// drawGraph(); +// } +// } + } commit 5c27686eafb2315ce4bc5f2871081fc74f2e5fe1 Author: Mike Thompson <mithomps(a)redhat.com> Date: Wed Apr 3 11:11:01 2013 -0700 For Group Availability graph change WARN status to MIXED to better convey the meaning of the status. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AvailabilityLineGraphType.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AvailabilityLineGraphType.java index b15edee..0547ca1 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AvailabilityLineGraphType.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AvailabilityLineGraphType.java @@ -24,6 +24,7 @@ import java.util.List; import org.rhq.core.domain.measurement.Availability; import org.rhq.core.domain.measurement.MeasurementUnits; import org.rhq.core.domain.resource.group.composite.ResourceGroupAvailability; +import org.rhq.core.domain.resource.group.composite.ResourceGroupComposite; import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.Messages; import org.rhq.enterprise.gui.coregui.client.util.Log; @@ -65,6 +66,7 @@ public class AvailabilityLineGraphType { // loop through the avail intervals for (Availability availability : availabilityList) { sb.append("{ \"availType\":\"" + availability.getAvailabilityType() + "\", "); + sb.append(" \"availTypeMessage\":\"" + availability.getAvailabilityType()+ "\", "); sb.append(" \"availStart\":" + availability.getStartTime() + ", "); // last record will be null long endTime = availability.getEndTime() != null ? availability.getEndTime() : (new Date()).getTime(); @@ -81,7 +83,12 @@ public class AvailabilityLineGraphType { } else if (null != groupAvailabilityList) { // loop through the group avail down intervals for (ResourceGroupAvailability groupAvailability : groupAvailabilityList) { + // allows substitution for situations like WARN=MIXED for easier terminology + String availabilityTypeMessage = (groupAvailability.getGroupAvailabilityType().equals(ResourceGroupComposite.GroupAvailabilityType.WARN)) + ? MSG.chart_hover_availability_type_warn() : groupAvailability.getGroupAvailabilityType().name(); + sb.append("{ \"availType\":\"" + groupAvailability.getGroupAvailabilityType() + "\", "); + sb.append(" \"availTypeMessage\":\"" + availabilityTypeMessage + "\", "); sb.append(" \"availStart\":" + groupAvailability.getStartTime() + ", "); // last record will be null long endTime = groupAvailability.getEndTime() != null ? groupAvailability.getEndTime() : (new Date()) @@ -224,19 +231,17 @@ public class AvailabilityLineGraphType { var hoverString, timeFormatter = $wnd.d3.time.format(availChartContext.chartHoverTimeFormat), dateFormatter = $wnd.d3.time.format(availChartContext.chartHoverDateFormat), - availType = d.availType, availStart = new Date(+d.availStart), - availEnd = new Date(+d.availEnd), - availDuration = d.availDuration; + availEnd = new Date(+d.availEnd); hoverString = '<div class="chartHoverEnclosingDiv">' + - '<div class="chartHoverAlignRight"><span >' + availChartContext.hoverBarAvailabilityLabel + ': </span><span style="width:50px;">' + availType + '</span></div>' + + '<div class="chartHoverAlignRight"><span >' + availChartContext.hoverBarAvailabilityLabel + ': </span><span style="width:50px;">' + d.availTypeMessage + '</span></div>' + '<div class="chartHoverAlignRight"><span >' + availChartContext.hoverStartLabel + ': </span><span style="width:50px;">' + timeFormatter(availStart) + '</span></div>' + '<div class="chartHoverAlignRight"><span >' + ' </span><span style="width:50px;">' + dateFormatter(availStart) + '</span></div>' + '<div class="chartHoverAlignRight"><span >' + availChartContext.hoverEndLabel + ': </span><span style="width:50px;">' + timeFormatter(availEnd) + '</span></div>' + '<div class="chartHoverAlignRight"><span >' + ' </span><span style="width:50px;">' + dateFormatter(availEnd) + '</span></div>' + - '<div class="chartHoverAlignRight"><span >' + availChartContext.hoverBarLabel + ': </span><span style="width:50px;">' + availDuration + '</span></div>' + + '<div class="chartHoverAlignRight"><span >' + availChartContext.hoverBarLabel + ': </span><span style="width:50px;">' + d.availDuration + '</span></div>' + '</div>'; return hoverString; 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 38a9605..eb8b22e 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 @@ -9,6 +9,7 @@ chart_date_label = Date chart_down_label = Down chart_hover_availability_label = Availability +chart_hover_availability_type_warn = MIXED chart_hover_bar_label = Duration chart_hover_date_format = %m/%d/%y chart_hover_end_label = End diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties index e8faace..e377ba9 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties @@ -38,6 +38,7 @@ ##chart_title_min_label = Min ##chart_title_peak_label = Max ##chart_hover_availability_label = Availability +##chart_hover_availability_type_warn = MIXED ##chart_hover_date_format = %m/%d/%y ##chart_hover_time_format = %I:%M:%S %p ##chart_hover_start_label = Start 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 ee5dfa3..7b454be 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 @@ -18,6 +18,7 @@ ##chart_title_min_label = Min ##chart_title_peak_label = Max ##chart_hover_availability_label = Availability +##chart_hover_availability_type_warn = MIXED ##chart_hover_date_format = %m/%d/%y ##chart_hover_time_format = %I:%M:%S %p ##chart_hover_start_label = Start diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties index 3772a39..f03b066 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties @@ -18,6 +18,7 @@ ##chart_title_min_label = Min ##chart_title_peak_label = Max ##chart_hover_availability_label = Availability +##chart_hover_availability_type_warn = MIXED ##chart_hover_date_format = %m/%d/%y ##chart_hover_time_format = %I:%M:%S %p ##chart_hover_start_label = Start diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties index fd7f639..55516ce 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties @@ -16,6 +16,7 @@ ##chart_title_min_label = Min ##chart_title_peak_label = Max ##chart_hover_availability_label = Availability +##chart_hover_availability_type_warn = MIXED ##chart_hover_date_format = %m/%d/%y ##chart_hover_time_format = %I:%M:%S %p ##chart_hover_start_label = Start diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties index c8d730d..aaa68cd 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties @@ -15,6 +15,7 @@ ##chart_title_min_label = Min ##chart_title_peak_label = Max ##chart_hover_availability_label = Availability +##chart_hover_availability_type_warn = MIXED ##chart_hover_date_format = %m/%d/%y ##chart_hover_time_format = %I:%M:%S %p ##chart_hover_start_label = Start diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties index ac55382..b5bb9c2 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties @@ -15,6 +15,7 @@ ##chart_title_min_label = Min ##chart_title_peak_label = Max ##chart_hover_availability_label = Availability +##chart_hover_availability_type_warn = MIXED ##chart_hover_date_format = %m/%d/%y ##chart_hover_time_format = %I:%M:%S %p ##chart_hover_start_label = Start diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties index 582be3a..550cef7 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties @@ -15,6 +15,7 @@ ##chart_title_min_label = Min ##chart_title_peak_label = Max ##chart_hover_availability_label = Availability +##chart_hover_availability_type_warn = MIXED ##chart_hover_date_format = %m/%d/%y ##chart_hover_time_format = %I:%M:%S %p ##chart_hover_start_label = Start

1 0

[rhq] 2 commits - modules/enterprise
by mike thompson 04 Apr '13

04 Apr '13

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/AutoRefreshPortlet.java | 22 -- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/AutoRefreshPortletUtil.java | 75 --------- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/AutoRefreshUtil.java | 76 ++++++++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/FavoriteGroupsPortlet.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupBundleDeploymentsPortlet.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupConfigurationUpdatesPortlet.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupEventsPortlet.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOobsPortlet.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOperationsPortlet.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupPkgHistoryPortlet.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/groups/graph/ResourceGroupD3GraphPortlet.java | 10 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/queue/AutodiscoveryPortlet.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/FavoriteResourcesPortlet.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceD3GraphPortlet.java | 9 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/AbstractRecentAlertsPortlet.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/drift/AbstractRecentDriftsPortlet.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedResourcesPortlet.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/AbstractOperationHistoryPortlet.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationSchedulePortlet.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/problems/ProblemResourcesPortlet.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/summary/InventorySummaryPortlet.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/AutoRefresh.java | 45 +++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractD3GraphListView.java | 34 ++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AvailabilityLineGraphType.java | 15 + modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java | 25 ++- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/ResourceGroupMetricD3GraphView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java | 14 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricD3Graph.java | 30 +++ 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_cs.properties | 1 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties | 1 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties | 1 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties | 1 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties | 1 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties | 1 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties | 1 38 files changed, 291 insertions(+), 180 deletions(-) New commits: commit 5c8056dad2e0bbc236ae98fa5483bf11e46d7912 Author: Mike Thompson <mithomps(a)redhat.com> Date: Wed Apr 3 15:31:37 2013 -0700 [BZ 948080] Add AutoRefresh capability to graphs other than portlet graphs. Refactored Auto refresh capability to be more generic so that it could be used for more than just portlets. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/AutoRefreshPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/AutoRefreshPortlet.java index e577230..c122620 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/AutoRefreshPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/AutoRefreshPortlet.java @@ -23,26 +23,16 @@ package org.rhq.enterprise.gui.coregui.client.dashboard; +import org.rhq.enterprise.gui.coregui.client.inventory.AutoRefresh; + /** + * An AutoRefreshPortlet has the capabilities of both a Portlet and AutoRefresh interface. + * * @author Simeon Pinder */ -public interface AutoRefreshPortlet extends Portlet { - - /** - * Each portlet implements to define the refresh cycle. Note that once refresh is started it - * should be canceled when the portlet goes out of scope (typically in an onDestroy() override). - */ - void startRefreshCycle(); +public interface AutoRefreshPortlet extends Portlet,AutoRefresh { - /** - * @return true if the portlet is currently responding to a refresh (i.e. reloading data). This can be used - * to ignore refresh requests until a prior request is completed. - */ - boolean isRefreshing(); + // All method signatures come from extension of parent Interfaces. - /** - * Refresh this portlet, reload data, redraw widgets, whatever is needed to refresh the portlet - */ - void refresh(); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/AutoRefreshPortletUtil.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/AutoRefreshPortletUtil.java deleted file mode 100644 index 8f0ca51..0000000 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/AutoRefreshPortletUtil.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2009 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -package org.rhq.enterprise.gui.coregui.client.dashboard; - -import com.google.gwt.user.client.Timer; -import com.smartgwt.client.widgets.Canvas; - -import org.rhq.enterprise.gui.coregui.client.UserSessionManager; -import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility; - -/** - * @author Jay Shaughnessy - */ -public class AutoRefreshPortletUtil { - - public static Timer startRefreshCycle(final AutoRefreshPortlet autoRefreshPortlet, - final Canvas autoRefreshPortletCanvas, Timer refreshTimer) { - - final int refreshInterval = UserSessionManager.getUserPreferences().getPageRefreshInterval(); - - //cancel any existing timer - if (null != refreshTimer) { - refreshTimer.cancel(); - refreshTimer = null; - } - - if (refreshInterval >= MeasurementUtility.MINUTES) { - - refreshTimer = new Timer() { - public void run() { - - // if the portlet is already refreshing or if the portlet is not currently on screen then - // don't bother doing the work. this protects against unnecessary or unwanted db queries - // being performed in the background. - if (!autoRefreshPortlet.isRefreshing() && autoRefreshPortletCanvas.isDrawn() - && autoRefreshPortletCanvas.isVisible()) { - - autoRefreshPortlet.refresh(); - } - } - }; - - refreshTimer.scheduleRepeating(refreshInterval); - } - - return refreshTimer; - } - - public static void onDestroy(final Canvas portlet, Timer refreshTimer) { - - if (refreshTimer != null) { - - refreshTimer.cancel(); - } - - } - -} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/AutoRefreshUtil.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/AutoRefreshUtil.java new file mode 100644 index 0000000..4c7a651 --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/AutoRefreshUtil.java @@ -0,0 +1,76 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2009 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +package org.rhq.enterprise.gui.coregui.client.dashboard; + +import com.google.gwt.user.client.Timer; +import com.smartgwt.client.widgets.Canvas; + +import org.rhq.enterprise.gui.coregui.client.UserSessionManager; +import org.rhq.enterprise.gui.coregui.client.inventory.AutoRefresh; +import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility; + +/** + * @author Jay Shaughnessy + */ +public class AutoRefreshUtil { + + public static Timer startRefreshCycle(final AutoRefresh autoRefresh, + final Canvas autoRefreshCanvas, Timer refreshTimer) { + + final int refreshInterval = UserSessionManager.getUserPreferences().getPageRefreshInterval(); + + //cancel any existing timer + if (null != refreshTimer) { + refreshTimer.cancel(); + refreshTimer = null; + } + + if (refreshInterval >= MeasurementUtility.MINUTES) { + + refreshTimer = new Timer() { + public void run() { + + // if the autoRefresh component is already refreshing or is not currently on screen then + // don't bother doing the work. this protects against unnecessary or unwanted db queries + // being performed in the background. + if (!autoRefresh.isRefreshing() && autoRefreshCanvas.isDrawn() + && autoRefreshCanvas.isVisible()) { + + autoRefresh.refresh(); + } + } + }; + + refreshTimer.scheduleRepeating(refreshInterval); + } + + return refreshTimer; + } + + public static void onDestroy(Timer refreshTimer) { + + if (refreshTimer != null) { + + refreshTimer.cancel(); + } + + } + +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/FavoriteGroupsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/FavoriteGroupsPortlet.java index 406c1fa..e9ab2c5 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/FavoriteGroupsPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/FavoriteGroupsPortlet.java @@ -38,7 +38,7 @@ import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.domain.dashboard.DashboardPortlet; import org.rhq.enterprise.gui.coregui.client.UserSessionManager; import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet; -import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortletUtil; +import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; 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; @@ -127,12 +127,12 @@ public class FavoriteGroupsPortlet extends ResourceGroupListView implements Auto } public void startRefreshCycle() { - refreshTimer = AutoRefreshPortletUtil.startRefreshCycle(this, this, refreshTimer); + refreshTimer = AutoRefreshUtil.startRefreshCycle(this, this, refreshTimer); } @Override protected void onDestroy() { - AutoRefreshPortletUtil.onDestroy(this, refreshTimer); + AutoRefreshUtil.onDestroy( refreshTimer); super.onDestroy(); } 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 71c4b6c..6432aa3 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 @@ -44,7 +44,7 @@ import org.rhq.core.domain.util.PageList; import org.rhq.core.domain.util.PageOrdering; import org.rhq.enterprise.gui.coregui.client.LinkManager; import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet; -import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortletUtil; +import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; 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; @@ -263,12 +263,12 @@ public class GroupBundleDeploymentsPortlet extends EnhancedVLayout implements Cu } public void startRefreshCycle() { - refreshTimer = AutoRefreshPortletUtil.startRefreshCycle(this, this, refreshTimer); + refreshTimer = AutoRefreshUtil.startRefreshCycle(this, this, refreshTimer); } @Override protected void onDestroy() { - AutoRefreshPortletUtil.onDestroy(this, refreshTimer); + AutoRefreshUtil.onDestroy(refreshTimer); super.onDestroy(); } 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 9966490..7c3bbb3 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 @@ -50,7 +50,7 @@ import org.rhq.core.domain.util.PageOrdering; import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.components.measurement.CustomConfigMeasurementRangeEditor; import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet; -import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortletUtil; +import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; 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; @@ -236,12 +236,12 @@ public class GroupConfigurationUpdatesPortlet extends EnhancedVLayout implements @Override public void startRefreshCycle() { - refreshTimer = AutoRefreshPortletUtil.startRefreshCycle(this, this, refreshTimer); + refreshTimer = AutoRefreshUtil.startRefreshCycle(this, this, refreshTimer); } @Override protected void onDestroy() { - AutoRefreshPortletUtil.onDestroy(this, refreshTimer); + AutoRefreshUtil.onDestroy(refreshTimer); super.onDestroy(); } 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 b62cfae..fc9205e 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 @@ -40,7 +40,7 @@ import org.rhq.enterprise.gui.coregui.client.ImageManager; import org.rhq.enterprise.gui.coregui.client.LinkManager; import org.rhq.enterprise.gui.coregui.client.components.measurement.CustomConfigMeasurementRangeEditor; import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet; -import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortletUtil; +import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; 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; @@ -288,12 +288,12 @@ public class GroupEventsPortlet extends EnhancedVLayout implements CustomSetting } public void startRefreshCycle() { - refreshTimer = AutoRefreshPortletUtil.startRefreshCycle(this, this, refreshTimer); + refreshTimer = AutoRefreshUtil.startRefreshCycle(this, this, refreshTimer); } @Override protected void onDestroy() { - AutoRefreshPortletUtil.onDestroy(this, refreshTimer); + AutoRefreshUtil.onDestroy(refreshTimer); super.onDestroy(); } 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 e3c45ec..e025bdc 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 @@ -59,7 +59,7 @@ import org.rhq.enterprise.gui.coregui.client.LinkManager; import org.rhq.enterprise.gui.coregui.client.components.FullHTMLPane; import org.rhq.enterprise.gui.coregui.client.components.measurement.CustomConfigMeasurementRangeEditor; import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet; -import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortletUtil; +import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; 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; @@ -517,7 +517,7 @@ public class GroupMetricsPortlet extends EnhancedVLayout implements CustomSettin @Override public void startRefreshCycle() { - refreshTimer = AutoRefreshPortletUtil.startRefreshCycle(this, this, refreshTimer); + refreshTimer = AutoRefreshUtil.startRefreshCycle(this, this, refreshTimer); //call out to 3rd party javascript lib BrowserUtility.graphSparkLines(); @@ -526,7 +526,7 @@ public class GroupMetricsPortlet extends EnhancedVLayout implements CustomSettin @Override protected void onDestroy() { - AutoRefreshPortletUtil.onDestroy(this, refreshTimer); + AutoRefreshUtil.onDestroy(refreshTimer); super.onDestroy(); } 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 00e8f3a..2be2613 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 @@ -43,7 +43,7 @@ import org.rhq.core.domain.measurement.composite.MeasurementOOBComposite; import org.rhq.core.domain.util.PageList; import org.rhq.enterprise.gui.coregui.client.components.FullHTMLPane; import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet; -import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortletUtil; +import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; 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; @@ -266,14 +266,14 @@ public class GroupOobsPortlet extends EnhancedVLayout implements CustomSettingsP } public void startRefreshCycle() { - refreshTimer = AutoRefreshPortletUtil.startRefreshCycle(this, this, refreshTimer); + refreshTimer = AutoRefreshUtil.startRefreshCycle(this, this, refreshTimer); recentOobContent.markForRedraw(); markForRedraw(); } @Override protected void onDestroy() { - AutoRefreshPortletUtil.onDestroy(this, refreshTimer); + AutoRefreshUtil.onDestroy(refreshTimer); super.onDestroy(); } 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 b75c572..09abd44 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 @@ -49,7 +49,7 @@ import org.rhq.core.domain.util.PageList; import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.components.measurement.CustomConfigMeasurementRangeEditor; import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet; -import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortletUtil; +import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; 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; @@ -304,12 +304,12 @@ public class GroupOperationsPortlet extends EnhancedVLayout implements CustomSet } public void startRefreshCycle() { - refreshTimer = AutoRefreshPortletUtil.startRefreshCycle(this, this, refreshTimer); + refreshTimer = AutoRefreshUtil.startRefreshCycle(this, this, refreshTimer); } @Override protected void onDestroy() { - AutoRefreshPortletUtil.onDestroy(this, refreshTimer); + AutoRefreshUtil.onDestroy(refreshTimer); super.onDestroy(); } 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 d8dc0a4..f6a89c3 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 @@ -42,7 +42,7 @@ import org.rhq.core.domain.util.PageControl; import org.rhq.core.domain.util.PageList; import org.rhq.core.domain.util.PageOrdering; import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet; -import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortletUtil; +import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; 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; @@ -260,12 +260,12 @@ public class GroupPkgHistoryPortlet extends EnhancedVLayout implements CustomSet } public void startRefreshCycle() { - refreshTimer = AutoRefreshPortletUtil.startRefreshCycle(this, this, refreshTimer); + refreshTimer = AutoRefreshUtil.startRefreshCycle(this, this, refreshTimer); } @Override protected void onDestroy() { - AutoRefreshPortletUtil.onDestroy(this, refreshTimer); + AutoRefreshUtil.onDestroy(refreshTimer); super.onDestroy(); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/groups/graph/ResourceGroupD3GraphPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/groups/graph/ResourceGroupD3GraphPortlet.java index 992df3f..279dfea 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/groups/graph/ResourceGroupD3GraphPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/groups/graph/ResourceGroupD3GraphPortlet.java @@ -18,7 +18,6 @@ */ package org.rhq.enterprise.gui.coregui.client.dashboard.portlets.inventory.groups.graph; -import com.google.gwt.user.client.Timer; import com.smartgwt.client.data.Criteria; import com.smartgwt.client.types.Overflow; import com.smartgwt.client.types.TitleOrientation; @@ -40,7 +39,7 @@ import org.rhq.enterprise.gui.coregui.client.components.form.SortedSelectItem; import org.rhq.enterprise.gui.coregui.client.components.selector.AssignedItemsChangedEvent; import org.rhq.enterprise.gui.coregui.client.components.selector.AssignedItemsChangedHandler; import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet; -import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortletUtil; +import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; 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; @@ -50,7 +49,6 @@ import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricSt import org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.ResourceGroupMetricD3GraphView; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.ResourceScheduledMetricDatasource; import org.rhq.enterprise.gui.coregui.client.inventory.resource.selection.SingleResourceGroupSelector; -import org.rhq.enterprise.gui.coregui.client.util.BrowserUtility; /** * @author Greg Hinkle @@ -66,7 +64,7 @@ public class ResourceGroupD3GraphPortlet extends ResourceGroupMetricD3GraphView // set on initial configuration, the window for this portlet view. private PortletWindow portletWindow; - private Timer refreshTimer; + public static final String CFG_RESOURCE_GROUP_ID = "resourceGroupId"; public static final String CFG_DEFINITION_ID = "definitionId"; @@ -205,12 +203,12 @@ public class ResourceGroupD3GraphPortlet extends ResourceGroupMetricD3GraphView } } public void startRefreshCycle() { - refreshTimer = AutoRefreshPortletUtil.startRefreshCycle(this, this, refreshTimer); + refreshTimer = AutoRefreshUtil.startRefreshCycle(this, this, refreshTimer); } @Override protected void onDestroy() { - AutoRefreshPortletUtil.onDestroy(this, refreshTimer); + AutoRefreshUtil.onDestroy(refreshTimer); super.onDestroy(); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/queue/AutodiscoveryPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/queue/AutodiscoveryPortlet.java index 22f0556..3c8b127 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/queue/AutodiscoveryPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/queue/AutodiscoveryPortlet.java @@ -33,7 +33,7 @@ import org.rhq.core.domain.common.EntityContext; import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.domain.dashboard.DashboardPortlet; import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet; -import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortletUtil; +import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; 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; @@ -204,12 +204,12 @@ public class AutodiscoveryPortlet extends ResourceAutodiscoveryView implements C } public void startRefreshCycle() { - refreshTimer = AutoRefreshPortletUtil.startRefreshCycle(this, this, refreshTimer); + refreshTimer = AutoRefreshUtil.startRefreshCycle(this, this, refreshTimer); } @Override protected void onDestroy() { - AutoRefreshPortletUtil.onDestroy(this, refreshTimer); + AutoRefreshUtil.onDestroy( refreshTimer); super.onDestroy(); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/FavoriteResourcesPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/FavoriteResourcesPortlet.java index 8bdbdfd..2aa99c9 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/FavoriteResourcesPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/FavoriteResourcesPortlet.java @@ -38,7 +38,7 @@ import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.domain.dashboard.DashboardPortlet; import org.rhq.enterprise.gui.coregui.client.UserSessionManager; import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet; -import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortletUtil; +import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; 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; @@ -130,12 +130,12 @@ public class FavoriteResourcesPortlet extends ResourceSearchView implements Auto } public void startRefreshCycle() { - refreshTimer = AutoRefreshPortletUtil.startRefreshCycle(this, this, refreshTimer); + refreshTimer = AutoRefreshUtil.startRefreshCycle(this, this, refreshTimer); } @Override protected void onDestroy() { - AutoRefreshPortletUtil.onDestroy(this, refreshTimer); + AutoRefreshUtil.onDestroy(refreshTimer); super.onDestroy(); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceD3GraphPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceD3GraphPortlet.java index 84c5c54..f461f25 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceD3GraphPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceD3GraphPortlet.java @@ -23,7 +23,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.rpc.AsyncCallback; import com.smartgwt.client.data.Criteria; import com.smartgwt.client.types.Overflow; @@ -48,7 +47,7 @@ import org.rhq.core.domain.util.PageList; import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.components.lookup.ResourceLookupComboBoxItem; import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet; -import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortletUtil; +import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; 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; @@ -61,7 +60,6 @@ import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.ResourceMetricD3Graph; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.ResourceScheduledMetricDatasource; import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository; -import org.rhq.enterprise.gui.coregui.client.util.BrowserUtility; import org.rhq.enterprise.gui.coregui.client.util.Log; import org.rhq.enterprise.server.measurement.util.MeasurementUtils; @@ -80,7 +78,6 @@ public class ResourceD3GraphPortlet extends ResourceMetricD3Graph implements Aut public static final String CFG_DEFINITION_ID = "definitionId"; // set on initial configuration, the window for this portlet view. private PortletWindow portletWindow; - private Timer refreshTimer; public ResourceD3GraphPortlet() { super(); @@ -306,12 +303,12 @@ public class ResourceD3GraphPortlet extends ResourceMetricD3Graph implements Aut } public void startRefreshCycle() { - refreshTimer = AutoRefreshPortletUtil.startRefreshCycle(this, this, refreshTimer); + refreshTimer = AutoRefreshUtil.startRefreshCycle(this, this, refreshTimer); } @Override protected void onDestroy() { - AutoRefreshPortletUtil.onDestroy(this, refreshTimer); + AutoRefreshUtil.onDestroy(refreshTimer); super.onDestroy(); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/AbstractRecentAlertsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/AbstractRecentAlertsPortlet.java index e6bd976..6075763 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/AbstractRecentAlertsPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/AbstractRecentAlertsPortlet.java @@ -39,7 +39,7 @@ import org.rhq.enterprise.gui.coregui.client.alert.AlertHistoryView; import org.rhq.enterprise.gui.coregui.client.components.measurement.CustomConfigMeasurementRangeEditor; 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; +import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; import org.rhq.enterprise.gui.coregui.client.dashboard.CustomSettingsPortlet; import org.rhq.enterprise.gui.coregui.client.dashboard.PortletWindow; import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.PortletConfigurationEditorComponent; @@ -295,7 +295,7 @@ public abstract class AbstractRecentAlertsPortlet extends AlertHistoryView imple } public void startRefreshCycle() { - refreshTimer = AutoRefreshPortletUtil.startRefreshCycle(this, this, refreshTimer); + refreshTimer = AutoRefreshUtil.startRefreshCycle(this, this, refreshTimer); } public boolean isRefreshing() { @@ -304,7 +304,7 @@ public abstract class AbstractRecentAlertsPortlet extends AlertHistoryView imple @Override protected void onDestroy() { - AutoRefreshPortletUtil.onDestroy(this, refreshTimer); + AutoRefreshUtil.onDestroy(refreshTimer); super.onDestroy(); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/drift/AbstractRecentDriftsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/drift/AbstractRecentDriftsPortlet.java index 85c0b92..319222c 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/drift/AbstractRecentDriftsPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/drift/AbstractRecentDriftsPortlet.java @@ -34,7 +34,7 @@ import org.rhq.core.domain.util.PageList; import org.rhq.core.domain.util.PageOrdering; import org.rhq.enterprise.gui.coregui.client.components.measurement.CustomConfigMeasurementRangeEditor; import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet; -import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortletUtil; +import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; import org.rhq.enterprise.gui.coregui.client.dashboard.CustomSettingsPortlet; import org.rhq.enterprise.gui.coregui.client.dashboard.PortletWindow; import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.PortletConfigurationEditorComponent; @@ -303,7 +303,7 @@ public abstract class AbstractRecentDriftsPortlet extends DriftHistoryView imple } public void startRefreshCycle() { - refreshTimer = AutoRefreshPortletUtil.startRefreshCycle(this, this, refreshTimer); + refreshTimer = AutoRefreshUtil.startRefreshCycle(this, this, refreshTimer); } public boolean isRefreshing() { @@ -312,7 +312,7 @@ public abstract class AbstractRecentDriftsPortlet extends DriftHistoryView imple @Override protected void onDestroy() { - AutoRefreshPortletUtil.onDestroy(this, refreshTimer); + AutoRefreshUtil.onDestroy(refreshTimer); super.onDestroy(); } 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 40d08d2..275932d 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 @@ -41,7 +41,7 @@ import org.rhq.core.domain.dashboard.DashboardPortlet; import org.rhq.enterprise.gui.coregui.client.components.HeaderLabel; 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; +import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; 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; @@ -253,12 +253,12 @@ public class RecentlyAddedResourcesPortlet extends EnhancedVLayout implements Cu } public void startRefreshCycle() { - refreshTimer = AutoRefreshPortletUtil.startRefreshCycle(this, this, refreshTimer); + refreshTimer = AutoRefreshUtil.startRefreshCycle(this, this, refreshTimer); } @Override protected void onDestroy() { - AutoRefreshPortletUtil.onDestroy(this, refreshTimer); + AutoRefreshUtil.onDestroy(refreshTimer); super.onDestroy(); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/AbstractOperationHistoryPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/AbstractOperationHistoryPortlet.java index 83a89fb..2a8a520 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/AbstractOperationHistoryPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/AbstractOperationHistoryPortlet.java @@ -33,7 +33,7 @@ import org.rhq.core.domain.util.PageOrdering; import org.rhq.enterprise.gui.coregui.client.LinkManager; import org.rhq.enterprise.gui.coregui.client.components.measurement.CustomConfigMeasurementRangeEditor; import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet; -import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortletUtil; +import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; import org.rhq.enterprise.gui.coregui.client.dashboard.CustomSettingsPortlet; import org.rhq.enterprise.gui.coregui.client.dashboard.PortletWindow; import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.PortletConfigurationEditorComponent; @@ -270,7 +270,7 @@ public abstract class AbstractOperationHistoryPortlet extends OperationHistoryVi } public void startRefreshCycle() { - refreshTimer = AutoRefreshPortletUtil.startRefreshCycle(this, this, refreshTimer); + refreshTimer = AutoRefreshUtil.startRefreshCycle(this, this, refreshTimer); } public boolean isRefreshing() { @@ -286,7 +286,7 @@ public abstract class AbstractOperationHistoryPortlet extends OperationHistoryVi @Override protected void onDestroy() { - AutoRefreshPortletUtil.onDestroy(this, refreshTimer); + AutoRefreshUtil.onDestroy(refreshTimer); super.onDestroy(); } 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 80c991b..949df1a 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 @@ -47,7 +47,7 @@ import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.LinkManager; 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; +import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; 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; @@ -377,12 +377,12 @@ public class OperationSchedulePortlet extends EnhancedVLayout implements CustomS } public void startRefreshCycle() { - refreshTimer = AutoRefreshPortletUtil.startRefreshCycle(this, this, refreshTimer); + refreshTimer = AutoRefreshUtil.startRefreshCycle(this, this, refreshTimer); } @Override protected void onDestroy() { - AutoRefreshPortletUtil.onDestroy(this, refreshTimer); + AutoRefreshUtil.onDestroy(refreshTimer); super.onDestroy(); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/problems/ProblemResourcesPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/problems/ProblemResourcesPortlet.java index 7562953..518ac29 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/problems/ProblemResourcesPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/problems/ProblemResourcesPortlet.java @@ -53,7 +53,7 @@ import org.rhq.enterprise.gui.coregui.client.components.table.IconField; import org.rhq.enterprise.gui.coregui.client.components.table.Table; import org.rhq.enterprise.gui.coregui.client.components.table.TableWidget; import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet; -import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortletUtil; +import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; 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; @@ -336,12 +336,12 @@ public class ProblemResourcesPortlet extends Table<ProblemResourcesDataSource> i } public void startRefreshCycle() { - refreshTimer = AutoRefreshPortletUtil.startRefreshCycle(this, this, refreshTimer); + refreshTimer = AutoRefreshUtil.startRefreshCycle(this, this, refreshTimer); } @Override protected void onDestroy() { - AutoRefreshPortletUtil.onDestroy(this, refreshTimer); + AutoRefreshUtil.onDestroy(refreshTimer); super.onDestroy(); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/summary/InventorySummaryPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/summary/InventorySummaryPortlet.java index b9bdc5c..6c05c9b 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/summary/InventorySummaryPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/summary/InventorySummaryPortlet.java @@ -43,7 +43,7 @@ import org.rhq.core.domain.dashboard.DashboardPortlet; import org.rhq.core.domain.resource.InventorySummary; import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet; -import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortletUtil; +import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; 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; @@ -161,12 +161,12 @@ public class InventorySummaryPortlet extends EnhancedVLayout implements AutoRefr } public void startRefreshCycle() { - refreshTimer = AutoRefreshPortletUtil.startRefreshCycle(this, this, refreshTimer); + refreshTimer = AutoRefreshUtil.startRefreshCycle(this, this, refreshTimer); } @Override protected void onDestroy() { - AutoRefreshPortletUtil.onDestroy(this, refreshTimer); + AutoRefreshUtil.onDestroy(refreshTimer); super.onDestroy(); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/AutoRefresh.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/AutoRefresh.java new file mode 100644 index 0000000..b2ae5e8 --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/AutoRefresh.java @@ -0,0 +1,45 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.coregui.client.inventory; + +/** + * @author Simeon Pinder + * @author Mike Thompson + */ +public interface AutoRefresh { + + /** + * Each item implements to define the refresh cycle. Note that once refresh is started it + * should be canceled when the portlet goes out of scope (typically in an onDestroy() override). + */ + void startRefreshCycle(); + + /** + * @return true if the widget is currently responding to a refresh (i.e. reloading data). This can be used + * to ignore refresh requests until a prior request is completed. + */ + boolean isRefreshing(); + + /** + * Refresh this widget, reload data, redraw widgets, whatever is needed to refresh the page + */ + void refresh(); + + +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractD3GraphListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractD3GraphListView.java index 12ff64f..d682a24 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractD3GraphListView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractD3GraphListView.java @@ -20,12 +20,15 @@ package org.rhq.enterprise.gui.coregui.client.inventory.common; import java.util.List; +import com.google.gwt.user.client.Timer; import com.smartgwt.client.widgets.Label; import org.rhq.core.domain.common.EntityContext; import org.rhq.core.domain.measurement.Availability; import org.rhq.core.domain.resource.group.composite.ResourceGroupAvailability; import org.rhq.enterprise.gui.coregui.client.components.measurement.UserPreferencesMeasurementRangeEditor; +import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; +import org.rhq.enterprise.gui.coregui.client.inventory.AutoRefresh; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.avail.AvailabilityD3Graph; import org.rhq.enterprise.gui.coregui.client.util.async.CountDownLatch; import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout; @@ -34,17 +37,21 @@ import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout; * Provide the shared stuff for create GraphListViews like Availability graphs * and User Preferences pickers for the date range. */ -public abstract class AbstractD3GraphListView extends EnhancedVLayout { +public abstract class AbstractD3GraphListView extends EnhancedVLayout implements AutoRefresh { + protected static int SINGLE_CHART_HEIGHT = 225; + protected static int MULTI_CHART_HEIGHT = 195; protected List<Availability> availabilityList; protected List<ResourceGroupAvailability> groupAvailabilityList; protected AvailabilityD3Graph availabilityGraph; protected static Label loadingLabel = new Label(MSG.common_msg_loading()); protected UserPreferencesMeasurementRangeEditor measurementRangeEditor; protected boolean showAvailabilityGraph = false; + protected Timer refreshTimer; public AbstractD3GraphListView() { super(); measurementRangeEditor = new UserPreferencesMeasurementRangeEditor(); + startRefreshCycle(); } public abstract void redrawGraphs(); @@ -52,4 +59,29 @@ public abstract class AbstractD3GraphListView extends EnhancedVLayout { protected abstract void queryAvailability(final EntityContext context, Long startTime, Long endTime, final CountDownLatch countDownLatch); + + @Override + public void startRefreshCycle() { + refreshTimer = AutoRefreshUtil.startRefreshCycle(this, this, refreshTimer); + } + + @Override + protected void onDestroy() { + AutoRefreshUtil.onDestroy( refreshTimer); + + super.onDestroy(); + } + + @Override + public boolean isRefreshing() { + return false; + } + + //Custom refresh operation as we are not directly extending Table + @Override + public void refresh() { + if (isVisible() && !isRefreshing()) { + redrawGraphs(); + } + } } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java index 251f5f9..2818b86 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java @@ -40,6 +40,7 @@ public abstract class AbstractMetricD3GraphView extends EnhancedVLayout { private int entityId; private int definitionId; private HTMLFlow graphDiv = null; + protected Timer refreshTimer; public AbstractMetricD3GraphView() { super(); @@ -73,7 +74,8 @@ public abstract class AbstractMetricD3GraphView extends EnhancedVLayout { + " <pattern id=\"downStripes\" patternUnits=\"userSpaceOnUse\" x=\"0\" y=\"0\"" + " width=\"6\" height=\"3\">" + " <path d=\"M 0 0 6 0\" style=\"stroke:#ff8a9a; fill:none;\"/>" - + " </pattern>" + "</defs>"; + + " </pattern>" + + "</defs>"; } @Override diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java index d49b533..1d88a64 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java @@ -38,6 +38,7 @@ import org.rhq.core.domain.resource.group.ResourceGroup; import org.rhq.core.domain.resource.group.composite.ResourceGroupAvailability; import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; +import org.rhq.enterprise.gui.coregui.client.inventory.AutoRefresh; import org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractD3GraphListView; import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AvailabilityLineGraphType; import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricGraphData; @@ -52,7 +53,7 @@ import org.rhq.enterprise.gui.coregui.client.util.async.CountDownLatch; * Build the Group version of the View that shows the individual graph views. * @author Mike Thompson */ -public final class D3GroupGraphListView extends AbstractD3GraphListView { +public final class D3GroupGraphListView extends AbstractD3GraphListView implements AutoRefresh{ private ResourceGroup resourceGroup; private VLayout graphsVLayout; @@ -83,15 +84,21 @@ public final class D3GroupGraphListView extends AbstractD3GraphListView { graphsVLayout.setWidth100(); if (resourceGroup != null) { - redrawGraphs(); + buildGraphs(); } addMember(graphsVLayout); } + + public void redrawGraphs() { + this.onDraw(); + availabilityGraph.drawJsniChart(); + } + /** * Build whatever graph metrics (MeasurementDefinitions) are defined for the resource. */ - public void redrawGraphs() { + private void buildGraphs() { queryAvailability(EntityContext.forGroup(resourceGroup), measurementRangeEditor.getStartTime(), measurementRangeEditor.getEndTime(), null); @@ -140,8 +147,11 @@ public final class D3GroupGraphListView extends AbstractD3GraphListView { for (List<MeasurementDataNumericHighLowComposite> data : result) { buildIndividualGraph(measurementDefinitions.get(i++), data); } - availabilityGraph.setGroupAvailabilityList(groupAvailabilityList); - availabilityGraph.drawJsniChart(); + // There is a weird timing case when availabilityGraph can be null + if (availabilityGraph != null) { + availabilityGraph.setGroupAvailabilityList(groupAvailabilityList); + availabilityGraph.drawJsniChart(); + } } } }); @@ -188,10 +198,13 @@ public final class D3GroupGraphListView extends AbstractD3GraphListView { ResourceMetricD3Graph graphView = new ResourceMetricD3Graph(graph); graphView.setWidth("95%"); - graphView.setHeight(225); + graphView.setHeight(MULTI_CHART_HEIGHT); if(graphsVLayout != null){ graphsVLayout.addMember(graphView); } } + + + } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/ResourceGroupMetricD3GraphView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/ResourceGroupMetricD3GraphView.java index 815aeed..a436aa0 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/ResourceGroupMetricD3GraphView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/ResourceGroupMetricD3GraphView.java @@ -42,6 +42,8 @@ import org.rhq.enterprise.server.measurement.util.MeasurementUtils; public class ResourceGroupMetricD3GraphView extends AbstractMetricD3GraphView { + + public ResourceGroupMetricD3GraphView(AbstractGraph graph) { super(graph); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java index 2b6a2f2..4a64509 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java @@ -64,8 +64,6 @@ import org.rhq.enterprise.gui.coregui.client.util.async.CountDownLatch; public class D3GraphListView extends AbstractD3GraphListView { private static int NUM_ASYNC_CALLS = 2; // wait for X async calls in Latch - private static int SINGLE_CHART_HEIGHT = 225; - private static int MULTI_CHART_HEIGHT = 195; private Resource resource; private Set<Integer> definitionIds = null; @@ -174,10 +172,8 @@ public class D3GraphListView extends AbstractD3GraphListView { @Override public void onSuccess(List<Availability> availList) { - if (Log.isDebugEnabled()) { - Log.debug("\nSuccessfully queried availability in: " + Log.debug("\nSuccessfully queried availability in: " + (System.currentTimeMillis() - timerStart) + " ms."); - } availabilityList = availList; if (countDownLatch != null) { countDownLatch.countDown(); @@ -301,14 +297,8 @@ public class D3GraphListView extends AbstractD3GraphListView { public void onSuccess(PageList<MeasurementOOBComposite> measurementOOBComposites) { measurementOOBCompositeList = measurementOOBComposites; - Log.debug("\nSuccessfully queried OOB data in: " + (System.currentTimeMillis() - startTime) + Log.debug("\nSuccessfully queried "+measurementOOBCompositeList.size() +" OOB records in: " + (System.currentTimeMillis() - startTime) + " ms."); - Log.debug("OOB Data size: " + measurementOOBCompositeList.size()); - if (null != measurementOOBCompositeList) { - for (MeasurementOOBComposite measurementOOBComposite : measurementOOBComposites) { - //Log.debug("measurementOOBComposite = " + measurementOOBComposite); - } - } countDownLatch.countDown(); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricD3Graph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricD3Graph.java index 036237b..93c99d3 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricD3Graph.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricD3Graph.java @@ -18,6 +18,8 @@ */ package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring; +import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; +import org.rhq.enterprise.gui.coregui.client.inventory.AutoRefresh; import org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractMetricD3GraphView; import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph; import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.HasD3MetricJsniChart; @@ -25,7 +27,7 @@ import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.HasD3Met /** * A D3 graph implementation for graphing Resource metrics. */ -public class ResourceMetricD3Graph extends AbstractMetricD3GraphView { +public class ResourceMetricD3Graph extends AbstractMetricD3GraphView { /** * This constructor is for the use case in the Dashboard where we dont actually @@ -38,6 +40,7 @@ public class ResourceMetricD3Graph extends AbstractMetricD3GraphView { public ResourceMetricD3Graph(AbstractGraph graph) { super(graph); + //startRefreshCycle(); } @@ -56,4 +59,29 @@ public class ResourceMetricD3Graph extends AbstractMetricD3GraphView { } +// @Override +// public void startRefreshCycle() { +// refreshTimer = AutoRefreshUtil.startRefreshCycle(this, this, refreshTimer); +// } +// +// @Override +// protected void onDestroy() { +// AutoRefreshUtil.onDestroy( refreshTimer); +// +// super.onDestroy(); +// } +// +// @Override +// public boolean isRefreshing() { +// return false; +// } +// +// //Custom refresh operation as we are not directly extending Table +// @Override +// public void refresh() { +// if (isVisible() && !isRefreshing()) { +// drawGraph(); +// } +// } + } commit 5c27686eafb2315ce4bc5f2871081fc74f2e5fe1 Author: Mike Thompson <mithomps(a)redhat.com> Date: Wed Apr 3 11:11:01 2013 -0700 For Group Availability graph change WARN status to MIXED to better convey the meaning of the status. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AvailabilityLineGraphType.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AvailabilityLineGraphType.java index b15edee..0547ca1 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AvailabilityLineGraphType.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AvailabilityLineGraphType.java @@ -24,6 +24,7 @@ import java.util.List; import org.rhq.core.domain.measurement.Availability; import org.rhq.core.domain.measurement.MeasurementUnits; import org.rhq.core.domain.resource.group.composite.ResourceGroupAvailability; +import org.rhq.core.domain.resource.group.composite.ResourceGroupComposite; import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.Messages; import org.rhq.enterprise.gui.coregui.client.util.Log; @@ -65,6 +66,7 @@ public class AvailabilityLineGraphType { // loop through the avail intervals for (Availability availability : availabilityList) { sb.append("{ \"availType\":\"" + availability.getAvailabilityType() + "\", "); + sb.append(" \"availTypeMessage\":\"" + availability.getAvailabilityType()+ "\", "); sb.append(" \"availStart\":" + availability.getStartTime() + ", "); // last record will be null long endTime = availability.getEndTime() != null ? availability.getEndTime() : (new Date()).getTime(); @@ -81,7 +83,12 @@ public class AvailabilityLineGraphType { } else if (null != groupAvailabilityList) { // loop through the group avail down intervals for (ResourceGroupAvailability groupAvailability : groupAvailabilityList) { + // allows substitution for situations like WARN=MIXED for easier terminology + String availabilityTypeMessage = (groupAvailability.getGroupAvailabilityType().equals(ResourceGroupComposite.GroupAvailabilityType.WARN)) + ? MSG.chart_hover_availability_type_warn() : groupAvailability.getGroupAvailabilityType().name(); + sb.append("{ \"availType\":\"" + groupAvailability.getGroupAvailabilityType() + "\", "); + sb.append(" \"availTypeMessage\":\"" + availabilityTypeMessage + "\", "); sb.append(" \"availStart\":" + groupAvailability.getStartTime() + ", "); // last record will be null long endTime = groupAvailability.getEndTime() != null ? groupAvailability.getEndTime() : (new Date()) @@ -224,19 +231,17 @@ public class AvailabilityLineGraphType { var hoverString, timeFormatter = $wnd.d3.time.format(availChartContext.chartHoverTimeFormat), dateFormatter = $wnd.d3.time.format(availChartContext.chartHoverDateFormat), - availType = d.availType, availStart = new Date(+d.availStart), - availEnd = new Date(+d.availEnd), - availDuration = d.availDuration; + availEnd = new Date(+d.availEnd); hoverString = '<div class="chartHoverEnclosingDiv">' + - '<div class="chartHoverAlignRight"><span >' + availChartContext.hoverBarAvailabilityLabel + ': </span><span style="width:50px;">' + availType + '</span></div>' + + '<div class="chartHoverAlignRight"><span >' + availChartContext.hoverBarAvailabilityLabel + ': </span><span style="width:50px;">' + d.availTypeMessage + '</span></div>' + '<div class="chartHoverAlignRight"><span >' + availChartContext.hoverStartLabel + ': </span><span style="width:50px;">' + timeFormatter(availStart) + '</span></div>' + '<div class="chartHoverAlignRight"><span >' + ' </span><span style="width:50px;">' + dateFormatter(availStart) + '</span></div>' + '<div class="chartHoverAlignRight"><span >' + availChartContext.hoverEndLabel + ': </span><span style="width:50px;">' + timeFormatter(availEnd) + '</span></div>' + '<div class="chartHoverAlignRight"><span >' + ' </span><span style="width:50px;">' + dateFormatter(availEnd) + '</span></div>' + - '<div class="chartHoverAlignRight"><span >' + availChartContext.hoverBarLabel + ': </span><span style="width:50px;">' + availDuration + '</span></div>' + + '<div class="chartHoverAlignRight"><span >' + availChartContext.hoverBarLabel + ': </span><span style="width:50px;">' + d.availDuration + '</span></div>' + '</div>'; return hoverString; 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 38a9605..eb8b22e 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 @@ -9,6 +9,7 @@ chart_date_label = Date chart_down_label = Down chart_hover_availability_label = Availability +chart_hover_availability_type_warn = MIXED chart_hover_bar_label = Duration chart_hover_date_format = %m/%d/%y chart_hover_end_label = End diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties index e8faace..e377ba9 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties @@ -38,6 +38,7 @@ ##chart_title_min_label = Min ##chart_title_peak_label = Max ##chart_hover_availability_label = Availability +##chart_hover_availability_type_warn = MIXED ##chart_hover_date_format = %m/%d/%y ##chart_hover_time_format = %I:%M:%S %p ##chart_hover_start_label = Start 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 ee5dfa3..7b454be 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 @@ -18,6 +18,7 @@ ##chart_title_min_label = Min ##chart_title_peak_label = Max ##chart_hover_availability_label = Availability +##chart_hover_availability_type_warn = MIXED ##chart_hover_date_format = %m/%d/%y ##chart_hover_time_format = %I:%M:%S %p ##chart_hover_start_label = Start diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties index 3772a39..f03b066 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties @@ -18,6 +18,7 @@ ##chart_title_min_label = Min ##chart_title_peak_label = Max ##chart_hover_availability_label = Availability +##chart_hover_availability_type_warn = MIXED ##chart_hover_date_format = %m/%d/%y ##chart_hover_time_format = %I:%M:%S %p ##chart_hover_start_label = Start diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties index fd7f639..55516ce 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties @@ -16,6 +16,7 @@ ##chart_title_min_label = Min ##chart_title_peak_label = Max ##chart_hover_availability_label = Availability +##chart_hover_availability_type_warn = MIXED ##chart_hover_date_format = %m/%d/%y ##chart_hover_time_format = %I:%M:%S %p ##chart_hover_start_label = Start diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties index c8d730d..aaa68cd 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties @@ -15,6 +15,7 @@ ##chart_title_min_label = Min ##chart_title_peak_label = Max ##chart_hover_availability_label = Availability +##chart_hover_availability_type_warn = MIXED ##chart_hover_date_format = %m/%d/%y ##chart_hover_time_format = %I:%M:%S %p ##chart_hover_start_label = Start diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties index ac55382..b5bb9c2 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties @@ -15,6 +15,7 @@ ##chart_title_min_label = Min ##chart_title_peak_label = Max ##chart_hover_availability_label = Availability +##chart_hover_availability_type_warn = MIXED ##chart_hover_date_format = %m/%d/%y ##chart_hover_time_format = %I:%M:%S %p ##chart_hover_start_label = Start diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties index 582be3a..550cef7 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties @@ -15,6 +15,7 @@ ##chart_title_min_label = Min ##chart_title_peak_label = Max ##chart_hover_availability_label = Availability +##chart_hover_availability_type_warn = MIXED ##chart_hover_date_format = %m/%d/%y ##chart_hover_time_format = %I:%M:%S %p ##chart_hover_start_label = Start

1 0

[rhq] Branch 'bug/rhq-1' - 2 commits - modules/enterprise
by mazz 03 Apr '13

03 Apr '13

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java | 14 +++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeDataSource.java | 4 + modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDataSourceField.java | 4 + modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java | 9 +++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java | 24 +++++++--- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGWTServiceImpl.java | 1 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 2 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties | 2 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties | 2 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties | 2 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties | 2 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties | 2 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties | 3 + modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties | 2 14 files changed, 66 insertions(+), 7 deletions(-) New commits: commit bef3bcffc69eeb48e723604f32441b518c2457a8 Author: John Mazzitelli <mazz(a)redhat.com> Date: Wed Apr 3 18:19:10 2013 -0400 BZ 535289 - get inventory status to be a field that the GWT server-side sends over the wire don't show the resource link or support double clicking if the resource is ignored diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java index 8025a0b..fb2d139 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java @@ -308,7 +308,7 @@ public class ResourceDatasource extends RPCDataSource<Resource, ResourceCriteria record.setAttribute(ITIME.propertyName(), from.getItime()); record.setAttribute(MTIME.propertyName(), from.getMtime()); record.setAttribute(MODIFIER.propertyName(), from.getModifiedBy()); - record.setAttribute(INVENTORY_STATUS.propertyName(), from.getInventoryStatus()); + record.setAttribute(INVENTORY_STATUS.propertyName(), from.getInventoryStatus().name()); record.setAttribute(AncestryUtil.RESOURCE_ANCESTRY, from.getAncestry()); record.setAttribute(AncestryUtil.RESOURCE_TYPE_ID, from.getResourceType().getId()); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java index 0d1a6f5..719bbb7 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java @@ -54,6 +54,7 @@ import com.smartgwt.client.widgets.grid.ListGridRecord; import org.rhq.core.domain.authz.Permission; import org.rhq.core.domain.criteria.ResourceCriteria; import org.rhq.core.domain.measurement.AvailabilityType; +import org.rhq.core.domain.resource.InventoryStatus; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceCategory; import org.rhq.core.domain.search.SearchSubsystem; @@ -440,8 +441,11 @@ public class ResourceSearchView extends Table { ListGrid listGrid = (ListGrid) event.getSource(); ListGridRecord[] selectedRows = listGrid.getSelectedRecords(); if (selectedRows != null && selectedRows.length == 1) { - String selectedId = selectedRows[0].getAttribute("id"); - CoreGUI.goToView(LinkManager.getResourceLink(Integer.valueOf(selectedId))); + String invStatus = selectedRows[0].getAttribute(INVENTORY_STATUS.propertyName()); + if (InventoryStatus.COMMITTED == InventoryStatus.valueOf(invStatus)) { + String selectedId = selectedRows[0].getAttribute("id"); + CoreGUI.goToView(LinkManager.getResourceLink(Integer.valueOf(selectedId))); + } } } }); @@ -505,9 +509,14 @@ public class ResourceSearchView extends Table { ListGridField nameField = new ListGridField(NAME.propertyName(), NAME.title(), 250); nameField.setCellFormatter(new CellFormatter() { public String format(Object value, ListGridRecord record, int rowNum, int colNum) { - String url = LinkManager.getResourceLink(record.getAttributeAsInt("id")); - String name = StringUtility.escapeHtml(value.toString()); - return LinkManager.getHref(url, name); + String invStatus = record.getAttribute(INVENTORY_STATUS.propertyName()); + if (InventoryStatus.COMMITTED == InventoryStatus.valueOf(invStatus)) { + String url = LinkManager.getResourceLink(record.getAttributeAsInt("id")); + String name = StringUtility.escapeHtml(value.toString()); + return LinkManager.getHref(url, name); + } else { + return value.toString(); + } } }); nameField.setShowHover(true); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGWTServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGWTServiceImpl.java index d9c74f6..8483106 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGWTServiceImpl.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGWTServiceImpl.java @@ -87,6 +87,7 @@ public class ResourceGWTServiceImpl extends AbstractGWTServiceImpl implements Re "modifiedBy", // "location", // "resourceType", // + "inventoryStatus", // "childResources", // "parentResource", // // "resourceConfiguration \n" + commit 71c7bd444860640e70cd9ee6fad1a0009da34397 Author: John Mazzitelli <mazz(a)redhat.com> Date: Wed Apr 3 17:29:56 2013 -0400 BZ 535289 - provide a Inventory>Ignored Resources item to view resources that are ignored. This isn't finished yet, need to add the ability to unignore them diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java index fa58e8a..dea213e 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java @@ -29,6 +29,7 @@ import com.smartgwt.client.widgets.Label; import org.rhq.core.domain.authz.Permission; import org.rhq.core.domain.measurement.AvailabilityType; +import org.rhq.core.domain.resource.InventoryStatus; import org.rhq.core.domain.resource.ResourceCategory; import org.rhq.core.domain.resource.group.GroupCategory; import org.rhq.enterprise.gui.coregui.client.IconEnum; @@ -73,6 +74,8 @@ public class InventoryView extends AbstractSectionedLeftNavigationView { private static final ViewName PAGE_SERVERS = new ViewName("Servers", MSG.view_inventory_servers(), IconEnum.SERVERS); private static final ViewName PAGE_SERVICES = new ViewName("Services", MSG.view_inventory_services(), IconEnum.SERVICES); + private static final ViewName PAGE_IGNORED_RESOURCES = new ViewName("IgnoredResources", + MSG.view_inventory_ignoredResources(), IconEnum.ALL_RESOURCES); private static final ViewName PAGE_UNAVAIL_SERVERS = new ViewName("UnavailableServers", MSG.view_inventory_unavailableServers(), IconEnum.UNAVAILABLE_SERVERS); @@ -190,6 +193,15 @@ public class InventoryView extends AbstractSectionedLeftNavigationView { } }); + NavigationItem ignoredResourcesItem = new NavigationItem(PAGE_IGNORED_RESOURCES, new ViewFactory() { + public Canvas createView() { + Criteria initialCriteria = new Criteria(ResourceDataSourceField.INVENTORY_STATUS.propertyName(), + InventoryStatus.IGNORED.name()); + + return createResourceSearchView(PAGE_IGNORED_RESOURCES, initialCriteria); + } + }); + NavigationItem downServersItem = new NavigationItem(PAGE_UNAVAIL_SERVERS, new ViewFactory() { public Canvas createView() { Criteria initialCriteria = new Criteria(ResourceDataSourceField.AVAILABILITY.propertyName(), @@ -202,7 +214,7 @@ public class InventoryView extends AbstractSectionedLeftNavigationView { }); return new NavigationSection(RESOURCES_SECTION_VIEW_ID, autodiscoveryQueueItem, allResourcesItem, - platformsItem, topLevelServersItem, serversItem, servicesItem, downServersItem); + platformsItem, topLevelServersItem, serversItem, servicesItem, ignoredResourcesItem, downServersItem); } private NavigationSection buildGroupsSection() { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeDataSource.java index 81c9bb0..ee0ed12 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeDataSource.java @@ -26,6 +26,7 @@ import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceD import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField.CATEGORY; import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField.CTIME; import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField.DESCRIPTION; +import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField.INVENTORY_STATUS; import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField.ITIME; import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField.KEY; import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField.LOCATION; @@ -52,6 +53,7 @@ import com.smartgwt.client.widgets.grid.ListGridRecord; import org.rhq.core.domain.criteria.ResourceCriteria; import org.rhq.core.domain.measurement.AvailabilityType; +import org.rhq.core.domain.resource.InventoryStatus; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceCategory; import org.rhq.core.domain.resource.ResourceType; @@ -183,6 +185,7 @@ public class ResourceCompositeDataSource extends RPCDataSource<ResourceComposite criteria.addFilterName(getFilter(request, NAME.propertyName(), String.class)); criteria.addFilterResourceTypeId(getFilter(request, TYPE.propertyName(), Integer.class)); criteria.addFilterPluginName(getFilter(request, PLUGIN.propertyName(), String.class)); + criteria.addFilterInventoryStatus(getFilter(request, INVENTORY_STATUS.propertyName(), InventoryStatus.class)); criteria.addFilterTagNamespace(getFilter(request, "tagNamespace", String.class)); criteria.addFilterTagSemantic(getFilter(request, "tagSemantic", String.class)); criteria.addFilterTagName(getFilter(request, "tagName", String.class)); @@ -221,6 +224,7 @@ public class ResourceCompositeDataSource extends RPCDataSource<ResourceComposite record.setAttribute(ITIME.propertyName(), res.getItime()); record.setAttribute(MTIME.propertyName(), res.getMtime()); record.setAttribute(MODIFIER.propertyName(), res.getModifiedBy()); + record.setAttribute(INVENTORY_STATUS.propertyName(), res.getInventoryStatus()); record.setAttribute("resourcePermission", from.getResourcePermission()); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDataSourceField.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDataSourceField.java index 8ec2ece..d54b857 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDataSourceField.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDataSourceField.java @@ -54,7 +54,9 @@ public enum ResourceDataSourceField { MTIME("mtime", CoreGUI.getMessages().dataSource_resources_field_lastModifiedTime()), - MODIFIER("modifiedBy", CoreGUI.getMessages().dataSource_resources_field_lastModifier()); + MODIFIER("modifiedBy", CoreGUI.getMessages().dataSource_resources_field_lastModifier()), + + INVENTORY_STATUS("inventoryStatus", CoreGUI.getMessages().common_title_inventoryStatus()); /** * Corresponds to a property name of Resource (e.g. resourceType.name). diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java index 6bd323e..8025a0b 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java @@ -22,6 +22,7 @@ import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceD import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField.CATEGORY; import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField.CTIME; import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField.DESCRIPTION; +import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField.INVENTORY_STATUS; import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField.ITIME; import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField.KEY; import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField.LOCATION; @@ -50,6 +51,7 @@ import com.smartgwt.client.widgets.grid.ListGridRecord; import org.rhq.core.domain.criteria.ResourceCriteria; import org.rhq.core.domain.measurement.AvailabilityType; +import org.rhq.core.domain.resource.InventoryStatus; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceCategory; import org.rhq.core.domain.resource.ResourceType; @@ -147,6 +149,11 @@ public class ResourceDatasource extends RPCDataSource<Resource, ResourceCriteria availabilityDataField.setCanEdit(false); fields.add(availabilityDataField); + DataSourceTextField inventoryStatusDataField = new DataSourceTextField(INVENTORY_STATUS.propertyName(), + INVENTORY_STATUS.title()); + inventoryStatusDataField.setDetail(true); + fields.add(inventoryStatusDataField); + DataSourceTextField ctimeDataField = new DataSourceTextField(CTIME.propertyName(), CTIME.title()); ctimeDataField.setDetail(true); fields.add(ctimeDataField); @@ -250,6 +257,7 @@ public class ResourceDatasource extends RPCDataSource<Resource, ResourceCriteria criteria.addFilterName(getFilter(request, NAME.propertyName(), String.class)); criteria.addFilterResourceTypeId(getFilter(request, TYPE.propertyName(), Integer.class)); criteria.addFilterPluginName(getFilter(request, PLUGIN.propertyName(), String.class)); + criteria.addFilterInventoryStatus(getFilter(request, INVENTORY_STATUS.propertyName(), InventoryStatus.class)); criteria.addFilterTagNamespace(getFilter(request, "tagNamespace", String.class)); criteria.addFilterTagSemantic(getFilter(request, "tagSemantic", String.class)); criteria.addFilterTagName(getFilter(request, "tagName", String.class)); @@ -300,6 +308,7 @@ public class ResourceDatasource extends RPCDataSource<Resource, ResourceCriteria record.setAttribute(ITIME.propertyName(), from.getItime()); record.setAttribute(MTIME.propertyName(), from.getMtime()); record.setAttribute(MODIFIER.propertyName(), from.getModifiedBy()); + record.setAttribute(INVENTORY_STATUS.propertyName(), from.getInventoryStatus()); record.setAttribute(AncestryUtil.RESOURCE_ANCESTRY, from.getAncestry()); record.setAttribute(AncestryUtil.RESOURCE_TYPE_ID, from.getResourceType().getId()); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java index 3e1c6cd..0d1a6f5 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java @@ -22,6 +22,7 @@ import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceD import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField.CATEGORY; import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField.CTIME; import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField.DESCRIPTION; +import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField.INVENTORY_STATUS; import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField.ITIME; import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField.KEY; import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField.LOCATION; @@ -563,6 +564,10 @@ public class ResourceSearchView extends Table { ListGridField modifiedByField = new ListGridField(MODIFIER.propertyName(), MODIFIER.title(), 100); fields.add(modifiedByField); + ListGridField inventoryStatusField = new ListGridField(INVENTORY_STATUS.propertyName(), + INVENTORY_STATUS.title(), 100); + fields.add(inventoryStatusField); + return fields; } 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 4a130e8..dc5aa12 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 @@ -173,6 +173,7 @@ common_title_id_parent = Parent ID common_title_in_compliance = In Compliance? common_title_interval = Interval common_title_inventory = Inventory +common_title_inventoryStatus = Inventory Status common_title_inventorySummary = Inventory Summary common_title_kind = Kind common_title_lastUpdated = Last Updated @@ -1673,6 +1674,7 @@ view_inventory_groups_deleteFailed = Failed to delete the selected resource grou view_inventory_groups_deleteSuccessful = You have successfully deleted the selected resource groups view_inventory_groups_descendants = Descendants view_inventory_groups_loadFailed = Failed to load group composite data +view_inventory_ignoredResources = Ignored Resources view_inventory_mixed = mixed view_inventory_platforms = Platforms view_inventory_problemGroups = Problem Groups diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties index 56d608f..9e388c0 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties @@ -197,6 +197,7 @@ common_title_id_parent = ID rodiče common_title_in_compliance = V cajku? common_title_interval = Interval common_title_inventory = Inventář +common_title_inventoryStatus = Stav inventarizace common_title_inventorySummary = Shrnutí inventáře common_title_kind = Druh common_title_lastUpdated = Naposledy modifikováno @@ -1687,6 +1688,7 @@ view_inventory_groups_deleteFailed = Nepodařilo se smazat vybrané skupiny zdro view_inventory_groups_deleteSuccessful = Úspěšně jste smazali vybrané skupiny zdrojů view_inventory_groups_descendants = Potomci view_inventory_groups_loadFailed = Nepodařilo se načíst složená data pro skupinu +##view_inventory_ignoredResources = Ignored Resources view_inventory_mixed = smíšené view_inventory_platforms = Platformy view_inventory_problemGroups = Problémové skupiny 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 fc69fc9..5edd2a6 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 @@ -174,6 +174,7 @@ common_title_id = ID common_title_id_parent = ID des Vaters common_title_interval = Intervall common_title_inventory = Inventar +common_title_inventoryStatus = Inventar-Status common_title_inventorySummary = Inventar Zusammenfassung common_title_kind = Art common_title_lastUpdated = Zuletzt aktualisiert @@ -1470,6 +1471,7 @@ view_inventory_groups_children = Kinder ##view_inventory_groups_deleteSuccessful = You have successfully deleted the selected resource groups ##view_inventory_groups_descendants = Descendants ##view_inventory_groups_loadFailed = Failed to load group composite data +##view_inventory_ignoredResources = Ignored Resources view_inventory_mixed = gemischt view_inventory_platforms = Platformen view_inventory_problemGroups = Gruppen mit Problemen diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties index 9ce350c..6807c15 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties @@ -176,6 +176,7 @@ common_title_id_parent = 親のID common_title_in_compliance = 順守しているか? common_title_interval = 間隔 common_title_inventory = インベントリ +common_title_inventoryStatus = インベントリステータス common_title_inventorySummary = インベントリサマリ common_title_kind = 種類 common_title_lastUpdated = 最終更新 @@ -1659,6 +1660,7 @@ view_inventory_groups_deleteFailed = 選択されたリソースグループの view_inventory_groups_deleteSuccessful = 選択されたリソースグループの削除に成功しました view_inventory_groups_descendants = 子孫 view_inventory_groups_loadFailed = グループ合成データのロードに失敗しました +##view_inventory_ignoredResources = Ignored Resources view_inventory_mixed = 混成 view_inventory_platforms = プラットフォーム view_inventory_problemGroups = 問題グループ diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties index ce50a7d..f19b749 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties @@ -164,6 +164,7 @@ common_title_id_parent = 부모ID common_title_in_compliance = 준수여부 common_title_interval = 간격 common_title_inventory = 인벤토리 +common_title_inventoryStatus = 인벤토리 상태 common_title_inventorySummary = 인벤토리 요약 common_title_ldapGroups = LDAP 그룹 common_title_members_reporting = 멤버 리포트 @@ -1383,6 +1384,7 @@ view_inventory_groups_deleteFailed = 선택된 리소스 그룹 삭제에 실패 view_inventory_groups_deleteSuccessful = 선택된 리소스 그룹 삭제에 성공했습니다 view_inventory_groups_descendants = 자손 view_inventory_groups_loadFailed = 그룹 합성 데이터 로드에 실패했습니다 +##view_inventory_ignoredResources = Ignored Resources view_inventory_mixed = 혼성 view_inventory_platforms = 플랫폼 view_inventory_problemGroups = 문제 그룹 diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties index af2453a..9dd698f 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties @@ -173,6 +173,7 @@ common_title_id = ID common_title_id_parent = ID do Recurso pai ##common_title_interval = Interval common_title_inventory = Invent\u00E1rio +common_title_inventoryStatus = Status do Invet\u00E1rio common_title_inventorySummary = Sum\u00E1rio do Invent\u00E1rio ##common_title_kind = Kind common_title_lastUpdated = \u00DAltima Atualiza\u00E7\u00E3o @@ -1684,6 +1685,7 @@ view_inventory_groups_deleteFailed = Failed to delete the selected resource grou view_inventory_groups_deleteSuccessful = You have successfully deleted the selected resource groups view_inventory_groups_descendants = Descendants view_inventory_groups_loadFailed = Failed to load group composite data +##view_inventory_ignoredResources = Ignored Resources view_inventory_mixed = mixed view_inventory_platforms = Platforms view_inventory_problemGroups = Problem Groups diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties index 94ea235..2a856bb 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties @@ -2274,6 +2274,7 @@ common_title_id = ID common_title_id_parent = Родительский ID common_title_interval = Интервал common_title_inventory = Инвентарь +##common_title_inventoryStatus = Inventory Status common_title_inventorySummary = Итог инвентаризации common_title_lastUpdated = Последнее обновление common_title_lastUpdatedBy = Последнее обновление от @@ -2658,6 +2659,7 @@ view_admin_systemSettings_LDAPBindDN_name = Имя пользователя view_admin_systemSettings_LDAPBindPW_name = Пароль ##view_alert_details_field_resource_ancestry = Resource Ancestry ##view_alert_details_field_watched_resource = Watched Resource +##view_autoDiscoveryQ_field_inventoryStatus = Inventory Status ##view_autoDiscoveryQ_ignore = Ignore ##view_bundle_revertWizard_getInfoStep_revertDeployDescFull = [REVERT From] {0} [REVERT To] {1} ##view_configEdit_description = Description @@ -2676,6 +2678,7 @@ view_admin_systemSettings_LDAPBindPW_name = Пароль ##view_group_detail_failRecursiveChange = Failed to update the recursive setting for group [{0}] view_group_detail_implicitAvail = Group availability for all members (includes recursive members). ##view_group_detail_recursiveChange = You successfully changed the recursive setting for group [{0}] +##view_inventory_ignoredResources = Ignored Resources ##view_inventory_resources_disableSuccessful = You have successfully disabled the selected resources and their children, [{0}] resources. ##view_inventory_resources_ignoreConfirm = Are you sure you want the selected resources to be ignored? They will no longer show up in inventory. ##view_inventory_resources_ignoreFailed = Failed to ignore Resources diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties index 7e43435..c34723f 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties @@ -170,6 +170,7 @@ common_title_host = \u4e3b\u673a common_title_id = ID common_title_id_parent = \u7236ID common_title_inventory = \u6e05\u5355 +common_title_inventoryStatus = \u6e05\u5355\u72b6\u6001 common_title_inventorySummary = \u6e05\u5355\u6c47\u603b ##common_title_kind = Kind common_title_lastUpdated = \u6700\u8fd1\u66f4\u65b0 @@ -1660,6 +1661,7 @@ view_inventory_groups_deleteFailed = \u5220\u9664\u6307\u5b9a\u7684\u8d44\u6e90\ view_inventory_groups_deleteSuccessful = \u6210\u529f\u7684\u5220\u9664\u6307\u5b9a\u7684\u8d44\u6e90\u7ec4 view_inventory_groups_descendants = \u540e\u4ee3\u7ec4 view_inventory_groups_loadFailed = \u52a0\u8f7d\u7ec4\u7ec4\u5408\u6570\u636e\u5931\u8d25 +##view_inventory_ignoredResources = Ignored Resources view_inventory_mixed = \u6df7\u5408 view_inventory_platforms = \u5e73\u53f0 view_inventory_problemGroups = \u95ee\u9898\u7ec4

1 0

[rhq] Branch 'bug/rhq-1' - 2 commits - modules/core
by mazz 03 Apr '13

03 Apr '13

modules/core/domain/src/main/java/org/rhq/core/domain/alert/Alert.java | 17 +++++----- modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertConditionLog.java | 7 ++-- modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java | 9 +++-- 3 files changed, 21 insertions(+), 12 deletions(-) New commits: commit 96c88f06b78f9e52f12b9dcb335d1910218e22ce Merge: bcb3c56 8beb6df Author: John Mazzitelli <mazz(a)redhat.com> Date: Wed Apr 3 15:14:42 2013 -0400 Merge remote-tracking branch 'origin/master' into bug/rhq-1 commit 8beb6dfc20c73dd5727e5f31a8144f33f8e872f0 Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Wed Apr 3 21:11:11 2013 +0200 Restore QUERY_NATIVE_TRUNCATE_SQL in Alert objects to preserve API diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/Alert.java b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/Alert.java index 59c7d6d..4742c17 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/Alert.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/Alert.java @@ -22,7 +22,11 @@ */ package org.rhq.core.domain.alert; -import org.rhq.core.domain.alert.notification.AlertNotificationLog; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Set; import javax.persistence.CascadeType; import javax.persistence.Column; @@ -39,17 +43,14 @@ import javax.persistence.OneToMany; import javax.persistence.OrderBy; import javax.persistence.SequenceGenerator; import javax.persistence.Table; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; + +import org.rhq.core.domain.alert.notification.AlertNotificationLog; /** * @author Joseph Marques */ @Entity -@NamedQueries( { +@NamedQueries({ @NamedQuery(name = Alert.QUERY_FIND_BY_MEASUREMENT_DEFINITION_ID, query = "SELECT a " + " FROM Alert AS a " + " JOIN a.alertDefinition definition " + " JOIN definition.conditions condition " + " WHERE condition.measurementDefinition.id = :measurementDefinitionId " @@ -232,6 +233,8 @@ public class Alert implements Serializable { public static final String QUERY_FIND_BY_MEAS_DEF_ID_AND_RESOURCE = "Alert.findByMeasDefIdAndResource"; public static final String QUERY_GET_ALERT_COUNT_FOR_SCHEDULES = "Alert.QUERY_GET_ALERT_COUNT_FOR_SCHEDULES"; + public static final String QUERY_NATIVE_TRUNCATE_SQL = "TRUNCATE TABLE RHQ_ALERT"; + // for subsystem view public static final String QUERY_FIND_ALL_COMPOSITES = "Alert.findAllComposites"; public static final String QUERY_FIND_ALL_COMPOSITES_ADMIN = "Alert.findAllComposites_admin"; diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertConditionLog.java b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertConditionLog.java index 76aac5a..b160a3c 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertConditionLog.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertConditionLog.java @@ -22,6 +22,8 @@ */ package org.rhq.core.domain.alert; +import java.io.Serializable; + import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; @@ -33,11 +35,10 @@ import javax.persistence.NamedQueries; import javax.persistence.NamedQuery; import javax.persistence.SequenceGenerator; import javax.persistence.Table; -import java.io.Serializable; /** * A log record for a triggered alert condition. - * + * * @author Joseph Marques */ @Entity @@ -120,6 +121,8 @@ public class AlertConditionLog implements Serializable { public static final String QUERY_DELETE_BY_ALERT_CTIME = "AlertConditionLog.deleteByAlertCTime"; public static final String QUERY_DELETE_UNMATCHED_BY_ALERT_DEFINITION_ID = "AlertConditionLog.deleteUnmatchedByAlertDefinitionId"; + public static final String QUERY_NATIVE_TRUNCATE_SQL = "TRUNCATE TABLE RHQ_ALERT_CONDITION_LOG"; + public static final int MAX_LOG_LENGTH = 250; private static final long serialVersionUID = 1L; diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java index 05f6e5f..13aaee5 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java @@ -22,7 +22,7 @@ */ package org.rhq.core.domain.alert.notification; -import org.rhq.core.domain.alert.Alert; +import java.io.Serializable; import javax.persistence.Column; import javax.persistence.Entity; @@ -42,11 +42,12 @@ import javax.persistence.Table; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlTransient; -import java.io.Serializable; + +import org.rhq.core.domain.alert.Alert; /** * A log record for a triggered action and/or notification taken for a fired alert. - * + * * @author Joseph Marques */ @Entity @@ -99,6 +100,8 @@ public class AlertNotificationLog implements Serializable { public static final String QUERY_DELETE_BY_RESOURCE_GROUPS = "AlertNotificationLog.deleteByResourceGroups"; public static final String QUERY_DELETE_BY_ALERT_CTIME = "AlertNotificationLog.deleteByAlertCtime"; + public static final String QUERY_NATIVE_TRUNCATE_SQL = "TRUNCATE TABLE RHQ_ALERT_NOTIF_LOG"; + @Column(name = "ID", nullable = false) @GeneratedValue(strategy = GenerationType.AUTO, generator = "RHQ_ALERT_NOTIF_LOG_ID_SEQ") @Id

1 0

[rhq] modules/core
by Thomas Segismont 03 Apr '13

03 Apr '13

modules/core/domain/src/main/java/org/rhq/core/domain/alert/Alert.java | 17 +++++----- modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertConditionLog.java | 7 ++-- modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java | 9 +++-- 3 files changed, 21 insertions(+), 12 deletions(-) New commits: commit 8beb6dfc20c73dd5727e5f31a8144f33f8e872f0 Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Wed Apr 3 21:11:11 2013 +0200 Restore QUERY_NATIVE_TRUNCATE_SQL in Alert objects to preserve API diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/Alert.java b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/Alert.java index 59c7d6d..4742c17 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/Alert.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/Alert.java @@ -22,7 +22,11 @@ */ package org.rhq.core.domain.alert; -import org.rhq.core.domain.alert.notification.AlertNotificationLog; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Set; import javax.persistence.CascadeType; import javax.persistence.Column; @@ -39,17 +43,14 @@ import javax.persistence.OneToMany; import javax.persistence.OrderBy; import javax.persistence.SequenceGenerator; import javax.persistence.Table; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; + +import org.rhq.core.domain.alert.notification.AlertNotificationLog; /** * @author Joseph Marques */ @Entity -@NamedQueries( { +@NamedQueries({ @NamedQuery(name = Alert.QUERY_FIND_BY_MEASUREMENT_DEFINITION_ID, query = "SELECT a " + " FROM Alert AS a " + " JOIN a.alertDefinition definition " + " JOIN definition.conditions condition " + " WHERE condition.measurementDefinition.id = :measurementDefinitionId " @@ -232,6 +233,8 @@ public class Alert implements Serializable { public static final String QUERY_FIND_BY_MEAS_DEF_ID_AND_RESOURCE = "Alert.findByMeasDefIdAndResource"; public static final String QUERY_GET_ALERT_COUNT_FOR_SCHEDULES = "Alert.QUERY_GET_ALERT_COUNT_FOR_SCHEDULES"; + public static final String QUERY_NATIVE_TRUNCATE_SQL = "TRUNCATE TABLE RHQ_ALERT"; + // for subsystem view public static final String QUERY_FIND_ALL_COMPOSITES = "Alert.findAllComposites"; public static final String QUERY_FIND_ALL_COMPOSITES_ADMIN = "Alert.findAllComposites_admin"; diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertConditionLog.java b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertConditionLog.java index 76aac5a..b160a3c 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertConditionLog.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertConditionLog.java @@ -22,6 +22,8 @@ */ package org.rhq.core.domain.alert; +import java.io.Serializable; + import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; @@ -33,11 +35,10 @@ import javax.persistence.NamedQueries; import javax.persistence.NamedQuery; import javax.persistence.SequenceGenerator; import javax.persistence.Table; -import java.io.Serializable; /** * A log record for a triggered alert condition. - * + * * @author Joseph Marques */ @Entity @@ -120,6 +121,8 @@ public class AlertConditionLog implements Serializable { public static final String QUERY_DELETE_BY_ALERT_CTIME = "AlertConditionLog.deleteByAlertCTime"; public static final String QUERY_DELETE_UNMATCHED_BY_ALERT_DEFINITION_ID = "AlertConditionLog.deleteUnmatchedByAlertDefinitionId"; + public static final String QUERY_NATIVE_TRUNCATE_SQL = "TRUNCATE TABLE RHQ_ALERT_CONDITION_LOG"; + public static final int MAX_LOG_LENGTH = 250; private static final long serialVersionUID = 1L; diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java index 05f6e5f..13aaee5 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java @@ -22,7 +22,7 @@ */ package org.rhq.core.domain.alert.notification; -import org.rhq.core.domain.alert.Alert; +import java.io.Serializable; import javax.persistence.Column; import javax.persistence.Entity; @@ -42,11 +42,12 @@ import javax.persistence.Table; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlTransient; -import java.io.Serializable; + +import org.rhq.core.domain.alert.Alert; /** * A log record for a triggered action and/or notification taken for a fired alert. - * + * * @author Joseph Marques */ @Entity @@ -99,6 +100,8 @@ public class AlertNotificationLog implements Serializable { public static final String QUERY_DELETE_BY_RESOURCE_GROUPS = "AlertNotificationLog.deleteByResourceGroups"; public static final String QUERY_DELETE_BY_ALERT_CTIME = "AlertNotificationLog.deleteByAlertCtime"; + public static final String QUERY_NATIVE_TRUNCATE_SQL = "TRUNCATE TABLE RHQ_ALERT_NOTIF_LOG"; + @Column(name = "ID", nullable = false) @GeneratedValue(strategy = GenerationType.AUTO, generator = "RHQ_ALERT_NOTIF_LOG_ID_SEQ") @Id

1 0

[rhq] Branch 'bug/rhq-1' - 3 commits - modules/enterprise
by mazz 03 Apr '13

03 Apr '13

modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientFactory.java | 24 ---------- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceOperationNotificationSenderForm.java | 3 - 2 files changed, 4 insertions(+), 23 deletions(-) New commits: commit bcb3c566ea4fbb4feac73e44dd28b28541080079 Merge: 062c182 014545b Author: John Mazzitelli <mazz(a)redhat.com> Date: Wed Apr 3 14:55:44 2013 -0400 Merge remote-tracking branch 'origin/master' into bug/rhq-1 commit 062c1826fd4d71ccebc9f6a0d44ca107b95a71d1 Author: John Mazzitelli <mazz(a)redhat.com> Date: Wed Apr 3 14:55:28 2013 -0400 BZ 535289 - get operations for all types, even if ignored. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceOperationNotificationSenderForm.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceOperationNotificationSenderForm.java index 676a95e..06466d7 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceOperationNotificationSenderForm.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceOperationNotificationSenderForm.java @@ -421,7 +421,8 @@ public class ResourceOperationNotificationSenderForm extends AbstractNotificatio */ private void setOperationDropDownMenuValues(int resourceTypeId, final Integer selectedOpId, final Configuration args) { ResourceTypeCriteria criteria = new ResourceTypeCriteria(); - criteria.addFilterId(resourceTypeId); // we are filtering directly on ID, we assume its unignored + criteria.addFilterId(resourceTypeId); + criteria.addFilterIgnored(null); // it probably makes sense to filter ignored type operations, but ugly errors in GUI show if we do that criteria.fetchOperationDefinitions(true); GWTServiceLookup.getResourceTypeGWTService().findResourceTypesByCriteria(criteria, new AsyncCallback<PageList<ResourceType>>() { commit 014545b4e2ac3ac07413ffae42a2b06e0e5926ed Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Wed Apr 3 20:17:49 2013 +0200 [BZ 928971] - Set the correct classloader for the dynamically created resource proxy classes. diff --git a/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientFactory.java b/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientFactory.java index fd85128..e15cb39 100644 --- a/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientFactory.java +++ b/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientFactory.java @@ -152,7 +152,7 @@ public class ResourceClientFactory { private Class<?> defineCustomInterface(ResourceClientProxy proxy) { try { // define the dynamic class - do not put it in any known rhq package in case our jars are signed (see BZ-794503) - ClassPool pool = ClassPoolFactory.getClassPoolForCurrentContextClassLoader(); + ClassPool pool = ClassPoolFactory.getClassPool(ResourceClientProxy.class.getClassLoader()); CtClass customClass = pool.makeInterface("org.rhq.bindings.client.dynamic." + ResourceClientProxy.class.getSimpleName() + proxy.fingerprint); @@ -209,13 +209,7 @@ public class ResourceClientFactory { } } - ClassLoader cl = Thread.currentThread().getContextClassLoader(); - try { - setContextClassLoader(ResourceClientProxy.class.getClassLoader()); - return customClass.toClass(); - } finally { - setContextClassLoader(cl); - } + return customClass.toClass(); } catch (NotFoundException e) { LOG.error("Could not create custom interface for resource with id " + proxy.getId(), e); throw new IllegalStateException("Could not create custom interface for resource with id " + proxy.getId(), e); @@ -227,18 +221,4 @@ public class ResourceClientFactory { throw new IllegalStateException("Could not create custom interface for resource with id " + proxy.getId(), e); } } - - private void setContextClassLoader(final ClassLoader cl) { - if (System.getSecurityManager() != null) { - AccessController.doPrivileged(new PrivilegedAction<Void>() { - @Override - public Void run() { - Thread.currentThread().setContextClassLoader(cl); - return null; - } - }); - } else { - Thread.currentThread().setContextClassLoader(cl); - } - } }

1 0

[rhq] modules/enterprise
by lkrejci 03 Apr '13

03 Apr '13

modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientFactory.java | 24 ---------- 1 file changed, 2 insertions(+), 22 deletions(-) New commits: commit 014545b4e2ac3ac07413ffae42a2b06e0e5926ed Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Wed Apr 3 20:17:49 2013 +0200 [BZ 928971] - Set the correct classloader for the dynamically created resource proxy classes. diff --git a/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientFactory.java b/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientFactory.java index fd85128..e15cb39 100644 --- a/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientFactory.java +++ b/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientFactory.java @@ -152,7 +152,7 @@ public class ResourceClientFactory { private Class<?> defineCustomInterface(ResourceClientProxy proxy) { try { // define the dynamic class - do not put it in any known rhq package in case our jars are signed (see BZ-794503) - ClassPool pool = ClassPoolFactory.getClassPoolForCurrentContextClassLoader(); + ClassPool pool = ClassPoolFactory.getClassPool(ResourceClientProxy.class.getClassLoader()); CtClass customClass = pool.makeInterface("org.rhq.bindings.client.dynamic." + ResourceClientProxy.class.getSimpleName() + proxy.fingerprint); @@ -209,13 +209,7 @@ public class ResourceClientFactory { } } - ClassLoader cl = Thread.currentThread().getContextClassLoader(); - try { - setContextClassLoader(ResourceClientProxy.class.getClassLoader()); - return customClass.toClass(); - } finally { - setContextClassLoader(cl); - } + return customClass.toClass(); } catch (NotFoundException e) { LOG.error("Could not create custom interface for resource with id " + proxy.getId(), e); throw new IllegalStateException("Could not create custom interface for resource with id " + proxy.getId(), e); @@ -227,18 +221,4 @@ public class ResourceClientFactory { throw new IllegalStateException("Could not create custom interface for resource with id " + proxy.getId(), e); } } - - private void setContextClassLoader(final ClassLoader cl) { - if (System.getSecurityManager() != null) { - AccessController.doPrivileged(new PrivilegedAction<Void>() { - @Override - public Void run() { - Thread.currentThread().setContextClassLoader(cl); - return null; - } - }); - } else { - Thread.currentThread().setContextClassLoader(cl); - } - } }

1 0

[rhq] Branch 'bug/rhq-1' - 2 commits - modules/core modules/enterprise
by mazz 03 Apr '13

03 Apr '13

modules/core/domain/src/main/java/org/rhq/core/domain/alert/Alert.java | 15 modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertConditionLog.java | 7 modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java | 12 modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBeanTest.java | 37 modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/test/AlertManagerTest.java | 375 ++++++++++ modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java | 61 - 6 files changed, 412 insertions(+), 95 deletions(-) New commits: commit 468a36bc568a6c17e83b311ce31700efaabcd608 Merge: c36856d b9b46c2 Author: John Mazzitelli <mazz(a)redhat.com> Date: Wed Apr 3 12:00:33 2013 -0400 Merge remote-tracking branch 'origin/master' into bug/rhq-1 commit b9b46c293cc0e6553cc61f9b14fbeea872ce70c9 Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Wed Apr 3 17:29:26 2013 +0200 Add itests for AlertManager As part of this commit, AlertManager #purgeAlerts method was also deleted as well as associated JPA named queries AlertDefinitionManager was also fixed as it did not clean correctly the database after tests diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/Alert.java b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/Alert.java index f0b585c..59c7d6d 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/Alert.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/Alert.java @@ -22,11 +22,7 @@ */ package org.rhq.core.domain.alert; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; +import org.rhq.core.domain.alert.notification.AlertNotificationLog; import javax.persistence.CascadeType; import javax.persistence.Column; @@ -43,8 +39,11 @@ import javax.persistence.OneToMany; import javax.persistence.OrderBy; import javax.persistence.SequenceGenerator; import javax.persistence.Table; - -import org.rhq.core.domain.alert.notification.AlertNotificationLog; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Set; /** * @author Joseph Marques @@ -233,8 +232,6 @@ public class Alert implements Serializable { public static final String QUERY_FIND_BY_MEAS_DEF_ID_AND_RESOURCE = "Alert.findByMeasDefIdAndResource"; public static final String QUERY_GET_ALERT_COUNT_FOR_SCHEDULES = "Alert.QUERY_GET_ALERT_COUNT_FOR_SCHEDULES"; - public static final String QUERY_NATIVE_TRUNCATE_SQL = "TRUNCATE TABLE RHQ_ALERT"; - // for subsystem view public static final String QUERY_FIND_ALL_COMPOSITES = "Alert.findAllComposites"; public static final String QUERY_FIND_ALL_COMPOSITES_ADMIN = "Alert.findAllComposites_admin"; diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertConditionLog.java b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertConditionLog.java index 4680835..76aac5a 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertConditionLog.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertConditionLog.java @@ -22,8 +22,6 @@ */ package org.rhq.core.domain.alert; -import java.io.Serializable; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; @@ -35,6 +33,7 @@ import javax.persistence.NamedQueries; import javax.persistence.NamedQuery; import javax.persistence.SequenceGenerator; import javax.persistence.Table; +import java.io.Serializable; /** * A log record for a triggered alert condition. @@ -121,8 +120,6 @@ public class AlertConditionLog implements Serializable { public static final String QUERY_DELETE_BY_ALERT_CTIME = "AlertConditionLog.deleteByAlertCTime"; public static final String QUERY_DELETE_UNMATCHED_BY_ALERT_DEFINITION_ID = "AlertConditionLog.deleteUnmatchedByAlertDefinitionId"; - public static final String QUERY_NATIVE_TRUNCATE_SQL = "TRUNCATE TABLE RHQ_ALERT_CONDITION_LOG"; - public static final int MAX_LOG_LENGTH = 250; private static final long serialVersionUID = 1L; @@ -244,4 +241,4 @@ public class AlertConditionLog implements Serializable { return "org.rhq.core.domain.alert.AlertConditionLog" + "[ " + "id=" + id + ", " + "value=" + value + ", " + condition + " ]"; } -} \ No newline at end of file +} diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java index cdf8824..05f6e5f 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java @@ -22,7 +22,7 @@ */ package org.rhq.core.domain.alert.notification; -import java.io.Serializable; +import org.rhq.core.domain.alert.Alert; import javax.persistence.Column; import javax.persistence.Entity; @@ -42,8 +42,7 @@ import javax.persistence.Table; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlTransient; - -import org.rhq.core.domain.alert.Alert; +import java.io.Serializable; /** * A log record for a triggered action and/or notification taken for a fired alert. @@ -68,8 +67,7 @@ import org.rhq.core.domain.alert.Alert; + " FROM AlertDefinition ad " // + " JOIN ad.alerts alert " // + " WHERE ad.resource.id IN ( :resourceIds ) ))"), - @NamedQuery(name = AlertNotificationLog.QUERY_DELETE_BY_RESOURCE_TEMPLATE, - query = "DELETE AlertNotificationLog log " + @NamedQuery(name = AlertNotificationLog.QUERY_DELETE_BY_RESOURCE_TEMPLATE, query = "DELETE AlertNotificationLog log " + " WHERE log.alert.id IN (SELECT alert.id " + " FROM AlertDefinition alertDef " + " JOIN alertDef.alerts alert " @@ -101,8 +99,6 @@ public class AlertNotificationLog implements Serializable { public static final String QUERY_DELETE_BY_RESOURCE_GROUPS = "AlertNotificationLog.deleteByResourceGroups"; public static final String QUERY_DELETE_BY_ALERT_CTIME = "AlertNotificationLog.deleteByAlertCtime"; - public static final String QUERY_NATIVE_TRUNCATE_SQL = "TRUNCATE TABLE RHQ_ALERT_NOTIF_LOG"; - @Column(name = "ID", nullable = false) @GeneratedValue(strategy = GenerationType.AUTO, generator = "RHQ_ALERT_NOTIF_LOG_ID_SEQ") @Id @@ -211,4 +207,4 @@ public class AlertNotificationLog implements Serializable { sb.append('}'); return sb.toString(); } -} \ No newline at end of file +} diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBeanTest.java index 09c3cc7..588f04b 100644 --- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBeanTest.java +++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBeanTest.java @@ -23,6 +23,8 @@ package org.rhq.enterprise.server.alert; import java.util.LinkedList; import java.util.List; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.testng.annotations.Test; import org.rhq.core.domain.alert.AlertDampening; @@ -51,6 +53,8 @@ import org.rhq.enterprise.server.util.SessionTestHelper; */ public class AlertDefinitionManagerBeanTest extends AbstractEJB3Test { + private static final Log LOG = LogFactory.getLog(AlertDefinitionManagerBeanTest.class); + private AlertDefinitionManagerLocal alertDefinitionManager; private ResourceGroupManagerLocal resourceGroupManager; @@ -106,26 +110,33 @@ public class AlertDefinitionManagerBeanTest extends AbstractEJB3Test { private void deleteTestData() throws Exception { if (testData != null) { - final TestData testDataToDelete = testData; + for (Integer alertDefinitionId : testData.getAlertDefinitionIds()) { + removeEntity(AlertDefinition.class, alertDefinitionId); + } + removeEntity(ResourceGroup.class, testData.getResourceGroup().getId()); + removeEntity(Resource.class, testData.getResource().getId()); + removeEntity(ResourceType.class, testData.getResourceType().getId()); + removeEntity(Subject.class, testData.getSubject().getId()); + removeEntity(Role.class, testData.getRole().getId()); testData = null; + } + } + + private void removeEntity(final Class<?> entityClass, final Object entityId) { + try { executeInTransaction(false, new TransactionCallback() { @Override public void execute() throws Exception { - for (Integer alertDefinitionId : testDataToDelete.getAlertDefinitionIds()) { - em.remove(em.find(AlertDefinition.class, alertDefinitionId)); + Object object = em.find(entityClass, entityId); + if (object instanceof Resource) { + ResourceTreeHelper.deleteResource(em, (Resource) object); + } else { + em.remove(object); } - resourceGroupManager.deleteResourceGroup(subjectManager.getOverlord(), testDataToDelete - .getResourceGroup().getId()); - ResourceTreeHelper.deleteResource(em, - em.find(Resource.class, testDataToDelete.getResource().getId())); - em.remove(em.find(ResourceType.class, testDataToDelete.getResourceType().getId())); - subjectManager.deleteSubjects(subjectManager.getOverlord(), new int[] { testDataToDelete - .getSubject().getId() }); - roleManager.deleteRoles(subjectManager.getOverlord(), new int[] { testDataToDelete.getRole() - .getId() }); - } }); + } catch (Exception e) { + LOG.error("Failed to delete object from database: " + entityClass + "[id=" + entityId + "]", e); } } diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/test/AlertManagerTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/test/AlertManagerTest.java new file mode 100644 index 0000000..3cd1044 --- /dev/null +++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/test/AlertManagerTest.java @@ -0,0 +1,375 @@ +/* + * RHQ Management Platform + * Copyright 2013, 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.server.alert.test; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.testng.annotations.Test; + +import org.rhq.core.domain.alert.Alert; +import org.rhq.core.domain.alert.AlertDampening; +import org.rhq.core.domain.alert.AlertDefinition; +import org.rhq.core.domain.alert.AlertPriority; +import org.rhq.core.domain.alert.BooleanExpression; +import org.rhq.core.domain.auth.Subject; +import org.rhq.core.domain.authz.Permission; +import org.rhq.core.domain.authz.Role; +import org.rhq.core.domain.common.EntityContext; +import org.rhq.core.domain.criteria.AlertCriteria; +import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.resource.ResourceType; +import org.rhq.core.domain.resource.group.ResourceGroup; +import org.rhq.core.domain.util.PageList; +import org.rhq.enterprise.server.alert.AlertDefinitionManagerBeanTest; +import org.rhq.enterprise.server.alert.AlertDefinitionManagerLocal; +import org.rhq.enterprise.server.alert.AlertManagerLocal; +import org.rhq.enterprise.server.auth.SubjectManagerLocal; +import org.rhq.enterprise.server.authz.RoleManagerLocal; +import org.rhq.enterprise.server.resource.group.ResourceGroupManagerLocal; +import org.rhq.enterprise.server.test.AbstractEJB3Test; +import org.rhq.enterprise.server.test.TransactionCallback; +import org.rhq.enterprise.server.test.TransactionCallbackReturnable; +import org.rhq.enterprise.server.util.LookupUtil; +import org.rhq.enterprise.server.util.ResourceTreeHelper; +import org.rhq.enterprise.server.util.SessionTestHelper; + +/** + * @author Thomas Segismont + */ +public class AlertManagerTest extends AbstractEJB3Test { + + private static final Log LOG = LogFactory.getLog(AlertDefinitionManagerBeanTest.class); + + private AlertManagerLocal alertManager; + + private AlertDefinitionManagerLocal alertDefinitionManager; + + private ResourceGroupManagerLocal resourceGroupManager; + + private RoleManagerLocal roleManager; + + private SubjectManagerLocal subjectManager; + + private TestData testData; + + @Override + protected void beforeMethod() throws Exception { + alertManager = LookupUtil.getAlertManager(); + subjectManager = LookupUtil.getSubjectManager(); + resourceGroupManager = LookupUtil.getResourceGroupManager(); + roleManager = LookupUtil.getRoleManager(); + alertDefinitionManager = LookupUtil.getAlertDefinitionManager(); + createTestData(); + prepareScheduler(); + } + + private void createTestData() { + testData = executeInTransaction(false, new TransactionCallbackReturnable<TestData>() { + @Override + public TestData execute() throws Exception { + TestData newTestData = new TestData(); + Subject subject = SessionTestHelper.createNewSubject(em, "fake subject"); + newTestData.setSubject(subject); + Role role = SessionTestHelper.createNewRoleForSubject(em, subject, "fake role", Permission.values()); + newTestData.setRole(role); + ResourceType resourceType = SessionTestHelper.createNewResourceType(em); + newTestData.setResourceType(resourceType); + ResourceGroup resourceGroup = new ResourceGroup("fake group", resourceType); + resourceGroup = resourceGroupManager.createPrivateResourceGroup(subject, resourceGroup); + newTestData.setResourceGroup(resourceGroup); + roleManager.setAssignedResourceGroups(subjectManager.getOverlord(), role.getId(), + new int[] { resourceGroup.getId() }); + Resource resource = SessionTestHelper.createNewResourceForGroup(em, resourceGroup, "fake resource"); + newTestData.setResource(resource); + return newTestData; + } + }); + } + + @Override + protected void afterMethod() throws Exception { + try { + deleteTestData(); + } finally { + unprepareScheduler(); + } + } + + private void deleteTestData() throws Exception { + if (testData != null) { + removeAlerts(); + removeEntity(AlertDefinition.class, testData.getAlertDefinitionId()); + removeEntity(ResourceGroup.class, testData.getResourceGroup().getId()); + removeEntity(Resource.class, testData.getResource().getId()); + removeEntity(ResourceType.class, testData.getResourceType().getId()); + removeEntity(Subject.class, testData.getSubject().getId()); + removeEntity(Role.class, testData.getRole().getId()); + testData = null; + } + } + + private void removeAlerts() { + try { + executeInTransaction(false, new TransactionCallback() { + @Override + public void execute() throws Exception { + alertManager.deleteAlertsByContext(subjectManager.getOverlord(), EntityContext.forSubsystemView()); + } + }); + } catch (Exception e) { + LOG.error("Failed to remove alerts", e); + } + } + + private void removeEntity(final Class<?> entityClass, final Object entityId) { + try { + executeInTransaction(false, new TransactionCallback() { + @Override + public void execute() throws Exception { + Object object = em.find(entityClass, entityId); + if (object instanceof Resource) { + ResourceTreeHelper.deleteResource(em, (Resource) object); + } else { + em.remove(object); + } + } + }); + } catch (Exception e) { + LOG.error("Failed to delete object from database: " + entityClass + "[id=" + entityId + "]", e); + } + } + + @Test + public void testDeleteAlertsByResourceContext() { + executeInTransaction(new TransactionCallback() { + @Override + public void execute() throws Exception { + int resourceAlertDefinitionId = createResourceAlertDefinitionAndGetId("fake resource alertdef"); + alertManager.fireAlert(resourceAlertDefinitionId); + + PageList<Alert> foundAlerts = findAlertsByDefinitionIds(resourceAlertDefinitionId); + assertEquals(1, foundAlerts.size()); + + alertManager.deleteAlertsByContext(testData.getSubject(), + EntityContext.forResource(testData.getResource().getId())); + foundAlerts = findAlertsByDefinitionIds(); + assertEquals(0, foundAlerts.size()); + } + }); + } + + @Test + public void testDeleteAlertsByGroupContext() { + executeInTransaction(new TransactionCallback() { + @Override + public void execute() throws Exception { + int resourceAlertDefinitionId = createResourceAlertDefinitionAndGetId("fake resource alertdef"); + alertManager.fireAlert(resourceAlertDefinitionId); + + PageList<Alert> foundAlerts = findAlertsByDefinitionIds(resourceAlertDefinitionId); + assertEquals(1, foundAlerts.size()); + + alertManager.deleteAlertsByContext(testData.getSubject(), + EntityContext.forGroup(testData.getResourceGroup().getId())); + foundAlerts = findAlertsByDefinitionIds(resourceAlertDefinitionId); + assertEquals(0, foundAlerts.size()); + } + }); + } + + @Test + public void testAcknowledgeAlertsByTemplateContext() { + executeInTransaction(new TransactionCallback() { + @Override + public void execute() throws Exception { + try { + // Template definition alert id could be anything + alertManager.acknowledgeAlertsByContext(testData.getSubject(), EntityContext.forTemplate(42)); + fail("It should not be possible to acknowledge alerts by template context"); + } catch (Exception e) { + assertEquals(e.getCause().getClass(), IllegalArgumentException.class); + } + } + }); + } + + @Test + public void testAcknowledgeAlertsByResourceContext() { + executeInTransaction(new TransactionCallback() { + @Override + public void execute() throws Exception { + int resourceAlertDefinitionId = createResourceAlertDefinitionAndGetId("fake resource alertdef"); + alertManager.fireAlert(resourceAlertDefinitionId); + + long testStartTimeStamp = System.currentTimeMillis(); + int count = alertManager.acknowledgeAlertsByContext(testData.getSubject(), + EntityContext.forResource(testData.getResource().getId())); + assertEquals(1, count); + + PageList<Alert> foundAlerts = findAlertsByDefinitionIds(resourceAlertDefinitionId); + assertEquals(1, foundAlerts.size()); + Alert alert = foundAlerts.iterator().next(); + em.refresh(alert); + + assertNotNull(alert.getAcknowledgingSubject()); + assertNotNull(alert.getAcknowledgeTime()); + assertEquals(testData.getSubject().getName(), alert.getAcknowledgingSubject()); + assertTrue("Alert should just have been acknowledged", alert.getAcknowledgeTime() >= testStartTimeStamp); + } + }); + } + + @Test + public void testAcknowledgeAlertsByGroupContext() { + executeInTransaction(new TransactionCallback() { + @Override + public void execute() throws Exception { + int resourceAlertDefinitionId = createResourceAlertDefinitionAndGetId("fake resource alertdef"); + alertManager.fireAlert(resourceAlertDefinitionId); + + long testStartTimeStamp = System.currentTimeMillis(); + int count = alertManager.acknowledgeAlertsByContext(testData.getSubject(), + EntityContext.forGroup(testData.getResourceGroup().getId())); + assertEquals(1, count); + + PageList<Alert> foundAlerts = findAlertsByDefinitionIds(resourceAlertDefinitionId); + assertEquals(1, foundAlerts.size()); + Alert alert = foundAlerts.iterator().next(); + em.refresh(alert); + + assertNotNull(alert.getAcknowledgingSubject()); + assertNotNull(alert.getAcknowledgeTime()); + assertEquals(testData.getSubject().getName(), alert.getAcknowledgingSubject()); + assertTrue("Alert should just have been acknowledged", alert.getAcknowledgeTime() >= testStartTimeStamp); + } + }); + } + + @Test + public void testAcknowledgeAlertsBySubsystemContext() { + executeInTransaction(new TransactionCallback() { + @Override + public void execute() throws Exception { + int resourceAlertDefinitionId = createResourceAlertDefinitionAndGetId("fake resource alertdef"); + alertManager.fireAlert(resourceAlertDefinitionId); + + long testStartTimeStamp = System.currentTimeMillis(); + int count = alertManager.acknowledgeAlertsByContext(testData.getSubject(), + EntityContext.forSubsystemView()); + assertEquals(1, count); + + PageList<Alert> foundAlerts = findAlertsByDefinitionIds(resourceAlertDefinitionId); + assertEquals(1, foundAlerts.size()); + Alert alert = foundAlerts.iterator().next(); + em.refresh(alert); + + assertNotNull(alert.getAcknowledgingSubject()); + assertNotNull(alert.getAcknowledgeTime()); + assertEquals(testData.getSubject().getName(), alert.getAcknowledgingSubject()); + assertTrue("Alert should just have been acknowledged", alert.getAcknowledgeTime() >= testStartTimeStamp); + } + }); + } + + private PageList<Alert> findAlertsByDefinitionIds(Integer... alertDefinitionIds) { + AlertCriteria criteria = new AlertCriteria(); + criteria.addFilterAlertDefinitionIds(alertDefinitionIds); + return alertManager.findAlertsByCriteria(testData.getSubject(), criteria); + } + + private int createResourceAlertDefinitionAndGetId(String name) { + AlertDefinition alertDefinition = new AlertDefinition(); + alertDefinition.setName(name); + alertDefinition.setPriority(AlertPriority.MEDIUM); + alertDefinition.setAlertDampening(new AlertDampening(AlertDampening.Category.NONE)); + alertDefinition.setConditionExpression(BooleanExpression.ANY); + alertDefinition.setRecoveryId(0); + alertDefinition.setEnabled(true); + int alertDefinitionId = alertDefinitionManager.createAlertDefinition(testData.getSubject(), alertDefinition, + testData.getResource().getId(), true); + testData.setAlertDefinitionId(alertDefinitionId); + return alertDefinitionId; + } + + private static final class TestData { + + private Subject subject; + + private Role role; + + private ResourceType resourceType; + + private ResourceGroup resourceGroup; + + private Resource resource; + + private int alertDefinitionId; + + public Subject getSubject() { + return subject; + } + + public void setSubject(Subject subject) { + this.subject = subject; + } + + public Role getRole() { + return role; + } + + public void setRole(Role role) { + this.role = role; + } + + public ResourceType getResourceType() { + return resourceType; + } + + public void setResourceType(ResourceType resourceType) { + this.resourceType = resourceType; + } + + public ResourceGroup getResourceGroup() { + return resourceGroup; + } + + public void setResourceGroup(ResourceGroup resourceGroup) { + this.resourceGroup = resourceGroup; + } + + public Resource getResource() { + return resource; + } + + public void setResource(Resource resource) { + this.resource = resource; + } + + public int getAlertDefinitionId() { + return alertDefinitionId; + } + + public void setAlertDefinitionId(int alertDefinitionId) { + this.alertDefinitionId = alertDefinitionId; + } + } + +} diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java index bc2f9a7..eaae22a 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java @@ -1,6 +1,6 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -18,9 +18,6 @@ */ package org.rhq.enterprise.server.alert; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.SQLException; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Arrays; @@ -71,7 +68,6 @@ import org.rhq.core.domain.util.PageControl; import org.rhq.core.domain.util.PageList; import org.rhq.core.server.MeasurementConverter; import org.rhq.core.util.collection.ArrayUtils; -import org.rhq.core.util.jdbc.JDBCUtil; import org.rhq.enterprise.server.RHQConstants; import org.rhq.enterprise.server.alert.i18n.AlertI18NFactory; import org.rhq.enterprise.server.alert.i18n.AlertI18NResourceKeys; @@ -138,7 +134,6 @@ public class AlertManagerBean implements AlertManagerLocal, AlertManagerRemote { return alert; } - // TODO: iterate in batches of 1000 elements at a time public int deleteAlerts(Subject user, int[] alertIds) { if (alertIds == null || alertIds.length == 0) { return 0; @@ -168,7 +163,6 @@ public class AlertManagerBean implements AlertManagerLocal, AlertManagerRemote { return updated; } - // TODO: iterate in batches of 1000 elements at a time /** * Acknowledge alert(s) so that administrators know who is working on remedying the underlying * condition(s) that caused the alert(s) in the first place. @@ -427,59 +421,6 @@ public class AlertManagerBean implements AlertManagerLocal, AlertManagerRemote { return deletedAlerts; } - @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW) - @TransactionTimeout(6 * 60 * 60) - public int purgeAlerts() { - long totalTime = 0; - - Connection conn = null; - PreparedStatement truncateConditionLogsStatement = null; - PreparedStatement truncateNotificationLogsStatement = null; - PreparedStatement truncateAlertsStatement = null; - try { - conn = rhqDs.getConnection(); - - truncateConditionLogsStatement = conn.prepareStatement(AlertConditionLog.QUERY_NATIVE_TRUNCATE_SQL); - truncateNotificationLogsStatement = conn.prepareStatement(AlertNotificationLog.QUERY_NATIVE_TRUNCATE_SQL); - truncateAlertsStatement = conn.prepareStatement(Alert.QUERY_NATIVE_TRUNCATE_SQL); - - long start = System.currentTimeMillis(); - int purgedConditions = truncateConditionLogsStatement.executeUpdate(); - long end = System.currentTimeMillis(); - log.debug("Purged [" + purgedConditions + "] alert condition logs in [" + (end - start) + "]ms"); - totalTime += (end - start); - - start = System.currentTimeMillis(); - int purgedNotifications = truncateNotificationLogsStatement.executeUpdate(); - end = System.currentTimeMillis(); - log.debug("Purged [" + purgedNotifications + "] alert notifications in [" + (end - start) + "]ms"); - totalTime += (end - start); - - start = System.currentTimeMillis(); - int purgedAlerts = truncateAlertsStatement.executeUpdate(); - end = System.currentTimeMillis(); - log.debug("Purged [" + purgedAlerts + "] alerts in [" + (end - start) + "]ms"); - totalTime += (end - start); - - MeasurementMonitor.getMBean().incrementPurgeTime(totalTime); - MeasurementMonitor.getMBean().setPurgedAlerts(purgedAlerts); - MeasurementMonitor.getMBean().setPurgedAlertConditions(purgedConditions); - MeasurementMonitor.getMBean().setPurgedAlertNotifications(purgedNotifications); - log.debug("Deleted [" + (purgedAlerts + purgedConditions + purgedNotifications) + "] " - + "alert audit records in [" + (totalTime) + "]ms"); - - return purgedAlerts; - } catch (SQLException sqle) { - log.error("Error purging alerts", sqle); - throw new RuntimeException("Error purging alerts: " + sqle.getMessage()); - } finally { - JDBCUtil.safeClose(truncateConditionLogsStatement); - JDBCUtil.safeClose(truncateNotificationLogsStatement); - JDBCUtil.safeClose(truncateAlertsStatement); - JDBCUtil.safeClose(conn); - } - } - public int getAlertCountByMeasurementDefinitionId(Integer measurementDefinitionId, long begin, long end) { Query query = PersistenceUtility.createCountQuery(entityManager, Alert.QUERY_FIND_BY_MEASUREMENT_DEFINITION_ID); query.setParameter("measurementDefinitionId", measurementDefinitionId);

1 0

[rhq] Branch 'bug/rhq-1' - modules/enterprise
by mazz 03 Apr '13

03 Apr '13

modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MetadataBeanTest.java | 25 ++++ modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionMetadataTest.java | 52 +++++++--- modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest.java | 18 --- 3 files changed, 65 insertions(+), 30 deletions(-) New commits: commit c36856d2411e6a8378c2a0abb04bfc8f76aef2a9 Author: John Mazzitelli <mazz(a)redhat.com> Date: Wed Apr 3 11:58:30 2013 -0400 BZ 535289 - test plugin extensions when types are ignored diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MetadataBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MetadataBeanTest.java index 8afabf2..1664c9f 100644 --- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MetadataBeanTest.java +++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MetadataBeanTest.java @@ -318,4 +318,29 @@ public class MetadataBeanTest extends AbstractEJB3Test { this.pluginIds.add(plugin.getId()); } } + + /** + * Use this to ignore a plugin's resource type. Useful for making sure metadata + * updates work even for types that are ignored. + * + * @param typeName type to ignore + * @param pluginName the plugin where the type is defined + */ + protected void ignoreType(String typeName, String pluginName) { + SubjectManagerLocal subjectMgr = LookupUtil.getSubjectManager(); + ResourceTypeManagerLocal typeMgr = LookupUtil.getResourceTypeManager(); + ResourceType rt = typeMgr.getResourceTypeByNameAndPlugin(typeName, pluginName); + if (rt == null) { + fail("Should have had a resource type named [" + typeName + "] from plugin [" + pluginName + "]"); + } + typeMgr.setResourceTypeIgnoreFlagAndUninventoryResources(subjectMgr.getOverlord(), rt.getId(), true); + + // sanity check - make sure the type really got ignored + rt = typeMgr.getResourceTypeByNameAndPlugin(typeName, pluginName); + if (!rt.isIgnored()) { + fail("Should have ignored resource type [" + rt + "]"); + } + + return; + } } diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionMetadataTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionMetadataTest.java index b34fa4c..fda9f31 100644 --- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionMetadataTest.java +++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionMetadataTest.java @@ -45,15 +45,23 @@ public class MultiplePluginExtensionMetadataTest extends MetadataBeanTest { private ResourceTypeManagerLocal resourceTypeMgr; public void testRegisterPlugins() throws Exception { + doTheTest(false); + } + + public void testRegisterPluginsWithIgnoredTypes() throws Exception { + doTheTest(true); + } + + public void doTheTest(boolean ignoreTypes) throws Exception { subjectMgr = LookupUtil.getSubjectManager(); resourceTypeMgr = LookupUtil.getResourceTypeManager(); - registerParentPluginV1(); // create an initial type (called the parent) - registerChild1PluginV1(); // using plugin extension mechanism, create child #1 type that extends that parent type - registerChild2PluginV1(); // using plugin extension mechanism, create child #2 type that extends that parent type - registerParentPluginV2(); // update the parent type - checkChild1Plugin(); // check that the changes to the parent type propogated to the child #1 - checkChild2Plugin(); // check that the changes to the parent type propogated to the child #2 + registerParentPluginV1(ignoreTypes); // create an initial type (called the parent) + registerChild1PluginV1(ignoreTypes); // using plugin extension mechanism, create child #1 type that extends that parent type + registerChild2PluginV1(ignoreTypes); // using plugin extension mechanism, create child #2 type that extends that parent type + registerParentPluginV2(ignoreTypes); // update the parent type + checkChild1Plugin(ignoreTypes); // check that the changes to the parent type propogated to the child #1 + checkChild2Plugin(ignoreTypes); // check that the changes to the parent type propogated to the child #2 } // this needs to be the last test executed in the class, it does cleanup @@ -62,21 +70,31 @@ public class MultiplePluginExtensionMetadataTest extends MetadataBeanTest { afterClassWork(); } - private void registerParentPluginV1() throws Exception { + private void registerParentPluginV1(boolean ignoreTypes) throws Exception { // register the plugin, load the new type and test to make sure its what we expect createPlugin("parent-plugin.jar", "1.0", "parent_plugin_v1.xml"); + if (ignoreTypes) { + ignoreType(TYPE_NAME_PARENT, PLUGIN_NAME_PARENT); + } + ResourceType resourceType = loadResourceTypeFully(TYPE_NAME_PARENT, PLUGIN_NAME_PARENT); assert resourceType.getName().equals(TYPE_NAME_PARENT); assert resourceType.getPlugin().equals(PLUGIN_NAME_PARENT); + assert resourceType.isIgnored() == ignoreTypes; assertVersion1(resourceType); } - private void registerChild1PluginV1() throws Exception { + private void registerChild1PluginV1(boolean ignoreTypes) throws Exception { // register the plugin, load the new type and test to make sure its what we expect createPlugin("child1-plugin.jar", "1.0", "child1_plugin_v1.xml"); + if (ignoreTypes) { + ignoreType(TYPE_NAME_CHILD1, PLUGIN_NAME_CHILD1); + } + ResourceType resourceType = loadResourceTypeFully(TYPE_NAME_CHILD1, PLUGIN_NAME_CHILD1); assert resourceType.getName().equals(TYPE_NAME_CHILD1); assert resourceType.getPlugin().equals(PLUGIN_NAME_CHILD1); + assert resourceType.isIgnored() == ignoreTypes; assertVersion1(resourceType); // in our child #1 plugin, our extended type is actually a child of child #1 plugin's root type @@ -87,29 +105,37 @@ public class MultiplePluginExtensionMetadataTest extends MetadataBeanTest { assert resourceType.getParentResourceTypes().iterator().next().getName().equals("OuterServerA"); } - private void registerChild2PluginV1() throws Exception { + private void registerChild2PluginV1(boolean ignoreTypes) throws Exception { // register the plugin, load the new type and test to make sure its what we expect createPlugin("child2-plugin.jar", "1.0", "child2_plugin_v1.xml"); + if (ignoreTypes) { + ignoreType(TYPE_NAME_CHILD2, PLUGIN_NAME_CHILD2); + } + ResourceType resourceType = loadResourceTypeFully(TYPE_NAME_CHILD2, PLUGIN_NAME_CHILD2); assert resourceType.getName().equals(TYPE_NAME_CHILD2); assert resourceType.getPlugin().equals(PLUGIN_NAME_CHILD2); + assert resourceType.isIgnored() == ignoreTypes; assertVersion1(resourceType); } - private void registerParentPluginV2() throws Exception { + private void registerParentPluginV2(boolean ignoreTypes) throws Exception { // register the plugin, load the new type and test to make sure its what we expect createPlugin("parent-plugin.jar", "2.0", "parent_plugin_v2.xml"); + ResourceType resourceType = loadResourceTypeFully(TYPE_NAME_PARENT, PLUGIN_NAME_PARENT); assert resourceType.getName().equals(TYPE_NAME_PARENT); assert resourceType.getPlugin().equals(PLUGIN_NAME_PARENT); + assert resourceType.isIgnored() == ignoreTypes; assertVersion2(resourceType); } - private void checkChild1Plugin() throws Exception { + private void checkChild1Plugin(boolean ignoreTypes) throws Exception { // load the child #1 type and test to make sure it has been updated to what we expect ResourceType resourceType = loadResourceTypeFully(TYPE_NAME_CHILD1, PLUGIN_NAME_CHILD1); assert resourceType.getName().equals(TYPE_NAME_CHILD1); assert resourceType.getPlugin().equals(PLUGIN_NAME_CHILD1); + assert resourceType.isIgnored() == ignoreTypes; assertVersion2(resourceType); // in our child #1 plugin, our extended type is actually a child of child #1 plugin's root type @@ -120,11 +146,12 @@ public class MultiplePluginExtensionMetadataTest extends MetadataBeanTest { assert resourceType.getParentResourceTypes().iterator().next().getName().equals("OuterServerA"); } - private void checkChild2Plugin() throws Exception { + private void checkChild2Plugin(boolean ignoreTypes) throws Exception { // load the child #2 type and test to make sure it has been updated to what we expect ResourceType resourceType = loadResourceTypeFully(TYPE_NAME_CHILD2, PLUGIN_NAME_CHILD2); assert resourceType.getName().equals(TYPE_NAME_CHILD2); assert resourceType.getPlugin().equals(PLUGIN_NAME_CHILD2); + assert resourceType.isIgnored() == ignoreTypes; assertVersion2(resourceType); } @@ -148,6 +175,7 @@ public class MultiplePluginExtensionMetadataTest extends MetadataBeanTest { ResourceTypeCriteria c = new ResourceTypeCriteria(); c.addFilterName(typeName); c.addFilterPluginName(typePlugin); + c.addFilterIgnored(null); c.setStrict(true); c.fetchParentResourceTypes(true); c.fetchOperationDefinitions(true); diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest.java index 0897163..f0aec2f 100644 --- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest.java +++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest.java @@ -102,24 +102,6 @@ public class PluginManagerBeanTest extends MetadataBeanTest { return; } - private void ignoreType(String typeName, String pluginName) { - SubjectManagerLocal subjectMgr = LookupUtil.getSubjectManager(); - ResourceTypeManagerLocal typeMgr = LookupUtil.getResourceTypeManager(); - ResourceType rt = typeMgr.getResourceTypeByNameAndPlugin(typeName, pluginName); - if (rt == null) { - fail("Should have had a resource type named [" + typeName + "] from plugin [" + pluginName + "]"); - } - typeMgr.setResourceTypeIgnoreFlagAndUninventoryResources(subjectMgr.getOverlord(), rt.getId(), true); - - // sanity check - make sure the type really got ignored - rt = typeMgr.getResourceTypeByNameAndPlugin(typeName, pluginName); - if (!rt.isIgnored()) { - fail("Should have ignored resource type [" + rt + "]"); - } - - return; - } - @Test(dependsOnMethods = { "registerPlugins" }) public void scanAndRegisterTest() throws Exception { Plugin plugin = getPlugin(PLUGIN_1);

1 0

[rhq] modules/core modules/enterprise
by Thomas Segismont 03 Apr '13

03 Apr '13

modules/core/domain/src/main/java/org/rhq/core/domain/alert/Alert.java | 15 modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertConditionLog.java | 7 modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java | 12 modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBeanTest.java | 37 modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/test/AlertManagerTest.java | 375 ++++++++++ modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java | 61 - 6 files changed, 412 insertions(+), 95 deletions(-) New commits: commit b9b46c293cc0e6553cc61f9b14fbeea872ce70c9 Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Wed Apr 3 17:29:26 2013 +0200 Add itests for AlertManager As part of this commit, AlertManager #purgeAlerts method was also deleted as well as associated JPA named queries AlertDefinitionManager was also fixed as it did not clean correctly the database after tests diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/Alert.java b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/Alert.java index f0b585c..59c7d6d 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/Alert.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/Alert.java @@ -22,11 +22,7 @@ */ package org.rhq.core.domain.alert; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; +import org.rhq.core.domain.alert.notification.AlertNotificationLog; import javax.persistence.CascadeType; import javax.persistence.Column; @@ -43,8 +39,11 @@ import javax.persistence.OneToMany; import javax.persistence.OrderBy; import javax.persistence.SequenceGenerator; import javax.persistence.Table; - -import org.rhq.core.domain.alert.notification.AlertNotificationLog; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Set; /** * @author Joseph Marques @@ -233,8 +232,6 @@ public class Alert implements Serializable { public static final String QUERY_FIND_BY_MEAS_DEF_ID_AND_RESOURCE = "Alert.findByMeasDefIdAndResource"; public static final String QUERY_GET_ALERT_COUNT_FOR_SCHEDULES = "Alert.QUERY_GET_ALERT_COUNT_FOR_SCHEDULES"; - public static final String QUERY_NATIVE_TRUNCATE_SQL = "TRUNCATE TABLE RHQ_ALERT"; - // for subsystem view public static final String QUERY_FIND_ALL_COMPOSITES = "Alert.findAllComposites"; public static final String QUERY_FIND_ALL_COMPOSITES_ADMIN = "Alert.findAllComposites_admin"; diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertConditionLog.java b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertConditionLog.java index 4680835..76aac5a 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertConditionLog.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertConditionLog.java @@ -22,8 +22,6 @@ */ package org.rhq.core.domain.alert; -import java.io.Serializable; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; @@ -35,6 +33,7 @@ import javax.persistence.NamedQueries; import javax.persistence.NamedQuery; import javax.persistence.SequenceGenerator; import javax.persistence.Table; +import java.io.Serializable; /** * A log record for a triggered alert condition. @@ -121,8 +120,6 @@ public class AlertConditionLog implements Serializable { public static final String QUERY_DELETE_BY_ALERT_CTIME = "AlertConditionLog.deleteByAlertCTime"; public static final String QUERY_DELETE_UNMATCHED_BY_ALERT_DEFINITION_ID = "AlertConditionLog.deleteUnmatchedByAlertDefinitionId"; - public static final String QUERY_NATIVE_TRUNCATE_SQL = "TRUNCATE TABLE RHQ_ALERT_CONDITION_LOG"; - public static final int MAX_LOG_LENGTH = 250; private static final long serialVersionUID = 1L; @@ -244,4 +241,4 @@ public class AlertConditionLog implements Serializable { return "org.rhq.core.domain.alert.AlertConditionLog" + "[ " + "id=" + id + ", " + "value=" + value + ", " + condition + " ]"; } -} \ No newline at end of file +} diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java index cdf8824..05f6e5f 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java @@ -22,7 +22,7 @@ */ package org.rhq.core.domain.alert.notification; -import java.io.Serializable; +import org.rhq.core.domain.alert.Alert; import javax.persistence.Column; import javax.persistence.Entity; @@ -42,8 +42,7 @@ import javax.persistence.Table; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlTransient; - -import org.rhq.core.domain.alert.Alert; +import java.io.Serializable; /** * A log record for a triggered action and/or notification taken for a fired alert. @@ -68,8 +67,7 @@ import org.rhq.core.domain.alert.Alert; + " FROM AlertDefinition ad " // + " JOIN ad.alerts alert " // + " WHERE ad.resource.id IN ( :resourceIds ) ))"), - @NamedQuery(name = AlertNotificationLog.QUERY_DELETE_BY_RESOURCE_TEMPLATE, - query = "DELETE AlertNotificationLog log " + @NamedQuery(name = AlertNotificationLog.QUERY_DELETE_BY_RESOURCE_TEMPLATE, query = "DELETE AlertNotificationLog log " + " WHERE log.alert.id IN (SELECT alert.id " + " FROM AlertDefinition alertDef " + " JOIN alertDef.alerts alert " @@ -101,8 +99,6 @@ public class AlertNotificationLog implements Serializable { public static final String QUERY_DELETE_BY_RESOURCE_GROUPS = "AlertNotificationLog.deleteByResourceGroups"; public static final String QUERY_DELETE_BY_ALERT_CTIME = "AlertNotificationLog.deleteByAlertCtime"; - public static final String QUERY_NATIVE_TRUNCATE_SQL = "TRUNCATE TABLE RHQ_ALERT_NOTIF_LOG"; - @Column(name = "ID", nullable = false) @GeneratedValue(strategy = GenerationType.AUTO, generator = "RHQ_ALERT_NOTIF_LOG_ID_SEQ") @Id @@ -211,4 +207,4 @@ public class AlertNotificationLog implements Serializable { sb.append('}'); return sb.toString(); } -} \ No newline at end of file +} diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBeanTest.java index 09c3cc7..588f04b 100644 --- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBeanTest.java +++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBeanTest.java @@ -23,6 +23,8 @@ package org.rhq.enterprise.server.alert; import java.util.LinkedList; import java.util.List; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.testng.annotations.Test; import org.rhq.core.domain.alert.AlertDampening; @@ -51,6 +53,8 @@ import org.rhq.enterprise.server.util.SessionTestHelper; */ public class AlertDefinitionManagerBeanTest extends AbstractEJB3Test { + private static final Log LOG = LogFactory.getLog(AlertDefinitionManagerBeanTest.class); + private AlertDefinitionManagerLocal alertDefinitionManager; private ResourceGroupManagerLocal resourceGroupManager; @@ -106,26 +110,33 @@ public class AlertDefinitionManagerBeanTest extends AbstractEJB3Test { private void deleteTestData() throws Exception { if (testData != null) { - final TestData testDataToDelete = testData; + for (Integer alertDefinitionId : testData.getAlertDefinitionIds()) { + removeEntity(AlertDefinition.class, alertDefinitionId); + } + removeEntity(ResourceGroup.class, testData.getResourceGroup().getId()); + removeEntity(Resource.class, testData.getResource().getId()); + removeEntity(ResourceType.class, testData.getResourceType().getId()); + removeEntity(Subject.class, testData.getSubject().getId()); + removeEntity(Role.class, testData.getRole().getId()); testData = null; + } + } + + private void removeEntity(final Class<?> entityClass, final Object entityId) { + try { executeInTransaction(false, new TransactionCallback() { @Override public void execute() throws Exception { - for (Integer alertDefinitionId : testDataToDelete.getAlertDefinitionIds()) { - em.remove(em.find(AlertDefinition.class, alertDefinitionId)); + Object object = em.find(entityClass, entityId); + if (object instanceof Resource) { + ResourceTreeHelper.deleteResource(em, (Resource) object); + } else { + em.remove(object); } - resourceGroupManager.deleteResourceGroup(subjectManager.getOverlord(), testDataToDelete - .getResourceGroup().getId()); - ResourceTreeHelper.deleteResource(em, - em.find(Resource.class, testDataToDelete.getResource().getId())); - em.remove(em.find(ResourceType.class, testDataToDelete.getResourceType().getId())); - subjectManager.deleteSubjects(subjectManager.getOverlord(), new int[] { testDataToDelete - .getSubject().getId() }); - roleManager.deleteRoles(subjectManager.getOverlord(), new int[] { testDataToDelete.getRole() - .getId() }); - } }); + } catch (Exception e) { + LOG.error("Failed to delete object from database: " + entityClass + "[id=" + entityId + "]", e); } } diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/test/AlertManagerTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/test/AlertManagerTest.java new file mode 100644 index 0000000..3cd1044 --- /dev/null +++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/test/AlertManagerTest.java @@ -0,0 +1,375 @@ +/* + * RHQ Management Platform + * Copyright 2013, 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.server.alert.test; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.testng.annotations.Test; + +import org.rhq.core.domain.alert.Alert; +import org.rhq.core.domain.alert.AlertDampening; +import org.rhq.core.domain.alert.AlertDefinition; +import org.rhq.core.domain.alert.AlertPriority; +import org.rhq.core.domain.alert.BooleanExpression; +import org.rhq.core.domain.auth.Subject; +import org.rhq.core.domain.authz.Permission; +import org.rhq.core.domain.authz.Role; +import org.rhq.core.domain.common.EntityContext; +import org.rhq.core.domain.criteria.AlertCriteria; +import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.resource.ResourceType; +import org.rhq.core.domain.resource.group.ResourceGroup; +import org.rhq.core.domain.util.PageList; +import org.rhq.enterprise.server.alert.AlertDefinitionManagerBeanTest; +import org.rhq.enterprise.server.alert.AlertDefinitionManagerLocal; +import org.rhq.enterprise.server.alert.AlertManagerLocal; +import org.rhq.enterprise.server.auth.SubjectManagerLocal; +import org.rhq.enterprise.server.authz.RoleManagerLocal; +import org.rhq.enterprise.server.resource.group.ResourceGroupManagerLocal; +import org.rhq.enterprise.server.test.AbstractEJB3Test; +import org.rhq.enterprise.server.test.TransactionCallback; +import org.rhq.enterprise.server.test.TransactionCallbackReturnable; +import org.rhq.enterprise.server.util.LookupUtil; +import org.rhq.enterprise.server.util.ResourceTreeHelper; +import org.rhq.enterprise.server.util.SessionTestHelper; + +/** + * @author Thomas Segismont + */ +public class AlertManagerTest extends AbstractEJB3Test { + + private static final Log LOG = LogFactory.getLog(AlertDefinitionManagerBeanTest.class); + + private AlertManagerLocal alertManager; + + private AlertDefinitionManagerLocal alertDefinitionManager; + + private ResourceGroupManagerLocal resourceGroupManager; + + private RoleManagerLocal roleManager; + + private SubjectManagerLocal subjectManager; + + private TestData testData; + + @Override + protected void beforeMethod() throws Exception { + alertManager = LookupUtil.getAlertManager(); + subjectManager = LookupUtil.getSubjectManager(); + resourceGroupManager = LookupUtil.getResourceGroupManager(); + roleManager = LookupUtil.getRoleManager(); + alertDefinitionManager = LookupUtil.getAlertDefinitionManager(); + createTestData(); + prepareScheduler(); + } + + private void createTestData() { + testData = executeInTransaction(false, new TransactionCallbackReturnable<TestData>() { + @Override + public TestData execute() throws Exception { + TestData newTestData = new TestData(); + Subject subject = SessionTestHelper.createNewSubject(em, "fake subject"); + newTestData.setSubject(subject); + Role role = SessionTestHelper.createNewRoleForSubject(em, subject, "fake role", Permission.values()); + newTestData.setRole(role); + ResourceType resourceType = SessionTestHelper.createNewResourceType(em); + newTestData.setResourceType(resourceType); + ResourceGroup resourceGroup = new ResourceGroup("fake group", resourceType); + resourceGroup = resourceGroupManager.createPrivateResourceGroup(subject, resourceGroup); + newTestData.setResourceGroup(resourceGroup); + roleManager.setAssignedResourceGroups(subjectManager.getOverlord(), role.getId(), + new int[] { resourceGroup.getId() }); + Resource resource = SessionTestHelper.createNewResourceForGroup(em, resourceGroup, "fake resource"); + newTestData.setResource(resource); + return newTestData; + } + }); + } + + @Override + protected void afterMethod() throws Exception { + try { + deleteTestData(); + } finally { + unprepareScheduler(); + } + } + + private void deleteTestData() throws Exception { + if (testData != null) { + removeAlerts(); + removeEntity(AlertDefinition.class, testData.getAlertDefinitionId()); + removeEntity(ResourceGroup.class, testData.getResourceGroup().getId()); + removeEntity(Resource.class, testData.getResource().getId()); + removeEntity(ResourceType.class, testData.getResourceType().getId()); + removeEntity(Subject.class, testData.getSubject().getId()); + removeEntity(Role.class, testData.getRole().getId()); + testData = null; + } + } + + private void removeAlerts() { + try { + executeInTransaction(false, new TransactionCallback() { + @Override + public void execute() throws Exception { + alertManager.deleteAlertsByContext(subjectManager.getOverlord(), EntityContext.forSubsystemView()); + } + }); + } catch (Exception e) { + LOG.error("Failed to remove alerts", e); + } + } + + private void removeEntity(final Class<?> entityClass, final Object entityId) { + try { + executeInTransaction(false, new TransactionCallback() { + @Override + public void execute() throws Exception { + Object object = em.find(entityClass, entityId); + if (object instanceof Resource) { + ResourceTreeHelper.deleteResource(em, (Resource) object); + } else { + em.remove(object); + } + } + }); + } catch (Exception e) { + LOG.error("Failed to delete object from database: " + entityClass + "[id=" + entityId + "]", e); + } + } + + @Test + public void testDeleteAlertsByResourceContext() { + executeInTransaction(new TransactionCallback() { + @Override + public void execute() throws Exception { + int resourceAlertDefinitionId = createResourceAlertDefinitionAndGetId("fake resource alertdef"); + alertManager.fireAlert(resourceAlertDefinitionId); + + PageList<Alert> foundAlerts = findAlertsByDefinitionIds(resourceAlertDefinitionId); + assertEquals(1, foundAlerts.size()); + + alertManager.deleteAlertsByContext(testData.getSubject(), + EntityContext.forResource(testData.getResource().getId())); + foundAlerts = findAlertsByDefinitionIds(); + assertEquals(0, foundAlerts.size()); + } + }); + } + + @Test + public void testDeleteAlertsByGroupContext() { + executeInTransaction(new TransactionCallback() { + @Override + public void execute() throws Exception { + int resourceAlertDefinitionId = createResourceAlertDefinitionAndGetId("fake resource alertdef"); + alertManager.fireAlert(resourceAlertDefinitionId); + + PageList<Alert> foundAlerts = findAlertsByDefinitionIds(resourceAlertDefinitionId); + assertEquals(1, foundAlerts.size()); + + alertManager.deleteAlertsByContext(testData.getSubject(), + EntityContext.forGroup(testData.getResourceGroup().getId())); + foundAlerts = findAlertsByDefinitionIds(resourceAlertDefinitionId); + assertEquals(0, foundAlerts.size()); + } + }); + } + + @Test + public void testAcknowledgeAlertsByTemplateContext() { + executeInTransaction(new TransactionCallback() { + @Override + public void execute() throws Exception { + try { + // Template definition alert id could be anything + alertManager.acknowledgeAlertsByContext(testData.getSubject(), EntityContext.forTemplate(42)); + fail("It should not be possible to acknowledge alerts by template context"); + } catch (Exception e) { + assertEquals(e.getCause().getClass(), IllegalArgumentException.class); + } + } + }); + } + + @Test + public void testAcknowledgeAlertsByResourceContext() { + executeInTransaction(new TransactionCallback() { + @Override + public void execute() throws Exception { + int resourceAlertDefinitionId = createResourceAlertDefinitionAndGetId("fake resource alertdef"); + alertManager.fireAlert(resourceAlertDefinitionId); + + long testStartTimeStamp = System.currentTimeMillis(); + int count = alertManager.acknowledgeAlertsByContext(testData.getSubject(), + EntityContext.forResource(testData.getResource().getId())); + assertEquals(1, count); + + PageList<Alert> foundAlerts = findAlertsByDefinitionIds(resourceAlertDefinitionId); + assertEquals(1, foundAlerts.size()); + Alert alert = foundAlerts.iterator().next(); + em.refresh(alert); + + assertNotNull(alert.getAcknowledgingSubject()); + assertNotNull(alert.getAcknowledgeTime()); + assertEquals(testData.getSubject().getName(), alert.getAcknowledgingSubject()); + assertTrue("Alert should just have been acknowledged", alert.getAcknowledgeTime() >= testStartTimeStamp); + } + }); + } + + @Test + public void testAcknowledgeAlertsByGroupContext() { + executeInTransaction(new TransactionCallback() { + @Override + public void execute() throws Exception { + int resourceAlertDefinitionId = createResourceAlertDefinitionAndGetId("fake resource alertdef"); + alertManager.fireAlert(resourceAlertDefinitionId); + + long testStartTimeStamp = System.currentTimeMillis(); + int count = alertManager.acknowledgeAlertsByContext(testData.getSubject(), + EntityContext.forGroup(testData.getResourceGroup().getId())); + assertEquals(1, count); + + PageList<Alert> foundAlerts = findAlertsByDefinitionIds(resourceAlertDefinitionId); + assertEquals(1, foundAlerts.size()); + Alert alert = foundAlerts.iterator().next(); + em.refresh(alert); + + assertNotNull(alert.getAcknowledgingSubject()); + assertNotNull(alert.getAcknowledgeTime()); + assertEquals(testData.getSubject().getName(), alert.getAcknowledgingSubject()); + assertTrue("Alert should just have been acknowledged", alert.getAcknowledgeTime() >= testStartTimeStamp); + } + }); + } + + @Test + public void testAcknowledgeAlertsBySubsystemContext() { + executeInTransaction(new TransactionCallback() { + @Override + public void execute() throws Exception { + int resourceAlertDefinitionId = createResourceAlertDefinitionAndGetId("fake resource alertdef"); + alertManager.fireAlert(resourceAlertDefinitionId); + + long testStartTimeStamp = System.currentTimeMillis(); + int count = alertManager.acknowledgeAlertsByContext(testData.getSubject(), + EntityContext.forSubsystemView()); + assertEquals(1, count); + + PageList<Alert> foundAlerts = findAlertsByDefinitionIds(resourceAlertDefinitionId); + assertEquals(1, foundAlerts.size()); + Alert alert = foundAlerts.iterator().next(); + em.refresh(alert); + + assertNotNull(alert.getAcknowledgingSubject()); + assertNotNull(alert.getAcknowledgeTime()); + assertEquals(testData.getSubject().getName(), alert.getAcknowledgingSubject()); + assertTrue("Alert should just have been acknowledged", alert.getAcknowledgeTime() >= testStartTimeStamp); + } + }); + } + + private PageList<Alert> findAlertsByDefinitionIds(Integer... alertDefinitionIds) { + AlertCriteria criteria = new AlertCriteria(); + criteria.addFilterAlertDefinitionIds(alertDefinitionIds); + return alertManager.findAlertsByCriteria(testData.getSubject(), criteria); + } + + private int createResourceAlertDefinitionAndGetId(String name) { + AlertDefinition alertDefinition = new AlertDefinition(); + alertDefinition.setName(name); + alertDefinition.setPriority(AlertPriority.MEDIUM); + alertDefinition.setAlertDampening(new AlertDampening(AlertDampening.Category.NONE)); + alertDefinition.setConditionExpression(BooleanExpression.ANY); + alertDefinition.setRecoveryId(0); + alertDefinition.setEnabled(true); + int alertDefinitionId = alertDefinitionManager.createAlertDefinition(testData.getSubject(), alertDefinition, + testData.getResource().getId(), true); + testData.setAlertDefinitionId(alertDefinitionId); + return alertDefinitionId; + } + + private static final class TestData { + + private Subject subject; + + private Role role; + + private ResourceType resourceType; + + private ResourceGroup resourceGroup; + + private Resource resource; + + private int alertDefinitionId; + + public Subject getSubject() { + return subject; + } + + public void setSubject(Subject subject) { + this.subject = subject; + } + + public Role getRole() { + return role; + } + + public void setRole(Role role) { + this.role = role; + } + + public ResourceType getResourceType() { + return resourceType; + } + + public void setResourceType(ResourceType resourceType) { + this.resourceType = resourceType; + } + + public ResourceGroup getResourceGroup() { + return resourceGroup; + } + + public void setResourceGroup(ResourceGroup resourceGroup) { + this.resourceGroup = resourceGroup; + } + + public Resource getResource() { + return resource; + } + + public void setResource(Resource resource) { + this.resource = resource; + } + + public int getAlertDefinitionId() { + return alertDefinitionId; + } + + public void setAlertDefinitionId(int alertDefinitionId) { + this.alertDefinitionId = alertDefinitionId; + } + } + +} diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java index bc2f9a7..eaae22a 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java @@ -1,6 +1,6 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -18,9 +18,6 @@ */ package org.rhq.enterprise.server.alert; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.SQLException; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Arrays; @@ -71,7 +68,6 @@ import org.rhq.core.domain.util.PageControl; import org.rhq.core.domain.util.PageList; import org.rhq.core.server.MeasurementConverter; import org.rhq.core.util.collection.ArrayUtils; -import org.rhq.core.util.jdbc.JDBCUtil; import org.rhq.enterprise.server.RHQConstants; import org.rhq.enterprise.server.alert.i18n.AlertI18NFactory; import org.rhq.enterprise.server.alert.i18n.AlertI18NResourceKeys; @@ -138,7 +134,6 @@ public class AlertManagerBean implements AlertManagerLocal, AlertManagerRemote { return alert; } - // TODO: iterate in batches of 1000 elements at a time public int deleteAlerts(Subject user, int[] alertIds) { if (alertIds == null || alertIds.length == 0) { return 0; @@ -168,7 +163,6 @@ public class AlertManagerBean implements AlertManagerLocal, AlertManagerRemote { return updated; } - // TODO: iterate in batches of 1000 elements at a time /** * Acknowledge alert(s) so that administrators know who is working on remedying the underlying * condition(s) that caused the alert(s) in the first place. @@ -427,59 +421,6 @@ public class AlertManagerBean implements AlertManagerLocal, AlertManagerRemote { return deletedAlerts; } - @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW) - @TransactionTimeout(6 * 60 * 60) - public int purgeAlerts() { - long totalTime = 0; - - Connection conn = null; - PreparedStatement truncateConditionLogsStatement = null; - PreparedStatement truncateNotificationLogsStatement = null; - PreparedStatement truncateAlertsStatement = null; - try { - conn = rhqDs.getConnection(); - - truncateConditionLogsStatement = conn.prepareStatement(AlertConditionLog.QUERY_NATIVE_TRUNCATE_SQL); - truncateNotificationLogsStatement = conn.prepareStatement(AlertNotificationLog.QUERY_NATIVE_TRUNCATE_SQL); - truncateAlertsStatement = conn.prepareStatement(Alert.QUERY_NATIVE_TRUNCATE_SQL); - - long start = System.currentTimeMillis(); - int purgedConditions = truncateConditionLogsStatement.executeUpdate(); - long end = System.currentTimeMillis(); - log.debug("Purged [" + purgedConditions + "] alert condition logs in [" + (end - start) + "]ms"); - totalTime += (end - start); - - start = System.currentTimeMillis(); - int purgedNotifications = truncateNotificationLogsStatement.executeUpdate(); - end = System.currentTimeMillis(); - log.debug("Purged [" + purgedNotifications + "] alert notifications in [" + (end - start) + "]ms"); - totalTime += (end - start); - - start = System.currentTimeMillis(); - int purgedAlerts = truncateAlertsStatement.executeUpdate(); - end = System.currentTimeMillis(); - log.debug("Purged [" + purgedAlerts + "] alerts in [" + (end - start) + "]ms"); - totalTime += (end - start); - - MeasurementMonitor.getMBean().incrementPurgeTime(totalTime); - MeasurementMonitor.getMBean().setPurgedAlerts(purgedAlerts); - MeasurementMonitor.getMBean().setPurgedAlertConditions(purgedConditions); - MeasurementMonitor.getMBean().setPurgedAlertNotifications(purgedNotifications); - log.debug("Deleted [" + (purgedAlerts + purgedConditions + purgedNotifications) + "] " - + "alert audit records in [" + (totalTime) + "]ms"); - - return purgedAlerts; - } catch (SQLException sqle) { - log.error("Error purging alerts", sqle); - throw new RuntimeException("Error purging alerts: " + sqle.getMessage()); - } finally { - JDBCUtil.safeClose(truncateConditionLogsStatement); - JDBCUtil.safeClose(truncateNotificationLogsStatement); - JDBCUtil.safeClose(truncateAlertsStatement); - JDBCUtil.safeClose(conn); - } - } - public int getAlertCountByMeasurementDefinitionId(Integer measurementDefinitionId, long begin, long end) { Query query = PersistenceUtility.createCountQuery(entityManager, Alert.QUERY_FIND_BY_MEASUREMENT_DEFINITION_ID); query.setParameter("measurementDefinitionId", measurementDefinitionId);

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

rhq-commits April 2013