[rhq] Branch 'jshaughn/avail' - modules/core modules/enterprise

modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementDefinition.java | 2 +- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBean.java | 2 +- modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBeanTest.java | 6 +++--- modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) New commits: commit f5ac3b7b2eef2b6866db11853263f47e2b614bb6 Author: John Mazzitelli <mazz(a)redhat.com&gt; Date: Wed Feb 29 15:06:09 2012 -0500 rename the auto-generated availability metric to Availability rename the property name to rhq.availability diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementDefinition.java b/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementDefinition.java index cb00371..4e13245 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementDefinition.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementDefinition.java @@ -111,7 +111,7 @@ public class MeasurementDefinition implements Serializable { public static final String DISABLE_ALL = "MeasurementDefinition.disableAll"; public static final String FIND_RAW_OR_PER_MINUTE_BY_NAME_AND_RESOURCE_TYPE_NAME = "MeasurementDefinition.findRawOrPerMinuteByNameAndResourceTypeName"; - public static final String AVAILABILITY_TYPE_NAME = "_AvailabilityType_"; + public static final String AVAILABILITY_TYPE_NAME = "rhq.availability"; @Column(name = "ID", nullable = false) @GeneratedValue(strategy = GenerationType.AUTO, generator = "id") diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBean.java index 0039aa2..7c7dae1 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBean.java @@ -168,7 +168,7 @@ public class MeasurementMetadataManagerBean implements MeasurementMetadataManage MeasurementDefinition availabilityScanPeriod = new MeasurementDefinition(newType, MeasurementDefinition.AVAILABILITY_TYPE_NAME); // TODO I18N for this? - availabilityScanPeriod.setDisplayName("Availability Type"); + availabilityScanPeriod.setDisplayName("Availability"); availabilityScanPeriod.setCategory(MeasurementCategory.AVAILABILITY); availabilityScanPeriod .setDescription("The number of seconds between availability checks. The agent honors this setting as best as possible but the actual period can be longer based on agent activity."); diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBeanTest.java index 0664545..aa8604b 100644 --- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBeanTest.java +++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBeanTest.java @@ -24,7 +24,7 @@ public class MeasurementMetadataManagerBeanTest extends MetadataBeanTest { @Test(groups = { "plugin.metadata", "Metrics.NewPlugin" }, dependsOnMethods = { "registerMetricsPlugin" }) public void persistNewMetrics() throws Exception { assertResourceTypeAssociationEquals("MetricServer1", "MeasurementMetadataManagerBeanTestPlugin", - "metricDefinitions", asList("metric1", "metric2", "metric3", "_AvailabilityType_")); + "metricDefinitions", asList("metric1", "metric2", "metric3", "rhq.availability")); } @Test(groups = { "plugin.metadata", "Metrics.NewPlugin" }, dependsOnMethods = { "persistNewMetrics" }) @@ -93,7 +93,7 @@ public class MeasurementMetadataManagerBeanTest extends MetadataBeanTest { @Test(groups = { "plugin.metadata", "Metrics.UpradePlugin" }, dependsOnMethods = { "upgradeMetricsPlugin" }) public void addNewMetricDef() throws Exception { assertResourceTypeAssociationEquals("MetricServer2", "MeasurementMetadataManagerBeanTestPlugin", - "metricDefinitions", asList("metric1", "_AvailabilityType_")); + "metricDefinitions", asList("metric1", "rhq.availability")); } @Test(groups = { "plugin.metadata", "Metrics.UpradePlugin" }, dependsOnMethods = { "upgradeMetricsPlugin" }) @@ -127,7 +127,7 @@ public class MeasurementMetadataManagerBeanTest extends MetadataBeanTest { @Test(groups = { "plugin.metadata", "Metrics.UpradePlugin" }, dependsOnMethods = { "upgradeMetricsPlugin" }) public void deleteMetricDefThatHasBeenRemovedFromResourceType() throws Exception { assertResourceTypeAssociationEquals("MetricServer4", "MeasurementMetadataManagerBeanTestPlugin", - "metricDefinitions", asList("_AvailabilityType_")); + "metricDefinitions", asList("rhq.availability")); } @Test(groups = { "plugin.metadata", "Metrics.UpradePlugin" }, dependsOnMethods = { "upgradeMetricsPlugin" }) diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java index 835e79e..34c247e 100644 --- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java +++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java @@ -142,7 +142,7 @@ public class ResourceMetadataManagerBeanTest extends MetadataBeanTest { @Test(dependsOnMethods = { "persistNewTypes" }, groups = { "plugin.metadata", "NewPlugin" }) public void persistMeasurementDefinitions() throws Exception { assertResourceTypeAssociationEquals("ServerA", "TestPlugin", "metricDefinitions", - asList("metric1", "metric2", "_AvailabilityType_")); + asList("metric1", "metric2", "rhq.availability")); } @Test(dependsOnMethods = { "persistNewTypes" }, groups = { "plugin.metadata", "NewPlugin" })