From cb5078b367f9ed8d268669fbdc122422e08dfa19 Mon Sep 17 00:00:00 2001 From: Jirka Kremser Date: Tue, 14 Oct 2014 13:23:26 +0200 Subject: [PATCH] [BZ 1114600] - Cannot load Metric red error when client time is different from server - Moving Moment.java to core/domain module. There was CNF exception during the install, but also CLI can benefit from this timezone independent class as well. (because depending on number millis from 1970 is confusing - it may return different number on different timezones) --- .../main/java/org/rhq/core/domain/measurement}/util/Moment.java | 2 +- .../client/alert/AlertPortletConfigurationDataSource.java | 2 +- .../components/measurement/AbstractMeasurementRangeEditor.java | 2 +- .../measurement/CustomConfigMeasurementRangeEditor.java | 2 +- .../measurement/UserPreferencesMeasurementRangeEditor.java | 2 +- .../portlets/groups/GroupConfigurationUpdatesPortlet.java | 2 +- .../dashboard/portlets/groups/GroupOperationsPortlet.java | 2 +- .../portlets/recent/alerts/AbstractRecentAlertsPortlet.java | 2 +- .../portlets/recent/drift/AbstractRecentDriftsPortlet.java | 2 +- .../portlets/recent/events/AbstractRecentEventsPortlet.java | 2 +- .../recent/operations/AbstractOperationHistoryPortlet.java | 2 +- .../portlets/recent/problems/ProblemResourcesPortlet.java | 2 +- .../portlets/resource/ResourceConfigurationUpdatesPortlet.java | 2 +- .../java/org/rhq/coregui/client/gwt/AvailabilityGWTService.java | 2 +- .../org/rhq/coregui/client/gwt/MeasurementChartsGWTService.java | 2 +- .../org/rhq/coregui/client/gwt/MeasurementDataGWTService.java | 2 +- .../client/inventory/common/AbstractD3GraphListView.java | 2 +- .../inventory/common/detail/summary/AbstractActivityView.java | 2 +- .../inventory/common/graph/ButtonBarDateTimeRangeEditor.java | 2 +- .../client/inventory/common/graph/CustomDateRangeState.java | 2 +- .../client/inventory/groups/detail/D3GroupGraphListView.java | 2 +- .../groups/detail/monitoring/metric/MetricsGroupView.java | 2 +- .../detail/monitoring/metric/MetricsGroupViewDataSource.java | 2 +- .../detail/monitoring/table/GroupMembersComparisonView.java | 2 +- .../detail/monitoring/table/GroupMetricsTableDataSource.java | 2 +- .../inventory/resource/detail/monitoring/D3GraphListView.java | 2 +- .../resource/detail/monitoring/table/MetricsResourceView.java | 2 +- .../resource/detail/monitoring/table/MetricsViewDataSource.java | 2 +- .../java/org/rhq/coregui/client/util/MeasurementUtility.java | 1 + .../client/util/preferences/MeasurementUserPreferences.java | 2 +- .../org/rhq/coregui/server/gwt/AvailabilityGWTServiceImpl.java | 2 +- .../rhq/coregui/server/gwt/MeasurementChartsGWTServiceImpl.java | 2 +- .../rhq/coregui/server/gwt/MeasurementDataGWTServiceImpl.java | 2 +- 33 files changed, 33 insertions(+), 32 deletions(-) rename modules/{enterprise/gui/coregui/src/main/java/org/rhq/coregui/client => core/domain/src/main/java/org/rhq/core/domain/measurement}/util/Moment.java (98%) diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/util/Moment.java b/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/util/Moment.java similarity index 98% rename from modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/util/Moment.java rename to modules/core/domain/src/main/java/org/rhq/core/domain/measurement/util/Moment.java index 423316d5c58..401cbd1b996 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/util/Moment.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/util/Moment.java @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -package org.rhq.coregui.client.util; +package org.rhq.core.domain.measurement.util; import java.io.Serializable; import java.util.Date; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/alert/AlertPortletConfigurationDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/alert/AlertPortletConfigurationDataSource.java index 98c89d3082f..162785fefbb 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/alert/AlertPortletConfigurationDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/alert/AlertPortletConfigurationDataSource.java @@ -34,6 +34,7 @@ import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.domain.criteria.AlertCriteria; import org.rhq.core.domain.dashboard.DashboardPortlet; +import org.rhq.core.domain.measurement.util.Moment; import org.rhq.core.domain.util.PageControl; import org.rhq.core.domain.util.PageList; import org.rhq.core.domain.util.PageOrdering; @@ -41,7 +42,6 @@ import org.rhq.coregui.client.dashboard.portlets.PortletConfigurationEditorComponent.Constant; import org.rhq.coregui.client.util.Log; import org.rhq.coregui.client.util.MeasurementUtility; -import org.rhq.coregui.client.util.Moment; /** Customize the AlertDataSource to pull fetch criteria information from * the Configuration object passed in. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/components/measurement/AbstractMeasurementRangeEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/components/measurement/AbstractMeasurementRangeEditor.java index 63185b46b62..1f2f1c3c51d 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/components/measurement/AbstractMeasurementRangeEditor.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/components/measurement/AbstractMeasurementRangeEditor.java @@ -41,11 +41,11 @@ import com.smartgwt.client.widgets.form.validator.CustomValidator; import com.smartgwt.client.widgets.grid.ListGrid; +import org.rhq.core.domain.measurement.util.Moment; import org.rhq.coregui.client.CoreGUI; import org.rhq.coregui.client.Messages; import org.rhq.coregui.client.components.table.TableWidget; import org.rhq.coregui.client.util.MeasurementUtility; -import org.rhq.coregui.client.util.Moment; import org.rhq.coregui.client.util.message.Message; import org.rhq.coregui.client.util.message.Message.Severity; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/components/measurement/CustomConfigMeasurementRangeEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/components/measurement/CustomConfigMeasurementRangeEditor.java index 922c4678090..4fa6bfd028e 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/components/measurement/CustomConfigMeasurementRangeEditor.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/components/measurement/CustomConfigMeasurementRangeEditor.java @@ -24,9 +24,9 @@ import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.PropertySimple; +import org.rhq.core.domain.measurement.util.Moment; import org.rhq.coregui.client.dashboard.portlets.PortletConfigurationEditorComponent.Constant; import org.rhq.coregui.client.util.MeasurementUtility; -import org.rhq.coregui.client.util.Moment; public class CustomConfigMeasurementRangeEditor extends AbstractMeasurementRangeEditor { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/components/measurement/UserPreferencesMeasurementRangeEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/components/measurement/UserPreferencesMeasurementRangeEditor.java index 15bc99aa2dc..c75306febc4 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/components/measurement/UserPreferencesMeasurementRangeEditor.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/components/measurement/UserPreferencesMeasurementRangeEditor.java @@ -21,8 +21,8 @@ import java.util.List; +import org.rhq.core.domain.measurement.util.Moment; import org.rhq.coregui.client.UserSessionManager; -import org.rhq.coregui.client.util.Moment; import org.rhq.coregui.client.util.preferences.MeasurementUserPreferences; public class UserPreferencesMeasurementRangeEditor extends AbstractMeasurementRangeEditor { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/groups/GroupConfigurationUpdatesPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/groups/GroupConfigurationUpdatesPortlet.java index a3f0b1aeb68..461604a342f 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/groups/GroupConfigurationUpdatesPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/groups/GroupConfigurationUpdatesPortlet.java @@ -42,6 +42,7 @@ import org.rhq.core.domain.criteria.GroupResourceConfigurationUpdateCriteria; import org.rhq.core.domain.criteria.ResourceGroupCriteria; import org.rhq.core.domain.dashboard.DashboardPortlet; +import org.rhq.core.domain.measurement.util.Moment; import org.rhq.core.domain.resource.group.ResourceGroup; import org.rhq.core.domain.resource.group.composite.ResourceGroupComposite; import org.rhq.core.domain.util.PageControl; @@ -64,7 +65,6 @@ import org.rhq.coregui.client.inventory.groups.detail.configuration.HistoryGroupResourceConfigurationTable; import org.rhq.coregui.client.util.Log; import org.rhq.coregui.client.util.MeasurementUtility; -import org.rhq.coregui.client.util.Moment; import org.rhq.coregui.client.util.enhanced.EnhancedVLayout; /** diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/groups/GroupOperationsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/groups/GroupOperationsPortlet.java index eddba62de4b..ca7cbcf50a8 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/groups/GroupOperationsPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/groups/GroupOperationsPortlet.java @@ -40,6 +40,7 @@ import org.rhq.core.domain.criteria.GroupOperationHistoryCriteria; import org.rhq.core.domain.criteria.ResourceGroupCriteria; import org.rhq.core.domain.dashboard.DashboardPortlet; +import org.rhq.core.domain.measurement.util.Moment; import org.rhq.core.domain.operation.GroupOperationHistory; import org.rhq.core.domain.operation.OperationRequestStatus; import org.rhq.core.domain.resource.group.ResourceGroup; @@ -63,7 +64,6 @@ import org.rhq.coregui.client.inventory.groups.detail.operation.history.GroupOperationHistoryListView; import org.rhq.coregui.client.util.Log; import org.rhq.coregui.client.util.MeasurementUtility; -import org.rhq.coregui.client.util.Moment; import org.rhq.coregui.client.util.enhanced.EnhancedVLayout; /** diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/recent/alerts/AbstractRecentAlertsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/recent/alerts/AbstractRecentAlertsPortlet.java index fab49e99351..ac3bc91b599 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/recent/alerts/AbstractRecentAlertsPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/recent/alerts/AbstractRecentAlertsPortlet.java @@ -47,6 +47,7 @@ import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.domain.criteria.AlertCriteria; import org.rhq.core.domain.dashboard.DashboardPortlet; +import org.rhq.core.domain.measurement.util.Moment; import org.rhq.core.domain.resource.composite.ResourcePermission; import org.rhq.core.domain.util.OrderingField; import org.rhq.core.domain.util.PageControl; @@ -65,7 +66,6 @@ import org.rhq.coregui.client.dashboard.portlets.PortletConfigurationEditorComponent; import org.rhq.coregui.client.dashboard.portlets.PortletConfigurationEditorComponent.Constant; import org.rhq.coregui.client.util.MeasurementUtility; -import org.rhq.coregui.client.util.Moment; import org.rhq.coregui.client.util.enhanced.EnhancedVLayout; /** diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/recent/drift/AbstractRecentDriftsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/recent/drift/AbstractRecentDriftsPortlet.java index 96a3db4e2be..74d2741e70a 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/recent/drift/AbstractRecentDriftsPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/recent/drift/AbstractRecentDriftsPortlet.java @@ -27,6 +27,7 @@ import org.rhq.core.domain.dashboard.DashboardPortlet; import org.rhq.core.domain.drift.DriftCategory; import org.rhq.core.domain.drift.DriftComposite; +import org.rhq.core.domain.measurement.util.Moment; import org.rhq.core.domain.resource.composite.ResourcePermission; import org.rhq.core.domain.util.OrderingField; import org.rhq.core.domain.util.PageControl; @@ -42,7 +43,6 @@ import org.rhq.coregui.client.drift.DriftDataSource; import org.rhq.coregui.client.drift.DriftHistoryView; import org.rhq.coregui.client.util.MeasurementUtility; -import org.rhq.coregui.client.util.Moment; import org.rhq.coregui.client.util.enhanced.EnhancedVLayout; /** diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/recent/events/AbstractRecentEventsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/recent/events/AbstractRecentEventsPortlet.java index f904f6773b3..63e5cae1005 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/recent/events/AbstractRecentEventsPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/recent/events/AbstractRecentEventsPortlet.java @@ -46,6 +46,7 @@ import org.rhq.core.domain.dashboard.DashboardPortlet; import org.rhq.core.domain.event.EventSeverity; import org.rhq.core.domain.event.composite.EventComposite; +import org.rhq.core.domain.measurement.util.Moment; import org.rhq.core.domain.util.OrderingField; import org.rhq.core.domain.util.PageControl; import org.rhq.core.domain.util.PageList; @@ -64,7 +65,6 @@ import org.rhq.coregui.client.inventory.common.event.EventCompositeHistoryView; import org.rhq.coregui.client.inventory.resource.AncestryUtil; import org.rhq.coregui.client.util.MeasurementUtility; -import org.rhq.coregui.client.util.Moment; import org.rhq.coregui.client.util.enhanced.EnhancedVLayout; /** diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/recent/operations/AbstractOperationHistoryPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/recent/operations/AbstractOperationHistoryPortlet.java index 5f0891be71c..a74beae759d 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/recent/operations/AbstractOperationHistoryPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/recent/operations/AbstractOperationHistoryPortlet.java @@ -23,6 +23,7 @@ import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.domain.criteria.ResourceOperationHistoryCriteria; import org.rhq.core.domain.dashboard.DashboardPortlet; +import org.rhq.core.domain.measurement.util.Moment; import org.rhq.core.domain.operation.OperationRequestStatus; import org.rhq.core.domain.operation.ResourceOperationHistory; import org.rhq.core.domain.resource.composite.ResourcePermission; @@ -41,7 +42,6 @@ import org.rhq.coregui.client.operation.OperationHistoryDataSource; import org.rhq.coregui.client.operation.OperationHistoryView; import org.rhq.coregui.client.util.MeasurementUtility; -import org.rhq.coregui.client.util.Moment; import org.rhq.coregui.client.util.enhanced.EnhancedVLayout; /** diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/recent/problems/ProblemResourcesPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/recent/problems/ProblemResourcesPortlet.java index de3aa8a1bb8..751d6f7af83 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/recent/problems/ProblemResourcesPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/recent/problems/ProblemResourcesPortlet.java @@ -48,6 +48,7 @@ import org.rhq.core.domain.configuration.definition.PropertyDefinitionSimple; import org.rhq.core.domain.configuration.definition.PropertySimpleType; import org.rhq.core.domain.dashboard.DashboardPortlet; +import org.rhq.core.domain.measurement.util.Moment; import org.rhq.coregui.client.LinkManager; import org.rhq.coregui.client.components.table.IconField; import org.rhq.coregui.client.components.table.Table; @@ -61,7 +62,6 @@ import org.rhq.coregui.client.inventory.resource.AncestryUtil; import org.rhq.coregui.client.resource.ProblemResourcesDataSource; import org.rhq.coregui.client.util.MeasurementUtility; -import org.rhq.coregui.client.util.Moment; import org.rhq.coregui.client.util.enhanced.EnhancedHLayout; /** diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/resource/ResourceConfigurationUpdatesPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/resource/ResourceConfigurationUpdatesPortlet.java index d8a70e38821..a8102d00486 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/resource/ResourceConfigurationUpdatesPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/resource/ResourceConfigurationUpdatesPortlet.java @@ -35,6 +35,7 @@ import org.rhq.core.domain.criteria.ResourceConfigurationUpdateCriteria; import org.rhq.core.domain.criteria.ResourceCriteria; import org.rhq.core.domain.dashboard.DashboardPortlet; +import org.rhq.core.domain.measurement.util.Moment; import org.rhq.core.domain.resource.composite.ResourceComposite; import org.rhq.core.domain.util.PageControl; import org.rhq.core.domain.util.PageList; @@ -51,7 +52,6 @@ import org.rhq.coregui.client.inventory.resource.detail.configuration.ResourceConfigurationHistoryListView; import org.rhq.coregui.client.util.Log; import org.rhq.coregui.client.util.MeasurementUtility; -import org.rhq.coregui.client.util.Moment; /**This portlet allows the end user to customize the Package History display * diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/gwt/AvailabilityGWTService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/gwt/AvailabilityGWTService.java index bd8a9f96a06..6a6fb55b1ce 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/gwt/AvailabilityGWTService.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/gwt/AvailabilityGWTService.java @@ -24,9 +24,9 @@ import org.rhq.core.domain.criteria.AvailabilityCriteria; import org.rhq.core.domain.measurement.Availability; +import org.rhq.core.domain.measurement.util.Moment; import org.rhq.core.domain.resource.group.composite.ResourceGroupAvailability; import org.rhq.core.domain.util.PageList; -import org.rhq.coregui.client.util.Moment; /** * @author Jay Shaughnessy diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/gwt/MeasurementChartsGWTService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/gwt/MeasurementChartsGWTService.java index 41ec536685f..1d2db4ad4a1 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/gwt/MeasurementChartsGWTService.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/gwt/MeasurementChartsGWTService.java @@ -28,7 +28,7 @@ import org.rhq.core.domain.common.EntityContext; import org.rhq.core.domain.measurement.MeasurementDefinition; import org.rhq.core.domain.measurement.ui.MetricDisplaySummary; -import org.rhq.coregui.client.util.Moment; +import org.rhq.core.domain.measurement.util.Moment; @RemoteServiceRelativePath("MeasurementChartsGWTService") public interface MeasurementChartsGWTService extends RemoteService { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/gwt/MeasurementDataGWTService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/gwt/MeasurementDataGWTService.java index ad6e2f4537b..da6d03b8c7d 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/gwt/MeasurementDataGWTService.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/gwt/MeasurementDataGWTService.java @@ -39,9 +39,9 @@ import org.rhq.core.domain.measurement.composite.MeasurementDataNumericHighLowComposite; import org.rhq.core.domain.measurement.composite.MeasurementOOBComposite; import org.rhq.core.domain.measurement.composite.MeasurementScheduleComposite; +import org.rhq.core.domain.measurement.util.Moment; import org.rhq.core.domain.util.PageControl; import org.rhq.core.domain.util.PageList; -import org.rhq.coregui.client.util.Moment; /** * @author Greg Hinkle diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/common/AbstractD3GraphListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/common/AbstractD3GraphListView.java index b6b0301e8e9..9c0d5800b73 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/common/AbstractD3GraphListView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/common/AbstractD3GraphListView.java @@ -25,13 +25,13 @@ import org.rhq.core.domain.common.EntityContext; import org.rhq.core.domain.measurement.Availability; +import org.rhq.core.domain.measurement.util.Moment; import org.rhq.core.domain.resource.group.composite.ResourceGroupAvailability; import org.rhq.coregui.client.dashboard.AutoRefreshUtil; import org.rhq.coregui.client.inventory.AutoRefresh; import org.rhq.coregui.client.inventory.common.graph.ButtonBarDateTimeRangeEditor; import org.rhq.coregui.client.inventory.common.graph.Refreshable; import org.rhq.coregui.client.inventory.resource.detail.monitoring.avail.AvailabilityD3GraphView; -import org.rhq.coregui.client.util.Moment; import org.rhq.coregui.client.util.async.CountDownLatch; import org.rhq.coregui.client.util.enhanced.EnhancedVLayout; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/common/detail/summary/AbstractActivityView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/common/detail/summary/AbstractActivityView.java index 2fb0b5cfa18..0e9e89e2879 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/common/detail/summary/AbstractActivityView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/common/detail/summary/AbstractActivityView.java @@ -49,6 +49,7 @@ import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.domain.criteria.ResourceGroupCriteria; import org.rhq.core.domain.measurement.MeasurementDefinition; +import org.rhq.core.domain.measurement.util.Moment; import org.rhq.core.domain.operation.OperationRequestStatus; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceCategory; @@ -66,7 +67,6 @@ import org.rhq.coregui.client.util.BrowserUtility; import org.rhq.coregui.client.util.Log; import org.rhq.coregui.client.util.MeasurementUtility; -import org.rhq.coregui.client.util.Moment; import org.rhq.coregui.client.util.enhanced.EnhancedHLayout; import org.rhq.coregui.client.util.enhanced.EnhancedIButton; import org.rhq.coregui.client.util.enhanced.EnhancedUtility; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java index 3e9a5641a5e..c7ac458c141 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java @@ -38,10 +38,10 @@ import com.smartgwt.client.widgets.layout.HLayout; import com.smartgwt.client.widgets.toolbar.ToolStrip; +import org.rhq.core.domain.measurement.util.Moment; import org.rhq.coregui.client.components.measurement.RefreshIntervalMenu; import org.rhq.coregui.client.inventory.AutoRefresh; import org.rhq.coregui.client.util.Log; -import org.rhq.coregui.client.util.Moment; import org.rhq.coregui.client.util.enhanced.EnhancedIButton; import org.rhq.coregui.client.util.enhanced.EnhancedIButton.ButtonColor; import org.rhq.coregui.client.util.enhanced.EnhancedVLayout; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/common/graph/CustomDateRangeState.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/common/graph/CustomDateRangeState.java index a47e1c6ea31..c6d9d3b5fc5 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/common/graph/CustomDateRangeState.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/common/graph/CustomDateRangeState.java @@ -20,11 +20,11 @@ import java.util.Date; +import org.rhq.core.domain.measurement.util.Moment; import org.rhq.coregui.client.CoreGUI; import org.rhq.coregui.client.Messages; import org.rhq.coregui.client.UserSessionManager; import org.rhq.coregui.client.components.measurement.AbstractMeasurementRangeEditor; -import org.rhq.coregui.client.util.Moment; import org.rhq.coregui.client.util.async.Command; import org.rhq.coregui.client.util.message.Message; import org.rhq.coregui.client.util.preferences.MeasurementUserPreferences; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/D3GroupGraphListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/D3GroupGraphListView.java index 94174e7ea4e..d62f156223c 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/D3GroupGraphListView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/D3GroupGraphListView.java @@ -33,6 +33,7 @@ import org.rhq.core.domain.common.EntityContext; import org.rhq.core.domain.measurement.MeasurementDefinition; import org.rhq.core.domain.measurement.composite.MeasurementDataNumericHighLowComposite; +import org.rhq.core.domain.measurement.util.Moment; import org.rhq.core.domain.resource.ResourceType; import org.rhq.core.domain.resource.group.GroupCategory; import org.rhq.core.domain.resource.group.ResourceGroup; @@ -50,7 +51,6 @@ import org.rhq.coregui.client.inventory.resource.detail.monitoring.avail.AvailabilityD3GraphView; import org.rhq.coregui.client.inventory.resource.type.ResourceTypeRepository; import org.rhq.coregui.client.util.Log; -import org.rhq.coregui.client.util.Moment; import org.rhq.coregui.client.util.async.CountDownLatch; /** diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/monitoring/metric/MetricsGroupView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/monitoring/metric/MetricsGroupView.java index 586e29fd0ff..1c2401ff4fa 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/monitoring/metric/MetricsGroupView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/monitoring/metric/MetricsGroupView.java @@ -30,6 +30,7 @@ import com.smartgwt.client.widgets.events.ClickHandler; import org.rhq.core.domain.common.EntityContext; +import org.rhq.core.domain.measurement.util.Moment; import org.rhq.core.domain.resource.group.ResourceGroup; import org.rhq.core.domain.resource.group.composite.ResourceGroupAvailability; import org.rhq.coregui.client.CoreGUI; @@ -43,7 +44,6 @@ import org.rhq.coregui.client.inventory.resource.detail.monitoring.avail.AvailabilityD3GraphView; import org.rhq.coregui.client.inventory.resource.detail.monitoring.table.MetricAvailabilityView; import org.rhq.coregui.client.util.BrowserUtility; -import org.rhq.coregui.client.util.Moment; import org.rhq.coregui.client.util.async.CountDownLatch; import org.rhq.coregui.client.util.enhanced.EnhancedHLayout; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/monitoring/metric/MetricsGroupViewDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/monitoring/metric/MetricsGroupViewDataSource.java index 90a1e22fc88..f1ddf514d5a 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/monitoring/metric/MetricsGroupViewDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/monitoring/metric/MetricsGroupViewDataSource.java @@ -53,6 +53,7 @@ import org.rhq.core.domain.measurement.composite.MeasurementDataNumericHighLowComposite; import org.rhq.core.domain.measurement.ui.MetricDisplaySummary; import org.rhq.core.domain.measurement.ui.MetricDisplayValue; +import org.rhq.core.domain.measurement.util.Moment; import org.rhq.core.domain.resource.group.ResourceGroup; import org.rhq.coregui.client.CoreGUI; import org.rhq.coregui.client.gwt.GWTServiceLookup; @@ -60,7 +61,6 @@ import org.rhq.coregui.client.util.BrowserUtility; import org.rhq.coregui.client.util.Log; import org.rhq.coregui.client.util.MeasurementUtility; -import org.rhq.coregui.client.util.Moment; import org.rhq.coregui.client.util.RPCDataSource; import org.rhq.coregui.client.util.async.Command; import org.rhq.coregui.client.util.async.CountDownLatch; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/monitoring/table/GroupMembersComparisonView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/monitoring/table/GroupMembersComparisonView.java index a46c327d58e..51b6e6c03fb 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/monitoring/table/GroupMembersComparisonView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/monitoring/table/GroupMembersComparisonView.java @@ -56,6 +56,7 @@ import org.rhq.core.domain.measurement.MeasurementDefinition; import org.rhq.core.domain.measurement.ui.MetricDisplaySummary; import org.rhq.core.domain.measurement.ui.MetricDisplayValue; +import org.rhq.core.domain.measurement.util.Moment; import org.rhq.core.domain.resource.InventoryStatus; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceType; @@ -77,7 +78,6 @@ import org.rhq.coregui.client.inventory.resource.type.ResourceTypeRepository; import org.rhq.coregui.client.inventory.resource.type.ResourceTypeRepository.TypesLoadedCallback; import org.rhq.coregui.client.util.MeasurementUtility; -import org.rhq.coregui.client.util.Moment; import org.rhq.coregui.client.util.RPCDataSource; import org.rhq.coregui.client.util.StringUtility; import org.rhq.coregui.client.util.preferences.MeasurementUserPreferences; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/monitoring/table/GroupMetricsTableDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/monitoring/table/GroupMetricsTableDataSource.java index 462a84b6bfb..e3ee0a8ef43 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/monitoring/table/GroupMetricsTableDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/monitoring/table/GroupMetricsTableDataSource.java @@ -17,6 +17,7 @@ import org.rhq.core.domain.criteria.Criteria; import org.rhq.core.domain.measurement.MeasurementDefinition; import org.rhq.core.domain.measurement.ui.MetricDisplaySummary; +import org.rhq.core.domain.measurement.util.Moment; import org.rhq.core.domain.resource.ResourceType; import org.rhq.core.domain.resource.group.ResourceGroup; import org.rhq.core.domain.resource.group.composite.ResourceGroupComposite; @@ -25,7 +26,6 @@ import org.rhq.coregui.client.gwt.GWTServiceLookup; import org.rhq.coregui.client.inventory.resource.type.ResourceTypeRepository; import org.rhq.coregui.client.util.MeasurementUtility; -import org.rhq.coregui.client.util.Moment; import org.rhq.coregui.client.util.preferences.MeasurementUserPreferences; import org.rhq.coregui.client.util.preferences.UserPreferences; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java index 6f06c4f0414..7c19fc610da 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java @@ -38,6 +38,7 @@ import org.rhq.core.domain.measurement.MeasurementDefinition; import org.rhq.core.domain.measurement.composite.MeasurementDataNumericHighLowComposite; import org.rhq.core.domain.measurement.composite.MeasurementOOBComposite; +import org.rhq.core.domain.measurement.util.Moment; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.util.PageList; import org.rhq.coregui.client.CoreGUI; @@ -49,7 +50,6 @@ import org.rhq.coregui.client.inventory.common.graph.graphtype.StackedBarMetricGraphImpl; import org.rhq.coregui.client.inventory.resource.detail.monitoring.avail.AvailabilityD3GraphView; import org.rhq.coregui.client.util.Log; -import org.rhq.coregui.client.util.Moment; import org.rhq.coregui.client.util.async.Command; import org.rhq.coregui.client.util.async.CountDownLatch; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java index 6fd852387cd..46b04e713d5 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java @@ -31,6 +31,7 @@ import org.rhq.core.domain.common.EntityContext; import org.rhq.core.domain.measurement.Availability; +import org.rhq.core.domain.measurement.util.Moment; import org.rhq.core.domain.resource.Resource; import org.rhq.coregui.client.CoreGUI; import org.rhq.coregui.client.IconEnum; @@ -41,7 +42,6 @@ import org.rhq.coregui.client.inventory.resource.detail.monitoring.ExpandedRowsMomento; import org.rhq.coregui.client.inventory.resource.detail.monitoring.avail.AvailabilityD3GraphView; import org.rhq.coregui.client.util.BrowserUtility; -import org.rhq.coregui.client.util.Moment; import org.rhq.coregui.client.util.async.CountDownLatch; import org.rhq.coregui.client.util.enhanced.EnhancedHLayout; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/monitoring/table/MetricsViewDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/monitoring/table/MetricsViewDataSource.java index c325a240ed6..48abec35a1f 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/monitoring/table/MetricsViewDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/monitoring/table/MetricsViewDataSource.java @@ -61,6 +61,7 @@ import org.rhq.core.domain.measurement.composite.MeasurementDataNumericHighLowComposite; import org.rhq.core.domain.measurement.ui.MetricDisplaySummary; import org.rhq.core.domain.measurement.ui.MetricDisplayValue; +import org.rhq.core.domain.measurement.util.Moment; import org.rhq.core.domain.resource.Resource; import org.rhq.coregui.client.CoreGUI; import org.rhq.coregui.client.gwt.GWTServiceLookup; @@ -69,7 +70,6 @@ import org.rhq.coregui.client.util.Log; import org.rhq.coregui.client.util.MeasurementConverterClient; import org.rhq.coregui.client.util.MeasurementUtility; -import org.rhq.coregui.client.util.Moment; import org.rhq.coregui.client.util.RPCDataSource; import org.rhq.coregui.client.util.async.Command; import org.rhq.coregui.client.util.async.CountDownLatch; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/util/MeasurementUtility.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/util/MeasurementUtility.java index e0cc506e5ba..d260eb683d1 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/util/MeasurementUtility.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/util/MeasurementUtility.java @@ -25,6 +25,7 @@ import org.rhq.core.domain.measurement.MeasurementUnits; import org.rhq.core.domain.measurement.ui.MetricDisplaySummary; +import org.rhq.core.domain.measurement.util.Moment; public class MeasurementUtility { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/util/preferences/MeasurementUserPreferences.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/util/preferences/MeasurementUserPreferences.java index 7804b20ee9a..7005dcca894 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/util/preferences/MeasurementUserPreferences.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/util/preferences/MeasurementUserPreferences.java @@ -25,9 +25,9 @@ import com.google.gwt.user.client.rpc.AsyncCallback; import org.rhq.core.domain.auth.Subject; +import org.rhq.core.domain.measurement.util.Moment; import org.rhq.coregui.client.components.measurement.AbstractMeasurementRangeEditor.MetricRangePreferences; import org.rhq.coregui.client.util.MeasurementUtility; -import org.rhq.coregui.client.util.Moment; import org.rhq.coregui.client.util.StringUtility; import org.rhq.coregui.client.util.async.Command; import org.rhq.coregui.client.util.async.CountDownLatch; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/server/gwt/AvailabilityGWTServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/server/gwt/AvailabilityGWTServiceImpl.java index 7afd62d2767..3d92b8f4655 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/server/gwt/AvailabilityGWTServiceImpl.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/server/gwt/AvailabilityGWTServiceImpl.java @@ -22,10 +22,10 @@ import org.rhq.core.domain.criteria.AvailabilityCriteria; import org.rhq.core.domain.measurement.Availability; +import org.rhq.core.domain.measurement.util.Moment; import org.rhq.core.domain.resource.group.composite.ResourceGroupAvailability; import org.rhq.core.domain.util.PageList; import org.rhq.coregui.client.gwt.AvailabilityGWTService; -import org.rhq.coregui.client.util.Moment; import org.rhq.coregui.server.util.SerialUtility; import org.rhq.enterprise.server.measurement.AvailabilityManagerLocal; import org.rhq.enterprise.server.util.LookupUtil; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/server/gwt/MeasurementChartsGWTServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/server/gwt/MeasurementChartsGWTServiceImpl.java index 3d471b4f782..77188b51bec 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/server/gwt/MeasurementChartsGWTServiceImpl.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/server/gwt/MeasurementChartsGWTServiceImpl.java @@ -25,8 +25,8 @@ import org.rhq.core.domain.common.EntityContext; import org.rhq.core.domain.measurement.MeasurementDefinition; import org.rhq.core.domain.measurement.ui.MetricDisplaySummary; +import org.rhq.core.domain.measurement.util.Moment; import org.rhq.coregui.client.gwt.MeasurementChartsGWTService; -import org.rhq.coregui.client.util.Moment; import org.rhq.coregui.server.util.SerialUtility; import org.rhq.enterprise.server.measurement.MeasurementChartsManagerLocal; import org.rhq.enterprise.server.util.LookupUtil; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/server/gwt/MeasurementDataGWTServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/server/gwt/MeasurementDataGWTServiceImpl.java index 7086a10aa90..ec28d88e98c 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/server/gwt/MeasurementDataGWTServiceImpl.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/server/gwt/MeasurementDataGWTServiceImpl.java @@ -38,11 +38,11 @@ import org.rhq.core.domain.measurement.composite.MeasurementDataNumericHighLowComposite; import org.rhq.core.domain.measurement.composite.MeasurementOOBComposite; import org.rhq.core.domain.measurement.composite.MeasurementScheduleComposite; +import org.rhq.core.domain.measurement.util.Moment; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.util.PageControl; import org.rhq.core.domain.util.PageList; import org.rhq.coregui.client.gwt.MeasurementDataGWTService; -import org.rhq.coregui.client.util.Moment; import org.rhq.coregui.server.util.SerialUtility; import org.rhq.enterprise.server.measurement.CallTimeDataManagerLocal; import org.rhq.enterprise.server.measurement.MeasurementBaselineManagerLocal;