[rhq] Branch 'release/jon3.1.x' - modules/core
by lkrejci
modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 6e84f520cd1ca11b9e7eb784fc6ded2af557ed37
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Fri Nov 23 17:18:35 2012 +0100
[BZ 879655] - Properly deactivate the resource instead of just calling the
component's stop() method when forcing reactivation of a started component.
This will ensure the PC can't enter an inconsistent state in the case the
stop() method fails.
(cherry picked from commit 844f016ee8b2608496d063c94f38461e997bcabe)
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java
index 3fcd148..d95a976 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java
@@ -1591,7 +1591,10 @@ public class InventoryManager extends AgentService implements ContainerService,
if (forceReinitialization) {
switch (state) {
case STARTED:
- component.stop();
+ if (log.isDebugEnabled()) {
+ log.debug("Forcing re-initialization of an already started resource: " + resource);
+ }
+ deactivateResource(resource);
break;
case STARTING:
log.warn("Could not force initialization of component for resource [" + resource.getId()
@@ -2013,7 +2016,7 @@ public class InventoryManager extends AgentService implements ContainerService,
log.debug("Successfully deactivated resource with id [" + resource.getId() + "].");
}
} catch (Throwable t) {
- log.warn("Plugin Error: Failed to stop component for [" + resource + "].");
+ log.warn("Plugin Error: Failed to stop component for [" + resource + "].", t);
}
container.setResourceComponentState(ResourceComponentState.STOPPED);
11 years, 6 months
- 1
- 0
[rhq] Changes to 'rc/jon3.1.2.ER3'
by Simeon Pinder
New branch 'rc/jon3.1.2.ER3' available with the following commits:
11 years, 6 months
- 1
- 0
[rhq] Branch 'feature/cassandra-backend' - modules/enterprise
by John Sanda
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementChartsManagerBean.java | 7 +
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBean.java | 16 ++-
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MetricsManagerBean.java | 9 +
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MetricsManagerLocal.java | 2
modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsServer.java | 25 ++++
modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsServerTest.java | 52 +++++++++-
6 files changed, 103 insertions(+), 8 deletions(-)
New commits:
commit f33738ab4a302fb2ec07734c86e53f51856f23bb
Author: John Sanda <jsanda(a)redhat.com>
Date: Tue Dec 4 22:34:59 2012 -0500
Adding initial support for fetching aggregate raw data for compatible groups
This commit includes a bit of a hack in the getAggregateMetricDisplaySummaries
method in MeasurementChartsManagerBean in order to get things working quickly.
Subsequent commits will have to include some refactoring of this method.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementChartsManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementChartsManagerBean.java
index 934dcd1..48afec2 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementChartsManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementChartsManagerBean.java
@@ -510,7 +510,12 @@ public class MeasurementChartsManagerBean implements MeasurementChartsManagerLoc
log.warn("No metric schedules found for def=[" + definition + "] and " + context
+ ", using empty aggregate");
} else {
- aggregate = dataUtil.getAggregateByDefinitionAndContext(begin, end, definitionId, context);
+ if (context.type == EntityContext.Type.ResourceGroup &&
+ definition.getDataType() == DataType.MEASUREMENT) {
+ aggregate = dataManager.getAggregate(subject, context.getGroupId(), definitionId, begin, end);
+ } else {
+ aggregate = dataUtil.getAggregateByDefinitionAndContext(begin, end, definitionId, context);
+ }
}
if (aggregate.isEmpty()) {
if (log.isTraceEnabled()) {
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBean.java
index 15e44a7..a6e96ee 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBean.java
@@ -666,9 +666,18 @@ public class MeasurementDataManagerBean implements MeasurementDataManagerLocal,
throw new IllegalArgumentException("Start date " + startTime + " is not before " + endTime);
}
- MeasurementAggregate aggregate = getConnectedUtilityInstance().getAggregateByDefinitionAndContext(startTime,
- endTime, definitionId, EntityContext.forGroup(groupId));
- return aggregate;
+// MeasurementAggregate aggregate = getConnectedUtilityInstance().getAggregateByDefinitionAndContext(startTime,
+// endTime, definitionId, EntityContext.forGroup(groupId));
+// return aggregate;
+
+ MeasurementScheduleCriteria criteria = new MeasurementScheduleCriteria();
+ criteria.addFilterResourceGroupId(groupId);
+ criteria.addFilterDefinitionIds(definitionId);
+ criteria.setPageControl(PageControl.getUnlimitedInstance());
+ PageList<MeasurementSchedule> schedules = measurementScheduleManager.findSchedulesByCriteria(subject,
+ criteria);
+
+ return metricsManager.getSummaryAggregate(map(schedules), startTime, endTime);
}
/**
@@ -754,6 +763,7 @@ public class MeasurementDataManagerBean implements MeasurementDataManagerLocal,
}
MeasurementScheduleCriteria criteria = new MeasurementScheduleCriteria();
criteria.addFilterResourceGroupId(context.getGroupId());
+ criteria.addFilterDefinitionIds(definitionId);
criteria.setPageControl(PageControl.getUnlimitedInstance());
PageList<MeasurementSchedule> schedules = measurementScheduleManager.findSchedulesByCriteria(subject,
criteria);
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MetricsManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MetricsManagerBean.java
index fb9879c..f622f77 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MetricsManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MetricsManagerBean.java
@@ -81,6 +81,15 @@ public class MetricsManagerBean implements MetricsManagerLocal {
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
+ public MeasurementAggregate getSummaryAggregate(List<Integer> scheduleIds, long beginTime, long endTime) {
+ MetricsServer metricsServer = getMetricsServer();
+ AggregatedNumericMetric summary = metricsServer.getSummaryAggregate(scheduleIds, beginTime, endTime);
+
+ return new MeasurementAggregate(summary.getMin(), summary.getAvg(), summary.getMax());
+ }
+
+ @Override
+ @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public List<MeasurementDataNumericHighLowComposite> findDataForResourceGroup(List<Integer> scheduleIds,
long beginTime, long endTime) {
MetricsServer metricsServer = getMetricsServer();
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MetricsManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MetricsManagerLocal.java
index 7e11c95..485b7ad 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MetricsManagerLocal.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MetricsManagerLocal.java
@@ -55,4 +55,6 @@ public interface MetricsManagerLocal {
MeasurementAggregate getSummaryAggregate(int scheduleId, long beginTime, long endTime);
+ MeasurementAggregate getSummaryAggregate(List<Integer> scheduleIds, long beginTime, long endTime);
+
}
diff --git a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsServer.java b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsServer.java
index 571e66f..4ffbdb7 100644
--- a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsServer.java
+++ b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsServer.java
@@ -109,6 +109,14 @@ public class MetricsServer {
throw new UnsupportedOperationException("MetricsServer.getSummaryAggregate currently only supports raw data.");
}
+ public AggregatedNumericMetric getSummaryAggregate(List<Integer> scheduleIds, long beginTime, long endTime) {
+ if (dateTimeService.isInRawDataRange(new DateTime(beginTime))) {
+ return getSummaryRawAggregate(scheduleIds, beginTime, endTime);
+ }
+ throw new UnsupportedOperationException("MetricServer.getSummaryAggregate (for resource group) currently " +
+ "only supports raw data");
+ }
+
private List<MeasurementDataNumericHighLowComposite> findRawDataForResource(int scheduleId, long beginTime,
long endTime) {
MetricsDAO dao = new MetricsDAO(session);
@@ -160,6 +168,18 @@ public class MetricsServer {
return calculateAggregatedRaw(rawMetrics, beginTime);
}
+ private AggregatedNumericMetric getSummaryRawAggregate(List<Integer> scheduleIds, long beginTime, long endTime) {
+ MetricsDAO dao = new MetricsDAO(session);
+ List<RawNumericMetric> rawMetrics = dao.findRawMetrics(scheduleIds, new DateTime(beginTime),
+ new DateTime(endTime));
+
+ if (rawMetrics.isEmpty()) {
+ // We do not care about the scheudule id here so can just use a dummy value of zero.
+ return new AggregatedNumericMetric(0, Double.NaN, Double.NaN,Double.NaN, beginTime);
+ }
+ return calculateAggregatedRaw(rawMetrics, beginTime);
+ }
+
private List<MeasurementDataNumericHighLowComposite> findAggregateDataForResource(int scheduleId, long beginTime,
long endTime, String columnFamily) {
MetricsDAO dao = new MetricsDAO(session);
@@ -255,6 +275,7 @@ public class MetricsServer {
List<RawNumericMetric> rawMetrics = dao.findRawMetrics(indexEntry.getScheduleId(), startTime, endTime);
AggregatedNumericMetric aggregatedRaw = calculateAggregatedRaw(rawMetrics, startTime.getMillis());
+ aggregatedRaw.setScheduleId(indexEntry.getScheduleId());
oneHourMetrics.add(aggregatedRaw);
}
@@ -286,7 +307,9 @@ public class MetricsServer {
}
double avg = divide(sum, count);
- return new AggregatedNumericMetric(rawMetrics.get(0).getScheduleId(), avg, min, max, timestamp);
+ // We let the caller handle setting the schedule id because in some cases we do
+ // not care about it.
+ return new AggregatedNumericMetric(0, avg, min, max, timestamp);
}
private List<AggregatedNumericMetric> calculateAggregates(String fromColumnFamily, String toColumnFamily,
diff --git a/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsServerTest.java b/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsServerTest.java
index 6d4c3d3..3472221 100644
--- a/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsServerTest.java
+++ b/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsServerTest.java
@@ -361,7 +361,7 @@ public class MetricsServerTest extends CassandraIntegrationTest {
}
@Test
- public void getSummaryRawAggregate() {
+ public void getSummaryRawAggregateForResource() {
DateTime beginTime = now().minusHours(4);
DateTime endTime = now();
Buckets buckets = new Buckets(beginTime, endTime);
@@ -385,10 +385,56 @@ public class MetricsServerTest extends CassandraIntegrationTest {
AggregatedNumericMetric actual = metricsServer.getSummaryAggregate(scheduleId, beginTime.getMillis(),
endTime.getMillis());
double avg = divide(1.1 + 2.2 + 3.3 + 4.4 + 5.5 + 6.6, 6);
- AggregatedNumericMetric expected = new AggregatedNumericMetric(scheduleId, avg, 1.1, 6.6,
+ AggregatedNumericMetric expected = new AggregatedNumericMetric(0, avg, 1.1, 6.6,
beginTime.getMillis());
- assertEquals(actual, expected, "Failed to get summary aggregate for raw data.");
+ assertEquals(actual, expected, "Failed to get resource summary aggregate for raw data.");
+ }
+
+ @Test
+ public void getSummaryRawAggregateForGroup() {
+ DateTime beginTime = now().minusHours(4);
+ DateTime endTime = now();
+ Buckets buckets = new Buckets(beginTime, endTime);
+ int scheduleId1 = 123;
+ int scheduleId2 = 456;
+
+ Set<MeasurementDataNumeric> data = new HashSet<MeasurementDataNumeric>();
+ data.add(new MeasurementDataNumeric(buckets.get(0).getStartTime() + 10, scheduleId1, 1.1));
+ data.add(new MeasurementDataNumeric(buckets.get(0).getStartTime() + 10, scheduleId2, 1.2));
+
+ data.add(new MeasurementDataNumeric(buckets.get(0).getStartTime() + 20, scheduleId1, 2.1));
+ data.add(new MeasurementDataNumeric(buckets.get(0).getStartTime() + 20, scheduleId2, 2.2));
+
+ data.add(new MeasurementDataNumeric(buckets.get(0).getStartTime() + 30, scheduleId1, 3.1));
+ data.add(new MeasurementDataNumeric(buckets.get(0).getStartTime() + 30, scheduleId2, 3.2));
+
+ data.add(new MeasurementDataNumeric(buckets.get(59).getStartTime() + 10, scheduleId1, 4.1));
+ data.add(new MeasurementDataNumeric(buckets.get(59).getStartTime() + 10, scheduleId2, 4.2));
+
+ data.add(new MeasurementDataNumeric(buckets.get(59).getStartTime() + 20, scheduleId1, 5.1));
+ data.add(new MeasurementDataNumeric(buckets.get(59).getStartTime() + 20, scheduleId2, 5.2));
+
+ data.add(new MeasurementDataNumeric(buckets.get(59).getStartTime() + 30, scheduleId1, 6.1));
+ data.add(new MeasurementDataNumeric(buckets.get(59).getStartTime() + 30, scheduleId2, 6.2));
+
+ // add some data outside the range
+ data.add(new MeasurementDataNumeric(buckets.get(0).getStartTime() - 100, scheduleId1, 1.23));
+ data.add(new MeasurementDataNumeric(buckets.get(0).getStartTime() - 100, scheduleId2, 2.23));
+ data.add(new MeasurementDataNumeric(buckets.get(59).getStartTime() + buckets.getInterval() + 50, scheduleId1,
+ 4.56));
+ data.add(new MeasurementDataNumeric(buckets.get(59).getStartTime() + buckets.getInterval() + 50, scheduleId2,
+ 4.56));
+
+ metricsServer.addNumericData(data);
+
+ AggregatedNumericMetric actual = metricsServer.getSummaryAggregate(asList(scheduleId1, scheduleId2),
+ beginTime.getMillis(), endTime.getMillis());
+
+ double avg = divide(1.1 + 1.2 + 2.1 + 2.2 + 3.1 + 3.2 + 4.1 + 4.2 + 5.1 + 5.2 + 6.1 + 6.2, 12);
+ AggregatedNumericMetric expected = new AggregatedNumericMetric(0, avg, 1.1, 6.2, beginTime.getMillis());
+
+ assertEquals(actual, expected, "Failed to get group summary aggregate for raw data.");
}
@Test
11 years, 6 months
- 1
- 0
[rhq] Branch 'feature/cassandra-backend' - 21 commits - .classpath etc/eclipse-tools modules/core modules/enterprise modules/integration-tests modules/plugins modules/pom.xml pom.xml
by John Sanda
.classpath | 2
etc/eclipse-tools/RHQ | 21
modules/core/dbutils/pom.xml | 2
modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml | 25
modules/enterprise/server/itests-2/pom.xml | 51 -
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/TestServerPluginService.java | 2
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/bundle/TestBundleServerPluginService.java | 2
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/content/test/ContentUIManagerBeanTest.java | 11
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/content/test/RepoSyncingTest.java | 71 -
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java | 2
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/core/plugin/DatabaseAndFilePluginDeploymentTest.java | 7
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/AbstractDriftServerTest.java | 36
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java | 7
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/DriftTemplateManagerBeanTest.java | 53 -
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/JPADriftServerBeanTest.java | 8
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/ManageDriftDefinitionsTest.java | 16
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/ManageSnapshotsTest.java | 16
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/inventory/UninventoryTest.java | 15
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.java | 55 +
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/test/AvailabilityManagerTest.java | 2
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/test/MeasurementBaselineManagerTest.java | 2
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/plugin/pc/content/TestContentServerPluginService.java | 2
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/plugin/pc/generic/TestGenericServerPluginService.java | 2
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/AlertMetadataManagerBeanTest.java | 6
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/ContentMetadataManagerBeanTest.java | 6
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/EventMetadataManagerBeanTest.java | 6
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBeanTest.java | 30
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MetadataBeanTest.java | 66 -
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionMetadataTest.java | 6
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionSinglePluginDescriptorMetadataTest.java | 6
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/OperationMetadataManagerBeanTest.java | 6
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginExtensionMetadataTest.java | 6
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest.java | 51 -
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginScanningExtensionMetadataTest.java | 56 -
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java | 149 +--
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java | 11
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java | 145 ++-
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/OldAbstractEJB3Test.java | 445 ----------
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/StandardServerPluginService.java | 2
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/TestServerPluginService.java | 2
modules/enterprise/server/itests-2/src/test/resources/arquillian.xml | 1
modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/AlertMetadataManagerBeanTest/plugin_v1.xml | 8
modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/AlertMetadataManagerBeanTest/plugin_v2.xml | 7
modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/ContentMetadataManagerBeanTest/plugin_v1.xml | 45 -
modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/ContentMetadataManagerBeanTest/plugin_v2.xml | 49 -
modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/EventMetadataManagerBeanTest/plugin_v1.xml | 23
modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/EventMetadataManagerBeanTest/plugin_v2.xml | 23
modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBeanTest/plugin_v1.xml | 48 -
modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBeanTest/plugin_v2.xml | 40
modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/MetadataTest.xml | 298 ------
modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionMetadataTest/child1_plugin_v1.xml | 19
modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionMetadataTest/child2_plugin_v1.xml | 19
modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionMetadataTest/parent_plugin_v1.xml | 18
modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionMetadataTest/parent_plugin_v2.xml | 18
modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionSinglePluginDescriptorMetadataTest/child_plugin_v1.xml | 29
modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionSinglePluginDescriptorMetadataTest/parent_plugin_v1.xml | 24
modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionSinglePluginDescriptorMetadataTest/parent_plugin_v2.xml | 24
modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/OperationMetadataManagerBeanTest/plugin_v1.xml | 42
modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/OperationMetadataManagerBeanTest/plugin_v2.xml | 41
modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/PluginExtensionMetadataTest/child_plugin_v1.xml | 17
modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/PluginExtensionMetadataTest/parent_plugin_v1.xml | 49 -
modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/PluginExtensionMetadataTest/parent_plugin_v2.xml | 67 -
modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_1.xml | 7
modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_2.xml | 10
modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_3.1.xml | 8
modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_3.xml | 8
modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/dup_drift.xml | 19
modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/parent_resource_type-plugin.xml | 29
modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/plugin_v1.xml | 92 --
modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/plugin_v2.xml | 110 --
modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/remove_bundle_drift_config_v1.xml | 20
modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/remove_bundle_drift_config_v2.xml | 7
modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/remove_types_v1.xml | 54 -
modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/remove_types_v2.xml | 8
modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/AlertMetadataManagerBeanTest/plugin_v1.xml | 8
modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/AlertMetadataManagerBeanTest/plugin_v2.xml | 7
modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ContentMetadataManagerBeanTest/plugin_v1.xml | 45 +
modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ContentMetadataManagerBeanTest/plugin_v2.xml | 49 +
modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/EventMetadataManagerBeanTest/plugin_v1.xml | 23
modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/EventMetadataManagerBeanTest/plugin_v2.xml | 23
modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBeanTest/plugin_v1.xml | 48 +
modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBeanTest/plugin_v2.xml | 40
modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/MetadataTest.xml | 298 ++++++
modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionMetadataTest/child1_plugin_v1.xml | 19
modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionMetadataTest/child2_plugin_v1.xml | 19
modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionMetadataTest/parent_plugin_v1.xml | 18
modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionMetadataTest/parent_plugin_v2.xml | 18
modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionSinglePluginDescriptorMetadataTest/child_plugin_v1.xml | 29
modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionSinglePluginDescriptorMetadataTest/parent_plugin_v1.xml | 24
modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionSinglePluginDescriptorMetadataTest/parent_plugin_v2.xml | 24
modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/OperationMetadataManagerBeanTest/plugin_v1.xml | 42
modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/OperationMetadataManagerBeanTest/plugin_v2.xml | 41
modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginExtensionMetadataTest/child_plugin_v1.xml | 17
modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginExtensionMetadataTest/parent_plugin_v1.xml | 49 +
modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginExtensionMetadataTest/parent_plugin_v2.xml | 67 +
modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_1.xml | 8
modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_2.xml | 11
modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_3.1.xml | 9
modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_3.xml | 9
modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/dup_drift.xml | 19
modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/parent_resource_type-plugin.xml | 29
modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/plugin_v1.xml | 92 ++
modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/plugin_v2.xml | 110 ++
modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/remove_bundle_drift_config_v1.xml | 20
modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/remove_bundle_drift_config_v2.xml | 7
modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/remove_types_v1.xml | 54 +
modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/remove_types_v2.xml | 8
modules/enterprise/server/itests-2/src/test/resources/test/metadata/alerts/type-with-metric.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/BZ_573034_v1.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/BZ_573034_v2.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/addDeleteTemplate1.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/addDeleteTemplate2.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/addDeleteTemplate3.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/constraint.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/constraintMinMax.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupDeleted-v1.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupDeleted-v2.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupPropDeleted-v1.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupPropDeleted-v2.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupPropDeleted-v3.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupPropDeleted-v4.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupPropMoved-v1.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupPropMoved-v2.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyChanging-v1.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyChanging-v2.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyList-simple.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyList-v1.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyList-v2.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyMap-v1.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyMap-v2.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/update5-v1_0.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/update5-v2_0.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/updateDefaultTemplate1.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/updateDefaultTemplate2.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/events/event1-1.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/events/event1-2.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/measurementDeletion-v1_0.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/measurementDeletion-v2_0.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/update-v1_0.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/update-v2_0.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/update6-1.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/update6-2.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/update7-1.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/update7-2.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/natives/update5-v1_0.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/natives/update5-v2_0.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/noTypes.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/operation1-1.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/operation1-2.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/operation2-1.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/operation2-2.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/operation3-1.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/operation3-2.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/update3-v1_0.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/update3-v2_0.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/duplicateResourceType.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/update2-v1_0.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/update2-v2_0.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/update4-v1_0.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/update4-v2_0.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/updateResourceTypeBundleTarget-v1.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/updateResourceTypeBundleTarget-v2.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/illegal-subcat-1.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-2children.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-grandchild.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-services-v1_0.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-services-v2_0.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-v1_0.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-v1_1.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-v2_0.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/no-subcat.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v1_0.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v1_1.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v2_0.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v3_0.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/services-v1_0.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/services-v2_0.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/test-subcategories.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/test-subcategories2.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/test-subcategories3.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/two-subcat.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/undefined-child-subcat-1.xml | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/ProductPluginDeployer.java | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBean.java | 4
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MetricsManagerBean.java | 10
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MetricsManagerLocal.java | 2
modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsServer.java | 72 +
modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsServerTest.java | 57 -
modules/integration-tests/jndi-access/jndi-access-test/src/test/java/org/rhq/jndi/test/JndiAccessTest.java | 5
modules/plugins/jboss-as-5/pom.xml | 10
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/JBossProductType.java | 7
modules/pom.xml | 17
pom.xml | 5
193 files changed, 2100 insertions(+), 2215 deletions(-)
New commits:
commit 1a98ff30ca4c83e3b9491237391c8b1c363aee0d
Author: John Sanda <jsanda(a)redhat.com>
Date: Tue Dec 4 21:18:24 2012 -0500
Adding initial Cassandra impl for MeasurementDataManagerBean.getAggregate
The getAggregate method is used to populate the metric tables in the UI. This
commit adds support for raw data.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBean.java
index 458d13a..15e44a7 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBean.java
@@ -645,9 +645,7 @@ public class MeasurementDataManagerBean implements MeasurementDataManagerLocal,
throw new IllegalArgumentException("Start date " + startTime + " is not before " + endTime);
}
- MeasurementAggregate aggregate = getConnectedUtilityInstance().getAggregateByScheduleId(startTime, endTime,
- schedule.getId());
- return aggregate;
+ return metricsManager.getSummaryAggregate(scheduleId, startTime, endTime);
}
public MeasurementAggregate getAggregate(Subject subject, int groupId, int definitionId, long startTime,
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MetricsManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MetricsManagerBean.java
index 0ebb42e..fb9879c 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MetricsManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MetricsManagerBean.java
@@ -36,6 +36,7 @@ import javax.ejb.TransactionAttributeType;
import org.rhq.core.domain.measurement.MeasurementDataNumeric;
import org.rhq.core.domain.measurement.composite.MeasurementDataNumericHighLowComposite;
import org.rhq.enterprise.server.cassandra.SessionManagerBean;
+import org.rhq.server.metrics.AggregatedNumericMetric;
import org.rhq.server.metrics.MetricsServer;
/**
@@ -71,6 +72,15 @@ public class MetricsManagerBean implements MetricsManagerLocal {
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
+ public MeasurementAggregate getSummaryAggregate(int scheduleId, long beginTime, long endTime) {
+ MetricsServer metricsServer = getMetricsServer();
+ AggregatedNumericMetric summary = metricsServer.getSummaryAggregate(scheduleId, beginTime, endTime);
+
+ return new MeasurementAggregate(summary.getMin(), summary.getAvg(), summary.getMax());
+ }
+
+ @Override
+ @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public List<MeasurementDataNumericHighLowComposite> findDataForResourceGroup(List<Integer> scheduleIds,
long beginTime, long endTime) {
MetricsServer metricsServer = getMetricsServer();
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MetricsManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MetricsManagerLocal.java
index 0cb6709..7e11c95 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MetricsManagerLocal.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MetricsManagerLocal.java
@@ -53,4 +53,6 @@ public interface MetricsManagerLocal {
List<MeasurementDataNumericHighLowComposite> findDataForResourceGroup(List<Integer> scheduleIds, long beginTime,
long endTime);
+ MeasurementAggregate getSummaryAggregate(int scheduleId, long beginTime, long endTime);
+
}
diff --git a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsServer.java b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsServer.java
index d49e03c..571e66f 100644
--- a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsServer.java
+++ b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsServer.java
@@ -100,6 +100,15 @@ public class MetricsServer {
"raw data");
}
+ public AggregatedNumericMetric getSummaryAggregate(int scheduleId, long beginTime, long endTime) {
+ DateTime begin = new DateTime(beginTime);
+
+ if (dateTimeService.isInRawDataRange(begin)) {
+ return getSummaryRawAggregate(scheduleId, beginTime, endTime);
+ }
+ throw new UnsupportedOperationException("MetricsServer.getSummaryAggregate currently only supports raw data.");
+ }
+
private List<MeasurementDataNumericHighLowComposite> findRawDataForResource(int scheduleId, long beginTime,
long endTime) {
MetricsDAO dao = new MetricsDAO(session);
@@ -140,6 +149,17 @@ public class MetricsServer {
return data;
}
+ private AggregatedNumericMetric getSummaryRawAggregate(int scheduleId, long beginTime, long endTime) {
+ MetricsDAO dao = new MetricsDAO(session);
+ List<RawNumericMetric> rawMetrics = dao.findRawMetrics(scheduleId, new DateTime(beginTime),
+ new DateTime(endTime));
+
+ if (rawMetrics.isEmpty()) {
+ return new AggregatedNumericMetric(scheduleId, Double.NaN, Double.NaN,Double.NaN, beginTime);
+ }
+ return calculateAggregatedRaw(rawMetrics, beginTime);
+ }
+
private List<MeasurementDataNumericHighLowComposite> findAggregateDataForResource(int scheduleId, long beginTime,
long endTime, String columnFamily) {
MetricsDAO dao = new MetricsDAO(session);
@@ -234,30 +254,8 @@ public class MetricsServer {
DateTime endTime = startTime.plusMinutes(60);
List<RawNumericMetric> rawMetrics = dao.findRawMetrics(indexEntry.getScheduleId(), startTime, endTime);
-
- double min = Double.NaN;
- double max = min;
- double sum = 0;
- int count = 0;
- double value;
-
- for (RawNumericMetric metric : rawMetrics) {
- value = metric.getValue();
- if (count == 0) {
- min = value;
- max = min;
- }
- if (value < min) {
- min = value;
- } else if (value > max) {
- max = value;
- }
- sum += value;
- ++count;
- }
- double avg = divide(sum, count);
- oneHourMetrics.add(new AggregatedNumericMetric(indexEntry.getScheduleId(), avg, min, max,
- startTime.getMillis()));
+ AggregatedNumericMetric aggregatedRaw = calculateAggregatedRaw(rawMetrics, startTime.getMillis());
+ oneHourMetrics.add(aggregatedRaw);
}
List<AggregatedNumericMetric> updatedSchedules = dao.insertAggregates(ONE_HOUR_METRICS_TABLE,
@@ -265,6 +263,32 @@ public class MetricsServer {
return updatedSchedules;
}
+ private AggregatedNumericMetric calculateAggregatedRaw(List<RawNumericMetric> rawMetrics, long timestamp) {
+ double min = Double.NaN;
+ double max = min;
+ double sum = 0;
+ int count = 0;
+ double value;
+
+ for (RawNumericMetric metric : rawMetrics) {
+ value = metric.getValue();
+ if (count == 0) {
+ min = value;
+ max = min;
+ }
+ if (value < min) {
+ min = value;
+ } else if (value > max) {
+ max = value;
+ }
+ sum += value;
+ ++count;
+ }
+ double avg = divide(sum, count);
+
+ return new AggregatedNumericMetric(rawMetrics.get(0).getScheduleId(), avg, min, max, timestamp);
+ }
+
private List<AggregatedNumericMetric> calculateAggregates(String fromColumnFamily, String toColumnFamily,
Minutes nextInterval, int ttl) {
diff --git a/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsServerTest.java b/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsServerTest.java
index 712503f..6d4c3d3 100644
--- a/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsServerTest.java
+++ b/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsServerTest.java
@@ -55,8 +55,6 @@ import org.testng.annotations.Test;
import org.rhq.core.domain.measurement.MeasurementDataNumeric;
import org.rhq.core.domain.measurement.composite.MeasurementDataNumericHighLowComposite;
-import me.prettyprint.hector.api.Keyspace;
-
/**
* @author John Sanda
*/
@@ -70,24 +68,8 @@ public class MetricsServerTest extends CassandraIntegrationTest {
private final long MINUTE = 60 * SECOND;
- private final String RAW_METRIC_DATA_CF = "raw_metrics";
-
- private final String ONE_HOUR_METRIC_DATA_CF = "one_hour_metrics";
-
- private final String SIX_HOUR_METRIC_DATA_CF = "six_hour_metrics";
-
- private final String TWENTY_FOUR_HOUR_METRIC_DATA_CF = "twenty_four_hour_metrics";
-
- private final String METRICS_INDEX = "metrics_index";
-
- private final String TRAITS_CF = "traits";
-
- private final String RESOURCE_TRAITS_CF = "resource_traits";
-
private MetricsServerStub metricsServer;
- private Keyspace keyspace;
-
private MetricsDAO dao;
private static class MetricsServerStub extends MetricsServer {
@@ -152,10 +134,10 @@ public class MetricsServerTest extends CassandraIntegrationTest {
assertEquals(actual, expected, "Failed to retrieve raw metric data");
assertColumnMetadataEquals(scheduleId, hour0.plusHours(4), hour0.plusHours(5), RAW_TTL, timestamp);
- List<MetricsIndexEntry> expectedIndex = asList(new MetricsIndexEntry(ONE_HOUR_METRIC_DATA_CF,
+ List<MetricsIndexEntry> expectedIndex = asList(new MetricsIndexEntry(ONE_HOUR_METRICS_TABLE,
hour0.plusHours(4), scheduleId));
- assertMetricsIndexEquals(ONE_HOUR_METRIC_DATA_CF, expectedIndex, "Failed to update index for " +
- ONE_HOUR_METRIC_DATA_CF);
+ assertMetricsIndexEquals(ONE_HOUR_METRICS_TABLE, expectedIndex, "Failed to update index for " +
+ ONE_HOUR_METRICS_TABLE);
}
@Test//(enabled = ENABLED)
@@ -379,6 +361,37 @@ public class MetricsServerTest extends CassandraIntegrationTest {
}
@Test
+ public void getSummaryRawAggregate() {
+ DateTime beginTime = now().minusHours(4);
+ DateTime endTime = now();
+ Buckets buckets = new Buckets(beginTime, endTime);
+ int scheduleId = 123;
+
+ Set<MeasurementDataNumeric> data = new HashSet<MeasurementDataNumeric>();
+ data.add(new MeasurementDataNumeric(buckets.get(0).getStartTime() + 10, scheduleId, 1.1));
+ data.add(new MeasurementDataNumeric(buckets.get(0).getStartTime() + 20, scheduleId, 2.2));
+ data.add(new MeasurementDataNumeric(buckets.get(0).getStartTime() + 30, scheduleId, 3.3));
+ data.add(new MeasurementDataNumeric(buckets.get(59).getStartTime() + 10, scheduleId, 4.4));
+ data.add(new MeasurementDataNumeric(buckets.get(59).getStartTime() + 20, scheduleId, 5.5));
+ data.add(new MeasurementDataNumeric(buckets.get(59).getStartTime() + 30, scheduleId, 6.6));
+
+ // add some data outside the range
+ data.add(new MeasurementDataNumeric(buckets.get(0).getStartTime() - 100, scheduleId, 1.23));
+ data.add(new MeasurementDataNumeric(buckets.get(59).getStartTime() + buckets.getInterval() + 50, scheduleId,
+ 4.56));
+
+ metricsServer.addNumericData(data);
+
+ AggregatedNumericMetric actual = metricsServer.getSummaryAggregate(scheduleId, beginTime.getMillis(),
+ endTime.getMillis());
+ double avg = divide(1.1 + 2.2 + 3.3 + 4.4 + 5.5 + 6.6, 6);
+ AggregatedNumericMetric expected = new AggregatedNumericMetric(scheduleId, avg, 1.1, 6.6,
+ beginTime.getMillis());
+
+ assertEquals(actual, expected, "Failed to get summary aggregate for raw data.");
+ }
+
+ @Test
public void findRawDataCompositesForGroup() {
DateTime beginTime = now().minusHours(4);
DateTime endTime = now();
@@ -555,7 +568,7 @@ public class MetricsServerTest extends CassandraIntegrationTest {
}
private void assert24HourDataEmpty(int scheduleId) {
- assertMetricDataEmpty(scheduleId, TWENTY_FOUR_HOUR_METRIC_DATA_CF);
+ assertMetricDataEmpty(scheduleId, TWENTY_FOUR_HOUR_METRICS_TABLE);
}
private void assertMetricDataEmpty(int scheduleId, String columnFamily) {
commit 9bd19f2b719df4ae9ea7aba3b54e1fceb9ab8bd4
Merge: c4c1a49 e499abf
Author: John Sanda <jsanda(a)redhat.com>
Date: Tue Dec 4 20:27:09 2012 -0500
Merge branch 'master' into feature/cassandra-backend
commit e499abf813bf6e92f7359d58ffd6f2ca442c5140
Author: John Sanda <jsanda(a)redhat.com>
Date: Tue Dec 4 20:26:00 2012 -0500
adding test for getAggregate method when fetching raw data
The method under test is used for the measurement tables in the UI.
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.java
index 190c3d5..9c2882c 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.java
@@ -61,6 +61,7 @@ import org.rhq.enterprise.server.drift.DriftServerPluginService;
import org.rhq.enterprise.server.measurement.util.MeasurementDataManagerUtility;
import org.rhq.enterprise.server.test.AbstractEJB3Test;
import org.rhq.enterprise.server.test.TransactionCallback;
+import org.rhq.test.AssertUtils;
/**
* @author John Sanda
@@ -168,6 +169,34 @@ public class MeasurementDataManagerBeanTest extends AbstractEJB3Test {
actualData.get(29));
}
+ @Test(enabled = true)
+ public void getRawAggregate() {
+ DateTime now = new DateTime();
+ DateTime beginTime = now.minusHours(4);
+ DateTime endTime = now;
+
+ Buckets buckets = new Buckets(beginTime, endTime);
+
+ MeasurementScheduleRequest request = new MeasurementScheduleRequest(dynamicSchedule);
+ MeasurementReport report = new MeasurementReport();
+ report.addData(new MeasurementDataNumeric(buckets.get(0) + 10, request, 1.1));
+ report.addData(new MeasurementDataNumeric(buckets.get(0) + 20, request, 2.2));
+ report.addData(new MeasurementDataNumeric(buckets.get(0) + 30, request, 3.3));
+ report.addData(new MeasurementDataNumeric(buckets.get(59) + 10, request, 4.4));
+ report.addData(new MeasurementDataNumeric(buckets.get(59) + 20, request, 5.5));
+ report.addData(new MeasurementDataNumeric(buckets.get(59) + 30, request, 6.6));
+
+ dataManager.mergeMeasurementReport(report);
+
+ MeasurementAggregate actual = dataManager.getAggregate(overlord, dynamicSchedule.getId(),
+ beginTime.getMillis(), endTime.getMillis());
+
+ MeasurementAggregate expected = new MeasurementAggregate(1.1, (1.1 + 2.2 + 3.3 + 4.4 + 5.5 + 6.6) / 6,
+ 6.6);
+
+ AssertUtils.assertPropertiesMatch(expected, actual, "Aggregate does not match");
+ }
+
@Test(enabled = ENABLED)
public void find1HourNumericData() throws Exception {
DateTime now = new DateTime();
commit c4c1a4945dc187c329f7d744ae6886e2a992bf92
Author: John Sanda <jsanda(a)redhat.com>
Date: Tue Dec 4 17:31:41 2012 -0500
add metrics profile for just building metrics related code
diff --git a/modules/pom.xml b/modules/pom.xml
index e40d89a..8b687e2 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -113,6 +113,23 @@
</modules>
</profile>
+ <profile>
+ <id>metrics</id>
+ <activation>
+ <property>
+ <name>metrics</name>
+ </property>
+ </activation>
+ <modules>
+ <module>core</module>
+ <module>common/cassandra-auth</module>
+ <module>common/cassandra-common</module>
+ <module>common/cassandra-common-itests</module>
+ <module>enterprise/server/server-metrics</module>
+ <module>enterprise/server/jar</module>
+ </modules>
+ </profile>
+
<profile>
<id>plugins</id>
<activation>
commit 0be34a847aa77afbcd05dd96624af2a11386746c
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Tue Dec 4 16:18:06 2012 -0500
First really clean run of server integration tests (itests-2)
- Fix another issue in AbstractDriftServerTest cleanup code
- Fix additional cleanup issues where we needed to deploy ytest services
- uninventoty requires test agents (comm) service
- system config requires (drift) server plugin service
- Fix some JDoc in AbstractEJB3Test
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/AbstractDriftServerTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/AbstractDriftServerTest.java
index 1bb0e0c..5f7d95c 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/AbstractDriftServerTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/AbstractDriftServerTest.java
@@ -142,8 +142,10 @@ public abstract class AbstractDriftServerTest extends AbstractEJB3Test {
"delete from JPADriftChangeSet cs where cs.id in ( select cast(ddt.changeSetId as int) from DriftDefinitionTemplate ddt where ddt.name like"
+ name + ")").executeUpdate();
- em.createNativeQuery(
- "delete from rhq_drift_set ds where not exists ( select * from rhq_drift d where d.drift_set_id = ds.id ) ")
+ em.createNativeQuery("" //
+ + "delete from rhq_drift_set ds " //
+ + " where not exists ( select * from rhq_drift d where d.drift_set_id = ds.id ) " //
+ + " and not exists ( select * from rhq_drift_change_set cs where cs.drift_set_id = ds.id ) ")
.executeUpdate();
em.createQuery("delete from JPADriftFile df where df.hashId like" + name).executeUpdate();
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java
index 03cffdc..aa42a11 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java
@@ -94,6 +94,10 @@ public class DriftManagerBeanTest extends AbstractEJB3Test {
prepareScheduler();
+ DriftServerPluginService driftServerPluginService = new DriftServerPluginService();
+ prepareCustomServerPluginService(driftServerPluginService);
+ driftServerPluginService.masterConfig.getPluginDirectory().mkdirs();
+
deleteDriftFiles();
newResource = createNewResource();
@@ -104,6 +108,7 @@ public class DriftManagerBeanTest extends AbstractEJB3Test {
try {
deleteNewResource(newResource);
} finally {
+ unprepareServerPluginService();
unprepareForTestAgents();
unprepareScheduler();
}
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/inventory/UninventoryTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/inventory/UninventoryTest.java
index a7c0021..ab95c23 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/inventory/UninventoryTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/inventory/UninventoryTest.java
@@ -48,10 +48,19 @@ public class UninventoryTest extends AbstractEJB3Test {
private Resource newResource;
@Override
+ protected void beforeMethod() throws Exception {
+ prepareForTestAgents();
+ }
+
+ @Override
protected void afterMethod() throws Exception {
- if (newResource != null) {
- deleteNewResource(newResource);
- newResource = null;
+ try {
+ if (newResource != null) {
+ deleteNewResource(newResource);
+ newResource = null;
+ }
+ } finally {
+ unprepareForTestAgents();
}
}
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/test/AvailabilityManagerTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/test/AvailabilityManagerTest.java
index 5ac610e..f180036 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/test/AvailabilityManagerTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/test/AvailabilityManagerTest.java
@@ -108,8 +108,10 @@ public class AvailabilityManagerTest extends AbstractEJB3Test {
if (theResource != null) {
// perform in-band and out-of-band work in quick succession
// this also deletes our attached agent
+ prepareForTestAgents();
resourceManager.uninventoryResource(overlord, theResource.getId());
resourceManager.uninventoryResourceAsyncWork(overlord, theResource.getId());
+ unprepareForTestAgents();
theResource = null;
}
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/test/MeasurementBaselineManagerTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/test/MeasurementBaselineManagerTest.java
index 5e41732..e8f8162 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/test/MeasurementBaselineManagerTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/test/MeasurementBaselineManagerTest.java
@@ -72,10 +72,12 @@ public class MeasurementBaselineManagerTest extends AbstractEJB3Test {
this.overlord = LookupUtil.getSubjectManager().getOverlord();
this.prepareScheduler();
+ this.prepareForTestAgents();
}
@Override
protected void afterMethod() throws Exception {
+ this.unprepareForTestAgents();
this.unprepareScheduler();
}
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java
index 7c815b7..f05e079 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java
@@ -50,6 +50,7 @@ import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.domain.util.PageList;
import org.rhq.core.util.MessageDigestGenerator;
+import org.rhq.enterprise.server.drift.DriftServerPluginService;
import org.rhq.enterprise.server.resource.ResourceManagerLocal;
import org.rhq.enterprise.server.resource.ResourceTypeManagerLocal;
import org.rhq.enterprise.server.resource.metadata.PluginManagerLocal;
@@ -76,6 +77,11 @@ public class UpdatePluginMetadataTestBase extends AbstractEJB3Test {
prepareMockAgentServiceContainer();
prepareScheduler();
preparePluginScannerService();
+ // we perform lookups of config settings from SystemManagerBean.
+ // SystemManagerBean.getDriftServerPluginManager method requires drift server plugin.
+ DriftServerPluginService driftServerPluginService = new DriftServerPluginService();
+ prepareCustomServerPluginService(driftServerPluginService);
+ driftServerPluginService.masterConfig.getPluginDirectory().mkdirs();
pluginMgr = LookupUtil.getPluginManager();
resourceTypeManager = LookupUtil.getResourceTypeManager();
@@ -86,6 +92,7 @@ public class UpdatePluginMetadataTestBase extends AbstractEJB3Test {
protected void afterMethod() throws Exception {
cleanupTest();
+ unprepareServerPluginService();
unpreparePluginScannerService();
unprepareScheduler();
unprepareForTestAgents();
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java
index d8db4b9..f1ba91f 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java
@@ -462,7 +462,7 @@ public abstract class AbstractEJB3Test extends Arquillian {
} catch (Throwable t) {
// Arquillian is eating these, make sure they show up in some way
- System.out.println("BEFORE METHOD FAILURE, TEST DID NOT RUN!!! ");
+ System.out.println("BEFORE METHOD FAILURE, TEST DID NOT RUN!!! [" + method.getName() + "]");
t.printStackTrace();
throw t;
}
@@ -484,7 +484,8 @@ public abstract class AbstractEJB3Test extends Arquillian {
}
} catch (Throwable t) {
System.out
- .println("AFTER METHOD FAILURE, TEST CLEAN UP FAILED!!! MAY NEED TO CLEAN DB BEFORE RUNNING MORE TESTS!");
+ .println("AFTER METHOD FAILURE, TEST CLEAN UP FAILED!!! MAY NEED TO CLEAN DB BEFORE RUNNING MORE TESTS! ["
+ + method.getName() + "]");
t.printStackTrace();
throw t;
}
@@ -722,11 +723,12 @@ public abstract class AbstractEJB3Test extends Arquillian {
}
/**
- * If you need to test server plugins, you must first prepare the server plugin service.
- * After this returns, the caller must explicitly start the PC by using the appropriate API
- * on the given mbean; this method will only start the service, it will NOT start the master PC.
+ * This will register any custom service, replacing any service with the same objectName.
+ * <br/>
+ * It does nothing more than registration, any calls to the service (e.g. start) are up to the caller.
*
- * @param testServiceMBean the object that will house your test server plugins
+ * @param testServiceMBean the test service MBean to register
+ * @param objectNameStr the name of the service, which will be converted to an ObjectName
*
* @throws RuntimeException
*/
@@ -740,11 +742,12 @@ public abstract class AbstractEJB3Test extends Arquillian {
}
/**
- * If you need to test server plugins, you must first prepare the server plugin service.
- * After this returns, the caller must explicitly start the PC by using the appropriate API
- * on the given mbean; this method will only start the service, it will NOT start the master PC.
+ * This will register any custom service, replacing any service with the same objectName.
+ * <br/>
+ * It does nothing more than registration, any calls to the service (e.g. start) are up to the caller.
*
- * @param testServiceMBean the object that will house your test server plugins
+ * @param testServiceMBean the test service MBean to register
+ * @param objectName the name of the service
*
* @throws RuntimeException
*/
commit e14b96b48e4a7faedf4dfcad1d3ebc7ad3ec0bd5
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Tue Dec 4 11:53:14 2012 -0500
Adding in the missing server plugin service prepare/unprepare.
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.java
index a3ae638..190c3d5 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.java
@@ -57,6 +57,7 @@ import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.util.jdbc.JDBCUtil;
import org.rhq.enterprise.server.auth.SubjectManagerLocal;
+import org.rhq.enterprise.server.drift.DriftServerPluginService;
import org.rhq.enterprise.server.measurement.util.MeasurementDataManagerUtility;
import org.rhq.enterprise.server.test.AbstractEJB3Test;
import org.rhq.enterprise.server.test.TransactionCallback;
@@ -66,16 +67,6 @@ import org.rhq.enterprise.server.test.TransactionCallback;
*/
public class MeasurementDataManagerBeanTest extends AbstractEJB3Test {
- // Tests in this class are failing currently do to a system initialization problem.
- // MeasurementDataManagerUtility looks up config settings from SystemManagerBean.
- // SystemManagerBean is however failing in its getDriftServerPluginManager method on
- // the call to LookupUtil.getServerPluginService(). An InstanceNotFoundException is
- // thrown,
- //
- // javax.management.InstanceNotFoundException: rhq:service=ServerPluginService
- //
- // Looks like the server plugin service is not getting deployed.
-
//private final Log log = LogFactory.getLog(MeasurementDataManagerBeanTest.class);
private static final boolean ENABLED = true;
@@ -120,13 +111,21 @@ public class MeasurementDataManagerBeanTest extends AbstractEJB3Test {
protected void beforeMethod() throws Exception {
overlord = subjectManager.getOverlord();
+ // MeasurementDataManagerUtility looks up config settings from SystemManagerBean.
+ // SystemManagerBean.getDriftServerPluginManager method requires drift server plugin.
+ DriftServerPluginService driftServerPluginService = new DriftServerPluginService();
+ prepareCustomServerPluginService(driftServerPluginService);
+ driftServerPluginService.masterConfig.getPluginDirectory().mkdirs();
+
createInventory();
insertDummyReport();
}
@Override
- protected void afterMethod() {
+ protected void afterMethod() throws Exception {
purgeDB();
+
+ unprepareServerPluginService();
}
@Test(enabled = ENABLED)
commit 6a533abe4e252374aaa1760dde8bc1cf567e2d0a
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Tue Dec 4 11:27:35 2012 -0500
Fix test failure, ensure that existing plugins are scanned and registered
prior to easch test.
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 befaa1a..05bb9c0 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
@@ -55,11 +55,13 @@ public class PluginManagerBeanTest extends MetadataBeanTest {
subjectMgr = LookupUtil.getSubjectManager();
pluginMgr = LookupUtil.getPluginManager();
- FileUtil.purge(new File(getPluginScannerService().getAgentPluginDir()), true);
+ getPluginScannerService().startDeployment();
}
@Override
protected void afterMethod() throws Exception {
+ FileUtil.purge(new File(getPluginScannerService().getAgentPluginDir()), true);
+
unpreparePluginScannerService();
}
@@ -86,7 +88,7 @@ public class PluginManagerBeanTest extends MetadataBeanTest {
createPluginJarFile("test-plugin3.jar", "plugin_3.xml");
createPluginJarFile("test-plugin3.1.jar", "plugin_3.1.xml");
- getPluginScannerService().startDeployment();
+ getPluginScannerService().scanAndRegister();
}
@Test(dependsOnMethods = { "registerPlugins" })
@@ -105,6 +107,8 @@ public class PluginManagerBeanTest extends MetadataBeanTest {
public void doNotDisablePluginIfDependentPluginsAreNotAlsoDisabled() throws Exception {
Plugin plugin = getPlugin("PluginManagerBeanTestPlugin1");
assertTrue("Plugin should not already be disabled", plugin.isEnabled());
+ Plugin plugin2 = getPlugin("PluginManagerBeanTestPlugin2");
+ assertTrue("Plugin should not already be disabled", plugin.isEnabled());
Exception exception = null;
commit bb6f2974eb61c5579c68137f1517ffe88d7b9a2c
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Tue Dec 4 11:26:44 2012 -0500
trivial, comment re: potentially unnecessary call
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/ProductPluginDeployer.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/ProductPluginDeployer.java
index 39ce392..ddff417 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/ProductPluginDeployer.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/ProductPluginDeployer.java
@@ -92,7 +92,7 @@ public class ProductPluginDeployer {
* allowed to begin registering types from deployed plugins.
*/
public void startDeployment() {
- // we can now register our initial set of plugins
+ // we can now register our initial set of plugins (This may be a no-op at this point)
registerPlugins();
// indicate that we are now ready for hot-deployment of new plugins
commit 5c02b44e2fc132e93e63f6f067f2cfd5b8e94808
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Tue Dec 4 11:18:48 2012 -0500
- override AbstractEJB3Test.afterMethod() as opposed to an explicitly annotated method
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/content/test/RepoSyncingTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/content/test/RepoSyncingTest.java
index 3f0ef84..d2682af 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/content/test/RepoSyncingTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/content/test/RepoSyncingTest.java
@@ -6,7 +6,6 @@ import javax.persistence.EntityManager;
import javax.persistence.Query;
import javax.transaction.TransactionManager;
-import org.testng.annotations.AfterMethod;
import org.testng.annotations.Test;
import org.rhq.core.domain.auth.Subject;
@@ -54,6 +53,41 @@ public class RepoSyncingTest extends AbstractEJB3Test {
em.flush();
}
+ @Override
+ protected void afterMethod() throws Exception {
+ unprepareServerPluginService();
+
+ getTransactionManager().begin();
+ EntityManager em = getEntityManager();
+ ContentSource deleteSrc = em.find(ContentSource.class, contentSource.getId());
+ // em.remove(deleteSrc.getContentSourceType());
+ em.remove(deleteSrc);
+
+ Query q = em.createNamedQuery(RepoDistribution.QUERY_FIND_BY_REPO_ID);
+ q.setParameter("repoId", repo.getId());
+ List<RepoDistribution> rds = q.getResultList();
+ for (RepoDistribution rd : rds) {
+ Distribution d = rd.getRepoDistributionPK().getDistribution();
+ List<DistributionFile> dfiles = LookupUtil.getDistributionManagerLocal().getDistributionFilesByDistId(
+ d.getId());
+ for (DistributionFile df : dfiles) {
+ DistributionFile dfl = em.find(DistributionFile.class, df.getId());
+ em.remove(dfl);
+ }
+ em.remove(rd);
+ em.remove(d);
+ }
+
+ Repo delRepo = em.find(Repo.class, repo.getId());
+ em.remove(delRepo);
+
+ TransactionManager tx = getTransactionManager();
+ if (tx != null) {
+ tx.commit();
+ }
+
+ }
+
@Test(enabled = ENABLED)
public void testSyncResults() throws Exception {
// We have to commit because bean has new transaction inside it
@@ -200,41 +234,6 @@ public class RepoSyncingTest extends AbstractEJB3Test {
}
}
- @AfterMethod
- public void tearDownAfterMethod() throws Exception {
- unprepareServerPluginService();
-
- getTransactionManager().begin();
- EntityManager em = getEntityManager();
- ContentSource deleteSrc = em.find(ContentSource.class, contentSource.getId());
- // em.remove(deleteSrc.getContentSourceType());
- em.remove(deleteSrc);
-
- Query q = em.createNamedQuery(RepoDistribution.QUERY_FIND_BY_REPO_ID);
- q.setParameter("repoId", repo.getId());
- List<RepoDistribution> rds = q.getResultList();
- for (RepoDistribution rd : rds) {
- Distribution d = rd.getRepoDistributionPK().getDistribution();
- List<DistributionFile> dfiles = LookupUtil.getDistributionManagerLocal().getDistributionFilesByDistId(
- d.getId());
- for (DistributionFile df : dfiles) {
- DistributionFile dfl = em.find(DistributionFile.class, df.getId());
- em.remove(dfl);
- }
- em.remove(rd);
- em.remove(d);
- }
-
- Repo delRepo = em.find(Repo.class, repo.getId());
- em.remove(delRepo);
-
- TransactionManager tx = getTransactionManager();
- if (tx != null) {
- tx.commit();
- }
-
- }
-
class SyncerThread extends Thread {
boolean synced = false;
commit 3a80401e9899f9025b9119259467118b64338c87
Author: Simeon Pinder <spinder(a)fulliautomatix.conchfritter.com>
Date: Tue Dec 4 07:50:29 2012 -0500
[BZ 871535] update product types to support EPP->JPP rename.
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/JBossProductType.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/JBossProductType.java
index 87e31f3..7239c02 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/JBossProductType.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/JBossProductType.java
@@ -34,6 +34,7 @@ public enum JBossProductType {
EAP("EAP", "JBoss EAP 6", "JBoss Enterprise Application Platform 6", "EAP"),
JDG("JDG", "JBoss JDG 6", "JBoss Data Grid 6", "Data Grid"),
EPP("EPP", "JBoss EAP 6", "JBoss Enterprise Portal Platform 6", "EPP"),
+ JPP("JPP", "JBoss EAP 6", "JBoss Portal Platform 6", "JPP"),
// EWP("EWP", "JBoss EWP 6", "JBoss Enterprise Web Platform 6", "EWP"),
SOA("SOA-P", "JBoss SOA-P 6", "JBoss Enterprise SOA Platform (ESB)", "SOAP");
@@ -97,8 +98,10 @@ public enum JBossProductType {
productType = JBossProductType.EAP;
} else if (slot.equals("jdg")) {
productType = JBossProductType.JDG;
- } else if (slot.equals("epp")) {
+ } else if (slot.equals("epp")) {//old EPP
productType = JBossProductType.EPP;
+ } else if (slot.equals("jpp")) {//new EPP->JPP plugin
+ productType = JBossProductType.JPP;
} else if (slot.equals("soa-p")) {
productType = JBossProductType.SOA;
} else {
@@ -122,6 +125,8 @@ public enum JBossProductType {
productType = JBossProductType.JDG;
} else if (homeDirName.contains("-epp-")) {
productType = JBossProductType.EPP;
+ } else if (homeDirName.contains("-jpp-")) {
+ productType = JBossProductType.JPP;
} else if (homeDirName.contains("soa-p-")) {
productType = JBossProductType.SOA;
} else {
commit 1e9d28d27bb1ba742dce4d4a946d56da4f7a9c39
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Mon Dec 3 15:48:05 2012 -0500
Variety of work to eliminate itest interaction issues (more work still in progress)
- Improve the cleanup in AbstractDriftServerTest. The cleanup here was
very aggressive, wiping pretty much all of the drift tables, including
any data still in use by other test classes. Added more easily identifiable
naming for the test drift entities to allow for more targeted cleanup.
- Add itest.debug support in itests-2 (from mazz's branch work)
- Use more unique (avoid clashing) and identifiable (trace back to creator)
plugin names in test plugin xml files.
diff --git a/etc/eclipse-tools/RHQ Remote Debugging - itest.launch b/etc/eclipse-tools/RHQ Remote Debugging - itest.launch
new file mode 100644
index 0000000..1ea5d31
--- /dev/null
+++ b/etc/eclipse-tools/RHQ Remote Debugging - itest.launch
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.launching.remoteJavaApplication">
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/rhq"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="4"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
+<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <sourceLookupDirector> <sourceContainers duplicates="false"> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;rhq&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/jboss/integration/jboss-profileservice-spi/5.1.0.SP1/jboss-profileservice-spi-5.1.0.SP1.jar&quot;/&gt;&#13;&#10;" typeId="org.ec
lipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/jboss/man/jboss-managed/2.1.1.GA/jboss-managed-2.1.1.GA.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/jboss/man/jboss-metatype/2.1.1.GA/jboss-metatype-2.1.1.GA.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encodi
ng=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/apache/commons/commons-io/1.3.2/commons-io-1.3.2.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/com/sun/xml/bind/jaxb-impl/2.1.12/jaxb-impl-2.1.12.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/i18nlog/i18nlog/1.0.10/i18nlog-1.
0.10.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/gnu-getopt/getopt/1.0.13/getopt-1.0.13.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/commons-httpclient/commons-httpclient/3.0.1/commons-httpclient-3.0.1.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento=
"&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/jboss/jboss-remoting/2.2.2.SP8/jboss-remoting-2.2.2.SP8.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/oswego-concurrent/concurrent/1.3.4/concurrent-1.3.4.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVari
able path=&quot;M2_REPO/rss4j/rss4j/0.92-on.2/rss4j-0.92-on.2.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/apache/ant/ant/1.8.0/ant-1.8.0.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/apache/ant/ant-nodeps/1.8.0/ant-nodeps-1.8.0.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"
/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/struts/struts/1.2.9/struts-1.2.9.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;class
pathVariable path=&quot;M2_REPO/javax/servlet/jsp-api/2.0/jsp-api-2.0.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/commons-validator/commons-validator/1.1.4/commons-validator-1.1.4.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/testng/testng/6.1.1/testng-6.1.1.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContai
ner.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/snmp4j/snmp4j/1.8.2/snmp4j-1.8.2.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&
#10;&lt;classpathVariable path=&quot;M2_REPO/tomcat/tomcat-jk/4.1.31/tomcat-jk-4.1.31.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/jdom/jdom/1.0/jdom-1.0.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/commons-collections/commons-collections/3.2/commons-collections-3.2.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sour
ceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/jboss/jboss-jmx/4.2.3.GA/jboss-jmx-4.2.3.GA.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&
;quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/tomcat/catalina/5.5.20/catalina-5.5.20.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/taglibs/standard/1.1.2/standard-1.1.2.jar&quot;/&gt;&#13;&#1
0;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/jboss/jboss-common/1.2.1.GA/jboss-common-1.2.1.GA.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/javax/servlet/jstl/1.1.2/jstl-1.1.2.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&
quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/struts-menu/struts-menu/2.3/struts-menu-2.3.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/junit/junit/3.8.2/junit-3.8.2.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/apache/velocity/velocity/1.5/velocity-1.5.jar&quot;/&gt;&am
p;#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/xalan/xalan/2.5.1/xalan-2.5.1.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&qu
ot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/javax/xml/bind/jsr173_api/1.0/jsr173_api-1.0.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/jboss/jboss-embeddable-ejb3/jboss-ejb3-all/1.0.0.Alpha9/jboss-ejb3-all-1.0.0.Alpha9.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/jboss/jbpm/3.1.1/j
bpm-3.1.1.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/jboss/jboss-embeddable-ejb3/hibernate-all/1.0.0.Alpha9/hibernate-all-1.0.0.Alpha9.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/jetbrains/annotations/7.0.2/annotations-7.0.2.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/>
3; <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/apache/ant/ant-launcher/1.8.0/ant-launcher-1.8.0.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&
lt;classpathVariable path=&quot;M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/commons-lang/commons-lang/2.4/commons-lang-2.4.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/javax/faces/jsf-api/1.2_14/jsf-api-1.2_14.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launch
ing.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/javax/faces/jsf-impl/1.2_14/jsf-impl-1.2_14.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/javax/el/el-api/1.0/el-api-1.0.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?
&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/com/sun/facelets/jsf-facelets/1.1.15.B1/jsf-facelets-1.1.15.B1.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/mc4j/org-mc4j-ems/1.2.16/org-mc4j-ems-1.2.16.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/opensymphony/quartz/quartz/1.6.5/quartz-1.6.5.jar&quot;/&gt;&#13;&#10;&q
uot; typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/javax/mail/mail/1.4.2/mail-1.4.2.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encodi
ng=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/richfaces/framework/richfaces-api/3.3.3.Final/richfaces-api-3.3.3.Final.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/richfaces/framework/richfaces-impl/3.3.3.Final/richfaces-impl-3.3.3.Final.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&
amp;quot;M2_REPO/org/richfaces/ui/richfaces-ui/3.3.3.Final/richfaces-ui-3.3.3.Final.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/postgresql/postgresql/9.0-801.jdbc4/postgresql-9.0-801.jdbc4.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/jboss/jboss-cache/1.4.1.SP9/jboss-cache-1.4.1.SP9.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.laun
ching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/hyperic/sigar/1.6.5.132/sigar-1.6.5.132.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/jboss/transaction/jboss-jta/4.2.3.SP5/jboss-jta-4.2.3.SP5.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; s
tandalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/jboss/transaction/jboss-jts-common/4.2.3.SP5/jboss-jts-common-4.2.3.SP5.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/jboss/jbossws-spi/1.1.1.GA/jbossws-spi-1.1.1.GA.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/jboss/jbossws/jbossws-native-core/3
.1.1.GA/jbossws-native-core-3.1.1.GA.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/apache/maven/maven-project/2.0.8/maven-project-2.0.8.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/apache/maven/maven-plugin-api/2.0.8/maven-plugin-api-2.0.8.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariabl
e"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/codehaus/swizzle/swizzle-confluence/1.6.1/swizzle-confluence-1.6.1.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/jvnet/inflector/0.7.0/inflector-0.7.0.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot
;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/net/augeas/augeas/0.0.2/augeas-0.0.2.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/json/json/20080701/json-20080701.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/net/java/dev/jna/jna/3.2.5/jna-3.2.5.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.s
ourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/freemarker/freemarker/2.3.11/freemarker-2.3.11.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/jboss/seam/jboss-seam/2.1.0.SP1/jboss-seam-2.1.0.SP1.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standa
lone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/jboss/seam/jboss-seam-ui/2.1.0.SP1/jboss-seam-ui-2.1.0.SP1.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/hibernate/hibernate3/3.2.r14201-2/hibernate3-3.2.r14201-2.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/jline/jline/0.9.94/jline-0.9.94.jar&quot;/&
gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/javassist/javassist/3.9.0.GA/javassist-3.9.0.GA.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/net/sf/opencsv/opencsv/1.8/opencsv-1.8.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&
quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/bouncycastle/bcpg-jdk15/140/bcpg-jdk15-140.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/bouncycastle/bcprov-jdk15/140/bcprov-jdk15-140.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/apache/xmlrpc/xmlrpc-client/3.1
.2/xmlrpc-client-3.1.2.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/apache/xmlrpc/xmlrpc-common/3.1.2/xmlrpc-common-3.1.2.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/apache/ws/commons/util/ws-commons-util/1.0.2/ws-commons-util-1.0.2.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable&quo
t;/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/commons-digester/commons-digester/1.8.1/commons-digester-1.8.1.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/commons-codec/commons-codec/1.4/commons-codec-1.4.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&am
p;gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/pircbot/pircbot/1.4.2/pircbot-1.4.2.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/twitter4j/twitter4j-core/2.2.4/twitter4j-core-2.2.4.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/jmock/jmock/2.5.1/jmock-2.5.1.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.l
aunching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/antlr/antlr-runtime/3.2/antlr-runtime-3.2.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/jboss/web/jbossweb/2.0.1.GA/jbossweb-2.0.1.GA.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/libvirt/libvirt/0.4.1/libvirt-0.4.1.jar&quot;/&gt;&#13;&am
p;#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/jboss/byteman/byteman/1.2.1/byteman-1.2.1.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/fedorahosted/cobbler/cobbler4j/0.1/cobbler4j-0.1.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quo
t; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/com/google/gwt/gwt-user/2.4.0/gwt-user-2.4.0.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/com/google/gwt/gwt-dev/2.4.0/gwt-dev-2.4.0.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/com/smartgwt/smartgwt/3.0/smartgwt-3.0.j
ar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/com/google/code/gwt-log/gwt-log/3.1.0/gwt-log-3.1.0.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/ca/nanometrics/gflot/1.0.0/gflot-1.0.0.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml vers
ion=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/com/jcraft/jsch/0.1.29/jsch-0.1.29.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/commons-jxpath/commons-jxpath/1.3/commons-jxpath-1.3.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/dbunit/dbun
it/2.4.8/dbunit-2.4.8.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/apache/poi/poi/3.7/poi-3.7.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/bsh/bsh/1.3.0/bsh-1.3.0.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot
;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/unitils/unitils-core/3.1/unitils-core-3.1.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/unitils/unitils-dbunit/3.1/unitils-dbunit-3.1.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/unitils/unitils-
orm/3.1/unitils-orm-3.1.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/unitils/unitils-testng/3.1/unitils-testng-3.1.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/codehaus/jackson/jackson-core-asl/1.7.4/jackson-core-asl-1.7.4.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/>
; <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/codehaus/jackson/jackson-mapper-asl/1.7.4/jackson-mapper-asl-1.7.4.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/mongodb/mongo-java-driver/2.6.5/mongo-java-driver-2.6.5.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&qu
ot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/com/googlecode/java-diff-utils/diffutils/1.2.1/diffutils-1.2.1.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/com/google/code/morphia/morphia/1.00-SNAPSHOT/morphia-1.00-SNAPSHOT.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/jboss/resteasy/resteasy-links/2.3.3.Final/resteasy-links-2.3.
3.Final.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/jboss/resteasy/resteasy-jaxrs/2.3.3.Final/resteasy-jaxrs-2.3.3.Final.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/jboss/resteasy/resteasy-jackson-provider/2.3.3.Final/resteasy-jackson-provider-2.3.3.Final.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContain
er.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/jboss/resteasy/jaxrs-api/2.3.3.Final/jaxrs-api-2.3.3.Final.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/jboss/sasl/jboss-sasl/1.0.0.Beta9/jboss-sasl-1.0.0.Beta9.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; st
andalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;JDK_HOME/lib/tools.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/mockito/mockito-all/1.9.0/mockito-all-1.9.0.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/powermock/powermock-api-mockito/1.4.11/powermock-api-mockito-1.4.11.jar&quot;/&gt;&#13;&#
10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/powermock/powermock-core/1.4.11/powermock-core-1.4.11.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/powermock/powermock-api-support/1.4.11/powermock-api-support-1.4.11.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml v
ersion=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/powermock/powermock-module-testng-common/1.4.11/powermock-module-testng-common-1.4.11.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/powermock/powermock-module-testng/1.4.11/powermock-module-testng-1.4.11.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&
amp;#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/liquibase/liquibase-core/2.0.3/liquibase-core-2.0.3.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/jboss/shrinkwrap/shrinkwrap-impl-base/1.0.0/shrinkwrap-impl-base-1.0.0.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/jboss/shrinkwrap/shrinkwrap-api/1.0.0/shrinkwrap-api-1.0.0.jar&quot;/&
amp;gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/jboss/shrinkwrap/shrinkwrap-spi/1.0.0/shrinkwrap-spi-1.0.0.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/jboss/shrinkwrap/descriptors/shrinkwrap-descriptors-api-base/2.0.0-alpha-2/shrinkwrap-descriptors-api-base-2.0.0-alpha-2.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.
classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/jboss/shrinkwrap/resolver/shrinkwrap-resolver-api/1.0.0-beta-6/shrinkwrap-resolver-api-1.0.0-beta-6.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/jboss/shrinkwrap/resolver/shrinkwrap-resolver-api-maven/1.0.0-beta-6/shrinkwrap-resolver-api-maven-1.0.0-beta-6.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container mem
ento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/jboss/arquillian/test/arquillian-test-spi/1.0.0.Final/arquillian-test-spi-1.0.0.Final.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/jboss/arquillian/test/arquillian-test-api/1.0.0.Final/arquillian-test-api-1.0.0.Final.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; stan
dalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/jboss/arquillian/core/arquillian-core-spi/1.0.0.Final/arquillian-core-spi-1.0.0.Final.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/jboss/arquillian/core/arquillian-core-api/1.0.0.Final/arquillian-core-api-1.0.0.Final.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quo
t;M2_REPO/org/jboss/arquillian/container/arquillian-container-spi/1.0.0.Final/arquillian-container-spi-1.0.0.Final.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/jboss/arquillian/container/arquillian-container-test-api/1.0.0.Final/arquillian-container-test-api-1.0.0.Final.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/jboss/arquillian/testng/arquillian-testng
-core/1.0.0.Final/arquillian-testng-core-1.0.0.Final.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;default/&gt;&#13;&#10;" typeId="org.eclipse.debug.core.containerType.default"/> </sourceContainers> </sourceLookupDirector> "/>
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.jdt.launching.ALLOW_TERMINATE" value="true"/>
+<mapAttribute key="org.eclipse.jdt.launching.CONNECT_MAP">
+<mapEntry key="hostname" value="localhost"/>
+<mapEntry key="port" value="8798"/>
+</mapAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="rhq"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_CONNECTOR_ID" value="org.eclipse.jdt.launching.socketAttachConnector"/>
+</launchConfiguration>
diff --git a/modules/enterprise/server/itests-2/pom.xml b/modules/enterprise/server/itests-2/pom.xml
index f0c179f..1b50266 100644
--- a/modules/enterprise/server/itests-2/pom.xml
+++ b/modules/enterprise/server/itests-2/pom.xml
@@ -1,6 +1,4 @@
-<project
- xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -25,13 +23,14 @@
<properties>
<jboss.zip>${settings.localRepository}/org/jboss/as/jboss-as-dist/${jboss.version}/jboss-as-dist-${jboss.version}.zip</jboss.zip>
<jboss.unzip.location>${basedir}/target/jboss-as-${jboss.version}</jboss.unzip.location>
+ <jboss.vm.args>-Xmx700m -XX:MaxPermSize=200m</jboss.vm.args>
+ <jboss.vm.args.debug></jboss.vm.args.debug> <!-- -Ditest.debug can override this, see below -->
</properties>
<dependencies>
<!--================ Test Deps ================ -->
- <!-- Note, the test dep ordering can be important. Maven orders the [test] classpath in the order listed
- in the pom. -->
+ <!-- Note, the test dep ordering can be important. Maven orders the [test] classpath in the order listed in the pom. -->
<dependency>
<groupId>org.jboss.as</groupId>
@@ -222,13 +221,9 @@
<configuration>
<target>
<echo>Unzipping JBossAS ${jboss.version} found at ${jboss.zip}</echo>
- <unzip
- src="${jboss.zip}"
- dest="${jboss.unzip.location}/.." />
+ <unzip src="${jboss.zip}" dest="${jboss.unzip.location}/.." />
<echo>JBossAS ${jboss.version} should now be at: ${jboss.unzip.location}</echo>
- <property
- name="jboss.conf"
- location="${jboss.unzip.location}/standalone/configuration/standalone.xml" />
+ <property name="jboss.conf" location="${jboss.unzip.location}/standalone/configuration/standalone.xml" />
<echo>Will now add test configuration to JBossAS config file: ${jboss.conf}</echo>
<replace file="${jboss.conf}">
@@ -420,15 +415,10 @@
</replace>
- <property
- name="jboss.modules.dir"
- location="${jboss.unzip.location}/modules" />
+ <property name="jboss.modules.dir" location="${jboss.unzip.location}/modules" />
<echo>Adding JDBC modules to ${jboss.modules.dir} ...</echo>
- <copy
- file="${settings.localRepository}/com/oracle/ojdbc6/${ojdbc6.version}/ojdbc6-${ojdbc6.version}.jar"
- toDir="${jboss.modules.dir}/org/rhq/oracle/main"
- failonerror="false"
- verbose="true" />
+ <copy file="${settings.localRepository}/com/oracle/ojdbc6/${ojdbc6.version}/ojdbc6-${ojdbc6.version}.jar"
+ toDir="${jboss.modules.dir}/org/rhq/oracle/main" failonerror="false" verbose="true" />
<echo file="${jboss.modules.dir}/org/rhq/oracle/main/module.xml"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
<module xmlns="urn:jboss:module:1.1" name="org.rhq.oracle">
<resources>
@@ -442,8 +432,7 @@
]]></echo>
<copy
file="${settings.localRepository}/postgresql/postgresql/${postgresql.version}/postgresql-${postgresql.version}.jar"
- toDir="${jboss.modules.dir}/org/rhq/postgres/main"
- verbose="true" />
+ toDir="${jboss.modules.dir}/org/rhq/postgres/main" verbose="true" />
<echo file="${jboss.modules.dir}/org/rhq/postgres/main/module.xml"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
<module xmlns="urn:jboss:module:1.1" name="org.rhq.postgres">
<resources>
@@ -469,9 +458,7 @@
<configuration>
<skip>${skip.postgres}</skip>
<target>
- <property
- name="jboss.conf"
- location="${jboss.unzip.location}/standalone/configuration/standalone.xml" />
+ <property name="jboss.conf" location="${jboss.unzip.location}/standalone/configuration/standalone.xml" />
<echo>Will now add test configuration datasource to JBossAS config file: ${jboss.conf}</echo>
<replace file="${jboss.conf}">
@@ -546,9 +533,7 @@
<configuration>
<skip>${skip.oracle}</skip>
<target>
- <property
- name="jboss.conf"
- location="${jboss.unzip.location}/standalone/configuration/standalone.xml" />
+ <property name="jboss.conf" location="${jboss.unzip.location}/standalone/configuration/standalone.xml" />
<echo>Will now add test configuration datasource to JBossAS config file: ${jboss.conf}</echo>
<replace file="${jboss.conf}">
@@ -705,5 +690,17 @@
<skip.oracle>false</skip.oracle>
</properties>
</profile>
+
+ <profile>
+ <id>itest.debug</id>
+ <activation>
+ <property>
+ <name>itest.debug</name>
+ </property>
+ </activation>
+ <properties>
+ <jboss.vm.args.debug>-Xrunjdwp:transport=dt_socket,address=8798,server=y,suspend=y</jboss.vm.args.debug>
+ </properties>
+ </profile>
</profiles>
</project>
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/AbstractDriftServerTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/AbstractDriftServerTest.java
index e8a8897..1bb0e0c 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/AbstractDriftServerTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/AbstractDriftServerTest.java
@@ -48,11 +48,13 @@ import org.rhq.enterprise.server.util.ResourceTreeHelper;
@Test(groups = "drift", singleThreaded = true)
public abstract class AbstractDriftServerTest extends AbstractEJB3Test {
- protected final String RESOURCE_TYPE_NAME = getClass().getSimpleName() + "_RESOURCE_TYPE";
+ protected final String NAME_PREFIX = getClass().getSimpleName() + "_";
- protected final String AGENT_NAME = getClass().getSimpleName() + "_AGENT";
+ protected final String RESOURCE_TYPE_NAME = NAME_PREFIX + "RESOURCE_TYPE";
- protected final String RESOURCE_NAME = getClass().getSimpleName() + "_RESOURCE";
+ protected final String AGENT_NAME = NAME_PREFIX + "AGENT";
+
+ protected final String RESOURCE_NAME = NAME_PREFIX + "RESOURCE";
protected DriftServerPluginService driftServerPluginService;
@@ -128,13 +130,27 @@ public abstract class AbstractDriftServerTest extends AbstractEJB3Test {
executeInTransaction(false, new TransactionCallback() {
@Override
public void execute() throws Exception {
+ String name = " '" + NAME_PREFIX + "%' ";
+
+ em.createQuery("delete from JPADrift d where d.newDriftFile like" + name).executeUpdate();
+
+ em.createQuery(
+ "delete from JPADriftChangeSet cs where cs.id in ( select cs1.id from JPADriftChangeSet cs1 where cs1.driftDefinition.name like"
+ + name + ")").executeUpdate();
+
+ em.createQuery(
+ "delete from JPADriftChangeSet cs where cs.id in ( select cast(ddt.changeSetId as int) from DriftDefinitionTemplate ddt where ddt.name like"
+ + name + ")").executeUpdate();
+
+ em.createNativeQuery(
+ "delete from rhq_drift_set ds where not exists ( select * from rhq_drift d where d.drift_set_id = ds.id ) ")
+ .executeUpdate();
+
+ em.createQuery("delete from JPADriftFile df where df.hashId like" + name).executeUpdate();
+
+ em.createQuery("delete from DriftDefinition dd where dd.name like" + name).executeUpdate();
- em.createQuery("delete from JPADrift ").executeUpdate();
- em.createQuery("delete from JPADriftChangeSet").executeUpdate();
- em.createQuery("delete from JPADriftSet").executeUpdate();
- em.createQuery("delete from JPADriftFile").executeUpdate();
- em.createQuery("delete from DriftDefinition").executeUpdate();
- em.createQuery("delete from DriftDefinitionTemplate").executeUpdate();
+ em.createQuery("delete from DriftDefinitionTemplate ddt where ddt.name like" + name).executeUpdate();
deleteEntity(Resource.class, RESOURCE_NAME);
deleteEntity(Agent.class, AGENT_NAME);
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/DriftTemplateManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/DriftTemplateManagerBeanTest.java
index c877368..9e70997 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/DriftTemplateManagerBeanTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/DriftTemplateManagerBeanTest.java
@@ -64,17 +64,18 @@ import org.rhq.test.AssertUtils;
public class DriftTemplateManagerBeanTest extends AbstractDriftServerTest {
- private static final String TEST_CREATE_TEMPLATE = "test-createTemplateForNegativeUpdateTests";
- private static final String TEST_PIN_TEMPLATE = "test-pinTemplate";
+ private static final String drift1Path = "drift.1";
+ private static final String drift2Path = "drift.2";
+
+ private final String TEST_CREATE_TEMPLATE = NAME_PREFIX + "createTemplateForNegativeUpdateTests";
+ private final String TEST_PIN_TEMPLATE = NAME_PREFIX + "pinTemplate";
+
+ private final String driftFile1Hash = NAME_PREFIX + "a1b2c3";
+ private final String driftFile2Hash = NAME_PREFIX + "1a2b3c";
private DriftTemplateManagerLocal templateMgr;
private DriftManagerLocal driftMgr;
- private static final String drift1Path = "drift.1";
- private static final String drift2Path = "drift.2";
-
- private static final String driftFile1Hash = "a1b2c3";
- private static final String driftFile2Hash = "1a2b3c";
// Note: Arquillian currently (1.0.2) runs each test in its own testng lifecycle. Think of it as each
// test being in its own suite, and the test class being new'd for each test. Instance variables
@@ -127,7 +128,7 @@ public class DriftTemplateManagerBeanTest extends AbstractDriftServerTest {
@Test(dependsOnGroups = "pinning")
public void createNewTemplate() {
final DriftDefinition definition = new DriftDefinition(new Configuration());
- definition.setName("test-createNewTemplate");
+ definition.setName(NAME_PREFIX + "createNewTemplate");
definition.setEnabled(true);
definition.setDriftHandlingMode(normal);
definition.setInterval(2400L);
@@ -265,7 +266,7 @@ public class DriftTemplateManagerBeanTest extends AbstractDriftServerTest {
//@Test(groups = "negativeUpdate", dependsOnMethods = "createTemplateForNegativeUpdateTests", expectedExceptions = EJBException.class, expectedExceptionsMessageRegExp = ".*name.*cannot be modified")
private void doNotAllowTemplateNameToBeUpdated() {
DriftDefinitionTemplate template = loadTemplate(TEST_CREATE_TEMPLATE);
- template.setName("A new name");
+ template.setName(NAME_PREFIX + "A new name");
templateMgr.updateTemplate(getOverlord(), template);
}
@@ -286,7 +287,7 @@ public class DriftTemplateManagerBeanTest extends AbstractDriftServerTest {
public void createAndUpdateTemplate() {
// create the template
DriftDefinition definition = new DriftDefinition(new Configuration());
- definition.setName("test-updateTemplate");
+ definition.setName(NAME_PREFIX + "test-updateTemplate");
definition.setDescription("update template test");
definition.setEnabled(true);
definition.setDriftHandlingMode(normal);
@@ -297,10 +298,10 @@ public class DriftTemplateManagerBeanTest extends AbstractDriftServerTest {
definition);
// next create some definitions from the template
- final DriftDefinition attachedDef1 = createDefinition(template, "attachedDef1", true);
- final DriftDefinition attachedDef2 = createDefinition(template, "attachedDef2", true);
- final DriftDefinition detachedDef1 = createDefinition(template, "detachedDef1", false);
- final DriftDefinition detachedDef2 = createDefinition(template, "detachedDef2", false);
+ final DriftDefinition attachedDef1 = createDefinition(template, NAME_PREFIX + "attachedDef1", true);
+ final DriftDefinition attachedDef2 = createDefinition(template, NAME_PREFIX + "attachedDef2", true);
+ final DriftDefinition detachedDef1 = createDefinition(template, NAME_PREFIX + "detachedDef1", false);
+ final DriftDefinition detachedDef2 = createDefinition(template, NAME_PREFIX + "detachedDef2", false);
driftMgr.updateDriftDefinition(getOverlord(), forResource(resource.getId()), attachedDef1);
driftMgr.updateDriftDefinition(getOverlord(), forResource(resource.getId()), attachedDef2);
@@ -384,10 +385,10 @@ public class DriftTemplateManagerBeanTest extends AbstractDriftServerTest {
templateDef);
// next create some resource level definitions
- final DriftDefinition attachedDef1 = createDefinition(template, "attachedDef1", true);
- final DriftDefinition attachedDef2 = createDefinition(template, "attachedDef2", true);
- final DriftDefinition detachedDef1 = createDefinition(template, "detachedDef1", false);
- final DriftDefinition detachedDef2 = createDefinition(template, "detachedDef2", false);
+ final DriftDefinition attachedDef1 = createDefinition(template, NAME_PREFIX + "attachedDef1", true);
+ final DriftDefinition attachedDef2 = createDefinition(template, NAME_PREFIX + "attachedDef2", true);
+ final DriftDefinition detachedDef1 = createDefinition(template, NAME_PREFIX + "detachedDef1", false);
+ final DriftDefinition detachedDef2 = createDefinition(template, NAME_PREFIX + "detachedDef2", false);
// create initial change set from which the snapshot will be generated
final JPADriftChangeSet changeSet0 = new JPADriftChangeSet(resource, 0, COVERAGE, attachedDef1);
@@ -474,7 +475,9 @@ public class DriftTemplateManagerBeanTest extends AbstractDriftServerTest {
// get the attached definitions
List<DriftDefinition> attachedDefs = new LinkedList<DriftDefinition>();
for (DriftDefinition d : template.getDriftDefinitions()) {
- if (d.isAttached() && (d.getName().equals("attachedDef1") || d.getName().equals("attachedDef2"))) {
+ if (d.isAttached()
+ && (d.getName().equals(NAME_PREFIX + "attachedDef1") || d.getName()
+ .equals(NAME_PREFIX + "attachedDef2"))) {
attachedDefs.add(d);
}
}
@@ -490,7 +493,9 @@ public class DriftTemplateManagerBeanTest extends AbstractDriftServerTest {
// get the detached definitions
List<DriftDefinition> detachedDefs = new LinkedList<DriftDefinition>();
for (DriftDefinition d : template.getDriftDefinitions()) {
- if (!d.isAttached() && (d.getName().equals("detachedDef1") || d.getName().equals("detachedDef2"))) {
+ if (!d.isAttached()
+ && (d.getName().equals(NAME_PREFIX + "detachedDef1") || d.getName()
+ .equals(NAME_PREFIX + "detachedDef2"))) {
detachedDefs.add(d);
}
}
@@ -513,10 +518,10 @@ public class DriftTemplateManagerBeanTest extends AbstractDriftServerTest {
templateDef);
// next create some resource level definitions
- final DriftDefinition attachedDef1 = createDefinition(template, "attachedDef1", true);
- final DriftDefinition attachedDef2 = createDefinition(template, "attachedDef2", true);
- final DriftDefinition detachedDef1 = createDefinition(template, "detachedDef1", false);
- final DriftDefinition detachedDef2 = createDefinition(template, "detachedDef2", false);
+ final DriftDefinition attachedDef1 = createDefinition(template, NAME_PREFIX + "attachedDef1", true);
+ final DriftDefinition attachedDef2 = createDefinition(template, NAME_PREFIX + "attachedDef2", true);
+ final DriftDefinition detachedDef1 = createDefinition(template, NAME_PREFIX + "detachedDef1", false);
+ final DriftDefinition detachedDef2 = createDefinition(template, NAME_PREFIX + "detachedDef2", false);
// create some change sets
final JPADriftChangeSet changeSet0 = new JPADriftChangeSet(resource, 0, COVERAGE, attachedDef1);
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/JPADriftServerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/JPADriftServerBeanTest.java
index 8fe5ac5..edd5f01 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/JPADriftServerBeanTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/JPADriftServerBeanTest.java
@@ -57,9 +57,9 @@ public class JPADriftServerBeanTest extends AbstractDriftServerTest {
private JPADriftServerLocal jpaDriftServer;
- private final String DRIFT_FILE_1_ID = "a1b2c3d4";
+ private final String DRIFT_FILE_1_ID = NAME_PREFIX + "a1b2c3d4";
- private final String DRIFT_FILE_2_ID = "1ab2b3c4d";
+ private final String DRIFT_FILE_2_ID = NAME_PREFIX + "1ab2b3c4d";
private JPADriftFile driftFile1;
@@ -90,7 +90,7 @@ public class JPADriftServerBeanTest extends AbstractDriftServerTest {
public void persistResourceChangeSet() {
// first create and persist the drift definition
final DriftDefinition driftDef = new DriftDefinition(new Configuration());
- driftDef.setName("test::persistResourceChangeSet");
+ driftDef.setName(NAME_PREFIX + "persistResourceChangeSet");
driftDef.setEnabled(true);
driftDef.setDriftHandlingMode(normal);
driftDef.setInterval(2400L);
@@ -245,7 +245,7 @@ public class JPADriftServerBeanTest extends AbstractDriftServerTest {
// next create the drift definition
final DriftDefinition driftDef = new DriftDefinition(new Configuration());
- driftDef.setName("test::copyChangeSet");
+ driftDef.setName(NAME_PREFIX + "copyChangeSet");
driftDef.setEnabled(true);
driftDef.setDriftHandlingMode(normal);
driftDef.setInterval(2400L);
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/ManageDriftDefinitionsTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/ManageDriftDefinitionsTest.java
index f31ffe5..18c7093 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/ManageDriftDefinitionsTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/ManageDriftDefinitionsTest.java
@@ -63,9 +63,9 @@ import org.rhq.test.AssertUtils;
@Test
public class ManageDriftDefinitionsTest extends AbstractDriftServerTest {
- private final String DRIFT_NOT_SUPPORTED_TYPE = getClass().getSimpleName() + "DRIFT_NOT_SUPPORTED_RESOURCE_TYPE";
+ private final String DRIFT_NOT_SUPPORTED_TYPE = NAME_PREFIX + "DRIFT_NOT_SUPPORTED_RESOURCE_TYPE";
- private final String DRIFT_NOT_SUPPORTED_RESOURCE = getClass().getSimpleName() + "DRIFT_NOT_SUPPORTED_RESOURCE";
+ private final String DRIFT_NOT_SUPPORTED_RESOURCE = NAME_PREFIX + "DRIFT_NOT_SUPPORTED_RESOURCE";
private DriftManagerLocal driftMgr;
@@ -94,7 +94,7 @@ public class ManageDriftDefinitionsTest extends AbstractDriftServerTest {
public void createDefinitionFromUnpinnedTemplate() {
// first create a template
final DriftDefinition templateDef = new DriftDefinition(new Configuration());
- templateDef.setName("test_createUnpinnedDefinition");
+ templateDef.setName(NAME_PREFIX + "createUnpinnedDefinition");
templateDef.setEnabled(true);
templateDef.setDriftHandlingMode(normal);
templateDef.setInterval(2400L);
@@ -184,8 +184,8 @@ public class ManageDriftDefinitionsTest extends AbstractDriftServerTest {
final JPADriftChangeSet changeSet0 = new JPADriftChangeSet(null, 0, COVERAGE, null);
changeSet0.setDriftHandlingMode(DriftConfigurationDefinition.DriftHandlingMode.normal);
- final JPADriftFile driftFile1 = new JPADriftFile("a1b2c3");
- final JPADriftFile driftFile2 = new JPADriftFile("1a2b3c");
+ final JPADriftFile driftFile1 = new JPADriftFile(NAME_PREFIX + "a1b2c3");
+ final JPADriftFile driftFile2 = new JPADriftFile(NAME_PREFIX + "1a2b3c");
JPADrift drift1 = new JPADrift(changeSet0, "drift.1", FILE_ADDED, null, driftFile1);
JPADrift drift2 = new JPADrift(changeSet0, "drift.2", FILE_ADDED, null, driftFile2);
@@ -196,7 +196,7 @@ public class ManageDriftDefinitionsTest extends AbstractDriftServerTest {
// create the template
final DriftDefinition templateDef = new DriftDefinition(new Configuration());
- templateDef.setName("test_createUnpinnedDefinition");
+ templateDef.setName(NAME_PREFIX + "createUnpinnedDefinition");
templateDef.setEnabled(true);
templateDef.setDriftHandlingMode(normal);
templateDef.setInterval(2400L);
@@ -288,7 +288,7 @@ public class ManageDriftDefinitionsTest extends AbstractDriftServerTest {
public void unpinDefinition() {
// First create the template
final DriftDefinition templateDef = new DriftDefinition(new Configuration());
- templateDef.setName("test_unpin_def_template");
+ templateDef.setName(NAME_PREFIX + "unpin_def_template");
templateDef.setEnabled(true);
templateDef.setDriftHandlingMode(normal);
templateDef.setInterval(2400L);
@@ -299,7 +299,7 @@ public class ManageDriftDefinitionsTest extends AbstractDriftServerTest {
// First create the definition
DriftDefinition definition = template.createDefinition();
- definition.setName("test_unpin");
+ definition.setName(NAME_PREFIX + "unpin");
definition.setEnabled(true);
definition.setBasedir(new DriftDefinition.BaseDirectory(fileSystem, "/foo/bar/test"));
definition.setComplianceStatus(DriftComplianceStatus.OUT_OF_COMPLIANCE_DRIFT);
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/ManageSnapshotsTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/ManageSnapshotsTest.java
index f1212fd..ed316a4 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/ManageSnapshotsTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/ManageSnapshotsTest.java
@@ -72,12 +72,12 @@ public class ManageSnapshotsTest extends AbstractDriftServerTest {
}
public void pinningSnapshotShouldSetDriftDefAsPinned() {
- final DriftDefinition driftDef = createAndPersistDriftDef("test::setPinnedFlag");
+ final DriftDefinition driftDef = createAndPersistDriftDef(NAME_PREFIX + "setPinnedFlag");
// create initial change set
final JPADriftChangeSet changeSet = new JPADriftChangeSet(resource, 0, COVERAGE, driftDef);
- final JPADriftFile driftFile1 = new JPADriftFile("a1b2c3");
+ final JPADriftFile driftFile1 = new JPADriftFile(NAME_PREFIX + "a1b2c3");
JPADrift drift = new JPADrift(changeSet, "drift.1", FILE_ADDED, null, driftFile1);
final JPADriftSet driftSet = new JPADriftSet();
@@ -104,19 +104,19 @@ public class ManageSnapshotsTest extends AbstractDriftServerTest {
@SuppressWarnings("unchecked")
public void pinningSnapshotShouldMakeSnapshotTheInitialChangeSet() throws Exception {
- final DriftDefinition driftDef = createAndPersistDriftDef("test::makeSnapshotVersionZero");
+ final DriftDefinition driftDef = createAndPersistDriftDef(NAME_PREFIX + "makeSnapshotVersionZero");
// create initial change set
final JPADriftChangeSet changeSet0 = new JPADriftChangeSet(resource, 0, COVERAGE, driftDef);
- final JPADriftFile driftFile1 = new JPADriftFile("a1b2c3");
+ final JPADriftFile driftFile1 = new JPADriftFile(NAME_PREFIX + "a1b2c3");
JPADrift drift1 = new JPADrift(changeSet0, "drift.1", FILE_ADDED, null, driftFile1);
final JPADriftSet driftSet = new JPADriftSet();
driftSet.addDrift(drift1);
// create change set v1
- final JPADriftFile driftFile2 = new JPADriftFile("1a2b3c");
+ final JPADriftFile driftFile2 = new JPADriftFile(NAME_PREFIX + "1a2b3c");
final JPADriftChangeSet changeSet1 = new JPADriftChangeSet(resource, 1, DRIFT, driftDef);
final JPADrift drift2 = new JPADrift(changeSet1, "drift.2", FILE_ADDED, null, driftFile2);
@@ -170,12 +170,12 @@ public class ManageSnapshotsTest extends AbstractDriftServerTest {
}
public void pinningSnapshotShouldSendRequestToAgent() {
- final DriftDefinition driftDef = createAndPersistDriftDef("test::setPinnedFlag");
+ final DriftDefinition driftDef = createAndPersistDriftDef(NAME_PREFIX + "setPinnedFlag");
// create initial change set
final JPADriftChangeSet changeSet = new JPADriftChangeSet(resource, 0, COVERAGE, driftDef);
- final JPADriftFile driftFile1 = new JPADriftFile("a1b2c3");
+ final JPADriftFile driftFile1 = new JPADriftFile(NAME_PREFIX + "a1b2c3");
JPADrift drift = new JPADrift(changeSet, "drift.1", FILE_ADDED, null, driftFile1);
final JPADriftSet driftSet = new JPADriftSet();
@@ -221,7 +221,7 @@ public class ManageSnapshotsTest extends AbstractDriftServerTest {
public void doNotAllowSnapshotToBePinnedWhenDefinitionIsAttachedToPinnedTemplate() {
// First create the template
final DriftDefinition templateDef = new DriftDefinition(new Configuration());
- templateDef.setName("Template-Pinned_Test");
+ templateDef.setName(NAME_PREFIX + "Template-Pinned_Test");
templateDef.setEnabled(true);
templateDef.setDriftHandlingMode(normal);
templateDef.setInterval(2400L);
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 38b1216..e5e5fea 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
@@ -197,6 +197,7 @@ public class MetadataBeanTest extends AbstractEJB3Test {
List<ResourceType> resourceTypes = resourceTypeMgr.findResourceTypesByCriteria(subjectMgr.getOverlord(),
criteria);
+ assertEquals("too many types!", 1, resourceTypes.size());
ResourceType resourceType = resourceTypes.get(0);
Set<String> expectedSet = new HashSet<String>(expected);
List<String> missing = new ArrayList<String>();
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java
index a5e23ff..1b6ebad 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java
@@ -53,13 +53,15 @@ import org.rhq.enterprise.server.util.LookupUtil;
@Test(groups = { "plugin.metadata" })
public class ResourceMetadataManagerBeanTest extends MetadataBeanTest {
+ private static final String PLUGIN_NAME = "ResourceMetadataManagerBeanTestPlugin";
+
@Test(groups = { "plugin.resource.metadata.test", "NewPlugin" })
public void testRemovalOfObsoleteBundleAndDriftConfig() throws Exception {
// create the initial type that has bundle and drift definitions
createPlugin("test-plugin.jar", "1.0", "remove_bundle_drift_config_v1.xml");
// make sure the drift definition was persisted, and remember the type
- ResourceType type1 = assertResourceTypeAssociationEquals("ServerWithBundleAndDriftConfig", "TestPlugin",
+ ResourceType type1 = assertResourceTypeAssociationEquals("ServerWithBundleAndDriftConfig", PLUGIN_NAME,
"driftDefinitionTemplates", asList("drift1"));
// sanity check, make sure our queries work and that we did persist these things
@@ -85,8 +87,6 @@ public class ResourceMetadataManagerBeanTest extends MetadataBeanTest {
getTransactionManager().commit();
}
- // make sure the bundle config was also persisted
- // NOTE: WHY DOES THIS WORK? I DIDN'T ASK TO FETCH IT AND IT IS MARKED AS LAZY LOAD
assertNotNull(type1.getResourceTypeBundleConfiguration());
assertEquals("destdir1", type1.getResourceTypeBundleConfiguration().getBundleDestinationBaseDirectories()
.iterator().next().getName());
@@ -139,14 +139,14 @@ public class ResourceMetadataManagerBeanTest extends MetadataBeanTest {
@Test(dependsOnMethods = { "registerPlugin" }, groups = { "plugin.resource.metadata.test", "NewPlugin" })
public void persistNewTypes() {
List<String> newTypes = asList("ServerA", "ServerB");
- assertTypesPersisted("Failed to persist new types", newTypes, "TestPlugin");
+ assertTypesPersisted("Failed to persist new types", newTypes, PLUGIN_NAME);
}
// @Test(dependsOnMethods = {"persistNewTypes"}, groups = {"plugin.resource.metadata.test", "NewPlugin"})
// public void persistSubcategories() throws Exception {
// assertResourceTypeAssociationEquals(
// "ServerA",
- // "TestPlugin",
+ // PLUGIN_NAME,
// "childSubCategories",
// asList("Resources", "Applications")
// );
@@ -154,29 +154,30 @@ public class ResourceMetadataManagerBeanTest extends MetadataBeanTest {
@Test(dependsOnMethods = { "persistNewTypes" }, groups = { "plugin.resource.metadata.test", "NewPlugin" })
public void persistMeasurementDefinitions() throws Exception {
- assertResourceTypeAssociationEquals("ServerA", "TestPlugin", "metricDefinitions",
+ assertResourceTypeAssociationEquals("ServerA", PLUGIN_NAME, "metricDefinitions",
asList("metric1", "metric2", "rhq.availability"));
}
@Test(dependsOnMethods = { "persistNewTypes" }, groups = { "plugin.resource.metadata.test", "NewPlugin" })
public void persistEventDefinitions() throws Exception {
- assertResourceTypeAssociationEquals("ServerA", "TestPlugin", "eventDefinitions",
+ assertResourceTypeAssociationEquals("ServerA", PLUGIN_NAME, "eventDefinitions",
asList("logAEntry", "logBEntry"));
}
@Test(dependsOnMethods = { "persistNewTypes" }, groups = { "plugin.resource.metadata.test", "NewPlugin" })
public void persistOperationDefinitions() throws Exception {
- assertResourceTypeAssociationEquals("ServerA", "TestPlugin", "operationDefinitions", asList("start", "stop"));
+ assertResourceTypeAssociationEquals("ServerA", PLUGIN_NAME, "operationDefinitions", asList("start", "stop"));
}
@Test(dependsOnMethods = { "persistNewTypes" }, groups = { "plugin.resource.metadata.test", "NewPlugin" })
public void persistProcessScans() throws Exception {
- assertResourceTypeAssociationEquals("ServerA", "TestPlugin", "processScans", asList("serverA"));
+ assertResourceTypeAssociationEquals("ServerA", PLUGIN_NAME, "processScans", asList("serverA"));
}
+
@Test(dependsOnMethods = { "persistNewTypes" }, groups = { "plugin.resource.metadata.test", "NewPlugin" })
public void persistDriftDefinitionTemplates() throws Exception {
- ResourceType type = assertResourceTypeAssociationEquals("ServerA", "TestPlugin", "driftDefinitionTemplates",
+ ResourceType type = assertResourceTypeAssociationEquals("ServerA", PLUGIN_NAME, "driftDefinitionTemplates",
asList("drift-pc", "drift-fs"));
DriftDefinition driftDef = null;
@@ -216,7 +217,7 @@ public class ResourceMetadataManagerBeanTest extends MetadataBeanTest {
@Test(dependsOnMethods = { "persistNewTypes" }, groups = { "plugin.resource.metadata.test", "NewPlugin" })
public void persistBundleTargetConfigurations() throws Exception {
String resourceTypeName = "ServerA";
- String plugin = "TestPlugin";
+ String plugin = PLUGIN_NAME;
SubjectManagerLocal subjectMgr = LookupUtil.getSubjectManager();
ResourceTypeManagerLocal resourceTypeMgr = LookupUtil.getResourceTypeManager();
@@ -227,6 +228,7 @@ public class ResourceMetadataManagerBeanTest extends MetadataBeanTest {
criteria.fetchBundleConfiguration(true);
List<ResourceType> resourceTypes = resourceTypeMgr.findResourceTypesByCriteria(subjectMgr.getOverlord(),
criteria);
+ assertEquals("too many types returned!", 1, resourceTypes.size());
ResourceType resourceType = resourceTypes.get(0);
ResourceTypeBundleConfiguration rtbc = resourceType.getResourceTypeBundleConfiguration();
@@ -250,7 +252,7 @@ public class ResourceMetadataManagerBeanTest extends MetadataBeanTest {
@Test(dependsOnMethods = { "persistNewTypes" }, groups = { "plugin.resource.metadata.test", "NewPlugin" })
public void persistChildTypes() throws Exception {
- assertResourceTypeAssociationEquals("ServerA", "TestPlugin", "childResourceTypes", asList("Child1", "Child2"));
+ assertResourceTypeAssociationEquals("ServerA", PLUGIN_NAME, "childResourceTypes", asList("Child1", "Child2"));
}
@Test(dependsOnMethods = { "persistNewTypes" }, groups = { "plugin.resource.metadata.test", "NewPlugin" })
@@ -260,7 +262,7 @@ public class ResourceMetadataManagerBeanTest extends MetadataBeanTest {
@Test(dependsOnMethods = { "persistNewTypes" }, groups = { "plugin.resource.metadata.test", "NewPlugin" })
public void persistPackageTypes() throws Exception {
- assertResourceTypeAssociationEquals("ServerA", "TestPlugin", "packageTypes",
+ assertResourceTypeAssociationEquals("ServerA", PLUGIN_NAME, "packageTypes",
asList("ServerA.Content.1", "ServerA.Content.2"));
}
@@ -271,34 +273,34 @@ public class ResourceMetadataManagerBeanTest extends MetadataBeanTest {
@Test(dependsOnMethods = { "upgradePlugin" }, groups = { "plugin.resource.metadata.test", "UpgradePlugin" })
public void upgradeOperationDefinitions() throws Exception {
- assertResourceTypeAssociationEquals("ServerA", "TestPlugin", "operationDefinitions",
+ assertResourceTypeAssociationEquals("ServerA", PLUGIN_NAME, "operationDefinitions",
asList("start", "shutdown", "restart"));
}
@Test(dependsOnMethods = { "upgradePlugin" }, groups = { "plugin.resource.metadata.test", "UpgradePlugin" })
public void upgradeChildResources() throws Exception {
- assertResourceTypeAssociationEquals("ServerA", "TestPlugin", "childResourceTypes", asList("Child1", "Child3"));
+ assertResourceTypeAssociationEquals("ServerA", PLUGIN_NAME, "childResourceTypes", asList("Child1", "Child3"));
}
@Test(dependsOnMethods = { "upgradePlugin" }, groups = { "plugin.resource.metadata.test", "UpgradePlugin" })
public void upgradeParentTypeOfChild() throws Exception {
- assertResourceTypeAssociationEquals("ServerB", "TestPlugin", "childResourceTypes", asList("Child2"));
+ assertResourceTypeAssociationEquals("ServerB", PLUGIN_NAME, "childResourceTypes", asList("Child2"));
}
@Test(dependsOnMethods = { "upgradePlugin" }, groups = { "plugin.resource.metadata.test", "UpgradePlugin" })
public void upgradeEventDefinitions() throws Exception {
- assertResourceTypeAssociationEquals("ServerA", "TestPlugin", "eventDefinitions",
+ assertResourceTypeAssociationEquals("ServerA", PLUGIN_NAME, "eventDefinitions",
asList("logAEntry", "logCEntry"));
}
@Test(dependsOnMethods = { "upgradePlugin" }, groups = { "plugin.resource.metadata.test", "UpgradePlugin" })
public void upgradeProcessScans() throws Exception {
- assertResourceTypeAssociationEquals("ServerA", "TestPlugin", "processScans", asList("processA", "processB"));
+ assertResourceTypeAssociationEquals("ServerA", PLUGIN_NAME, "processScans", asList("processA", "processB"));
}
@Test(dependsOnMethods = { "upgradePlugin" }, groups = { "plugin.resource.metadata.test", "UpgradePlugin" })
public void upgradeDriftDefinitionTemplates() throws Exception {
- ResourceType type = assertResourceTypeAssociationEquals("ServerA", "TestPlugin", "driftDefinitionTemplates",
+ ResourceType type = assertResourceTypeAssociationEquals("ServerA", PLUGIN_NAME, "driftDefinitionTemplates",
asList("drift-rc", "drift-mt"));
DriftDefinition driftDef = null;
@@ -329,7 +331,7 @@ public class ResourceMetadataManagerBeanTest extends MetadataBeanTest {
@Test(dependsOnMethods = { "upgradePlugin" }, groups = { "plugin.resource.metadata.test", "UpgradePlugin" })
public void upgradeBundleTargetConfigurations() throws Exception {
String resourceTypeName = "ServerA";
- String plugin = "TestPlugin";
+ String plugin = PLUGIN_NAME;
SubjectManagerLocal subjectMgr = LookupUtil.getSubjectManager();
ResourceTypeManagerLocal resourceTypeMgr = LookupUtil.getResourceTypeManager();
@@ -363,7 +365,7 @@ public class ResourceMetadataManagerBeanTest extends MetadataBeanTest {
@Test(dependsOnMethods = { "upgradePlugin" }, groups = { "plugin.resource.metadata.test", "UpgradePlugin" })
public void upgradePackageTypes() throws Exception {
- assertResourceTypeAssociationEquals("ServerA", "TestPlugin", "packageTypes",
+ assertResourceTypeAssociationEquals("ServerA", PLUGIN_NAME, "packageTypes",
asList("ServerA.Content.1", "ServerA.Content.3"));
}
@@ -591,7 +593,7 @@ public class ResourceMetadataManagerBeanTest extends MetadataBeanTest {
String fetch = "fetch" + WordUtils.capitalize(propertyName);
ResourceTypeCriteria criteria = new ResourceTypeCriteria();
criteria.addFilterName(resourceTypeName);
- criteria.addFilterPluginName("TestPlugin");
+ criteria.addFilterPluginName(PLUGIN_NAME);
MethodUtils.invokeMethod(criteria, fetch, true);
List<ResourceType> resourceTypes = resourceTypeMgr.findResourceTypesByCriteria(subjectMgr.getOverlord(),
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java
index 7c4fa43..7c815b7 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java
@@ -62,7 +62,7 @@ public class UpdatePluginMetadataTestBase extends AbstractEJB3Test {
protected TestServerCommunicationsService agentServiceContainer;
- protected static final String PLUGIN_NAME = "ResourceMetaDataManagerBeanTest"; // don't change this - our test descriptor .xml files use it as plugin name
+ protected static final String PLUGIN_NAME = "UpdatePluginMetadataTestBasePlugin"; // don't change this - our test descriptor .xml files use it as plugin name
protected static final String AGENT_NAME = "-dummy agent-";
protected static final String COMMON_PATH_PREFIX = "./test/metadata/";
diff --git a/modules/enterprise/server/itests-2/src/test/resources/arquillian.xml b/modules/enterprise/server/itests-2/src/test/resources/arquillian.xml
index d473413..c1dcf1b 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/arquillian.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/arquillian.xml
@@ -21,6 +21,7 @@
<configuration>
<property name="jbossHome">${jboss.unzip.location}</property>
+ <property name="javaVmArguments">${jboss.vm.args} ${jboss.vm.args.debug}</property>
</configuration>
</container>
</arquillian>
diff --git a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/dup_drift.xml b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/dup_drift.xml
index bd9728b..7f79c93 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/dup_drift.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/dup_drift.xml
@@ -1,4 +1,4 @@
-<plugin name="TestPlugin" displayName="Test Plugin" package="org.rhq.plugins.test"
+<plugin name="ResourceMetadataManagerBeanTestPlugin" displayName="Test Plugin" package="org.rhq.plugins.test"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
xmlns:c="urn:xmlns:rhq-configuration">
diff --git a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/plugin_v1.xml b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/plugin_v1.xml
index 88cd39c..8673ce4 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/plugin_v1.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/plugin_v1.xml
@@ -1,4 +1,4 @@
-<plugin name="TestPlugin" displayName="Test Plugin" package="org.rhq.plugins.test"
+<plugin name="ResourceMetadataManagerBeanTestPlugin" displayName="Test Plugin" package="org.rhq.plugins.test"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
xmlns:c="urn:xmlns:rhq-configuration">
diff --git a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/plugin_v2.xml b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/plugin_v2.xml
index a89f679..3f9cebe 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/plugin_v2.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/plugin_v2.xml
@@ -1,4 +1,4 @@
-<plugin name="TestPlugin" displayName="Test Plugin" package="org.rhq.plugins.test"
+<plugin name="ResourceMetadataManagerBeanTestPlugin" displayName="Test Plugin" package="org.rhq.plugins.test"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
xmlns:c="urn:xmlns:rhq-configuration">
diff --git a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/remove_bundle_drift_config_v1.xml b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/remove_bundle_drift_config_v1.xml
index 460954b..902dd0a 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/remove_bundle_drift_config_v1.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/remove_bundle_drift_config_v1.xml
@@ -1,4 +1,4 @@
-<plugin name="TestPlugin" displayName="Test Plugin" package="org.rhq.plugins.test"
+<plugin name="ResourceMetadataManagerBeanTestPlugin" displayName="Test Plugin" package="org.rhq.plugins.test"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
xmlns:c="urn:xmlns:rhq-configuration">
diff --git a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/remove_bundle_drift_config_v2.xml b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/remove_bundle_drift_config_v2.xml
index c92919d..83d80bb 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/remove_bundle_drift_config_v2.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/remove_bundle_drift_config_v2.xml
@@ -1,4 +1,4 @@
-<plugin name="TestPlugin" displayName="Test Plugin" package="org.rhq.plugins.test"
+<plugin name="ResourceMetadataManagerBeanTestPlugin" displayName="Test Plugin" package="org.rhq.plugins.test"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
xmlns:c="urn:xmlns:rhq-configuration">
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/alerts/type-with-metric.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/alerts/type-with-metric.xml
index 1af82a9..73e95e2 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/alerts/type-with-metric.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/alerts/type-with-metric.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Type with Metric Test Plugin" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Type with Metric Test Plugin" package="org.rhq.plugins.mock.jboss"
version="1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/BZ_573034_v1.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/BZ_573034_v1.xml
index 85de1cf..28680e5 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/BZ_573034_v1.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/BZ_573034_v1.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Bug 573034 Test Plugin" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Bug 573034 Test Plugin" package="org.rhq.plugins.mock.jboss"
version="1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/BZ_573034_v2.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/BZ_573034_v2.xml
index 15b8d74..493da85 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/BZ_573034_v2.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/BZ_573034_v2.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Bug 573034 Test Plugin" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Bug 573034 Test Plugin" package="org.rhq.plugins.mock.jboss"
version="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/addDeleteTemplate1.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/addDeleteTemplate1.xml
index bea3eef..c095380 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/addDeleteTemplate1.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/addDeleteTemplate1.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
version="1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/addDeleteTemplate2.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/addDeleteTemplate2.xml
index 47653a7..ccaf547 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/addDeleteTemplate2.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/addDeleteTemplate2.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
version="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/addDeleteTemplate3.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/addDeleteTemplate3.xml
index e57a2ab..b85bc51 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/addDeleteTemplate3.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/addDeleteTemplate3.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
version="3.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/constraint.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/constraint.xml
index 9c6cbe3..11462f4 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/constraint.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/constraint.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
xmlns:c="urn:xmlns:rhq-configuration">
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/constraintMinMax.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/constraintMinMax.xml
index 2653ee3..44f1f00 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/constraintMinMax.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/constraintMinMax.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
xmlns:c="urn:xmlns:rhq-configuration">
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupDeleted-v1.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupDeleted-v1.xml
index 4e3ef1d..74dc51b 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupDeleted-v1.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupDeleted-v1.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
version="1"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupDeleted-v2.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupDeleted-v2.xml
index 755ee5c..3d4c2d7 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupDeleted-v2.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupDeleted-v2.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
version="2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupPropDeleted-v1.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupPropDeleted-v1.xml
index b5daf46..8ca3d83 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupPropDeleted-v1.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupPropDeleted-v1.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
version="1"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupPropDeleted-v2.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupPropDeleted-v2.xml
index 3c16420..a197008 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupPropDeleted-v2.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupPropDeleted-v2.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
version="2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupPropDeleted-v3.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupPropDeleted-v3.xml
index 4360c2b..7bf6d2f 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupPropDeleted-v3.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupPropDeleted-v3.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
version="3"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupPropDeleted-v4.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupPropDeleted-v4.xml
index 6da4878..6687398 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupPropDeleted-v4.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupPropDeleted-v4.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
version="4"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupPropMoved-v1.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupPropMoved-v1.xml
index 2c73c28..04c23b7 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupPropMoved-v1.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupPropMoved-v1.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
version="1"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupPropMoved-v2.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupPropMoved-v2.xml
index 4b7588a..ed48555 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupPropMoved-v2.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupPropMoved-v2.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
version="2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyChanging-v1.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyChanging-v1.xml
index 7c137eb..e921ed5 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyChanging-v1.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyChanging-v1.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
version="1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyChanging-v2.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyChanging-v2.xml
index 442d64b..41c26e4 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyChanging-v2.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyChanging-v2.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
version="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyList-simple.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyList-simple.xml
index b64cbee..6fa92ed 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyList-simple.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyList-simple.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
xmlns:c="urn:xmlns:rhq-configuration">
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyList-v1.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyList-v1.xml
index aebbbac..5362890 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyList-v1.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyList-v1.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
version="1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyList-v2.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyList-v2.xml
index 23c2100..fed5af6 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyList-v2.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyList-v2.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
version="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyMap-v1.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyMap-v1.xml
index 047a0a7..3ff2add 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyMap-v1.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyMap-v1.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
version="1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyMap-v2.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyMap-v2.xml
index d370778..4e34d4f 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyMap-v2.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyMap-v2.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
version="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/update5-v1_0.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/update5-v1_0.xml
index 036e44e..e73f094 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/update5-v1_0.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/update5-v1_0.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
version="1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/update5-v2_0.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/update5-v2_0.xml
index 8db93dd..21a8e9e 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/update5-v2_0.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/update5-v2_0.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
version="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/updateDefaultTemplate1.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/updateDefaultTemplate1.xml
index 0183c27..2293c7b 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/updateDefaultTemplate1.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/updateDefaultTemplate1.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
version="1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/updateDefaultTemplate2.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/updateDefaultTemplate2.xml
index 702de08..e493a44 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/updateDefaultTemplate2.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/updateDefaultTemplate2.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
version="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/events/event1-1.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/events/event1-1.xml
index 11f345e..f8e196a 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/events/event1-1.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/events/event1-1.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
version="1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/events/event1-2.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/events/event1-2.xml
index f2bc857..0f1aa83 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/events/event1-2.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/events/event1-2.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
version="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/measurementDeletion-v1_0.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/measurementDeletion-v1_0.xml
index db954f5..1200e34 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/measurementDeletion-v1_0.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/measurementDeletion-v1_0.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
version="1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/measurementDeletion-v2_0.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/measurementDeletion-v2_0.xml
index 721375a..8bab712 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/measurementDeletion-v2_0.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/measurementDeletion-v2_0.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
version="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/update-v1_0.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/update-v1_0.xml
index 6ba4994..d62f05d 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/update-v1_0.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/update-v1_0.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
version="1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/update-v2_0.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/update-v2_0.xml
index 419e171..a44a02c 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/update-v2_0.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/update-v2_0.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
version="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/update6-1.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/update6-1.xml
index df4caf1..185aae3 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/update6-1.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/update6-1.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
version="1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/update6-2.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/update6-2.xml
index 0c31c6d..d76ede1 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/update6-2.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/update6-2.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
version="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/update7-1.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/update7-1.xml
index cac3941..1c56093 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/update7-1.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/update7-1.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
version="1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/update7-2.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/update7-2.xml
index 99d5659..50e15fe 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/update7-2.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/update7-2.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
version="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/natives/update5-v1_0.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/natives/update5-v1_0.xml
index 036e44e..e73f094 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/natives/update5-v1_0.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/natives/update5-v1_0.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
version="1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/natives/update5-v2_0.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/natives/update5-v2_0.xml
index 8db93dd..21a8e9e 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/natives/update5-v2_0.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/natives/update5-v2_0.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
version="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/noTypes.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/noTypes.xml
index 72bc8df..a279437 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/noTypes.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/noTypes.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
version="1000.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/operation1-1.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/operation1-1.xml
index 4587815..0671e30 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/operation1-1.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/operation1-1.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
version="1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/operation1-2.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/operation1-2.xml
index f32b862..463cda1 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/operation1-2.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/operation1-2.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest"
+<plugin name="UpdatePluginMetadataTestBasePlugin"
version="2.0"
displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/operation2-1.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/operation2-1.xml
index c04bc55..0937efd 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/operation2-1.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/operation2-1.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
version="1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/operation2-2.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/operation2-2.xml
index d28dabc..c58f267 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/operation2-2.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/operation2-2.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
version="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/operation3-1.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/operation3-1.xml
index af34668..c2a98dd 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/operation3-1.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/operation3-1.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest"
+<plugin name="UpdatePluginMetadataTestBasePlugin"
version="1.0"
displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/operation3-2.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/operation3-2.xml
index 0589700..e43bba4 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/operation3-2.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/operation3-2.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest"
+<plugin name="UpdatePluginMetadataTestBasePlugin"
version="2.0"
displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/update3-v1_0.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/update3-v1_0.xml
index 658f24e..f45831e 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/update3-v1_0.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/update3-v1_0.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest"
+<plugin name="UpdatePluginMetadataTestBasePlugin"
version="1.0"
displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/update3-v2_0.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/update3-v2_0.xml
index 8a24c5d..3d3ead1 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/update3-v2_0.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/update3-v2_0.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest"
+<plugin name="UpdatePluginMetadataTestBasePlugin"
version="2.0"
displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/duplicateResourceType.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/duplicateResourceType.xml
index 5340b2e..689a922 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/duplicateResourceType.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/duplicateResourceType.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
xmlns:c="urn:xmlns:rhq-configuration">
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/update2-v1_0.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/update2-v1_0.xml
index bb70c9b..ca404e2 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/update2-v1_0.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/update2-v1_0.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
version="1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/update2-v2_0.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/update2-v2_0.xml
index 91b63d9..62346a8 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/update2-v2_0.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/update2-v2_0.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
version="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/update4-v1_0.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/update4-v1_0.xml
index 614da65..cc55191 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/update4-v1_0.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/update4-v1_0.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
version="1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/update4-v2_0.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/update4-v2_0.xml
index e8b90b1..e032a92 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/update4-v2_0.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/update4-v2_0.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
version="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/updateResourceTypeBundleTarget-v1.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/updateResourceTypeBundleTarget-v1.xml
index aa29ffd..b3d6130 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/updateResourceTypeBundleTarget-v1.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/updateResourceTypeBundleTarget-v1.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock" package="org.rhq.plugins.mock.jboss"
version="1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/updateResourceTypeBundleTarget-v2.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/updateResourceTypeBundleTarget-v2.xml
index c4f11ad..b54f598 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/updateResourceTypeBundleTarget-v2.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/updateResourceTypeBundleTarget-v2.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock" package="org.rhq.plugins.mock.jboss"
version="1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/illegal-subcat-1.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/illegal-subcat-1.xml
index e653736..efc39ed 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/illegal-subcat-1.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/illegal-subcat-1.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
version="1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-2children.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-2children.xml
index 4aa4064..89cba82 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-2children.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-2children.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
version="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-grandchild.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-grandchild.xml
index 63afe40..d331fea 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-grandchild.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-grandchild.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
version="1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-services-v1_0.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-services-v1_0.xml
index 91d6463..17044bb 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-services-v1_0.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-services-v1_0.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
version="1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-services-v2_0.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-services-v2_0.xml
index 93310c1..6d73374 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-services-v2_0.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-services-v2_0.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
version="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-v1_0.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-v1_0.xml
index 18c05ef..c524878 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-v1_0.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-v1_0.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
version="1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-v1_1.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-v1_1.xml
index 0a13158..8309a8a 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-v1_1.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-v1_1.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
version="1.1"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-v2_0.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-v2_0.xml
index 56563dc..420ed34 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-v2_0.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-v2_0.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
version="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/no-subcat.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/no-subcat.xml
index 064753f..999eeb0 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/no-subcat.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/no-subcat.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v1_0.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v1_0.xml
index c7d308e..ca33483 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v1_0.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v1_0.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
version="1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v1_1.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v1_1.xml
index 36d6acd..ce3bf70 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v1_1.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v1_1.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
version="1.1"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v2_0.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v2_0.xml
index 21a0134..54265b0 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v2_0.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v2_0.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
version="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v3_0.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v3_0.xml
index 05bca6a..a4315cc 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v3_0.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v3_0.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
version="3.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/services-v1_0.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/services-v1_0.xml
index 27908e4..b204150 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/services-v1_0.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/services-v1_0.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
version="1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/services-v2_0.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/services-v2_0.xml
index 0440e33..08fc0c3 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/services-v2_0.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/services-v2_0.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
version="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/test-subcategories.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/test-subcategories.xml
index 95f27d8..eaaa3b1 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/test-subcategories.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/test-subcategories.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
version="1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/test-subcategories2.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/test-subcategories2.xml
index ec1e69d..3bdec86 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/test-subcategories2.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/test-subcategories2.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
version="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/test-subcategories3.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/test-subcategories3.xml
index 505a361..d97e4a4 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/test-subcategories3.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/test-subcategories3.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
version="3.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/two-subcat.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/two-subcat.xml
index 2f44202..3573e1e 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/two-subcat.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/two-subcat.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/undefined-child-subcat-1.xml b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/undefined-child-subcat-1.xml
index 9870576..2caa635 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/undefined-child-subcat-1.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/undefined-child-subcat-1.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest"
+<plugin name="UpdatePluginMetadataTestBasePlugin"
version="1.0"
displayName="Mock JBoss AS"
package="org.rhq.plugins.mock.jboss"
commit b12f68cf0ed1cd6f890d2b11b61a0ac818c1491e
Author: John Sanda <jsanda(a)redhat.com>
Date: Mon Dec 3 11:21:20 2012 -0500
fixing exception in JPQL query in set up/tear down code
Also removing references to LookUtil since we can directly inject managed
components into tests.
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.java
index 95a4dbe..a3ae638 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.java
@@ -38,6 +38,8 @@ import java.sql.Statement;
import java.util.Collections;
import java.util.List;
+import javax.ejb.EJB;
+
import org.joda.time.DateTime;
import org.joda.time.Hours;
import org.testng.annotations.Test;
@@ -58,13 +60,22 @@ import org.rhq.enterprise.server.auth.SubjectManagerLocal;
import org.rhq.enterprise.server.measurement.util.MeasurementDataManagerUtility;
import org.rhq.enterprise.server.test.AbstractEJB3Test;
import org.rhq.enterprise.server.test.TransactionCallback;
-import org.rhq.enterprise.server.util.LookupUtil;
/**
* @author John Sanda
*/
public class MeasurementDataManagerBeanTest extends AbstractEJB3Test {
+ // Tests in this class are failing currently do to a system initialization problem.
+ // MeasurementDataManagerUtility looks up config settings from SystemManagerBean.
+ // SystemManagerBean is however failing in its getDriftServerPluginManager method on
+ // the call to LookupUtil.getServerPluginService(). An InstanceNotFoundException is
+ // thrown,
+ //
+ // javax.management.InstanceNotFoundException: rhq:service=ServerPluginService
+ //
+ // Looks like the server plugin service is not getting deployed.
+
//private final Log log = LogFactory.getLog(MeasurementDataManagerBeanTest.class);
private static final boolean ENABLED = true;
@@ -99,9 +110,14 @@ public class MeasurementDataManagerBeanTest extends AbstractEJB3Test {
private Subject overlord;
+ @EJB
+ private SubjectManagerLocal subjectManager;
+
+ @EJB
+ private MeasurementDataManagerLocal dataManager;
+
@Override
protected void beforeMethod() throws Exception {
- SubjectManagerLocal subjectManager = LookupUtil.getSubjectManager();
overlord = subjectManager.getOverlord();
createInventory();
@@ -130,7 +146,6 @@ public class MeasurementDataManagerBeanTest extends AbstractEJB3Test {
report.addData(new MeasurementDataNumeric(buckets.get(59) + 20, request, 5.5));
report.addData(new MeasurementDataNumeric(buckets.get(59) + 30, request, 6.6));
- MeasurementDataManagerLocal dataManager = LookupUtil.getMeasurementDataManager();
dataManager.mergeMeasurementReport(report);
List<MeasurementDataNumericHighLowComposite> actualData = findDataForContext(overlord,
@@ -254,7 +269,7 @@ public class MeasurementDataManagerBeanTest extends AbstractEJB3Test {
em.createQuery("delete from MeasurementDefinition " +
"where dataType = :dataType and " +
"name = :name")
- .setParameter("dataType", DYNAMIC)
+ .setParameter("dataType", MEASUREMENT)
.setParameter("name", DYNAMIC_DEF_NAME)
.executeUpdate();
}
@@ -291,7 +306,6 @@ public class MeasurementDataManagerBeanTest extends AbstractEJB3Test {
MeasurementReport dummyReport = new MeasurementReport();
dummyReport.addData(new MeasurementDataNumeric(now.getMillis(), -1, 0.0));
- MeasurementDataManagerLocal dataManager = LookupUtil.getMeasurementDataManager();
dataManager.mergeMeasurementReport(dummyReport);
}
@@ -380,7 +394,6 @@ public class MeasurementDataManagerBeanTest extends AbstractEJB3Test {
private List<MeasurementDataNumericHighLowComposite> findDataForContext(Subject subject, EntityContext context,
MeasurementSchedule schedule, long beginTime, long endTime) {
- MeasurementDataManagerLocal dataManager = LookupUtil.getMeasurementDataManager();
List<List<MeasurementDataNumericHighLowComposite>> data = dataManager.findDataForContext(subject, context,
schedule.getDefinition().getId(), beginTime, endTime, 60);
commit a8d94d9619c760f372499502be72db3384487154
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Sat Dec 1 19:29:10 2012 -0500
Server i-test work to address many test interaction issues ( ** There are still some test failures ** )
- thin rhq.ear by removing the services SAR. The standard services actually
just get in the way, tests are responsible for prepare/unprepare of any
services they need and should not depend on the production services, which
may perform undesired work anyway.
- Add AbstractEJB3Test.preparePluginScannerService(), which will prepare a default
test deployment scanner, and make use of it in more classes that
need that service deployed, and were previously depending on the production
deployment scanner.
- Apply more consistent temp directory usage by settling on
java.io.tmpdir/rhq/<class.simplename> as the convention. Add
AbstractEJB3Test.getTempDir() and use it ubiquitously. This consolidates
the test files under and "rhq" root dir and also identofies them by creating
class name.
- DatabaseAndFilePluginDeploymentTest
- make a non-test method private, not public so it doesn't execute as a test
- remove the obsolete OldAbstractEJB3Test class
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/TestServerPluginService.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/TestServerPluginService.java
index be9b752..796a562 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/TestServerPluginService.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/TestServerPluginService.java
@@ -53,7 +53,7 @@ public abstract class TestServerPluginService extends ServerPluginService implem
protected TestServerPluginService() {
// build the config at constructor time so tests have it even before the PC is initialized
- File dir = new File(System.getProperty("java.io.tmpdir"), "test-server-plugins");
+ File dir = new File(System.getProperty("java.io.tmpdir") + "/rhq", this.getClass().getSimpleName());
this.masterConfig = new MasterServerPluginContainerConfiguration(dir, dir, dir, null);
}
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/bundle/TestBundleServerPluginService.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/bundle/TestBundleServerPluginService.java
index 61c53d3..45f210c 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/bundle/TestBundleServerPluginService.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/bundle/TestBundleServerPluginService.java
@@ -68,7 +68,7 @@ public class TestBundleServerPluginService extends ServerPluginService implement
public TestBundleServerPluginService() {
// build the config at constructor time so tests have it even before the PC is initialized
- File dir = new File(System.getProperty("java.io.tmpdir"), "test-server-plugins");
+ File dir = new File(System.getProperty("java.io.tmpdir") + "/rhq", this.getClass().getSimpleName());
this.masterConfig = new MasterServerPluginContainerConfiguration(dir, dir, dir, null);
}
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/content/test/ContentUIManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/content/test/ContentUIManagerBeanTest.java
index 311d521..51bd984 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/content/test/ContentUIManagerBeanTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/content/test/ContentUIManagerBeanTest.java
@@ -268,12 +268,13 @@ public class ContentUIManagerBeanTest extends AbstractEJB3Test {
// contents into memory every time.
// destination once pulled from db
- String pulledFilename = System.getProperty("java.io.tmpdir") + "/"
- + this.getClass().getSimpleName()
- + "/pulled.jar";
- File retrieved = new File(pulledFilename);
+ File tempDir = getTempDir();
+ if (!tempDir.exists()) {
+ assertTrue("Unable to mkdirs " + tempDir + " for test.", tempDir.mkdirs());
+ }
+ File retrieved = new File(tempDir, "pulled.jar");
if (retrieved.exists()) {
- assertTrue("Unable to delete " + pulledFilename + " for test cleanup.", retrieved.delete());
+ assertTrue("Unable to delete " + retrieved.getPath() + " for test cleanup.", retrieved.delete());
}
//any jar should be fine. Use canned jar
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java
index 645e35c..02a2fbc 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java
@@ -531,7 +531,7 @@ public class CoreServerServiceImplTest extends AbstractEJB3Test {
@Override
public File getJBossServerHomeDir() {
- return new File(System.getProperty("java.io.tmpdir"), "CoreServerServiceImplTest");
+ return getTempDir();
}
@Override
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/core/plugin/DatabaseAndFilePluginDeploymentTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/core/plugin/DatabaseAndFilePluginDeploymentTest.java
index 6d649f5..d031926 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/core/plugin/DatabaseAndFilePluginDeploymentTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/core/plugin/DatabaseAndFilePluginDeploymentTest.java
@@ -48,13 +48,12 @@ import org.rhq.enterprise.server.util.LookupUtil;
//make sure we run this after the plugins.metadata tests are done so that
//the db contents don't interfere
-@Test
-//(dependsOnGroups = "plugin.metadata")
+//@Test(dependsOnGroups = "plugin.metadata")
public class DatabaseAndFilePluginDeploymentTest extends AbstractEJB3Test {
private static final String PLUGIN_NAME = "DeployTest"; // as defined in our test descriptors
private static final String DESCRIPTORS_LOCATION = "test/deployment/";
- private static final String TEST_DIR = System.getProperty("java.io.tmpdir") + "/"
+ private static final String TEST_DIR = System.getProperty("java.io.tmpdir") + "/rhq/"
+ DatabaseAndFilePluginDeploymentTest.class.getName() + "/";
private static final String JARS_LOCATION = TEST_DIR + "jars";
private static final String DEPLOY_LOCATION = TEST_DIR + "deploy";
@@ -116,7 +115,7 @@ public class DatabaseAndFilePluginDeploymentTest extends AbstractEJB3Test {
// is important that afterClassStandIn() have a dependency such that it runs in the last test-set.
//@BeforeClass
- public void beforeClass() throws Exception {
+ private void beforeClass() throws Exception {
Calendar cal = Calendar.getInstance();
cal.set(2009, Calendar.FEBRUARY, 1, 1, 0, 0);
cal.set(Calendar.MILLISECOND, 0);
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java
index 8389f17..03cffdc 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java
@@ -111,7 +111,7 @@ public class DriftManagerBeanTest extends AbstractEJB3Test {
@Test
public void testStoreChangeSet() throws Exception {
- File rootDir = new File(System.getProperty("java.io.tmpdir"));
+ File rootDir = getTempDir();
File changeSetsDir = new File(rootDir, "changesets");
deleteDirectory(changeSetsDir);
changeSetsDir.mkdirs();
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/plugin/pc/content/TestContentServerPluginService.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/plugin/pc/content/TestContentServerPluginService.java
index da94c58..5850985 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/plugin/pc/content/TestContentServerPluginService.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/plugin/pc/content/TestContentServerPluginService.java
@@ -86,7 +86,7 @@ public class TestContentServerPluginService extends ServerPluginService implemen
protected MasterServerPluginContainer createMasterPluginContainer() {
MasterServerPluginContainer master = new TestMasterServerPluginContainer();
- File dir = new File(System.getProperty("java.io.tmpdir"), "test-server-plugins");
+ File dir = new File(System.getProperty("java.io.tmpdir") + "/rhq", this.getClass().getSimpleName());
MasterServerPluginContainerConfiguration config = new MasterServerPluginContainerConfiguration(dir, dir, dir,
null);
master.initialize(config);
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/plugin/pc/generic/TestGenericServerPluginService.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/plugin/pc/generic/TestGenericServerPluginService.java
index e8cdb51..85f45d0 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/plugin/pc/generic/TestGenericServerPluginService.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/plugin/pc/generic/TestGenericServerPluginService.java
@@ -57,7 +57,7 @@ public class TestGenericServerPluginService extends ServerPluginService implemen
public TestGenericServerPluginService() {
// build the config at constructor time so tests have it even before the PC is initialized
- File dir = new File(System.getProperty("java.io.tmpdir"), "test-server-plugins");
+ File dir = new File(System.getProperty("java.io.tmpdir" + "/rhq"), this.getClass().getSimpleName());
this.masterConfig = new MasterServerPluginContainerConfiguration(dir, dir, dir, null);
}
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 dbdb765..38b1216 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
@@ -39,7 +39,6 @@ import org.rhq.core.util.MessageDigestGenerator;
import org.rhq.core.util.stream.StreamUtil;
import org.rhq.enterprise.server.auth.SubjectManagerLocal;
import org.rhq.enterprise.server.bundle.TestBundleServerPluginService;
-import org.rhq.enterprise.server.core.plugin.PluginDeploymentScanner;
import org.rhq.enterprise.server.resource.ResourceTypeManagerLocal;
import org.rhq.enterprise.server.scheduler.jobs.PurgePluginsJob;
import org.rhq.enterprise.server.scheduler.jobs.PurgeResourceTypesJob;
@@ -48,8 +47,6 @@ import org.rhq.enterprise.server.util.LookupUtil;
public class MetadataBeanTest extends AbstractEJB3Test {
- protected PluginDeploymentScanner pluginScanner;
-
private List<Integer> pluginIds = new ArrayList<Integer>();
/**
@@ -81,6 +78,7 @@ public class MetadataBeanTest extends AbstractEJB3Test {
prepareCustomServerPluginService(bundleService);
bundleService.startMasterPluginContainerWithoutSchedulingJobs();
prepareScheduler();
+ preparePluginScannerService();
}
/**
@@ -91,6 +89,7 @@ public class MetadataBeanTest extends AbstractEJB3Test {
@Override
protected void afterMethod() throws Exception {
+ unpreparePluginScannerService();
unprepareServerPluginService();
unprepareScheduler();
}
@@ -145,7 +144,7 @@ public class MetadataBeanTest extends AbstractEJB3Test {
protected void createPlugin(String pluginFileName, String version, String descriptorFileName) throws Exception {
URL descriptorURL = getDescriptorURL(descriptorFileName);
PluginDescriptor pluginDescriptor = loadPluginDescriptor(descriptorURL);
- String pluginFilePath = getPluginWorkDir() + "/" + pluginFileName + ".jar";
+ String pluginFilePath = getPluginScannerService().getAgentPluginDir() + "/" + pluginFileName + ".jar";
Plugin plugin = new Plugin(pluginDescriptor.getName(), pluginFilePath);
plugin.setDisplayName(pluginDescriptor.getName());
@@ -162,37 +161,11 @@ public class MetadataBeanTest extends AbstractEJB3Test {
pluginIds.add(plugin.getId());
}
- protected void preparePluginScannerService() {
- if (this.pluginScanner == null) {
- this.pluginScanner = new PluginDeploymentScanner();
-
- String pluginDirPath = null;
- try {
- pluginDirPath = getPluginWorkDir();
- } catch (Exception e) {
- throw new RuntimeException("Cannot determine where to put the plugin jar files", e);
- }
- this.pluginScanner.setAgentPluginDir(pluginDirPath); // we don't want to scan for these
- this.pluginScanner.setServerPluginDir(null); // we don't want to scan for these
- this.pluginScanner.setScanPeriod("9999999"); // we want to manually scan - don't allow for auto-scan to happen
- }
-
- preparePluginScannerService(this.pluginScanner);
- }
-
private URL getDescriptorURL(String descriptor) {
String dir = getClass().getSimpleName();
return getClass().getResource(dir + "/" + descriptor);
}
- protected String getPluginWorkDir() throws Exception {
- return getCurrentWorkingDir() + "/" + this.getClass().getSimpleName() + "/" + "plugins";
- }
-
- protected String getCurrentWorkingDir() throws Exception {
- return System.getProperty("java.io.tmpdir");
- }
-
String getAmpsVersion(PluginDescriptor pluginDescriptor) {
if (pluginDescriptor.getAmpsVersion() == null) {
return "2.0";
@@ -283,7 +256,7 @@ public class MetadataBeanTest extends AbstractEJB3Test {
InputStream in = null;
try {
- String pluginDirPath = getPluginWorkDir();
+ String pluginDirPath = getPluginScannerService().getAgentPluginDir();
File pluginDir = new File(pluginDirPath);
pluginDir.mkdirs();
File jarFile = new File(pluginDir, jarName);
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 36b0821..befaa1a 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
@@ -55,9 +55,7 @@ public class PluginManagerBeanTest extends MetadataBeanTest {
subjectMgr = LookupUtil.getSubjectManager();
pluginMgr = LookupUtil.getPluginManager();
- FileUtil.purge(new File(getPluginWorkDir()), true);
-
- preparePluginScannerService();
+ FileUtil.purge(new File(getPluginScannerService().getAgentPluginDir()), true);
}
@Override
@@ -88,7 +86,7 @@ public class PluginManagerBeanTest extends MetadataBeanTest {
createPluginJarFile("test-plugin3.jar", "plugin_3.xml");
createPluginJarFile("test-plugin3.1.jar", "plugin_3.1.xml");
- pluginScanner.startDeployment();
+ getPluginScannerService().startDeployment();
}
@Test(dependsOnMethods = { "registerPlugins" })
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginScanningExtensionMetadataTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginScanningExtensionMetadataTest.java
index 5417305..1667dee 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginScanningExtensionMetadataTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginScanningExtensionMetadataTest.java
@@ -56,8 +56,6 @@ public class PluginScanningExtensionMetadataTest extends MetadataBeanTest {
protected void beforeMethod() throws Exception {
super.beforeMethod();
- preparePluginScannerService();
-
subjectMgr = LookupUtil.getSubjectManager();
resourceTypeMgr = LookupUtil.getResourceTypeManager();
@@ -80,8 +78,6 @@ public class PluginScanningExtensionMetadataTest extends MetadataBeanTest {
}
createdJarFiles.clear();
- unpreparePluginScannerService();
-
super.afterMethod();
}
@@ -110,7 +106,7 @@ public class PluginScanningExtensionMetadataTest extends MetadataBeanTest {
private void registerParentPluginV1() throws Exception {
// register the plugin, load the new type and test to make sure its what we expect
createdJarFiles.add(createPluginJarFile("parent-plugin.jar", "parent_plugin_v1.xml"));
- this.pluginScanner.startDeployment(); // first time we need to scan so call startDeployment which will call scanAndRegister
+ getPluginScannerService().startDeployment(); // first time we need to scan so call startDeployment which will call scanAndRegister
ResourceType resourceType = loadResourceTypeFully(TYPE_NAME_PARENT, PLUGIN_NAME_PARENT);
assert resourceType.getName().equals(TYPE_NAME_PARENT);
assert resourceType.getPlugin().equals(PLUGIN_NAME_PARENT);
@@ -120,7 +116,7 @@ public class PluginScanningExtensionMetadataTest extends MetadataBeanTest {
private void registerChild1PluginV1() throws Exception {
// register the plugin, load the new type and test to make sure its what we expect
createdJarFiles.add(createPluginJarFile("child1-plugin.jar", "child1_plugin_v1.xml"));
- this.pluginScanner.scanAndRegister();
+ getPluginScannerService().scanAndRegister();
ResourceType resourceType = loadResourceTypeFully(TYPE_NAME_CHILD1, PLUGIN_NAME_CHILD1);
assert resourceType.getName().equals(TYPE_NAME_CHILD1);
assert resourceType.getPlugin().equals(PLUGIN_NAME_CHILD1);
@@ -137,7 +133,7 @@ public class PluginScanningExtensionMetadataTest extends MetadataBeanTest {
private void registerChild2PluginV1() throws Exception {
// register the plugin, load the new type and test to make sure its what we expect
createdJarFiles.add(createPluginJarFile("child2-plugin.jar", "child2_plugin_v1.xml"));
- this.pluginScanner.scanAndRegister();
+ getPluginScannerService().scanAndRegister();
ResourceType resourceType = loadResourceTypeFully(TYPE_NAME_CHILD2, PLUGIN_NAME_CHILD2);
assert resourceType.getName().equals(TYPE_NAME_CHILD2);
assert resourceType.getPlugin().equals(PLUGIN_NAME_CHILD2);
@@ -147,7 +143,7 @@ public class PluginScanningExtensionMetadataTest extends MetadataBeanTest {
private void registerParentPluginV2() throws Exception {
// register the plugin, load the new type and test to make sure its what we expect
createdJarFiles.add(createPluginJarFile("parent-plugin.jar", "parent_plugin_v2.xml"));
- this.pluginScanner.scanAndRegister();
+ getPluginScannerService().scanAndRegister();
ResourceType resourceType = loadResourceTypeFully(TYPE_NAME_PARENT, PLUGIN_NAME_PARENT);
assert resourceType.getName().equals(TYPE_NAME_PARENT);
assert resourceType.getPlugin().equals(PLUGIN_NAME_PARENT);
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java
index ddf59f0..7c4fa43 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java
@@ -75,6 +75,7 @@ public class UpdatePluginMetadataTestBase extends AbstractEJB3Test {
agentServiceContainer = prepareForTestAgents();
prepareMockAgentServiceContainer();
prepareScheduler();
+ preparePluginScannerService();
pluginMgr = LookupUtil.getPluginManager();
resourceTypeManager = LookupUtil.getResourceTypeManager();
@@ -85,6 +86,7 @@ public class UpdatePluginMetadataTestBase extends AbstractEJB3Test {
protected void afterMethod() throws Exception {
cleanupTest();
+ unpreparePluginScannerService();
unprepareScheduler();
unprepareForTestAgents();
}
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java
index 975efb8..d8db4b9 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java
@@ -58,6 +58,7 @@ import org.rhq.core.util.stream.StreamUtil;
import org.rhq.enterprise.server.RHQConstants;
import org.rhq.enterprise.server.auth.SessionManager;
import org.rhq.enterprise.server.core.comm.ServerCommunicationsServiceMBean;
+import org.rhq.enterprise.server.core.plugin.PluginDeploymentScanner;
import org.rhq.enterprise.server.core.plugin.PluginDeploymentScannerMBean;
import org.rhq.enterprise.server.plugin.pc.ServerPluginService;
import org.rhq.enterprise.server.plugin.pc.ServerPluginServiceMBean;
@@ -292,9 +293,10 @@ public abstract class AbstractEJB3Test extends Arquillian {
EnterpriseArchive testEar = ShrinkWrap.create(EnterpriseArchive.class, "rhq.ear");
EnterpriseArchive rhqEar = earResolver.artifact("org.rhq:rhq-enterprise-server-ear:ear:4.6.0-SNAPSHOT")
.resolveAs(EnterpriseArchive.class).iterator().next();
- // merge rhq.ear into testEar but include only the EJB jars, the SAR, and the supporting libraries
- testEar = testEar.merge(rhqEar,
- Filters.include("/lib.*|/rhq.*ejb3\\.jar.*|/rhq-enterprise-server-services-sar.*"));
+ // merge rhq.ear into testEar but include only the EJB jars and the supporting libraries. Note that we
+ // don't include the services sar because tests are responsible for prepare/unprepare of all required services,
+ // we don't want the production services performig any unexpected work.
+ testEar = testEar.merge(rhqEar, Filters.include("/lib.*|/rhq.*ejb3\\.jar.*"));
// remove startup beans and shutdown listeners, we don't want this to be a full server deployment. The tests
// start/stop what they need, typically with test services or mocks.
testEar.delete(ArchivePaths
@@ -932,12 +934,33 @@ public abstract class AbstractEJB3Test extends Arquillian {
}
/**
+ * Prepares a test deployment scanner with the following characteristics<br/>.
+ * - start() is called but startDeployment() is not called.<br/>
+ * - agentPluginDir is set to getTempDir() + "/plugins"<br/>
+ * - serverPluginDir is set to null (no scanning for server plugins)<br/>
+ * - scanPeriod is set to 9999999 (basically prevent autoscan)<br/>
+ */
+ protected PluginDeploymentScannerMBean preparePluginScannerService() {
+ if (null != pluginScannerService) {
+ return pluginScannerService;
+ }
+
+ PluginDeploymentScanner scanner = new PluginDeploymentScanner();
+ String pluginDirPath = getTempDir() + "/plugins";
+ scanner.setAgentPluginDir(pluginDirPath); // we don't want to scan for these
+ scanner.setServerPluginDir(null); // we don't want to scan for these
+ scanner.setScanPeriod("9999999"); // we want to manually scan - don't allow for auto-scan to happen
+
+ return preparePluginScannerService(scanner);
+ }
+
+ /**
* Note that the standard plugin scanner service is deployed automatically with the test rhq ear,
* this is only necessary if you want a custom service.
*
* @param scannerService
*/
- public void preparePluginScannerService(PluginDeploymentScannerMBean scannerService) {
+ public PluginDeploymentScannerMBean preparePluginScannerService(PluginDeploymentScannerMBean scannerService) {
try {
MBeanServer mbs = getPlatformMBeanServer();
if (mbs.isRegistered(PluginDeploymentScannerMBean.OBJECT_NAME)) {
@@ -949,6 +972,8 @@ public abstract class AbstractEJB3Test extends Arquillian {
pluginScannerService = scannerService;
pluginScannerService.start();
+ return pluginScannerService;
+
} catch (Exception e) {
e.printStackTrace();
throw new RuntimeException(e);
@@ -998,7 +1023,7 @@ public abstract class AbstractEJB3Test extends Arquillian {
* @throws Exception
*/
protected void writeObjects(String filename, Object... objects) throws Exception {
- File file = new File(System.getProperty("java.io.tmpdir"), this.getClass().getName() + "-" + filename);
+ File file = new File(getTempDir(), "-" + filename);
file.delete();
ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream(file));
for (Object o : objects) {
@@ -1021,7 +1046,7 @@ public abstract class AbstractEJB3Test extends Arquillian {
ObjectInputStream ois = null;
try {
- File file = new File(System.getProperty("java.io.tmpdir"), this.getClass().getName() + "-" + filename);
+ File file = new File(getTempDir(), "-" + filename);
ois = new ObjectInputStream(new FileInputStream(file));
for (int i = 0; i < numObjects; ++i) {
result.add(ois.readObject());
@@ -1040,8 +1065,15 @@ public abstract class AbstractEJB3Test extends Arquillian {
* @return true if deleted, false otherwise.
*/
protected boolean deleteObjects(String filename) {
- File file = new File(System.getProperty("java.io.tmpdir"), this.getClass().getName() + "-" + filename);
+ File file = new File(getTempDir(), "-" + filename);
return file.delete();
}
+ /**
+ * @return a temp directory for testing that is specific to this test class.
+ */
+ protected File getTempDir() {
+ return new File(System.getProperty("java.io.tmpdir") + "/rhq", this.getClass().getSimpleName());
+ }
+
}
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/OldAbstractEJB3Test.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/OldAbstractEJB3Test.java
deleted file mode 100644
index a8337b7..0000000
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/OldAbstractEJB3Test.java
+++ /dev/null
@@ -1,445 +0,0 @@
-///*
-// * RHQ Management Platform
-// * Copyright (C) 2005-2008 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.server.test;
-
-import org.testng.AssertJUnit;
-
-
-//import static org.rhq.test.JPAUtils.lookupEntityManager;
-//import static org.rhq.test.JPAUtils.lookupTransactionManager;
-//
-//import java.sql.Connection;
-//import java.sql.SQLException;
-//import java.util.Hashtable;
-//import java.util.Properties;
-//
-//import javax.management.MBeanServer;
-//import javax.management.MBeanServerFactory;
-//import javax.naming.InitialContext;
-//import javax.naming.NamingException;
-//import javax.persistence.EntityManager;
-//import javax.transaction.TransactionManager;
-//
-//import org.hibernate.SessionFactory;
-//import org.hibernate.stat.Statistics;
-//import org.testng.AssertJUnit;
-//import org.testng.annotations.AfterMethod;
-//import org.testng.annotations.AfterSuite;
-//import org.testng.annotations.BeforeMethod;
-//import org.testng.annotations.BeforeSuite;
-//
-//import org.jboss.ejb3.embedded.EJB3StandaloneBootstrap;
-//import org.jboss.ejb3.embedded.EJB3StandaloneDeployer;
-//import org.jboss.mx.util.MBeanServerLocator;
-//
-//import org.rhq.core.db.DatabaseTypeFactory;
-//import org.rhq.core.db.PostgresqlDatabaseType;
-//import org.rhq.core.domain.auth.Subject;
-//import org.rhq.core.domain.server.PersistenceUtility;
-//import org.rhq.enterprise.server.RHQConstants;
-//import org.rhq.enterprise.server.auth.SessionManager;
-//import org.rhq.enterprise.server.content.ContentSourceManagerBean;
-//import org.rhq.enterprise.server.core.comm.ServerCommunicationsServiceMBean;
-//import org.rhq.enterprise.server.core.plugin.PluginDeploymentScanner;
-//import org.rhq.enterprise.server.core.plugin.PluginDeploymentScannerMBean;
-//import org.rhq.enterprise.server.plugin.pc.ServerPluginService;
-//import org.rhq.enterprise.server.plugin.pc.ServerPluginServiceMBean;
-//import org.rhq.enterprise.server.scheduler.SchedulerService;
-//import org.rhq.enterprise.server.scheduler.SchedulerServiceMBean;
-//import org.rhq.enterprise.server.util.LookupUtil;
-//
-////
-/////**
-//// * This is the abstract test base for server jar tests.
-//// *
-//// * @author Greg Hinkle
-//// */
-public abstract class OldAbstractEJB3Test extends AssertJUnit {
- //
- // private static EJB3StandaloneDeployer deployer;
- // private static Statistics stats;
- // @SuppressWarnings("unused")
- // private static long start; // see endTest() if you want to output this
- // private SchedulerService schedulerService;
- // private ServerPluginService serverPluginService;
- // private MBeanServer dummyJBossMBeanServer;
- // private PluginDeploymentScannerMBean pluginScannerService;
- //
- //
- // //@BeforeSuite(groups = {"integration.ejb3","PERF"}) // TODO investigate again
- // @BeforeSuite(alwaysRun = true)
- // public static void startupEmbeddedJboss() throws Exception {
- // // The embeddedDeployment property needs to be set for running tests
- // // with the embedded container. It is set in the surefire configuration
- // // in pom.xml but setting here makes it easier to run tests directly
- // // from your IDE.
- // //
- // // jsanda
- // System.setProperty("embeddedDeployment", "true");
- //
- // // Setting content location to the tmp dir
- // System.setProperty(ContentSourceManagerBean.FILESYSTEM_PROPERTY, System.getProperty("java.io.tmpdir"));
- //
- // System.out.println("Starting JBoss EJB3 Embedded Container...");
- // String deployDir = System.getProperty("deploymentDirectory", "target/classes");
- // System.out.println("Loading EJB3 deployments from directory: " + deployDir);
- // try {
- // EJB3StandaloneBootstrap.boot(null);
- // // EJB3StandaloneBootstrap.scanClasspath();
- //
- // System.err.println("...... embedded container booted....");
- //
- // deployer = EJB3StandaloneBootstrap.createDeployer();
- //
- // deployer.setClassLoader(AbstractEJB3Test.class.getClassLoader());
- // System.err.println("...... embedded container classloader set....");
- //
- // deployer.getArchivesByResource().add("META-INF/persistence.xml");
- // System.err.println("...... embedded container persistence xml deployed....");
- //
- // deployer.getArchivesByResource().add("META-INF/ejb-jar.xml");
- // System.err.println("...... embedded container ejb-jar xml deployed....");
- //
- // EJB3StandaloneBootstrap.deployXmlResource("jboss-jms-beans.xml");
- // System.err.println("...... embedded container jboss-jms-beans xml deployed....");
- //
- // EJB3StandaloneBootstrap.deployXmlResource("rhq-mdb-beans.xml");
- // System.err.println("...... embedded container rhq-mdb-beans xml deployed....");
- //
- // /*
- // * File core = new File(deployDir, "on-core-domain-ejb.ejb3"); if (!core.exists())
- // * System.err.println("Deployment directory does not exist: " + core.getAbsolutePath());
- // * deployer.getArchives().add(core.toURI().toURL());
- // *
- // * File server = new File(deployDir, "on-enterprise-server-ejb.ejb3"); if (!server.exists())
- // * System.err.println("Deployment directory does not exist: " + server.getAbsolutePath());
- // * deployer.getArchives().add(server.toURI().toURL());
- // *
- // */
- //
- // //deployer.setKernel(EJB3StandaloneBootstrap.getKernel());
- // deployer.create();
- // System.err.println("...... deployer created....");
- //
- // deployer.start();
- // System.err.println("...... deployer started....");
- //
- // System.err.println("...... start statistics");
- // SessionFactory sessionFactory = PersistenceUtility.getHibernateSession(getEntityManager())
- // .getSessionFactory();
- // stats = sessionFactory.getStatistics();
- // stats.setStatisticsEnabled(true);
- //
- // System.err.println("...... embedded container initialized and ready for testing....");
- //
- // } catch (Throwable t) {
- // // Catch RuntimeExceptions and Errors and dump their stack trace, because Surefire will completely swallow them
- // // and throw a cryptic NPE (see http://jira.codehaus.org/browse/SUREFIRE-157)!
- // t.printStackTrace();
- // throw new RuntimeException(t);
- // }
- // }
- //
- // //@Configuration(groups = "integration.ejb3", afterSuite = true)
- // @AfterSuite(alwaysRun = true)
- // public static void shutdownEmbeddedJboss() {
- // System.out.println("Stopping JBoss EJB3 Embedded Container...");
- //
- // System.err.println("!!! Any errors occurring after this point !!!");
- // System.err.println("!!! occurred during embedded server shutdown !!!");
- // System.err.println("!!! and are probably not a real problem. !!!");
- // if (deployer != null) {
- // try {
- // deployer.stop();
- // deployer.destroy();
- // deployer = null;
- // } catch (Throwable t) {
- // System.err.println("Failed to stop embedded deployer");
- // t.printStackTrace(System.err);
- // }
- // }
- // EJB3StandaloneBootstrap.shutdown();
- // }
- //
- // @BeforeMethod
- // public static void startTest() {
- // if (DatabaseTypeFactory.getDefaultDatabaseType() == null) {
- // try {
- // Connection conn = getConnection();
- // DatabaseTypeFactory.setDefaultDatabaseType(DatabaseTypeFactory.getDatabaseType(conn));
- // } catch (Exception e) {
- // System.err.println("!!! WARNING !!! cannot set default database type, some tests may fail");
- // e.printStackTrace();
- // }
- // }
- //
- // if (stats != null)
- // start = stats.getQueryExecutionCount();
- // else
- // start = 0;
- // }
- //
- // public static Connection getConnection() throws SQLException {
- // return LookupUtil.getDataSource().getConnection();
- // }
- //
- // @AfterMethod
- // public static void endTest() {
- // //System.out.println("Connections used: " + (stats.getQueryExecutionCount() - start));
- // }
- //
- // public TransactionManager getTransactionManager() {
- // return lookupTransactionManager();
- // }
- //
- // public static EntityManager getEntityManager() {
- // return lookupEntityManager();
- // }
- //
- // public static InitialContext getInitialContext() {
- // Hashtable<String, String> env = new Hashtable<String, String>();
- // env.put("java.naming.factory.initial", "org.jnp.interfaces.LocalOnlyContextFactory");
- // env.put("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces");
- // try {
- // return new InitialContext(env);
- // } catch (NamingException e) {
- // e.printStackTrace();
- // throw new RuntimeException("Failed to load initial context", e);
- // }
- // }
- //
- // public boolean isPostgres() throws Exception {
- // return DatabaseTypeFactory.getDatabaseType(getInitialContext(), RHQConstants.DATASOURCE_JNDI_NAME) instanceof PostgresqlDatabaseType;
- // }
- //
- // /**
- // * This creates a session for the given user and associates that session with the subject. You can test the security
- // * annotations by creating sessions for different users with different permissions.
- // *
- // * @param subject a JON subject
- // * @return the session activated subject, a copy of the subject passed in.
- // */
- // public Subject createSession(Subject subject) {
- // return SessionManager.getInstance().put(subject);
- // }
- //
- // /**
- // * Returns an MBeanServer that simulates the JBossAS MBeanServer.
- // *
- // * @return MBeanServer instance
- // */
- // public MBeanServer getJBossMBeanServer() {
- // if (dummyJBossMBeanServer == null) {
- // dummyJBossMBeanServer = MBeanServerFactory.createMBeanServer("jboss");
- // MBeanServerLocator.setJBoss(dummyJBossMBeanServer);
- // }
- //
- // return dummyJBossMBeanServer;
- // }
- //
- // public void releaseJBossMBeanServer() {
- // if (dummyJBossMBeanServer != null) {
- // MBeanServerFactory.releaseMBeanServer(dummyJBossMBeanServer);
- // dummyJBossMBeanServer = null;
- // }
- // }
- //
- // /**
- // * If you need to test round trips from server to agent and back, you first must install the server communications
- // * service that houses all the agent clients. Call this method and add your test agent services to the public fields
- // * in the returned object.
- // *
- // * @return the object that will house your test agent service impls and the agent clients.
- // *
- // * @throws RuntimeException
- // */
- // public TestServerCommunicationsService prepareForTestAgents() {
- // try {
- // MBeanServer mbs = getJBossMBeanServer();
- // if (mbs.isRegistered(ServerCommunicationsServiceMBean.OBJECT_NAME)) {
- // mbs.unregisterMBean(ServerCommunicationsServiceMBean.OBJECT_NAME);
- // }
- // TestServerCommunicationsService testAgentContainer = new TestServerCommunicationsService();
- // mbs.registerMBean(testAgentContainer, ServerCommunicationsServiceMBean.OBJECT_NAME);
- // return testAgentContainer;
- // } catch (Exception e) {
- // throw new RuntimeException(e);
- // }
- // }
- //
- // /**
- // * Call this after your tests have finished. You only need to call this if your test previously called
- // * {@link #prepareForTestAgents()}.
- // */
- // public void unprepareForTestAgents() {
- // unprepareForTestAgents(false);
- // }
- //
- // public void unprepareForTestAgents(boolean beanOnly) {
- // try {
- // if (beanOnly) {
- // MBeanServer mbs = getJBossMBeanServer();
- // if (mbs.isRegistered(ServerCommunicationsServiceMBean.OBJECT_NAME)) {
- // mbs.unregisterMBean(ServerCommunicationsServiceMBean.OBJECT_NAME);
- // }
- // } else {
- // releaseJBossMBeanServer();
- // }
- // } catch (Exception e) {
- // throw new RuntimeException(e);
- // }
- // }
- //
- // /**
- // * If you need to test server plugins, you must first prepare the server plugin service.
- // * After this returns, the caller must explicitly start the PC by using the appropriate API
- // * on the given mbean; this method will only start the service, it will NOT start the master PC.
- // *
- // * @param testServiceMBean the object that will house your test server plugins
- // *
- // * @throws RuntimeException
- // */
- // public void prepareCustomServerPluginService(ServerPluginService testServiceMBean) {
- // try {
- // MBeanServer mbs = getJBossMBeanServer();
- // testServiceMBean.start();
- // mbs.registerMBean(testServiceMBean, ServerPluginServiceMBean.OBJECT_NAME);
- // serverPluginService = testServiceMBean;
- // return;
- // } catch (Exception e) {
- // throw new RuntimeException(e);
- // }
- // }
- //
- // public void unprepareServerPluginService() throws Exception {
- // unprepareServerPluginService(false);
- // }
- //
- // public void unprepareServerPluginService(boolean beanOnly) throws Exception {
- // if (serverPluginService != null) {
- // serverPluginService.stopMasterPluginContainer();
- // serverPluginService.stop();
- // if (beanOnly) {
- // MBeanServer mbs = getJBossMBeanServer();
- // if (mbs.isRegistered(ServerPluginService.OBJECT_NAME)) {
- // getJBossMBeanServer().unregisterMBean(ServerPluginService.OBJECT_NAME);
- // }
- // if (mbs.isRegistered(ServerPluginServiceMBean.OBJECT_NAME)) {
- // getJBossMBeanServer().unregisterMBean(ServerPluginServiceMBean.OBJECT_NAME);
- // }
- //
- // } else {
- // releaseJBossMBeanServer();
- // }
- // serverPluginService = null;
- // }
- // }
- //
- // public SchedulerService getSchedulerService() {
- // return schedulerService;
- // }
- //
- // public void prepareScheduler() {
- // try {
- // if (schedulerService != null) {
- // return;
- // }
- //
- // Properties quartzProps = new Properties();
- // quartzProps.load(this.getClass().getClassLoader().getResourceAsStream("test-scheduler.properties"));
- //
- // schedulerService = new SchedulerService();
- // schedulerService.setQuartzProperties(quartzProps);
- // schedulerService.start();
- // getJBossMBeanServer().registerMBean(schedulerService, SchedulerServiceMBean.SCHEDULER_MBEAN_NAME);
- // schedulerService.startQuartzScheduler();
- // return;
- // } catch (Exception e) {
- // e.printStackTrace();
- // throw new RuntimeException(e);
- // }
- // }
- //
- // public void unprepareScheduler() throws Exception {
- // unprepareScheduler(false);
- // }
- //
- // public void unprepareScheduler(boolean beanOnly) throws Exception {
- // if (schedulerService != null) {
- // schedulerService.stop();
- // if (beanOnly) {
- // MBeanServer mbs = getJBossMBeanServer();
- // if (mbs.isRegistered(SchedulerServiceMBean.SCHEDULER_MBEAN_NAME)) {
- // getJBossMBeanServer().unregisterMBean(SchedulerServiceMBean.SCHEDULER_MBEAN_NAME);
- // }
- // } else {
- // releaseJBossMBeanServer();
- // }
- //
- // schedulerService = null;
- // }
- // }
- //
- // public PluginDeploymentScannerMBean getPluginScannerService() {
- // return pluginScannerService;
- // }
- //
- // protected void preparePluginScannerService() {
- // preparePluginScannerService(null);
- // }
- //
- // public void preparePluginScannerService(PluginDeploymentScannerMBean scannerService) {
- // try {
- // if (scannerService == null) {
- // scannerService = new PluginDeploymentScanner();
- // }
- // MBeanServer mbs = getJBossMBeanServer();
- // mbs.registerMBean(scannerService, PluginDeploymentScannerMBean.OBJECT_NAME);
- // pluginScannerService = scannerService;
- // return;
- // } catch (Exception e) {
- // e.printStackTrace();
- // throw new RuntimeException(e);
- // }
- // }
- //
- // public void unpreparePluginScannerService() throws Exception {
- // unpreparePluginScannerService(false);
- // }
- //
- // public void unpreparePluginScannerService(boolean beanOnly) throws Exception {
- // if (pluginScannerService != null) {
- // pluginScannerService.stop();
- // if (beanOnly) {
- // MBeanServer mbs = getJBossMBeanServer();
- // if (mbs.isRegistered(PluginDeploymentScannerMBean.OBJECT_NAME)) {
- // getJBossMBeanServer().unregisterMBean(PluginDeploymentScannerMBean.OBJECT_NAME);
- // }
- // } else {
- // releaseJBossMBeanServer();
- // }
- //
- // pluginScannerService = null;
- // }
- // }
- //
- // protected void executeInTransaction(TransactionCallback callback) {
- // executeInTransaction(callback);
- // }
-}
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/StandardServerPluginService.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/StandardServerPluginService.java
index 5f5692f..adcde42 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/StandardServerPluginService.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/StandardServerPluginService.java
@@ -84,7 +84,7 @@ public class StandardServerPluginService extends ServerPluginService implements
public List<Class<? extends AbstractTypeServerPluginContainer>> pluginContainerClasses;
public StandardServerPluginService() {
- File dir = new File(System.getProperty("java.io.tmpdir"), "test-server-plugins");
+ File dir = new File(System.getProperty("java.io.tmpdir") + "/rhq", this.getClass().getSimpleName());
this.masterConfig = new MasterServerPluginContainerConfiguration(dir, dir, dir, null);
pluginContainerClasses = new ArrayList<Class<? extends AbstractTypeServerPluginContainer>>();
pluginContainerClasses.add(AlertServerPluginContainer.class);
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/TestServerPluginService.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/TestServerPluginService.java
index c28256b..a8b134e 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/TestServerPluginService.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/TestServerPluginService.java
@@ -46,7 +46,7 @@ public class TestServerPluginService extends ServerPluginService implements Test
public TestServerPluginService() {
// build the config at constructor time so tests have it even before the PC is initialized
- File dir = new File(System.getProperty("java.io.tmpdir"), "test-server-plugins");
+ File dir = new File(System.getProperty("java.io.tmpdir") + "/rhq", this.getClass().getSimpleName());
this.masterConfig = new MasterServerPluginContainerConfiguration(dir, dir, dir, null);
}
commit 943cc7818a3934dc3516ea39ddf632d437e9d0a5
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Fri Nov 30 17:26:15 2012 -0500
trivial - remove a debugging sleep stmt
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 2df0d96..36b0821 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
@@ -88,9 +88,6 @@ public class PluginManagerBeanTest extends MetadataBeanTest {
createPluginJarFile("test-plugin3.jar", "plugin_3.xml");
createPluginJarFile("test-plugin3.1.jar", "plugin_3.1.xml");
- System.out.println("***** SLEEP");
- Thread.sleep(60000);
-
pluginScanner.startDeployment();
}
commit 01044f44df613b54d5d5fb36c4b4c713bf1fcd1b
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Fri Nov 30 17:22:34 2012 -0500
More work on the metadata tests.
- better protect against test interaction issues by using explicit "AfterClass"
stand-in tests for each subclass.
- work on PluginManagerBeanTest such that it registers plugins to be enabled
before trying to disable them.
- Not passing, maybe a real problem?
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/AlertMetadataManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/AlertMetadataManagerBeanTest.java
index 29c146f..26e1cab 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/AlertMetadataManagerBeanTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/AlertMetadataManagerBeanTest.java
@@ -41,6 +41,12 @@ public class AlertMetadataManagerBeanTest extends MetadataBeanTest {
assertEquals("Alert templates should have been deleted.", 0, templates.size());
}
+ // this needs to be the last test executed in the class, it does cleanup
+ @Test(priority = 10, alwaysRun = true, dependsOnGroups = { "Alerts.UpgradePlugin" })
+ public void afterClassWorkTest() throws Exception {
+ afterClassWork();
+ }
+
void createAlertTemplate(String name, String resourceTypeName, String pluginName) throws Exception {
SubjectManagerLocal subjectMgr = LookupUtil.getSubjectManager();
ResourceTypeManagerLocal resourceTypeMgr = LookupUtil.getResourceTypeManager();
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/ContentMetadataManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/ContentMetadataManagerBeanTest.java
index 6f5582a..c109bf8 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/ContentMetadataManagerBeanTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/ContentMetadataManagerBeanTest.java
@@ -108,6 +108,12 @@ public class ContentMetadataManagerBeanTest extends MetadataBeanTest {
bundleType.getName());
}
+ // this needs to be the last test executed in the class, it does cleanup
+ @Test(priority = 10, alwaysRun = true, dependsOnGroups = { "Content.UpgradePlugin" })
+ public void afterClassWorkTest() throws Exception {
+ afterClassWork();
+ }
+
PackageType loadPackageType(String resourceType, String plugin, String packageType) {
return (PackageType) getEntityManager()
.createQuery(
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/EventMetadataManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/EventMetadataManagerBeanTest.java
index 99e1e22..8a11e07 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/EventMetadataManagerBeanTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/EventMetadataManagerBeanTest.java
@@ -60,6 +60,12 @@ public class EventMetadataManagerBeanTest extends MetadataBeanTest {
assertEquals("The description property should have been updated", "EVENT ONE", eventDef.getDescription());
}
+ // this needs to be the last test executed in the class, it does cleanup
+ @Test(priority = 10, alwaysRun = true, dependsOnGroups = { "Events.UpgradePlugin" })
+ public void afterClassWorkTest() throws Exception {
+ afterClassWork();
+ }
+
EventDefinition loadEventDef(String name, String resourceType) {
return (EventDefinition) getEntityManager()
.createQuery("from EventDefinition e where e.name = :name and e.resourceType.name = :resourceType")
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBeanTest.java
index 2bf2f31..25fbd5c 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBeanTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBeanTest.java
@@ -16,13 +16,6 @@ import org.rhq.test.AssertUtils;
public class MeasurementMetadataManagerBeanTest extends MetadataBeanTest {
- @Override
- protected void beforeMethod() throws Exception {
- super.beforeMethod();
-
- disableAfterClassStandIn = true;
- }
-
@Test(groups = { "plugin.metadata", "Metrics.NewPlugin" })
void registerMetricsPlugin() throws Exception {
createPlugin("metric-test-plugin", "1.0", "plugin_v1.xml");
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 cfaf7a8..dbdb765 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
@@ -28,7 +28,6 @@ import org.dbunit.dataset.datatype.IDataTypeFactory;
import org.dbunit.dataset.xml.FlatXmlDataSet;
import org.dbunit.dataset.xml.FlatXmlProducer;
import org.dbunit.operation.DatabaseOperation;
-import org.testng.annotations.Test;
import org.xml.sax.InputSource;
import org.rhq.core.clientapi.descriptor.plugin.PluginDescriptor;
@@ -40,6 +39,7 @@ import org.rhq.core.util.MessageDigestGenerator;
import org.rhq.core.util.stream.StreamUtil;
import org.rhq.enterprise.server.auth.SubjectManagerLocal;
import org.rhq.enterprise.server.bundle.TestBundleServerPluginService;
+import org.rhq.enterprise.server.core.plugin.PluginDeploymentScanner;
import org.rhq.enterprise.server.resource.ResourceTypeManagerLocal;
import org.rhq.enterprise.server.scheduler.jobs.PurgePluginsJob;
import org.rhq.enterprise.server.scheduler.jobs.PurgeResourceTypesJob;
@@ -48,28 +48,21 @@ import org.rhq.enterprise.server.util.LookupUtil;
public class MetadataBeanTest extends AbstractEJB3Test {
+ protected PluginDeploymentScanner pluginScanner;
+
private List<Integer> pluginIds = new ArrayList<Integer>();
- protected boolean disableAfterClassStandIn = false;
- // Arquillian (1.0.2) executes @AfterClass after each test. So, instead turn it into a low priority
- // test that should execute last.
- /**
- * !! Important !! This should be disabled if the subclass has tests in groups other than plugin.metadata because<br/>
- * !! priority applies only to the tests in the same grouping.<br/>
- * <br/>
+ /**
+ * <pre>IMPORTANT NOTE FOR SUBCLASS IMPLEMENTORS
+ * Arquillian (1.0.2) executes @AfterXXX after each test. The work below would normally be done in
+ * an AfterClass method, but instead we'll use mock tests, that perform last for each subclass, to
+ * perform this cleanup code.
+ * </pre>
* Need to delete rows from RHQ_PLUGINS because subsequent tests in server/jar would otherwise fail. Some tests look
* at what plugins are in the database, and then look for corresponding plugin files on the file system. MetadataTest
* however removes the generated plugin files during each test run.
+ *
*/
- @Test(priority = 10, alwaysRun = true, groups = { "plugin.metadata" })
- void afterClassStandIn() throws Exception {
- if (!disableAfterClassStandIn) {
- afterClassWork();
- } else {
- System.out.println("Skipping MetadataBeanTest.afterClassStandIn, it is disabled by a subclass.");
- }
- }
-
protected void afterClassWork() throws Exception {
PluginManagerLocal pluginMgr = LookupUtil.getPluginManager();
Subject overlord = LookupUtil.getSubjectManager().getOverlord();
@@ -81,9 +74,6 @@ public class MetadataBeanTest extends AbstractEJB3Test {
@Override
protected void beforeMethod() throws Exception {
- if (!inContainer()) {
- return;
- }
setupDB();
@@ -100,9 +90,6 @@ public class MetadataBeanTest extends AbstractEJB3Test {
*/
@Override
protected void afterMethod() throws Exception {
- if (!inContainer()) {
- return;
- }
unprepareServerPluginService();
unprepareScheduler();
@@ -158,8 +145,7 @@ public class MetadataBeanTest extends AbstractEJB3Test {
protected void createPlugin(String pluginFileName, String version, String descriptorFileName) throws Exception {
URL descriptorURL = getDescriptorURL(descriptorFileName);
PluginDescriptor pluginDescriptor = loadPluginDescriptor(descriptorURL);
- String pluginFilePath = getCurrentWorkingDir() + "/" + pluginFileName + ".jar";
- File pluginFile = new File(pluginFilePath);
+ String pluginFilePath = getPluginWorkDir() + "/" + pluginFileName + ".jar";
Plugin plugin = new Plugin(pluginDescriptor.getName(), pluginFilePath);
plugin.setDisplayName(pluginDescriptor.getName());
@@ -169,7 +155,6 @@ public class MetadataBeanTest extends AbstractEJB3Test {
plugin.setVersion(pluginDescriptor.getVersion());
plugin.setMD5(MessageDigestGenerator.getDigestString(descriptorURL));
- SubjectManagerLocal subjectMgr = LookupUtil.getSubjectManager();
PluginManagerLocal pluginMgr = LookupUtil.getPluginManager();
pluginMgr.registerPlugin(plugin, pluginDescriptor, null, true);
@@ -177,13 +162,31 @@ public class MetadataBeanTest extends AbstractEJB3Test {
pluginIds.add(plugin.getId());
}
+ protected void preparePluginScannerService() {
+ if (this.pluginScanner == null) {
+ this.pluginScanner = new PluginDeploymentScanner();
+
+ String pluginDirPath = null;
+ try {
+ pluginDirPath = getPluginWorkDir();
+ } catch (Exception e) {
+ throw new RuntimeException("Cannot determine where to put the plugin jar files", e);
+ }
+ this.pluginScanner.setAgentPluginDir(pluginDirPath); // we don't want to scan for these
+ this.pluginScanner.setServerPluginDir(null); // we don't want to scan for these
+ this.pluginScanner.setScanPeriod("9999999"); // we want to manually scan - don't allow for auto-scan to happen
+ }
+
+ preparePluginScannerService(this.pluginScanner);
+ }
+
private URL getDescriptorURL(String descriptor) {
String dir = getClass().getSimpleName();
return getClass().getResource(dir + "/" + descriptor);
}
protected String getPluginWorkDir() throws Exception {
- return getCurrentWorkingDir() + "/rhqtest";
+ return getCurrentWorkingDir() + "/" + this.getClass().getSimpleName() + "/" + "plugins";
}
protected String getCurrentWorkingDir() throws Exception {
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 b395120..b34fa4c 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
@@ -56,6 +56,12 @@ public class MultiplePluginExtensionMetadataTest extends MetadataBeanTest {
checkChild2Plugin(); // 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
+ @Test(priority = 10, alwaysRun = true, dependsOnMethods = { "testRegisterPlugins" })
+ public void afterClassWorkTest() throws Exception {
+ afterClassWork();
+ }
+
private void registerParentPluginV1() 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");
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionSinglePluginDescriptorMetadataTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionSinglePluginDescriptorMetadataTest.java
index e381168..337efd2 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionSinglePluginDescriptorMetadataTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionSinglePluginDescriptorMetadataTest.java
@@ -50,6 +50,12 @@ public class MultiplePluginExtensionSinglePluginDescriptorMetadataTest extends M
checkChildPlugin(); // check that the changes to the parent type propogated to the child #1 and #2
}
+ // this needs to be the last test executed in the class, it does cleanup
+ @Test(priority = 10, alwaysRun = true, dependsOnMethods = { "testRegisterPlugins" })
+ public void afterClassWorkTest() throws Exception {
+ afterClassWork();
+ }
+
private void registerParentPluginV1() 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");
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/OperationMetadataManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/OperationMetadataManagerBeanTest.java
index 59f5d44..f863fb1 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/OperationMetadataManagerBeanTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/OperationMetadataManagerBeanTest.java
@@ -111,6 +111,12 @@ public class OperationMetadataManagerBeanTest extends MetadataBeanTest {
assertNull("Results definition should have been removed", resultsDef);
}
+ // this needs to be the last test executed in the class, it does cleanup
+ @Test(priority = 10, alwaysRun = true, dependsOnGroups = { "Operations.UpgradePlugin" })
+ public void afterClassWorkTest() throws Exception {
+ afterClassWork();
+ }
+
ResourceType loadResourceTypeWithOperationDefs(String resourceType, String plugin) {
return (ResourceType) getEntityManager().createQuery(
"from ResourceType t left join fetch t.operationDefinitions tod "
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginExtensionMetadataTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginExtensionMetadataTest.java
index fedd45e..af24f3c 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginExtensionMetadataTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginExtensionMetadataTest.java
@@ -123,6 +123,12 @@ public class PluginExtensionMetadataTest extends MetadataBeanTest {
checkChildPlugin(); // check that the changes to the parent type propogated to the child
}
+ // this needs to be the last test executed in the class, it does cleanup
+ @Test(priority = 10, alwaysRun = true, dependsOnMethods = { "testRegisterPlugins" })
+ public void afterClassWorkTest() throws Exception {
+ afterClassWork();
+ }
+
private void registerParentPluginV1() 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");
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 ff279d9..2df0d96 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
@@ -21,6 +21,7 @@ package org.rhq.enterprise.server.resource.metadata;
import static java.util.Arrays.asList;
+import java.io.File;
import java.util.List;
import javax.ejb.EJBException;
@@ -30,6 +31,7 @@ import org.testng.annotations.Test;
import org.rhq.core.domain.plugin.Plugin;
import org.rhq.core.domain.plugin.PluginStatusType;
import org.rhq.core.domain.resource.ResourceType;
+import org.rhq.core.util.file.FileUtil;
import org.rhq.enterprise.server.auth.SubjectManagerLocal;
import org.rhq.enterprise.server.inventory.InventoryManagerLocal;
import org.rhq.enterprise.server.resource.ResourceTypeManagerLocal;
@@ -53,7 +55,14 @@ public class PluginManagerBeanTest extends MetadataBeanTest {
subjectMgr = LookupUtil.getSubjectManager();
pluginMgr = LookupUtil.getPluginManager();
- disableAfterClassStandIn = true;
+ FileUtil.purge(new File(getPluginWorkDir()), true);
+
+ preparePluginScannerService();
+ }
+
+ @Override
+ protected void afterMethod() throws Exception {
+ unpreparePluginScannerService();
}
public void registerPlugins() throws Exception {
@@ -71,16 +80,24 @@ public class PluginManagerBeanTest extends MetadataBeanTest {
new PurgeResourceTypesJob().execute(null);
new PurgePluginsJob().execute(null);
}
+
+ //createPluginJarFile("child1-plugin.jar", "child1_plugin_v1.xml"));
+
+ createPluginJarFile("test-plugin1.jar", "plugin_1.xml");
+ createPluginJarFile("test-plugin2.jar", "plugin_2.xml");
+ createPluginJarFile("test-plugin3.jar", "plugin_3.xml");
+ createPluginJarFile("test-plugin3.1.jar", "plugin_3.1.xml");
+
+ System.out.println("***** SLEEP");
+ Thread.sleep(60000);
- createPlugin("test-plugin1", "1.0", "plugin_1.xml");
- createPlugin("test-plugin2", "1.0", "plugin_2.xml");
- createPlugin("test-plugin3", "1.0", "plugin_3.xml");
- createPlugin("test-plugin3.1", "1.0", "plugin_3.1.xml");
+ pluginScanner.startDeployment();
}
@Test(dependsOnMethods = { "registerPlugins" })
public void disablePlugin() throws Exception {
Plugin plugin = getPlugin("PluginManagerBeanTestPlugin3");
+ assertTrue("Plugin should not already be disabled", plugin.isEnabled());
pluginMgr.disablePlugins(subjectMgr.getOverlord(), asList(plugin.getId()));
plugin = pluginMgr.getPlugin("PluginManagerBeanTestPlugin3");
@@ -92,18 +109,23 @@ public class PluginManagerBeanTest extends MetadataBeanTest {
@Test(dependsOnMethods = { "registerPlugins" })
public void doNotDisablePluginIfDependentPluginsAreNotAlsoDisabled() throws Exception {
Plugin plugin = getPlugin("PluginManagerBeanTestPlugin1");
- EJBException exception = null;
+ assertTrue("Plugin should not already be disabled", plugin.isEnabled());
+
+ Exception exception = null;
try {
pluginMgr.disablePlugins(subjectMgr.getOverlord(), asList(plugin.getId()));
- } catch (EJBException e) {
+ } catch (Exception e) {
exception = e;
}
+ plugin = getPlugin("PluginManagerBeanTestPlugin1");
+ assertTrue("Plugin should not have been disabled", plugin.isEnabled());
+
assertNotNull("Expected exception to be thrown when trying to disable a plugin that has dependent plugins",
exception);
assertTrue("Expected an IllegalArgumentException when trying to disable a plugin with dependent plugins",
- exception.getCausedByException() instanceof IllegalArgumentException);
+ exception.getCause() instanceof IllegalArgumentException);
}
@Test(dependsOnMethods = { "doNotDisablePluginIfDependentPluginsAreNotAlsoDisabled" })
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginScanningExtensionMetadataTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginScanningExtensionMetadataTest.java
index 4e19f85..5417305 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginScanningExtensionMetadataTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginScanningExtensionMetadataTest.java
@@ -4,15 +4,12 @@ import java.io.File;
import java.util.ArrayList;
import java.util.List;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import org.rhq.core.domain.criteria.ResourceTypeCriteria;
import org.rhq.core.domain.operation.OperationDefinition;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.enterprise.server.auth.SubjectManagerLocal;
-import org.rhq.enterprise.server.core.plugin.PluginDeploymentScanner;
import org.rhq.enterprise.server.resource.ResourceTypeManagerLocal;
import org.rhq.enterprise.server.util.LookupUtil;
@@ -54,13 +51,10 @@ public class PluginScanningExtensionMetadataTest extends MetadataBeanTest {
private ResourceTypeManagerLocal resourceTypeMgr;
private List<File> createdJarFiles = new ArrayList<File>();
- private PluginDeploymentScanner pluginScanner;
- @BeforeMethod(groups = { "plugin.metadata" }, dependsOnGroups = { "integration.ejb3" })
- protected void beforeTestMethod() throws Exception {
- if (!inContainer()) {
- return;
- }
+ @Override
+ protected void beforeMethod() throws Exception {
+ super.beforeMethod();
preparePluginScannerService();
@@ -76,11 +70,8 @@ public class PluginScanningExtensionMetadataTest extends MetadataBeanTest {
createdJarFiles.clear();
}
- @AfterMethod(groups = { "plugin.metadata" }, dependsOnGroups = { "integration.ejb3" })
- protected void afterTestMethod() throws Exception {
- if (!inContainer()) {
- return;
- }
+ @Override
+ protected void afterMethod() throws Exception {
// clean up any generated jar files - we want to remove these so they don't get in the way of a future test run
if (!createdJarFiles.isEmpty()) {
for (File doomed : createdJarFiles) {
@@ -90,25 +81,8 @@ public class PluginScanningExtensionMetadataTest extends MetadataBeanTest {
createdJarFiles.clear();
unpreparePluginScannerService();
- }
- // this method isn't a test method
- private void preparePluginScannerService() {
- if (this.pluginScanner == null) {
- this.pluginScanner = new PluginDeploymentScanner();
-
- String pluginDirPath = null;
- try {
- pluginDirPath = getPluginWorkDir();
- } catch (Exception e) {
- throw new RuntimeException("Cannot determine where to put the plugin jar files", e);
- }
- this.pluginScanner.setAgentPluginDir(pluginDirPath); // we don't want to scan for these
- this.pluginScanner.setServerPluginDir(null); // we don't want to scan for these
- this.pluginScanner.setScanPeriod("9999999"); // we want to manually scan - don't allow for auto-scan to happen
- }
-
- preparePluginScannerService(this.pluginScanner);
+ super.afterMethod();
}
public void testRegisterPlugins() throws Exception {
@@ -127,6 +101,12 @@ public class PluginScanningExtensionMetadataTest extends MetadataBeanTest {
}
}
+ // this needs to be the last test executed in the class, it does cleanup
+ @Test(priority = 10, alwaysRun = true, dependsOnMethods = { "testRegisterPlugins" })
+ public void afterClassWorkTest() throws Exception {
+ afterClassWork();
+ }
+
private void registerParentPluginV1() throws Exception {
// register the plugin, load the new type and test to make sure its what we expect
createdJarFiles.add(createPluginJarFile("parent-plugin.jar", "parent_plugin_v1.xml"));
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java
index 5f2acd8..a5e23ff 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java
@@ -53,13 +53,6 @@ import org.rhq.enterprise.server.util.LookupUtil;
@Test(groups = { "plugin.metadata" })
public class ResourceMetadataManagerBeanTest extends MetadataBeanTest {
- @Override
- protected void beforeMethod() throws Exception {
- super.beforeMethod();
-
- disableAfterClassStandIn = true;
- }
-
@Test(groups = { "plugin.resource.metadata.test", "NewPlugin" })
public void testRemovalOfObsoleteBundleAndDriftConfig() throws Exception {
// create the initial type that has bundle and drift definitions
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java
index 6fc8350..975efb8 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java
@@ -341,7 +341,7 @@ public abstract class AbstractEJB3Test extends Arquillian {
testEar.addAsLibraries(dependencies);
// Print out the test EAR structure
- // System.out.println("** The Deployment EAR: " + ear.toString(true) + "\n");
+ //System.out.println("** The Deployment EAR: " + testEar.toString(true) + "\n");
// Save the test EAR to a zip file for inspection (set file explicitly)
//exportZip(testEar, new File("/home/jshaughn/temp/test-ear.ear"));
diff --git a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_1.xml b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_1.xml
index 6680aa6..a639a3b 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_1.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_1.xml
@@ -1,4 +1,5 @@
<plugin name="PluginManagerBeanTestPlugin1"
+ version="1.0"
package="org.rhq.plugins.test"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_2.xml b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_2.xml
index c6f8736..e2c7b22 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_2.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_2.xml
@@ -1,4 +1,5 @@
<plugin name="PluginManagerBeanTestPlugin2"
+ version="1.0"
package="org.rhq.plugins.test"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_3.1.xml b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_3.1.xml
index e885167..ec2aef1 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_3.1.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_3.1.xml
@@ -1,4 +1,5 @@
<plugin name="PluginManagerBeanTestPlugin3.1"
+ version="1.0"
package="org.rhq.plugins.test"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_3.xml b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_3.xml
index 78184bf..c2bde29 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_3.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_3.xml
@@ -1,4 +1,5 @@
<plugin name="PluginManagerBeanTestPlugin3"
+ version="1.0"
package="org.rhq.plugins.test"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
commit 59514c1a6a6a879d6a7bf0174c0d3ca252ebbfed
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Fri Nov 30 17:11:20 2012 -0500
[BZ 882280] purge old perspective plugin from the DB during db upgrade
(cherry picked from commit dadcd3fbff9d883c7d6a166ad42687c26c9b5a70)
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
index 615b252..036b65b 100644
--- a/modules/core/dbutils/pom.xml
+++ b/modules/core/dbutils/pom.xml
@@ -17,7 +17,7 @@
<description>Database schema setup, upgrade and other utilities</description>
<properties>
- <db.schema.version>2.127</db.schema.version>
+ <db.schema.version>2.128</db.schema.version>
<rhq.ds.type-mapping>${rhq.test.ds.type-mapping}</rhq.ds.type-mapping>
<rhq.ds.server-name>${rhq.test.ds.server-name}</rhq.ds.server-name>
<rhq.ds.db-name>${rhq.test.ds.db-name}</rhq.ds.db-name>
diff --git a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
index 7188198..19ac9dd 100644
--- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
+++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
@@ -30,8 +30,8 @@
<!-- Empty initial schema to avoid install failure on default latest schema version -->
</schemaSpec>
- <!-- 2.1 through 2.69 removed, no longer needed as these versions are not in use -->
-
+ <!-- 2.1 through 2.69 removed, no longer needed as these versions are not in use -->
+
<schemaSpec version="2.70">
<schema-addColumn table="RHQ_ALERT" column="ACK_TIME" columnType="LONG" />
<schema-addColumn table="RHQ_ALERT" column="ACK_SUBJECT" precision="100" columnType="VARCHAR2" />
@@ -1267,10 +1267,10 @@
UPDATE RHQ_RESOURCE_TYPE
SET DELETED = false
</statement>
- <statement targetDBVendor="oracle" desc="Set deleted flag for existing resources types to false">
+ <statement targetDBVendor="oracle" desc="Set deleted flag for existing resources types to false">
UPDATE RHQ_RESOURCE_TYPE
SET DELETED = 0
- </statement>
+ </statement>
</schema-directSQL>
<schema-alterColumn table="RHQ_RESOURCE_TYPE" column="DELETED" nullable="FALSE" />
</schemaSpec>
@@ -1351,14 +1351,14 @@
<schemaSpec version="2.105">
<schema-addColumn table="RHQ_REPO" column="OWNER_ID" columnType="INTEGER" />
<schema-addColumn table="RHQ_REPO" column="IS_PRIVATE" columnType="BOOLEAN" />
- <schema-directSQL>
+ <schema-directSQL>
<statement targetDBVendor="postgresql" desc="Set is_private flag for existing repos to false">
UPDATE RHQ_REPO SET IS_PRIVATE = false
</statement>
<statement targetDBVendor="oracle" desc="Set is_private flag for existing repos to false">
UPDATE RHQ_REPO SET IS_PRIVATE = 0
</statement>
- </schema-directSQL>
+ </schema-directSQL>
<schema-alterColumn table="RHQ_REPO" column="IS_PRIVATE" nullable="FALSE"/>
<schema-directSQL>
<statement desc="Creating OWNER_ID foreign key relation on RHQ_REPO">
@@ -1970,7 +1970,7 @@
</schema-directSQL>
</schemaSpec>
- <!-- Remove unnecessary tables for RHQ on AS7 -->
+ <!-- Remove unnecessary tables for RHQ on AS7 -->
<schemaSpec version="2.127">
<schema-dropTable table="JMS_MESSAGES" ignoreError="true" />
<schema-dropTable table="JMS_TRANSACTIONS" ignoreError="true" />
@@ -1978,7 +1978,16 @@
<schema-dropTable table="JMS_ROLES" ignoreError="true" />
<schema-dropTable table="JMS_SUBSCRIPTIONS" ignoreError="true" />
</schemaSpec>
-
+
+ <!-- The perspective server plugin type has been removed - delete perspective plugin from DB -->
+ <schemaSpec version="2.128">
+ <schema-directSQL>
+ <statement>
+ DELETE FROM RHQ_PLUGIN WHERE NAME = 'CorePerspective'
+ </statement>
+ </schema-directSQL>
+ </schemaSpec>
+
</dbupgrade>
</target>
</project>
commit 48ca15b5be083629a1529b069fda928576046ac8
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Fri Nov 30 14:21:27 2012 -0600
Force versions 1.3.1 until upstream JIRA for the plugin is resolved.
http://jira.codehaus.org/browse/MVERSIONS-201
diff --git a/pom.xml b/pom.xml
index 57be9a8..6af4a4b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -814,6 +814,11 @@
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
+ <artifactId>versions-maven-plugin</artifactId>
+ <version>1.3.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>${findbugs.version}</version>
</plugin>
commit 24a906cb902960a614df13165776cfd5f42516e7
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Fri Nov 30 10:55:40 2012 -0500
Add support (hopefully) for EAP 5.2 in as5.itest profile.
diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml
index 365f544..a15b24f 100644
--- a/modules/plugins/jboss-as-5/pom.xml
+++ b/modules/plugins/jboss-as-5/pom.xml
@@ -479,17 +479,15 @@
<get src="${as5.url}" dest="${as5.zipfile}"
usetimestamp="true" verbose="true"/>
<unzip src="${as5.zipfile}" dest="${java.io.tmpdir}"/>
+ <!-- This works for AS versions -->
<move file="${java.io.tmpdir}/jboss-${as5.version}"
tofile="${jboss5.home}" failonerror="false"
overwrite="false"/>
- <move file="${java.io.tmpdir}/jboss-eap-5.0/jboss-as"
+ <!-- This works for EAP versions -->
+ <move file="${java.io.tmpdir}/jboss-eap-${as5.version}/jboss-as"
tofile="${jboss5.home}" failonerror="false"
overwrite="false"/>
- <delete dir="${java.io.tmpdir}/jboss-eap-5.0" failonerror="false"/>
- <move file="${java.io.tmpdir}/jboss-eap-5.1/jboss-as"
- tofile="${jboss5.home}" failonerror="false"
- overwrite="false"/>
- <delete dir="${java.io.tmpdir}/jboss-eap-5.1" failonerror="false"/>
+ <delete dir="${java.io.tmpdir}/jboss-eap-${as5.version}" failonerror="false"/>
<chmod perm="u+rx">
<fileset dir="${jboss5.home}/bin" includes="*.sh"/>
commit dbd0327e0395c4d8a94be5282435aeaa7e5efd52
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Fri Nov 30 10:53:38 2012 -0500
The metadata update integration tests were not actually running. We had
false postives because the BeforeMethod was throwing an exception. When this
happens Arquillian (1.0.2) swallows it and passes the test (not good). Made
several changes to these test classes to get them running although there may
be test interaction issues still. Checking in now to see how things go
in a full jenkins run.
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBeanTest.java
index 22834fa..2bf2f31 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBeanTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBeanTest.java
@@ -16,6 +16,13 @@ import org.rhq.test.AssertUtils;
public class MeasurementMetadataManagerBeanTest extends MetadataBeanTest {
+ @Override
+ protected void beforeMethod() throws Exception {
+ super.beforeMethod();
+
+ disableAfterClassStandIn = true;
+ }
+
@Test(groups = { "plugin.metadata", "Metrics.NewPlugin" })
void registerMetricsPlugin() throws Exception {
createPlugin("metric-test-plugin", "1.0", "plugin_v1.xml");
@@ -38,7 +45,7 @@ public class MeasurementMetadataManagerBeanTest extends MetadataBeanTest {
expected.setDisplayOrder(1);
AssertUtils.assertPropertiesMatch("Failed to persist properties for a trait metric definition", expected,
- traitDef, asList("id", "resourceType"));
+ traitDef, asList("id", "resourceType", "schedules", "alertCondition"));
}
@Test(groups = { "plugin.metadata", "Metrics.NewPlugin" }, dependsOnMethods = { "persistNewMetrics" })
@@ -53,7 +60,7 @@ public class MeasurementMetadataManagerBeanTest extends MetadataBeanTest {
expected.setDisplayOrder(2);
AssertUtils.assertPropertiesMatch("Failed to persist properties for numeric metric definition", expected,
- measurementDef, asList("id", "resourceType"));
+ measurementDef, asList("id", "resourceType", "schedules", "alertCondition"));
MeasurementDefinition perMinuteDef = loadMeasurementDef("metric2", "MetricServer1", "metric2 per Minute");
@@ -66,7 +73,7 @@ public class MeasurementMetadataManagerBeanTest extends MetadataBeanTest {
AssertUtils.assertPropertiesMatch(
"Failed to create and persist per minute metric definition for numeric metric definition", expected,
- perMinuteDef, asList("id", "resourceType"));
+ perMinuteDef, asList("id", "resourceType", "schedules", "alertCondition"));
}
@Test(groups = { "plugin.metadata", "Metrics.NewPlugin" }, dependsOnMethods = { "persistNewMetrics" })
@@ -82,7 +89,7 @@ public class MeasurementMetadataManagerBeanTest extends MetadataBeanTest {
expected.setDisplayOrder(4);
AssertUtils.assertPropertiesMatch("Failed to create calltime metric definition", expected, calltimeDef,
- asList("id", "resourceType"));
+ asList("id", "resourceType", "schedules", "alertCondition"));
}
@Test(groups = { "plugin.metadata", "Metrics.NewPlugin" }, dependsOnMethods = { "persistNewMetrics" })
@@ -98,7 +105,7 @@ public class MeasurementMetadataManagerBeanTest extends MetadataBeanTest {
expected.setDescription(MeasurementDefinition.AVAILABILITY_DESCRIPTION);
AssertUtils.assertPropertiesMatch("Failed to create avail metric definition", expected, serverAvailDef,
- asList("id", "resourceType", "destinationType", "displayOrder"));
+ asList("id", "resourceType", "destinationType", "displayOrder", "alertCondition", "schedules"));
MeasurementDefinition serviceAvailDef = loadMeasurementDef("rhq.availability", "MetricService1",
MeasurementDefinition.AVAILABILITY_DISPLAY_NAME);
@@ -110,7 +117,7 @@ public class MeasurementMetadataManagerBeanTest extends MetadataBeanTest {
expected.setDescription(MeasurementDefinition.AVAILABILITY_DESCRIPTION);
AssertUtils.assertPropertiesMatch("Failed to create avail metric definition", expected, serviceAvailDef,
- asList("id", "resourceType", "destinationType", "displayOrder"));
+ asList("id", "resourceType", "destinationType", "displayOrder", "schedules", "alertCondition"));
serviceAvailDef = loadMeasurementDef("rhq.availability", "MetricService2",
MeasurementDefinition.AVAILABILITY_DISPLAY_NAME);
@@ -123,7 +130,7 @@ public class MeasurementMetadataManagerBeanTest extends MetadataBeanTest {
expected.setDescription(MeasurementDefinition.AVAILABILITY_DESCRIPTION);
AssertUtils.assertPropertiesMatch("Failed to create avail metric definition", expected, serviceAvailDef,
- asList("id", "resourceType", "destinationType", "displayOrder"));
+ asList("id", "resourceType", "destinationType", "displayOrder", "schedules", "alertCondition"));
}
@@ -151,7 +158,7 @@ public class MeasurementMetadataManagerBeanTest extends MetadataBeanTest {
expected.setDisplayOrder(1);
AssertUtils.assertPropertiesMatch("Failed to change trait definition to a measurement defintion", expected,
- measurementDef, asList("id", "resourceType"));
+ measurementDef, asList("id", "resourceType", "schedules", "alertCondition"));
MeasurementDefinition perMinuteDef = loadMeasurementDef("metric1", "MetricServer3", "metric1 per Minute");
expected.setDisplayName("metric1 per Minute");
@@ -163,7 +170,7 @@ public class MeasurementMetadataManagerBeanTest extends MetadataBeanTest {
AssertUtils.assertPropertiesMatch(
"Failed to create and persist per minute metric definition for updated metric definition", expected,
- perMinuteDef, asList("id", "resourceType"));
+ perMinuteDef, asList("id", "resourceType", "schedules", "alertCondition"));
}
@Test(groups = { "plugin.metadata", "Metrics.UpradePlugin" }, dependsOnMethods = { "upgradeMetricsPlugin" })
@@ -195,7 +202,7 @@ public class MeasurementMetadataManagerBeanTest extends MetadataBeanTest {
expected.setDescription(MeasurementDefinition.AVAILABILITY_DESCRIPTION);
AssertUtils.assertPropertiesMatch("Failed to create avail metric definition", expected, serverAvailDef,
- asList("id", "resourceType", "destinationType", "displayOrder"));
+ asList("id", "resourceType", "destinationType", "displayOrder", "schedules", "alertCondition"));
MeasurementDefinition serviceAvailDef = loadMeasurementDef("rhq.availability", "MetricService1",
MeasurementDefinition.AVAILABILITY_DISPLAY_NAME);
@@ -208,7 +215,7 @@ public class MeasurementMetadataManagerBeanTest extends MetadataBeanTest {
expected.setDescription(MeasurementDefinition.AVAILABILITY_DESCRIPTION);
AssertUtils.assertPropertiesMatch("Failed to create avail metric definition", expected, serviceAvailDef,
- asList("id", "resourceType", "destinationType", "displayOrder"));
+ asList("id", "resourceType", "destinationType", "displayOrder", "schedules", "alertCondition"));
serviceAvailDef = loadMeasurementDef("rhq.availability", "MetricService2",
MeasurementDefinition.AVAILABILITY_DISPLAY_NAME);
@@ -220,7 +227,13 @@ public class MeasurementMetadataManagerBeanTest extends MetadataBeanTest {
expected.setDescription(MeasurementDefinition.AVAILABILITY_DESCRIPTION);
AssertUtils.assertPropertiesMatch("Failed to create avail metric definition", expected, serviceAvailDef,
- asList("id", "resourceType", "destinationType", "displayOrder"));
+ asList("id", "resourceType", "destinationType", "displayOrder", "schedules", "alertCondition"));
+ }
+
+ // this needs to be the last test executed in the class, it does cleanup
+ @Test(priority = 10, alwaysRun = true, dependsOnGroups = { "Metrics.UpradePlugin" })
+ public void afterClassWorkTest() throws Exception {
+ afterClassWork();
}
MeasurementDefinition loadMeasurementDef(String name, String resourceType) {
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 7c9a6d3..cfaf7a8 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
@@ -28,8 +28,6 @@ import org.dbunit.dataset.datatype.IDataTypeFactory;
import org.dbunit.dataset.xml.FlatXmlDataSet;
import org.dbunit.dataset.xml.FlatXmlProducer;
import org.dbunit.operation.DatabaseOperation;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import org.xml.sax.InputSource;
@@ -51,30 +49,28 @@ import org.rhq.enterprise.server.util.LookupUtil;
public class MetadataBeanTest extends AbstractEJB3Test {
private List<Integer> pluginIds = new ArrayList<Integer>();
-
- // Arquillian (1.0.2) executes @BeforeGroups only as client (remote). So, we can't get DS here.
- // Also, it is called for each test. For now call from BeforeMethod.
- //
- //@BeforeGroups(groups = { "plugin.metadata" }, dependsOnGroups = { "integration.ejb3" })
- public void beforeGroups() throws Exception {
- setupDB();
- }
+ protected boolean disableAfterClassStandIn = false;
// Arquillian (1.0.2) executes @AfterClass after each test. So, instead turn it into a low priority
// test that should execute last.
/**
+ * !! Important !! This should be disabled if the subclass has tests in groups other than plugin.metadata because<br/>
+ * !! priority applies only to the tests in the same grouping.<br/>
+ * <br/>
* Need to delete rows from RHQ_PLUGINS because subsequent tests in server/jar would otherwise fail. Some tests look
* at what plugins are in the database, and then look for corresponding plugin files on the file system. MetadataTest
* however removes the generated plugin files during each test run.
*/
@Test(priority = 10, alwaysRun = true, groups = { "plugin.metadata" })
void afterClassStandIn() throws Exception {
- // Although its documented that AfterXXX don't execute in-container (only as client), in practice this is not true
- // and we perform in-container work here.
- if (!inContainer()) {
- return;
+ if (!disableAfterClassStandIn) {
+ afterClassWork();
+ } else {
+ System.out.println("Skipping MetadataBeanTest.afterClassStandIn, it is disabled by a subclass.");
}
+ }
+ protected void afterClassWork() throws Exception {
PluginManagerLocal pluginMgr = LookupUtil.getPluginManager();
Subject overlord = LookupUtil.getSubjectManager().getOverlord();
pluginMgr.deletePlugins(overlord, pluginIds);
@@ -83,14 +79,13 @@ public class MetadataBeanTest extends AbstractEJB3Test {
new PurgeResourceTypesJob().executeJobCode(null);
}
- @BeforeMethod(groups = { "plugin.metadata" }, dependsOnGroups = { "integration.ejb3" })
- protected void before() throws Exception {
+ @Override
+ protected void beforeMethod() throws Exception {
if (!inContainer()) {
return;
}
- // @BeforeGroups currently executed only as client (remote) only with Arquillian/testNg, so call from here instead
- beforeGroups();
+ setupDB();
TestBundleServerPluginService bundleService = new TestBundleServerPluginService();
prepareCustomServerPluginService(bundleService);
@@ -103,8 +98,8 @@ public class MetadataBeanTest extends AbstractEJB3Test {
* at what plugins are in the database, and then look for corresponding plugin files on the file system. MetadataTest
* however removes the generated plugin files during each test run.
*/
- @AfterMethod(alwaysRun = true, groups = { "plugin.metadata" })
- protected void after() throws Exception {
+ @Override
+ protected void afterMethod() throws Exception {
if (!inContainer()) {
return;
}
@@ -220,6 +215,8 @@ public class MetadataBeanTest extends AbstractEJB3Test {
criteria.addFilterName(resourceTypeName);
criteria.addFilterPluginName(plugin);
criteria.setStrict(true);
+ criteria.fetchBundleConfiguration(true);
+ criteria.fetchDriftDefinitionTemplates(true);
MethodUtils.invokeMethod(criteria, fetch, true);
List<ResourceType> resourceTypes = resourceTypeMgr.findResourceTypesByCriteria(subjectMgr.getOverlord(),
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 c282777..ff279d9 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
@@ -46,10 +46,18 @@ public class PluginManagerBeanTest extends MetadataBeanTest {
private SubjectManagerLocal subjectMgr;
private PluginManagerLocal pluginMgr;
- public void registerPlugins() throws Exception {
+ @Override
+ protected void beforeMethod() throws Exception {
+ super.beforeMethod();
+
subjectMgr = LookupUtil.getSubjectManager();
pluginMgr = LookupUtil.getPluginManager();
+ disableAfterClassStandIn = true;
+ }
+
+ public void registerPlugins() throws Exception {
+
List<Plugin> plugins = getEntityManager()
.createQuery(
"from Plugin where name IN ('PluginManagerBeanTestPlugin1', 'PluginManagerBeanTestPlugin2', 'PluginManagerBeanTestPlugin3')")
@@ -217,6 +225,12 @@ public class PluginManagerBeanTest extends MetadataBeanTest {
assertEquals("Failed to purge plugins from the database", 1, pluginMgr.getPlugins().size());
}
+ // this needs to be the last test executed in the class, it does cleanup
+ @Test(priority = 10, alwaysRun = true, dependsOnMethods = { "pluginPurgeCheckShouldUseExactMatchesInQuery" })
+ public void afterClassWorkTest() throws Exception {
+ afterClassWork();
+ }
+
private Plugin getPlugin(String name) {
Plugin plugin = pluginMgr.getPlugin(name);
assertNotNull("Failed to find plugin [" + name + "].", plugin);
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java
index 0e142e9..5f2acd8 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java
@@ -50,9 +50,17 @@ import org.rhq.enterprise.server.resource.ResourceTypeManagerLocal;
import org.rhq.enterprise.server.resource.group.ResourceGroupManagerLocal;
import org.rhq.enterprise.server.util.LookupUtil;
+@Test(groups = { "plugin.metadata" })
public class ResourceMetadataManagerBeanTest extends MetadataBeanTest {
- @Test(groups = { "plugin.resource.metadata.test", "plugin.metadata", "NewPlugin" })
+ @Override
+ protected void beforeMethod() throws Exception {
+ super.beforeMethod();
+
+ disableAfterClassStandIn = true;
+ }
+
+ @Test(groups = { "plugin.resource.metadata.test", "NewPlugin" })
public void testRemovalOfObsoleteBundleAndDriftConfig() throws Exception {
// create the initial type that has bundle and drift definitions
createPlugin("test-plugin.jar", "1.0", "remove_bundle_drift_config_v1.xml");
@@ -107,7 +115,7 @@ public class ResourceMetadataManagerBeanTest extends MetadataBeanTest {
}
}
- @Test(groups = { "plugin.resource.metadata.test", "plugin.metadata", "NewPlugin" })
+ @Test(groups = { "plugin.resource.metadata.test", "NewPlugin" })
public void registerPluginWithDuplicateDriftDefinitions() {
try {
createPlugin("test-plugin.jar", "1.0", "dup_drift.xml");
@@ -118,14 +126,13 @@ public class ResourceMetadataManagerBeanTest extends MetadataBeanTest {
}
@Test(dependsOnMethods = { "registerPluginWithDuplicateDriftDefinitions" }, groups = {
- "plugin.resource.metadata.test", "plugin.metadata", "NewPlugin" })
+ "plugin.resource.metadata.test", "NewPlugin" })
public void registerPlugin() throws Exception {
createPlugin("test-plugin.jar", "1.0", "plugin_v1.xml");
}
-
@Test(dependsOnMethods = { "registerPluginWithDuplicateDriftDefinitions" }, groups = {
- "plugin.resource.metadata.test", "plugin.metadata", "NewPlugin" })
+ "plugin.resource.metadata.test", "NewPlugin" })
public void registerParentResouceTypePlugin() throws Exception {
createPlugin("parent_resource_type-plugin.jar", "1.0", "parent_resource_type-plugin.xml");
assertResourceTypeAssociationEquals("Server A First Level", "ParentResourceTypeTestPlugin",
@@ -136,15 +143,13 @@ public class ResourceMetadataManagerBeanTest extends MetadataBeanTest {
"childResourceTypes", asList("Service C First Level"));
}
-
- @Test(dependsOnMethods = { "registerPlugin" }, groups = { "plugin.resource.metadata.test", "plugin.metadata",
- "NewPlugin" })
+ @Test(dependsOnMethods = { "registerPlugin" }, groups = { "plugin.resource.metadata.test", "NewPlugin" })
public void persistNewTypes() {
List<String> newTypes = asList("ServerA", "ServerB");
assertTypesPersisted("Failed to persist new types", newTypes, "TestPlugin");
}
- // @Test(dependsOnMethods = {"persistNewTypes"}, groups = {"plugin.resource.metadata.test", "plugin.metadata", "NewPlugin"})
+ // @Test(dependsOnMethods = {"persistNewTypes"}, groups = {"plugin.resource.metadata.test", "NewPlugin"})
// public void persistSubcategories() throws Exception {
// assertResourceTypeAssociationEquals(
// "ServerA",
@@ -154,34 +159,29 @@ public class ResourceMetadataManagerBeanTest extends MetadataBeanTest {
// );
// }
- @Test(dependsOnMethods = { "persistNewTypes" }, groups = { "plugin.resource.metadata.test", "plugin.metadata",
- "NewPlugin" })
+ @Test(dependsOnMethods = { "persistNewTypes" }, groups = { "plugin.resource.metadata.test", "NewPlugin" })
public void persistMeasurementDefinitions() throws Exception {
assertResourceTypeAssociationEquals("ServerA", "TestPlugin", "metricDefinitions",
asList("metric1", "metric2", "rhq.availability"));
}
- @Test(dependsOnMethods = { "persistNewTypes" }, groups = { "plugin.resource.metadata.test", "plugin.metadata",
- "NewPlugin" })
+ @Test(dependsOnMethods = { "persistNewTypes" }, groups = { "plugin.resource.metadata.test", "NewPlugin" })
public void persistEventDefinitions() throws Exception {
assertResourceTypeAssociationEquals("ServerA", "TestPlugin", "eventDefinitions",
asList("logAEntry", "logBEntry"));
}
- @Test(dependsOnMethods = { "persistNewTypes" }, groups = { "plugin.resource.metadata.test", "plugin.metadata",
- "NewPlugin" })
+ @Test(dependsOnMethods = { "persistNewTypes" }, groups = { "plugin.resource.metadata.test", "NewPlugin" })
public void persistOperationDefinitions() throws Exception {
assertResourceTypeAssociationEquals("ServerA", "TestPlugin", "operationDefinitions", asList("start", "stop"));
}
- @Test(dependsOnMethods = { "persistNewTypes" }, groups = { "plugin.resource.metadata.test", "plugin.metadata",
- "NewPlugin" })
+ @Test(dependsOnMethods = { "persistNewTypes" }, groups = { "plugin.resource.metadata.test", "NewPlugin" })
public void persistProcessScans() throws Exception {
assertResourceTypeAssociationEquals("ServerA", "TestPlugin", "processScans", asList("serverA"));
}
- @Test(dependsOnMethods = { "persistNewTypes" }, groups = { "plugin.resource.metadata.test", "plugin.metadata",
- "NewPlugin" })
+ @Test(dependsOnMethods = { "persistNewTypes" }, groups = { "plugin.resource.metadata.test", "NewPlugin" })
public void persistDriftDefinitionTemplates() throws Exception {
ResourceType type = assertResourceTypeAssociationEquals("ServerA", "TestPlugin", "driftDefinitionTemplates",
asList("drift-pc", "drift-fs"));
@@ -220,8 +220,7 @@ public class ResourceMetadataManagerBeanTest extends MetadataBeanTest {
}
}
- @Test(dependsOnMethods = { "persistNewTypes" }, groups = { "plugin.resource.metadata.test", "plugin.metadata",
- "NewPlugin" })
+ @Test(dependsOnMethods = { "persistNewTypes" }, groups = { "plugin.resource.metadata.test", "NewPlugin" })
public void persistBundleTargetConfigurations() throws Exception {
String resourceTypeName = "ServerA";
String plugin = "TestPlugin";
@@ -256,64 +255,55 @@ public class ResourceMetadataManagerBeanTest extends MetadataBeanTest {
}
}
- @Test(dependsOnMethods = { "persistNewTypes" }, groups = { "plugin.resource.metadata.test", "plugin.metadata",
- "NewPlugin" })
+ @Test(dependsOnMethods = { "persistNewTypes" }, groups = { "plugin.resource.metadata.test", "NewPlugin" })
public void persistChildTypes() throws Exception {
assertResourceTypeAssociationEquals("ServerA", "TestPlugin", "childResourceTypes", asList("Child1", "Child2"));
}
- @Test(dependsOnMethods = { "persistNewTypes" }, groups = { "plugin.resource.metadata.test", "plugin.metadata",
- "NewPlugin" })
+ @Test(dependsOnMethods = { "persistNewTypes" }, groups = { "plugin.resource.metadata.test", "NewPlugin" })
public void persistPluginConfigurationDefinition() throws Exception {
assertAssociationExists("ServerA", "pluginConfigurationDefinition");
}
- @Test(dependsOnMethods = { "persistNewTypes" }, groups = { "plugin.resource.metadata.test", "plugin.metadata",
- "NewPlugin" })
+ @Test(dependsOnMethods = { "persistNewTypes" }, groups = { "plugin.resource.metadata.test", "NewPlugin" })
public void persistPackageTypes() throws Exception {
assertResourceTypeAssociationEquals("ServerA", "TestPlugin", "packageTypes",
asList("ServerA.Content.1", "ServerA.Content.2"));
}
- @Test(groups = { "plugin.resource.metadata.test", "plugin.metadata", "UpgradePlugin" }, dependsOnGroups = { "NewPlugin" })
+ @Test(groups = { "plugin.resource.metadata.test", "UpgradePlugin" }, dependsOnGroups = { "NewPlugin" })
public void upgradePlugin() throws Exception {
createPlugin("test-plugin.jar", "2.0", "plugin_v2.xml");
}
- @Test(dependsOnMethods = { "upgradePlugin" }, groups = { "plugin.resource.metadata.test", "plugin.metadata",
- "UpgradePlugin" })
+ @Test(dependsOnMethods = { "upgradePlugin" }, groups = { "plugin.resource.metadata.test", "UpgradePlugin" })
public void upgradeOperationDefinitions() throws Exception {
assertResourceTypeAssociationEquals("ServerA", "TestPlugin", "operationDefinitions",
asList("start", "shutdown", "restart"));
}
- @Test(dependsOnMethods = { "upgradePlugin" }, groups = { "plugin.resource.metadata.test", "plugin.metadata",
- "UpgradePlugin" })
+ @Test(dependsOnMethods = { "upgradePlugin" }, groups = { "plugin.resource.metadata.test", "UpgradePlugin" })
public void upgradeChildResources() throws Exception {
assertResourceTypeAssociationEquals("ServerA", "TestPlugin", "childResourceTypes", asList("Child1", "Child3"));
}
- @Test(dependsOnMethods = { "upgradePlugin" }, groups = { "plugin.resource.metadata.test", "plugin.metadata",
- "UpgradePlugin" })
+ @Test(dependsOnMethods = { "upgradePlugin" }, groups = { "plugin.resource.metadata.test", "UpgradePlugin" })
public void upgradeParentTypeOfChild() throws Exception {
assertResourceTypeAssociationEquals("ServerB", "TestPlugin", "childResourceTypes", asList("Child2"));
}
- @Test(dependsOnMethods = { "upgradePlugin" }, groups = { "plugin.resource.metadata.test", "plugin.metadata",
- "UpgradePlugin" })
+ @Test(dependsOnMethods = { "upgradePlugin" }, groups = { "plugin.resource.metadata.test", "UpgradePlugin" })
public void upgradeEventDefinitions() throws Exception {
assertResourceTypeAssociationEquals("ServerA", "TestPlugin", "eventDefinitions",
asList("logAEntry", "logCEntry"));
}
- @Test(dependsOnMethods = { "upgradePlugin" }, groups = { "plugin.resource.metadata.test", "plugin.metadata",
- "UpgradePlugin" })
+ @Test(dependsOnMethods = { "upgradePlugin" }, groups = { "plugin.resource.metadata.test", "UpgradePlugin" })
public void upgradeProcessScans() throws Exception {
assertResourceTypeAssociationEquals("ServerA", "TestPlugin", "processScans", asList("processA", "processB"));
}
- @Test(dependsOnMethods = { "upgradePlugin" }, groups = { "plugin.resource.metadata.test", "plugin.metadata",
- "UpgradePlugin" })
+ @Test(dependsOnMethods = { "upgradePlugin" }, groups = { "plugin.resource.metadata.test", "UpgradePlugin" })
public void upgradeDriftDefinitionTemplates() throws Exception {
ResourceType type = assertResourceTypeAssociationEquals("ServerA", "TestPlugin", "driftDefinitionTemplates",
asList("drift-rc", "drift-mt"));
@@ -343,8 +333,7 @@ public class ResourceMetadataManagerBeanTest extends MetadataBeanTest {
}
}
- @Test(dependsOnMethods = { "upgradePlugin" }, groups = { "plugin.resource.metadata.test", "plugin.metadata",
- "UpgradePlugin" })
+ @Test(dependsOnMethods = { "upgradePlugin" }, groups = { "plugin.resource.metadata.test", "UpgradePlugin" })
public void upgradeBundleTargetConfigurations() throws Exception {
String resourceTypeName = "ServerA";
String plugin = "TestPlugin";
@@ -379,8 +368,7 @@ public class ResourceMetadataManagerBeanTest extends MetadataBeanTest {
}
}
- @Test(dependsOnMethods = { "upgradePlugin" }, groups = { "plugin.resource.metadata.test", "plugin.metadata",
- "UpgradePlugin" })
+ @Test(dependsOnMethods = { "upgradePlugin" }, groups = { "plugin.resource.metadata.test", "UpgradePlugin" })
public void upgradePackageTypes() throws Exception {
assertResourceTypeAssociationEquals("ServerA", "TestPlugin", "packageTypes",
asList("ServerA.Content.1", "ServerA.Content.3"));
@@ -400,7 +388,7 @@ public class ResourceMetadataManagerBeanTest extends MetadataBeanTest {
}
@Test(dependsOnMethods = { "upgradePluginWithTypesRemoved" }, groups = { "plugin.resource.metadata.test",
- "plugin.metadata", "RemoveTypes" })
+ "RemoveTypes" })
public void deleteOperationDefsForRemovedType() throws Exception {
OperationManagerLocal operationMgr = LookupUtil.getOperationManager();
SubjectManagerLocal subjectMgr = LookupUtil.getSubjectManager();
@@ -416,7 +404,7 @@ public class ResourceMetadataManagerBeanTest extends MetadataBeanTest {
}
@Test(dependsOnMethods = { "upgradePluginWithTypesRemoved" }, groups = { "plugin.resource.metadata.test",
- "plugin.metadata", "RemoveTypes" })
+ "RemoveTypes" })
public void deleteEventDefsForRemovedType() throws Exception {
List<?> results = getEntityManager()
.createQuery("from EventDefinition e where e.name = :ename and e.resourceType.name = :rname")
@@ -426,7 +414,7 @@ public class ResourceMetadataManagerBeanTest extends MetadataBeanTest {
}
@Test(dependsOnMethods = { "upgradePluginWithTypesRemoved" }, groups = { "plugin.resource.metadata.test",
- "plugin.metadata", "RemoveTypes" })
+ "RemoveTypes" })
public void deleteParent() throws Exception {
SubjectManagerLocal subjectMgr = LookupUtil.getSubjectManager();
ResourceTypeManagerLocal resourceTypeMgr = LookupUtil.getResourceTypeManager();
@@ -460,7 +448,7 @@ public class ResourceMetadataManagerBeanTest extends MetadataBeanTest {
}
@Test(dependsOnMethods = { "upgradePluginWithTypesRemoved" }, groups = { "plugin.resource.metadata.test",
- "plugin.metadata", "RemoveTypes" })
+ "RemoveTypes" })
public void deleteTypeAndAllItsDescedantTypes() throws Exception {
List<?> typesNotRemoved = getEntityManager()
.createQuery("from ResourceType t where t.plugin = :plugin and t.name in (:resourceTypes)")
@@ -472,7 +460,7 @@ public class ResourceMetadataManagerBeanTest extends MetadataBeanTest {
}
@Test(dependsOnMethods = { "upgradePluginWithTypesRemoved" }, groups = { "plugin.resource.metadata.test",
- "plugin.metadata", "RemoveTypes" })
+ "RemoveTypes" })
public void deleteProcessScans() {
List<?> processScans = getEntityManager()
.createQuery("from ProcessScan p where p.name = :name1 or p.name = :name2").setParameter("name1", "scan1")
@@ -482,7 +470,7 @@ public class ResourceMetadataManagerBeanTest extends MetadataBeanTest {
}
@Test(dependsOnMethods = { "upgradePluginWithTypesRemoved" }, groups = { "plugin.resource.metadata.test",
- "plugin.metadata", "RemoveTypes" })
+ "RemoveTypes" })
public void deleteSubcategories() {
List<?> subcategories = getEntityManager()
.createQuery("from ResourceSubCategory r where r.name = :name1 or r.name = :name2 or r.name = :name3")
@@ -492,7 +480,7 @@ public class ResourceMetadataManagerBeanTest extends MetadataBeanTest {
}
@Test(dependsOnMethods = { "upgradePluginWithTypesRemoved" }, groups = { "plugin.resource.metadata.test",
- "plugin.metadata", "RemoveTypes" })
+ "RemoveTypes" })
public void deleteResources() {
ResourceManagerLocal resourceMgr = LookupUtil.getResourceManager();
SubjectManagerLocal subjectMgr = LookupUtil.getSubjectManager();
@@ -518,7 +506,7 @@ public class ResourceMetadataManagerBeanTest extends MetadataBeanTest {
}
@Test(dependsOnMethods = { "upgradePluginWithTypesRemoved" }, groups = { "plugin.resource.metadata.test",
- "plugin.metadata", "RemoveTypes" })
+ "RemoveTypes" })
public void deleteBundles() {
List<?> bundles = getEntityManager().createQuery("from Bundle b where b.bundleType.name = :name")
.setParameter("name", "Test Bundle").getResultList();
@@ -527,7 +515,7 @@ public class ResourceMetadataManagerBeanTest extends MetadataBeanTest {
}
@Test(dependsOnMethods = { "upgradePluginWithTypesRemoved" }, groups = { "plugin.resource.metadata.test",
- "plugin.metadata", "RemoveTypes" })
+ "RemoveTypes" })
public void deleteBundleTypes() {
List<?> bundleTypes = getEntityManager().createQuery("from BundleType b where b.name = :name")
.setParameter("name", "Test Bundle").getResultList();
@@ -536,7 +524,7 @@ public class ResourceMetadataManagerBeanTest extends MetadataBeanTest {
}
@Test(dependsOnMethods = { "upgradePluginWithTypesRemoved" }, groups = { "plugin.resource.metadata.test",
- "plugin.metadata", "RemoveTypes" })
+ "RemoveTypes" })
public void deletePackages() {
List<?> packages = getEntityManager().createQuery("from Package p where p.name = :name")
.setParameter("name", "ServerC::test-package").getResultList();
@@ -545,7 +533,7 @@ public class ResourceMetadataManagerBeanTest extends MetadataBeanTest {
}
@Test(dependsOnMethods = { "upgradePluginWithTypesRemoved" }, groups = { "plugin.resource.metadata.test",
- "plugin.metadata", "RemoveTypes" })
+ "RemoveTypes" })
public void deletePackageTypes() {
List<?> packageTypes = getEntityManager().createQuery("from PackageType p where p.name = :name")
.setParameter("name", "ServerC.Content").getResultList();
@@ -554,7 +542,7 @@ public class ResourceMetadataManagerBeanTest extends MetadataBeanTest {
}
@Test(dependsOnMethods = { "upgradePluginWithTypesRemoved" }, groups = { "plugin.resource.metadata.test",
- "plugin.metadata", "RemoveTypes" })
+ "RemoveTypes" })
public void deleteResourceGroups() {
List<?> groups = getEntityManager()
.createQuery("from ResourceGroup g where g.name = :name and g.resourceType.name = :typeName")
@@ -564,7 +552,7 @@ public class ResourceMetadataManagerBeanTest extends MetadataBeanTest {
}
@Test(dependsOnMethods = { "upgradePluginWithTypesRemoved" }, groups = { "plugin.resource.metadata.test",
- "plugin.metadata", "RemoveTypes" })
+ "RemoveTypes" })
public void deleteAlertTemplates() {
List<?> templates = getEntityManager()
.createQuery("from AlertDefinition a where a.name = :name and a.resourceType.name = :typeName")
@@ -574,7 +562,7 @@ public class ResourceMetadataManagerBeanTest extends MetadataBeanTest {
}
@Test(dependsOnMethods = { "upgradePluginWithTypesRemoved" }, groups = { "plugin.resource.metadata.test",
- "plugin.metadata", "RemoveTypes" })
+ "RemoveTypes" })
public void deleteMeasurementDefinitions() {
List<?> measurementDefs = getEntityManager().createQuery("from MeasurementDefinition m where m.name = :name")
.setParameter("name", "ServerC::metric1").getResultList();
@@ -582,6 +570,12 @@ public class ResourceMetadataManagerBeanTest extends MetadataBeanTest {
assertEquals("Measurement definitions should have been deleted", 0, measurementDefs.size());
}
+ // this needs to be the last test executed in the class, it does cleanup
+ @Test(priority = 10, alwaysRun = true, dependsOnGroups = { "RemoveTypes" })
+ public void afterClassWorkTest() throws Exception {
+ afterClassWork();
+ }
+
void assertTypesPersisted(String msg, List<String> types, String plugin) {
List<String> typesNotFound = new ArrayList<String>();
ResourceTypeManagerLocal resourceTypeMgr = LookupUtil.getResourceTypeManager();
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java
index 8984027..6fc8350 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java
@@ -121,6 +121,62 @@ public abstract class AbstractEJB3Test extends Arquillian {
.addAsResource("org/rhq/enterprise/server/configuration/metadata/configuration_metadata_manager_bean_test_v2.xml");
testClassesJar.addAsResource("org/rhq/enterprise/server/discovery/DiscoveryBossBeanTest.xml");
testClassesJar.addAsResource("org/rhq/enterprise/server/inventory/InventoryManagerBeanTest.xml");
+ testClassesJar.addAsResource("org/rhq/enterprise/server/resource/metadata/MetadataTest.xml");
+
+ testClassesJar
+ .addAsResource("org/rhq/enterprise/server/resource/metadata/AlertMetadataManagerBeanTest/plugin_v1.xml");
+ testClassesJar
+ .addAsResource("org/rhq/enterprise/server/resource/metadata/AlertMetadataManagerBeanTest/plugin_v2.xml");
+
+ testClassesJar
+ .addAsResource("org/rhq/enterprise/server/resource/metadata/ContentMetadataManagerBeanTest/plugin_v1.xml");
+ testClassesJar
+ .addAsResource("org/rhq/enterprise/server/resource/metadata/ContentMetadataManagerBeanTest/plugin_v2.xml");
+
+ testClassesJar
+ .addAsResource("org/rhq/enterprise/server/resource/metadata/EventMetadataManagerBeanTest/plugin_v1.xml");
+ testClassesJar
+ .addAsResource("org/rhq/enterprise/server/resource/metadata/EventMetadataManagerBeanTest/plugin_v2.xml");
+
+ testClassesJar
+ .addAsResource("org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBeanTest/plugin_v1.xml");
+ testClassesJar
+ .addAsResource("org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBeanTest/plugin_v2.xml");
+
+ testClassesJar
+ .addAsResource("org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionMetadataTest/child1_plugin_v1.xml");
+ testClassesJar
+ .addAsResource("org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionMetadataTest/child2_plugin_v1.xml");
+ testClassesJar
+ .addAsResource("org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionMetadataTest/parent_plugin_v1.xml");
+ testClassesJar
+ .addAsResource("org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionMetadataTest/parent_plugin_v2.xml");
+
+ testClassesJar
+ .addAsResource("org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionSinglePluginDescriptorMetadataTest/child_plugin_v1.xml");
+ testClassesJar
+ .addAsResource("org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionSinglePluginDescriptorMetadataTest/parent_plugin_v1.xml");
+ testClassesJar
+ .addAsResource("org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionSinglePluginDescriptorMetadataTest/parent_plugin_v2.xml");
+
+ testClassesJar
+ .addAsResource("org/rhq/enterprise/server/resource/metadata/OperationMetadataManagerBeanTest/plugin_v1.xml");
+ testClassesJar
+ .addAsResource("org/rhq/enterprise/server/resource/metadata/OperationMetadataManagerBeanTest/plugin_v2.xml");
+
+ testClassesJar
+ .addAsResource("org/rhq/enterprise/server/resource/metadata/PluginExtensionMetadataTest/child_plugin_v1.xml");
+ testClassesJar
+ .addAsResource("org/rhq/enterprise/server/resource/metadata/PluginExtensionMetadataTest/parent_plugin_v1.xml");
+ testClassesJar
+ .addAsResource("org/rhq/enterprise/server/resource/metadata/PluginExtensionMetadataTest/parent_plugin_v2.xml");
+
+ testClassesJar.addAsResource("org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_1.xml");
+ testClassesJar.addAsResource("org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_2.xml");
+ testClassesJar
+ .addAsResource("org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_3.1.xml");
+ testClassesJar.addAsResource("org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_3.xml");
+
testClassesJar
.addAsResource("org/rhq/enterprise/server/resource/metadata/PluginScanningExtensionMetadataTest/child1_plugin_v1.xml");
testClassesJar
@@ -129,6 +185,24 @@ public abstract class AbstractEJB3Test extends Arquillian {
.addAsResource("org/rhq/enterprise/server/resource/metadata/PluginScanningExtensionMetadataTest/parent_plugin_v1.xml");
testClassesJar
.addAsResource("org/rhq/enterprise/server/resource/metadata/PluginScanningExtensionMetadataTest/parent_plugin_v2.xml");
+
+ testClassesJar
+ .addAsResource("org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/dup_drift.xml");
+ testClassesJar
+ .addAsResource("org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/parent_resource_type-plugin.xml");
+ testClassesJar
+ .addAsResource("org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/plugin_v1.xml");
+ testClassesJar
+ .addAsResource("org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/plugin_v2.xml");
+ testClassesJar
+ .addAsResource("org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/remove_bundle_drift_config_v1.xml");
+ testClassesJar
+ .addAsResource("org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/remove_bundle_drift_config_v2.xml");
+ testClassesJar
+ .addAsResource("org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/remove_types_v1.xml");
+ testClassesJar
+ .addAsResource("org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/remove_types_v2.xml");
+
testClassesJar.addAsResource("perftest/AvailabilityInsertPurgeTest-testOne-data.xml.zip");
testClassesJar.addAsResource("serverplugins/simple-generic-serverplugin.xml");
testClassesJar.addAsResource("test/deployment/1.0-feb-2.xml");
diff --git a/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/AlertMetadataManagerBeanTest/plugin_v1.xml b/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/AlertMetadataManagerBeanTest/plugin_v1.xml
deleted file mode 100644
index 3b9ad64..0000000
--- a/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/AlertMetadataManagerBeanTest/plugin_v1.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<plugin name="AlertMetadataManagerBeanTestPlugin"
- displayName="AlertMetadataManagerBean Test Plugin"
- package="org.rhq.plugins.test"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:xmlns:rhq-plugin"
- xmlns:c="urn:xmlns:rhq-configuration">
- <server name="AlertServer"/>
-</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/AlertMetadataManagerBeanTest/plugin_v2.xml b/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/AlertMetadataManagerBeanTest/plugin_v2.xml
deleted file mode 100644
index f2664dc..0000000
--- a/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/AlertMetadataManagerBeanTest/plugin_v2.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<plugin name="AlertMetadataManagerBeanTestPlugin"
- displayName="AlertMetadataManagerBean Test Plugin"
- package="org.rhq.plugins.test"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:xmlns:rhq-plugin"
- xmlns:c="urn:xmlns:rhq-configuration">
-</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/ContentMetadataManagerBeanTest/plugin_v1.xml b/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/ContentMetadataManagerBeanTest/plugin_v1.xml
deleted file mode 100644
index 79f9296..0000000
--- a/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/ContentMetadataManagerBeanTest/plugin_v1.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<plugin name="ContentMetadataManagerBeanTestPlugin"
- displayName="ContentMetadataManagerBean Test Plugin"
- package="org.rhq.plugins.test"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:xmlns:rhq-plugin"
- xmlns:c="urn:xmlns:rhq-configuration">
- <server name="ContentServer">
- <content name="ContentServer.Content.1" category="deployable"/>
- </server>
-
- <server name="ContentServer1"/>
-
- <server name="ContentServer2">
- <content name="ContentServer2.Content.1" category="executableScript"/>
- </server>
-
- <server name="ContentServer3">
- <content name="ContentServer3.Content.1" category="deployable"/>
- <content name="ContentServer3.Content.2" category="deployable"/>
- <content name="ContentServer3.Content.3" category="deployable"/>
- </server>
-
- <server name="ContentServer4">
- <content name="ContentServer4.Content.1" category="deployable"/>
- </server>
-
- <server name="ContentServer5">
- <content name="ContentServer5.Content.1" category="deployable">
- <configuration>
- <c:simple-property name="x"/>
- </configuration>
- </content>
- <content name="ContentServer5.Content.2" category="deployable">
- <configuration>
- <c:simple-property name="x"/>
- </configuration>
- </content>
- </server>
-
- <server name="ContentServer6"/>
-
- <server name="ContentServer7">
- <bundle type="ContentServer.Bundle.1"/>
- </server>
-</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/ContentMetadataManagerBeanTest/plugin_v2.xml b/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/ContentMetadataManagerBeanTest/plugin_v2.xml
deleted file mode 100644
index f0cd7b8..0000000
--- a/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/ContentMetadataManagerBeanTest/plugin_v2.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<plugin name="ContentMetadataManagerBeanTestPlugin"
- displayName="ContentMetadataManagerBean Test Plugin"
- package="org.rhq.plugins.test"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:xmlns:rhq-plugin"
- xmlns:c="urn:xmlns:rhq-configuration">
- <server name="ContentServer">
- <content name="ContentServer.Content.1" category="deployable">
- <configuration>
- <c:simple-property name="version"/>
- </configuration>
- </content>
- </server>
-
- <server name="ContentServer1">
- <content name="ContentServer1.Content.1" category="deployable"/>
- <content name="ContentServer1.Content.2" category="configuration"/>
- </server>
-
- <server name="ContentServer2"/>
-
- <server name="ContentServer3">
- <content name="ContentServer3.Content.2" category="deployable"/>
- <content name="ContentServer3.Content.3" category="deployable"/>
- </server>
-
- <server name="ContentServer4">
- <content name="ContentServer4.Content.1" category="deployable"/>
- <content name="ContentServer4.Content.2" category="deployable"/>
- </server>
-
- <server name="ContentServer5">
- <content name="ContentServer5.Content.1" category="deployable">
- <configuration>
- <c:simple-property name="x"/>
- <c:simple-property name="y"/>
- </configuration>
- </content>
- <content name="ContentServer5.Content.2" category="deployable"/>
- </server>
-
- <server name="ContentServer6">
- <bundle type="ContentServer6.Bundle.1"/>
- </server>
-
- <server name="ContentServer7">
- <bundle type="ContentServer.Bundle.2"/>
- </server>
-</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/EventMetadataManagerBeanTest/plugin_v1.xml b/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/EventMetadataManagerBeanTest/plugin_v1.xml
deleted file mode 100644
index 2786b05..0000000
--- a/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/EventMetadataManagerBeanTest/plugin_v1.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<plugin name="EventMetadataManagerBeanTestPlugin"
- displayName="MeasurementMetadataManagerBean Test Plugin"
- package="org.rhq.plugins.test"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:xmlns:rhq-plugin"
- xmlns:c="urn:xmlns:rhq-configuration">
- <server name="EventServer1">
- <event name="event1" description="Event 1"/>
- <event name="event2" description="Event 2"/>
- </server>
-
- <server name="EventServer2"/>
-
- <server name="EventServer3">
- <event name="event1" description="Event 1"/>
- <event name="event2" description="Event 2"/>
- </server>
-
- <server name="EventServer4">
- <event name="event1" description="Event 1"/>
- <event name="event2" description="Event 2"/>
- </server>
-</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/EventMetadataManagerBeanTest/plugin_v2.xml b/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/EventMetadataManagerBeanTest/plugin_v2.xml
deleted file mode 100644
index f4f765f..0000000
--- a/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/EventMetadataManagerBeanTest/plugin_v2.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<plugin name="EventMetadataManagerBeanTestPlugin"
- displayName="ContentMetadataManagerBean Test Plugin"
- package="org.rhq.plugins.test"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:xmlns:rhq-plugin"
- xmlns:c="urn:xmlns:rhq-configuration">
- <server name="EventServer1">
- <event name="event1" description="Event 1"/>
- <event name="event2" description="Event 2"/>
- </server>
-
- <server name="EventServer2">
- <event name="event1" description="Event 1"/>
- <event name="event2" description="Event 2"/>
- </server>
-
- <server name="EventServer3"/>
-
- <server name="EventServer4">
- <event name="event1" description="EVENT ONE"/>
- <event name="event3" description="Event 3"/>
- </server>
-</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBeanTest/plugin_v1.xml b/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBeanTest/plugin_v1.xml
deleted file mode 100644
index 0202079..0000000
--- a/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBeanTest/plugin_v1.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<plugin name="MeasurementMetadataManagerBeanTestPlugin"
- displayName="MeasurementMetadataManagerBean Test Plugin"
- package="org.rhq.plugins.test"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:xmlns:rhq-plugin"
- xmlns:c="urn:xmlns:rhq-configuration">
- <server name="MetricServer1">
- <metric displayName="metric1" property="metric1" dataType="trait" displayType="summary"
- description="Metric 1" category="availability" defaultInterval="30000" defaultOn="true"
- units="milliseconds"/>
- <metric displayName="metric2" property="metric2" dataType="measurement" displayType="detail"
- description="Metric 2" category="performance" defaultInterval="30000" defaultOn="true"
- units="megabytes" measurementType="trendsup"/>
- <metric displayName="metric3" property="metric3" dataType="calltime" displayType="detail"
- description="Metric 3" category="throughput" defaultInterval="30000" defaultOn="true"
- units="milliseconds" destinationType="myMethod"/>
- </server>
- <server name="MetricServer2"/>
- <server name="MetricServer3">
- <metric displayName="metric1" property="metric1" dataType="trait" displayType="summary"
- description="Metric 1" category="availability" defaultInterval="30000" defaultOn="true"
- units="milliseconds"/>
-
- <service name="MetricService1">
- <metric property="rhq.availability" defaultInterval="120000" defaultOn="false" />
- </service>
- <service name="MetricService2" />
- </server>
- <server name="MetricServer4">
- <metric displayName="metric1" property="metric1" dataType="trait" displayType="summary"
- description="Metric 1" category="availability" defaultInterval="30000" defaultOn="true"
- units="milliseconds"/>
- </server>
- <server name="MetricServer5">
- <!--
- Need to use names for these metrics that are unique across the plugin because the resource
- type will be deleted and the metric definition cannot be looked up by resource type. We will
- instead look them up by name only.
- -->
- <metric displayName="metric1" property="MetricServer5.metric1" dataType="trait" displayType="summary"
- description="Metric 1" category="availability" defaultInterval="30000" defaultOn="true"
- units="milliseconds"/>
- <metric displayName="metric3" property="MetricServer5.metric3" dataType="calltime" displayType="detail"
- description="Metric 3" category="throughput" defaultInterval="30000" defaultOn="true"
- units="milliseconds" destinationType="myMethod"/>
- </server>
-
-</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBeanTest/plugin_v2.xml b/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBeanTest/plugin_v2.xml
deleted file mode 100644
index d949778..0000000
--- a/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBeanTest/plugin_v2.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<plugin name="MeasurementMetadataManagerBeanTestPlugin"
- displayName="MeasurementMetadataManagerBean Test Plugin"
- package="org.rhq.plugins.test"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:xmlns:rhq-plugin"
- xmlns:c="urn:xmlns:rhq-configuration">
- <server name="MetricServer1">
- <metric displayName="metric1" property="metric1" dataType="trait" displayType="summary"
- description="Metric 1" category="availability" defaultInterval="30000" defaultOn="true"
- units="milliseconds"/>
- <metric displayName="metric2" property="metric2" dataType="measurement" displayType="detail"
- description="Metric 2" category="performance" defaultInterval="30000" defaultOn="true"
- units="megabytes" measurementType="trendsup"/>
- <metric displayName="metric3" property="metric3" dataType="calltime" displayType="detail"
- description="Metric 3" category="throughput" defaultInterval="30000" defaultOn="true"
- units="milliseconds" destinationType="myMethod"/>
- <metric displayName="cannotBeSet" property="rhq.availability"
- description="cannotBeSet" defaultInterval="120000" defaultOn="true"/>
- </server>
- <server name="MetricServer2">
- <metric displayName="metric1" property="metric1" dataType="trait" displayType="summary"
- description="Metric 1" category="availability" defaultInterval="30000" defaultOn="true"
- units="milliseconds"/>
- </server>
- <server name="MetricServer3">
- <metric displayName="metric1" property="metric1" dataType="measurement" displayType="detail"
- description="Metric One" category="performance" defaultInterval="60000" defaultOn="false"
- units="milliseconds" measurementType="trendsup"/>
-
- <service name="MetricService1">
- <metric displayName="cannotBeSet" property="rhq.availability"
- description="cannotBeSet" defaultInterval="240000" defaultOn="true" />
- </service>
- <service name="MetricService2">
- <metric displayName="cannotBeSet" property="rhq.availability"
- description="cannotBeSet" defaultInterval="480000" defaultOn="true" />
- </service>
- </server>
- <server name="MetricServer4"/>
-</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/MetadataTest.xml b/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/MetadataTest.xml
deleted file mode 100644
index e914562..0000000
--- a/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/MetadataTest.xml
+++ /dev/null
@@ -1,298 +0,0 @@
-<dataset>
- <rhq_config_def/>
- <rhq_config_prop_grp_def/>
- <rhq_config_prop_def/>
- <rhq_config_pd_osrc/>
- <rhq_conf_prop_def_enum/>
- <rhq_config_prop_constr/>
- <rhq_config/>
- <rhq_config_property/>
- <rhq_config_template/>
- <rhq_raw_config/>
- <rhq_affinity_group/>
- <rhq_server/>
- <rhq_agent/>
- <rhq_partition_event/>
- <rhq_partition_details/>
- <rhq_failover_list/>
- <rhq_failover_details/>
- <rhq_principal id="2" PRINCIPAL="rhqadmin" PASSWORD="x1XwrxKuPvYUILiOnOZTLg=="/>
- <rhq_subject
- ID="1"
- NAME="admin"
- FIRST_NAME="Super"
- LAST_NAME="User"
- FSYSTEM="1"/>
- <rhq_subject
- ID="2"
- NAME="rhqadmin"
- FIRST_NAME="RHQ"
- LAST_NAME="Administrator"
- EMAIL_ADDRESS="nobody@localhost"
- FSYSTEM="0"/>
- <rhq_resource_type/>
- <rhq_resource_subcat/>
- <rhq_resource_type_parents/>
- <rhq_process_scan/>
- <rhq_prd_ver/>
- <rhq_resource/>
- <rhq_resource_error/>
- <rhq_group_def/>
- <rhq_resource_group/>
- <rhq_resource_group_res_imp_map/>
- <rhq_resource_group_res_exp_map/>
- <rhq_config_group_update/>
- <rhq_config_update/>
- <rhq_tagging/>
- <rhq_tagging_resource_map/>
- <rhq_tagging_res_group_map/>
- <rhq_role
- ID="1"
- NAME="Super User Role"
- FSYSTEM="1"
- DESCRIPTION="System superuser role that provides full access to everything. This role cannot be modified."/>
- <rhq_role
- ID="2"
- NAME="All Resources Role"
- FSYSTEM="0"
- DESCRIPTION="Provides full access to all resources in inventory. Cannot modify users, roles or server settings."/>
- <rhq_role_resource_group_map/>
- <rhq_role_ldap_group/>
- <rhq_permission ROLE_ID="1" OPERATION="0"/> <!-- Permission.MANAGE_SECURITY -->
- <rhq_permission ROLE_ID="1" OPERATION="1"/> <!-- Permission.MANAGE_INVENTORY -->
- <rhq_permission ROLE_ID="1" OPERATION="2"/> <!-- Permission.MANAGE_SETTINGS -->
- <rhq_permission ROLE_ID="1" OPERATION="12"/> <!-- Permission.MANAGE_BUNDLE -->
- <rhq_permission ROLE_ID="1" OPERATION="15"/> <!-- Permission.MANAGE_REPOSITORIES -->
- <!-- resource permissions start here-->
- <rhq_permission ROLE_ID="1" OPERATION="3"/> <!-- Permission.VIEW_RESOURCE -->
- <rhq_permission ROLE_ID="1" OPERATION="4"/> <!-- Permission.MODIFY_RESOURCE -->
- <rhq_permission ROLE_ID="1" OPERATION="5"/> <!-- Permission.DELETE_RESOURCE -->
- <rhq_permission ROLE_ID="1" OPERATION="6"/> <!-- Permission.CREATE_CHILD_RESOURCES -->
- <rhq_permission ROLE_ID="1" OPERATION="7"/> <!-- Permission.MANAGE_ALERTS -->
- <rhq_permission ROLE_ID="1" OPERATION="8"/> <!-- Permission.MANAGE_MEASUREMENTS -->
- <rhq_permission ROLE_ID="1" OPERATION="9"/> <!-- Permission.MANAGE_CONTENT -->
- <rhq_permission ROLE_ID="1" OPERATION="10"/> <!-- Permission.CONTROL -->
- <rhq_permission ROLE_ID="1" OPERATION="11"/> <!-- Permission.CONFIGURE -->
- <rhq_permission ROLE_ID="1" OPERATION="14"/> <!-- Permission.MANAGE_EVENTS -->
-
- <!-- give all-resources-role all permissions (resource perms is mainly just to show on view-role page) -->
- <rhq_permission ROLE_ID="2" OPERATION="1"/> <!-- Permission.MANAGE_INVENTORY -->
- <rhq_permission ROLE_ID="2" OPERATION="12"/> <!-- Permission.MANAGE_BUNDLE -->
- <!-- resource permissions start here-->
- <rhq_permission ROLE_ID="2" OPERATION="3"/> <!-- Permission.VIEW_RESOURCE -->
- <rhq_permission ROLE_ID="2" OPERATION="4"/> <!-- Permission.MODIFY_RESOURCE -->
- <rhq_permission ROLE_ID="2" OPERATION="5"/> <!-- Permission.DELETE_RESOURCE -->
- <rhq_permission ROLE_ID="2" OPERATION="6"/> <!-- Permission.CREATE_CHILD_RESOURCES -->
- <rhq_permission ROLE_ID="2" OPERATION="7"/> <!-- Permission.MANAGE_ALERTS -->
- <rhq_permission ROLE_ID="2" OPERATION="8"/> <!-- Permission.MANAGE_MEASUREMENTS -->
- <rhq_permission ROLE_ID="2" OPERATION="9"/> <!-- Permission.MANAGE_CONTENT -->
- <rhq_permission ROLE_ID="2" OPERATION="10"/> <!-- Permission.CONTROL -->
- <rhq_permission ROLE_ID="2" OPERATION="11"/> <!-- Permission.CONFIGURE -->
- <rhq_permission ROLE_ID="2" OPERATION="14"/> <!-- Permission.MANAGE_EVENTS -->
- <rhq_subject_role_map SUBJECT_ID="1" ROLE_ID="1"/>
- <rhq_subject_role_map SUBJECT_ID="2" ROLE_ID="1"/>
- <rhq_subject_role_ldap_map/>
- <rhq_saved_search/>
- <rhq_dashboard/>
- <rhq_dashboard_portlet/>
- <rhq_operation_def/>
- <rhq_operation_history/>
- <rhq_operation_schedule/>
- <rhq_event_def/>
- <rhq_event_source/>
- <rhq_event/>
- <rhq_alert_definition/>
- <rhq_alert_dampen_event/>
- <rhq_alert_condition/>
- <rhq_alert/>
- <rhq_alert_notif_log/>
- <rhq_alert_condition_log/>
- <rhq_alert_notification/>
- <rhq_plugin/>
- <rhq_measurement_def/>
- <rhq_measurement_sched/>
- <rhq_measurement_bline/>
- <rhq_measurement_data_num_1h/>
- <rhq_measurement_data_num_6h/>
- <rhq_measurement_data_num_1d/>
- <rhq_measurement_data_trait/>
- <rhq_calltime_data_key/>
- <rhq_calltime_data_value/>
- <rhq_availability/>
- <rhq_resource_avail/>
- <rhq_measurement_oob/>
- <rhq_measurement_oob_tmp/>
- <rhq_numbers i="0"/>
- <rhq_numbers i="1"/>
- <rhq_numbers i="2"/>
- <rhq_numbers i="3"/>
- <rhq_numbers i="4"/>
- <rhq_numbers i="5"/>
- <rhq_numbers i="6"/>
- <rhq_numbers i="7"/>
- <rhq_numbers i="8"/>
- <rhq_numbers i="9"/>
- <rhq_numbers i="10"/>
- <rhq_numbers i="11"/>
- <rhq_numbers i="12"/>
- <rhq_numbers i="13"/>
- <rhq_numbers i="14"/>
- <rhq_numbers i="15"/>
- <rhq_numbers i="16"/>
- <rhq_numbers i="17"/>
- <rhq_numbers i="18"/>
- <rhq_numbers i="19"/>
- <rhq_numbers i="20"/>
- <rhq_numbers i="21"/>
- <rhq_numbers i="22"/>
- <rhq_numbers i="23"/>
- <rhq_numbers i="24"/>
- <rhq_numbers i="25"/>
- <rhq_numbers i="26"/>
- <rhq_numbers i="27"/>
- <rhq_numbers i="28"/>
- <rhq_numbers i="29"/>
- <rhq_numbers i="30"/>
- <rhq_numbers i="31"/>
- <rhq_numbers i="32"/>
- <rhq_numbers i="33"/>
- <rhq_numbers i="34"/>
- <rhq_numbers i="35"/>
- <rhq_numbers i="36"/>
- <rhq_numbers i="37"/>
- <rhq_numbers i="38"/>
- <rhq_numbers i="39"/>
- <rhq_numbers i="40"/>
- <rhq_numbers i="41"/>
- <rhq_numbers i="42"/>
- <rhq_numbers i="43"/>
- <rhq_numbers i="44"/>
- <rhq_numbers i="45"/>
- <rhq_numbers i="46"/>
- <rhq_numbers i="47"/>
- <rhq_numbers i="48"/>
- <rhq_numbers i="49"/>
- <rhq_numbers i="50"/>
- <rhq_numbers i="51"/>
- <rhq_numbers i="52"/>
- <rhq_numbers i="53"/>
- <rhq_numbers i="54"/>
- <rhq_numbers i="55"/>
- <rhq_numbers i="56"/>
- <rhq_numbers i="57"/>
- <rhq_numbers i="58"/>
- <rhq_numbers i="59"/>
- <rhq_meas_data_num_r00/>
- <rhq_meas_data_num_r01/>
- <rhq_meas_data_num_r02/>
- <rhq_meas_data_num_r03/>
- <rhq_meas_data_num_r04/>
- <rhq_meas_data_num_r05/>
- <rhq_meas_data_num_r06/>
- <rhq_meas_data_num_r07/>
- <rhq_meas_data_num_r08/>
- <rhq_meas_data_num_r09/>
- <rhq_meas_data_num_r10/>
- <rhq_meas_data_num_r11/>
- <rhq_meas_data_num_r12/>
- <rhq_meas_data_num_r13/>
- <rhq_meas_data_num_r14/>
- <rhq_architecture id="1" name="noarch"/>
- <rhq_architecture id="2" name="i386"/>
- <rhq_architecture id="3" name="i486"/>
- <rhq_architecture id="4" name="i586"/>
- <rhq_architecture id="5" name="i686"/>
- <rhq_architecture id="6" name="alpha"/>
- <rhq_architecture id="7" name="alphaev6"/>
- <rhq_architecture id="8" name="ia64"/>
- <rhq_architecture id="9" name="sparc"/>
- <rhq_architecture id="10" name="sparcv9"/>
- <rhq_architecture id="11" name="sparc64"/>
- <rhq_architecture id="12" name="src"/>
- <rhq_architecture id="13" name="s390"/>
- <rhq_architecture id="14" name="athlon"/>
- <rhq_architecture id="15" name="s390x"/>
- <rhq_architecture id="16" name="ppc"/>
- <rhq_architecture id="17" name="ppc64"/>
- <rhq_architecture id="18" name="pSeries"/>
- <rhq_architecture id="19" name="iSeries"/>
- <rhq_architecture id="20" name="x86_64"/>
- <rhq_architecture id="21" name="ppc64iseries"/>
- <rhq_architecture id="22" name="ppc64pseries"/>
- <rhq_architecture id="23" name="sparc-solaris"/>
- <rhq_architecture id="24" name="sparc.sun4u-solaris"/>
- <rhq_architecture id="25" name="tar"/>
- <rhq_architecture id="26" name="ia32e"/>
- <rhq_architecture id="27" name="amd64"/>
- <rhq_architecture id="28" name="i386-solaris"/>
- <rhq_architecture id="29" name="nosrc"/>
- <rhq_architecture id="30" name="sparc-solaris-patch"/>
- <rhq_architecture id="31" name="i386-solaris-patch"/>
- <rhq_architecture id="32" name="sparc-solaris-patch-cluster"/>
- <rhq_architecture id="33" name="i386-solaris-patch-cluster"/>
- <rhq_architecture id="34" name="noarch-solaris"/>
- <rhq_architecture id="35" name="noarch-solaris-patch"/>
- <rhq_architecture id="36" name="noarch-solaris-patch-cluster"/>
- <rhq_architecture id="37" name="solaris-patch"/>
- <rhq_architecture id="38" name="solaris-patch-cluster"/>
- <rhq_repo_group_type id="1" name="family"/>
- <rhq_repo_group/>
- <rhq_content_source_type/>
- <rhq_content_source/>
- <rhq_repo/>
- <rhq_repo_relation_type id="1" name="parent"/>
- <rhq_repo_relation_type id="2" name="clone"/>
- <rhq_repo_relation/>
- <rhq_package_type/>
- <rhq_package/>
- <rhq_package_bits/>
- <rhq_package_version/>
- <rhq_content_req/>
- <rhq_installed_package/>
- <rhq_installed_pkg_hist/>
- <rhq_content_src_sync/>
- <rhq_repo_sync/>
- <rhq_package_inst_step/>
- <rhq_repo_resource_map/>
- <rhq_repo_content_src_map/>
- <rhq_repo_repo_group_map/>
- <rhq_repo_repo_relation_map/>
- <rhq_repo_pkg_version_map/>
- <rhq_pkg_ver_content_src_map/>
- <rhq_pkg_prd_map/>
- <rhq_distribution_type id="1" name="kickstart" description="Linux kickstart distribution"/>
- <rhq_distribution_type id="2" name="jumpstart" description="solaris jumpstart distribution"/>
- <rhq_distribution/>
- <rhq_repo_distribution/>
- <rhq_distribution_file/>
- <rhq_advisory/>
- <rhq_advisory_package/>
- <rhq_cve/>
- <rhq_advisory_cve/>
- <rhq_advisory_buglist/>
- <rhq_repo_advisory/>
- <rhq_bundle_type/>
- <rhq_bundle/>
- <rhq_bundle_version/>
- <rhq_bundle_version_repo/>
- <rhq_bundle_file/>
- <rhq_bundle_destination/>
- <rhq_bundle_deployment/>
- <rhq_bundle_res_deploy/>
- <rhq_bundle_res_dep_hist/>
- <rhq_tagging_bundle_map/>
- <rhq_tagging_bundle_version_map/>
- <rhq_tagging_bundle_deploy_map/>
- <rhq_tagging_bundle_dest_map/>
- <rhq_create_res_hist/>
- <rhq_delete_res_hist/>
- <rhq_drift_def_template/>
- <rhq_drift_definition/>
- <rhq_drift_change_set/>
- <jms_messages/>
- <jms_transactions/>
- <jms_users/>
- <jms_roles/>
- <jms_subscriptions/>
-</dataset>
-
diff --git a/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionMetadataTest/child1_plugin_v1.xml b/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionMetadataTest/child1_plugin_v1.xml
deleted file mode 100644
index befc699..0000000
--- a/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionMetadataTest/child1_plugin_v1.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<plugin name="PluginExtensionMetadataChild1TestPlugin"
- version="1.0"
- displayName="Plugin Extension Metadata Child 1 Test Plugin"
- package="org.rhq.plugins.test.child1"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:xmlns:rhq-plugin"
- xmlns:c="urn:xmlns:rhq-configuration">
-
- <server name="OuterServerA">
- <server name="Child1ServerA"
- description="Child 1 Server type that extends Parent Server type"
- discovery="Child1DiscoveryComponent"
- class="Child1Component"
- sourcePlugin="MultiplePluginExtensionMetadataParentTestPlugin"
- sourceType="ParentServerA">
- </server>
- </server>
-
-</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionMetadataTest/child2_plugin_v1.xml b/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionMetadataTest/child2_plugin_v1.xml
deleted file mode 100644
index 0dafa9b..0000000
--- a/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionMetadataTest/child2_plugin_v1.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<plugin name="PluginExtensionMetadataChild2TestPlugin"
- version="1.0"
- displayName="Plugin Extension Metadata Child 2 Test Plugin"
- package="org.rhq.plugins.test.child2"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:xmlns:rhq-plugin"
- xmlns:c="urn:xmlns:rhq-configuration">
-
-
- <server name="Child2ServerA"
- description="Child 2 Server type that extends Parent Server type"
- discovery="Child2DiscoveryComponent"
- class="Child2Component"
- sourcePlugin="MultiplePluginExtensionMetadataParentTestPlugin"
- sourceType="ParentServerA">
- </server>
-
-
-</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionMetadataTest/parent_plugin_v1.xml b/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionMetadataTest/parent_plugin_v1.xml
deleted file mode 100644
index 627c5a8..0000000
--- a/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionMetadataTest/parent_plugin_v1.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<plugin name="MultiplePluginExtensionMetadataParentTestPlugin"
- version="1.0"
- displayName="Multiple Plugin Extension Metadata Parent Test Plugin"
- package="org.rhq.plugins.test.parent"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:xmlns:rhq-plugin"
- xmlns:c="urn:xmlns:rhq-configuration">
-
- <server name="ParentServerA"
- description="Parent Server type that can be extended by a Child Server type"
- discovery="ParentDiscoveryComponent"
- class="ParentComponent">
-
- <operation name="A-op" timeout="123456" description="a op"></operation>
-
- </server>
-
-</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionMetadataTest/parent_plugin_v2.xml b/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionMetadataTest/parent_plugin_v2.xml
deleted file mode 100644
index 2c0e9d8..0000000
--- a/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionMetadataTest/parent_plugin_v2.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<plugin name="MultiplePluginExtensionMetadataParentTestPlugin"
- version="2.0"
- displayName="Multiple Plugin Extension Metadata Parent Test Plugin"
- package="org.rhq.plugins.test.parent"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:xmlns:rhq-plugin"
- xmlns:c="urn:xmlns:rhq-configuration">
-
- <server name="ParentServerA"
- description="Parent Server type that can be extended by a Child Server type"
- discovery="ParentDiscoveryComponent"
- class="ParentComponent">
-
- <operation name="A-op-NEW" timeout="987654" description="a new op"></operation>
-
- </server>
-
-</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionSinglePluginDescriptorMetadataTest/child_plugin_v1.xml b/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionSinglePluginDescriptorMetadataTest/child_plugin_v1.xml
deleted file mode 100644
index 08ea056..0000000
--- a/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionSinglePluginDescriptorMetadataTest/child_plugin_v1.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<plugin name="MultiplePluginExtensionSinglePluginDescriptorMetadataChildTestPlugin"
- version="1.0"
- displayName="Multiple Plugin Extension Single Descriptor Metadata Child Test Plugin"
- package="org.rhq.plugins.test.child"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:xmlns:rhq-plugin"
- xmlns:c="urn:xmlns:rhq-configuration">
-
- <server name="OuterServerA">
- <server name="Child1ServerA"
- description="Child 1 Server type that extends Parent Server type"
- discovery="Child1DiscoveryComponent"
- class="Child1Component"
- sourcePlugin="MultiplePluginExtensionSinglePluginDescriptorMetadataParentTestPlugin"
- sourceType="ParentServerA">
- </server>
- </server>
-
- <server name="OuterServerB">
- <server name="Child2ServerA"
- description="Child 2 Server type that extends Parent Server type"
- discovery="Child2DiscoveryComponent"
- class="Child2Component"
- sourcePlugin="MultiplePluginExtensionSinglePluginDescriptorMetadataParentTestPlugin"
- sourceType="ParentServerA">
- </server>
- </server>
-
-</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionSinglePluginDescriptorMetadataTest/parent_plugin_v1.xml b/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionSinglePluginDescriptorMetadataTest/parent_plugin_v1.xml
deleted file mode 100644
index be977e7..0000000
--- a/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionSinglePluginDescriptorMetadataTest/parent_plugin_v1.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<plugin name="MultiplePluginExtensionSinglePluginDescriptorMetadataParentTestPlugin"
- version="1.0"
- displayName="Multiple Plugin Extension Metadata Parent Test Plugin"
- package="org.rhq.plugins.test.parent"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:xmlns:rhq-plugin"
- xmlns:c="urn:xmlns:rhq-configuration">
-
- <server name="ParentServerA"
- description="Parent Server type that can be extended by a Child Server type"
- discovery="ParentDiscoveryComponent"
- class="ParentComponent">
-
- <operation name="A-op" timeout="123456" description="a op"></operation>
-
- <!-- BZ 789420 - if that bug isn't fixed and you uncomment this, the child plugin will fail to register properly
- <service name="InnerServiceA">
- <metric property="inner-A-metric" />
- </service>
- -->
-
- </server>
-
-</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionSinglePluginDescriptorMetadataTest/parent_plugin_v2.xml b/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionSinglePluginDescriptorMetadataTest/parent_plugin_v2.xml
deleted file mode 100644
index 9f02834..0000000
--- a/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionSinglePluginDescriptorMetadataTest/parent_plugin_v2.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<plugin name="MultiplePluginExtensionSinglePluginDescriptorMetadataParentTestPlugin"
- version="2.0"
- displayName="Multiple Plugin Extension Metadata Parent Test Plugin"
- package="org.rhq.plugins.test.parent"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:xmlns:rhq-plugin"
- xmlns:c="urn:xmlns:rhq-configuration">
-
- <server name="ParentServerA"
- description="Parent Server type that can be extended by a Child Server type"
- discovery="ParentDiscoveryComponent"
- class="ParentComponent">
-
- <operation name="A-op-NEW" timeout="987654" description="a new op"></operation>
-
- <!-- BZ 789420 - if that bug isn't fixed and you uncomment this, the child plugin will fail to register properly
- <service name="InnerServiceA">
- <metric property="inner-A-metric" />
- </service>
- -->
-
- </server>
-
-</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/OperationMetadataManagerBeanTest/plugin_v1.xml b/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/OperationMetadataManagerBeanTest/plugin_v1.xml
deleted file mode 100644
index 93a15ef..0000000
--- a/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/OperationMetadataManagerBeanTest/plugin_v1.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<plugin name="OperationMetadataManagerBeanTestPlugin"
- displayName="OperationMetadataManagerBean Test Plugin"
- package="org.rhq.plugins.test"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:xmlns:rhq-plugin"
- xmlns:c="urn:xmlns:rhq-configuration">
- <server name="OperationServer1">
- <operation name="OperationServer1.Operation1"/>
- </server>
- <server name="OperationServer11">
- <operation name="OperationServer11.Operation1">
- <parameters>
- <c:simple-property name="param1"/>
- <c:simple-property name="param2"/>
- </parameters>
- </operation>
- </server>
-
- <server name="OperationServer2"/>
- <server name="OperationServer21">
- <operation name="OperationServer21.Operation1"/>
- </server>
- <server name="OperationServer22">
- <operation name="OperationServer22.Operation1">
- <parameters>
- <c:simple-property name="param1"/>
- <c:simple-property name="param2"/>
- </parameters>
- </operation>
- </server>
- <server name="OperationServer23">
- <operation name="OperationServer23.Operation1"/>
- </server>
- <server name="OperationServer24">
- <operation name="OperationServer24.Operation1"/>
- <operation name="OperationServer24.Operation2">
- <results>
- <c:simple-property name="exitCode"/>
- </results>
- </operation>
- </server>
-</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/OperationMetadataManagerBeanTest/plugin_v2.xml b/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/OperationMetadataManagerBeanTest/plugin_v2.xml
deleted file mode 100644
index a86fbcf..0000000
--- a/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/OperationMetadataManagerBeanTest/plugin_v2.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<plugin name="OperationMetadataManagerBeanTestPlugin"
- displayName="OperationMetadataManagerBean Test Plugin"
- package="org.rhq.plugins.test"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:xmlns:rhq-plugin"
- xmlns:c="urn:xmlns:rhq-configuration">
- <server name="OperationServer1">
- <operation name="OperationServer1.Operation1"/>
- </server>
- <server name="OperationServer11">
- <operation name="OperationServer11.Operation1">
- <parameters>
- <c:simple-property name="param1"/>
- <c:simple-property name="param2"/>
- </parameters>
- </operation>
- </server>
-
- <server name="OperationServer2">
- <operation name="OperationServer2.Operation1"/>
- </server>
- <server name="OperationServer21"/>
- <server name="OperationServer22">
- <operation name="OperationServer22.Operation1"/>
- </server>
- <server name="OperationServer23">
- <operation name="OperationServer23.Operation1">
- <results>
- <c:simple-property name="exitCode"/>
- </results>
- </operation>
- </server>
- <server name="OperationServer24">
- <operation name="OperationServer24.Operation1">
- <parameters>
- <c:simple-property name="param1"/>
- </parameters>
- </operation>
- <operation name="OperationServer24.Operation2"/>
- </server>
-</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/PluginExtensionMetadataTest/child_plugin_v1.xml b/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/PluginExtensionMetadataTest/child_plugin_v1.xml
deleted file mode 100644
index ddedf10..0000000
--- a/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/PluginExtensionMetadataTest/child_plugin_v1.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<plugin name="PluginExtensionMetadataChildTestPlugin"
- version="1.0"
- displayName="Plugin Extension Metadata Child Test Plugin"
- package="org.rhq.plugins.test.child"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:xmlns:rhq-plugin"
- xmlns:c="urn:xmlns:rhq-configuration">
-
- <server name="ChildServerA"
- description="Child Server type that extends Parent Server type"
- discovery="ChildDiscoveryComponent"
- class="ChildComponent"
- sourcePlugin="PluginExtensionMetadataParentTestPlugin"
- sourceType="ParentServerA">
- </server>
-
-</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/PluginExtensionMetadataTest/parent_plugin_v1.xml b/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/PluginExtensionMetadataTest/parent_plugin_v1.xml
deleted file mode 100644
index e640187..0000000
--- a/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/PluginExtensionMetadataTest/parent_plugin_v1.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<plugin name="PluginExtensionMetadataParentTestPlugin"
- version="1.0"
- displayName="Plugin Extension Metadata Parent Test Plugin"
- package="org.rhq.plugins.test.parent"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:xmlns:rhq-plugin"
- xmlns:c="urn:xmlns:rhq-configuration">
-
- <server name="ParentServerA"
- description="Parent Server type that can be extended by a Child Server type"
- discovery="ParentDiscoveryComponent"
- class="ParentComponent">
-
- <subcategories>
- <subcategory name="A-subcat" displayName="a subcat"/>
- </subcategories>
-
- <plugin-configuration>
- <c:group name="A-pc-group" hiddenByDefault="true">
- <c:simple-property name="A-pc-prop" description="test plugin config prop" required="false" />
- </c:group>
- </plugin-configuration>
-
- <process-scan name="A-process-scan" query="process|basename|match=A.exe"/>
- <operation name="A-op" timeout="123456" description="a op"></operation>
- <metric property="A-metric" defaultInterval="123456"></metric>
- <event name="A-event" description="a event"></event>
-
- <resource-configuration>
- <c:simple-property name="A-rc-prop" description="test resource config prop" required="false" />
- </resource-configuration>
-
- <drift-definition name="A-drift-def">
- <basedir>
- <value-context>pluginConfiguration</value-context>
- <value-name>A-pc-prop</value-name>
- </basedir>
- </drift-definition>
-
- <bundle-target>
- <destination-base-dir name="A-bundle-basedir">
- <value-context>resourceConfiguration</value-context>
- <value-name>A-rc-prop</value-name>
- </destination-base-dir>
- </bundle-target>
-
- </server>
-
-</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/PluginExtensionMetadataTest/parent_plugin_v2.xml b/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/PluginExtensionMetadataTest/parent_plugin_v2.xml
deleted file mode 100644
index b0d4027..0000000
--- a/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/PluginExtensionMetadataTest/parent_plugin_v2.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<plugin name="PluginExtensionMetadataParentTestPlugin"
- version="2.0"
- displayName="Plugin Extension Metadata Parent Test Plugin"
- package="org.rhq.plugins.test.parent"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:xmlns:rhq-plugin"
- xmlns:c="urn:xmlns:rhq-configuration">
-
- <server name="ParentServerA"
- description="Parent Server type that can be extended by a Child Server type"
- discovery="ParentDiscoveryComponent"
- class="ParentComponent">
-
- <subcategories>
- <subcategory name="A-subcat" displayName="a subcat"/>
- </subcategories>
-
- <plugin-configuration>
- <c:group name="A-pc-group" hiddenByDefault="false">
- <c:simple-property name="A-pc-prop-CHANGED" description="A-pc-prop desc 1" required="true" />
- </c:group>
- <c:group name="A-pc-group-NEW" hiddenByDefault="true">
- <c:simple-property name="A-pc-prop-NEW" description="A-pc-prop desc 2" required="false" />
- </c:group>
- </plugin-configuration>
-
- <process-scan name="A-process-scan" query="process|basename|match=CHANGED.exe"/> <!-- CHANGED, but same name -->
- <process-scan name="A-process-scan-NEW" query="process|basename|match=NEW.exe"/>
- <operation name="A-op" timeout="987654" description="a changed op"></operation> <!-- CHANGED, but same name -->
- <operation name="A-op-NEW" timeout="111111" description="a new op"></operation>
- <metric property="A-metric" defaultInterval="555555"></metric> <!-- CHANGED, but same name -->
- <metric property="A-metric-NEW" defaultInterval="98765"></metric>
- <event name="A-event-CHANGED" description="a changed event"></event>
- <event name="A-event-NEW" description="a new event"></event>
-
- <resource-configuration>
- <c:simple-property name="A-rc-prop-CHANGED" description="test resource config prop 1" required="true" />
- <c:simple-property name="A-rc-prop-NEW" description="test resource config prop 2" required="false" />
- </resource-configuration>
-
- <drift-definition name="A-drift-def-CHANGED">
- <basedir>
- <value-context>pluginConfiguration</value-context>
- <value-name>A-pc-prop</value-name>
- </basedir>
- </drift-definition>
- <drift-definition name="A-drift-def-NEW">
- <basedir>
- <value-context>resourceConfiguration</value-context>
- <value-name>A-rc-prop</value-name>
- </basedir>
- </drift-definition>
-
- <bundle-target>
- <destination-base-dir name="A-bundle-basedir-CHANGED">
- <value-context>resourceConfiguration</value-context>
- <value-name>A-rc-prop</value-name>
- </destination-base-dir>
- <destination-base-dir name="A-bundle-basedir-NEW">
- <value-context>pluginConfiguration</value-context>
- <value-name>A-pc-prop</value-name>
- </destination-base-dir>
- </bundle-target>
-
- </server>
-
-</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_1.xml b/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_1.xml
deleted file mode 100644
index 6680aa6..0000000
--- a/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_1.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<plugin name="PluginManagerBeanTestPlugin1"
- package="org.rhq.plugins.test"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:xmlns:rhq-plugin"
- xmlns:c="urn:xmlns:rhq-configuration">
- <server name="TestServer1"/>
-</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_2.xml b/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_2.xml
deleted file mode 100644
index c6f8736..0000000
--- a/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_2.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<plugin name="PluginManagerBeanTestPlugin2"
- package="org.rhq.plugins.test"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:xmlns:rhq-plugin"
- xmlns:c="urn:xmlns:rhq-configuration">
-
- <depends plugin="PluginManagerBeanTestPlugin1" useClasses="true"/>
-
- <server name="TestServer2"/>
-</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_3.1.xml b/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_3.1.xml
deleted file mode 100644
index e885167..0000000
--- a/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_3.1.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<plugin name="PluginManagerBeanTestPlugin3.1"
- package="org.rhq.plugins.test"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:xmlns:rhq-plugin"
- xmlns:c="urn:xmlns:rhq-configuration">
-
- <server name="TestServer3.1"/>
-</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_3.xml b/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_3.xml
deleted file mode 100644
index 78184bf..0000000
--- a/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_3.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<plugin name="PluginManagerBeanTestPlugin3"
- package="org.rhq.plugins.test"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:xmlns:rhq-plugin"
- xmlns:c="urn:xmlns:rhq-configuration">
-
- <server name="TestServer3"/>
-</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/dup_drift.xml b/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/dup_drift.xml
deleted file mode 100644
index bd9728b..0000000
--- a/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/dup_drift.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<plugin name="TestPlugin" displayName="Test Plugin" package="org.rhq.plugins.test"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:xmlns:rhq-plugin"
- xmlns:c="urn:xmlns:rhq-configuration">
- <server name="ServerWithDupDrift" description="has duplicate drift config names and thus is invalid">
- <drift-definition name="drift-one">
- <basedir>
- <value-context>fileSystem</value-context>
- <value-name>/a</value-name>
- </basedir>
- </drift-definition>
- <drift-definition name="drift-one">
- <basedir>
- <value-context>fileSystem</value-context>
- <value-name>/b</value-name>
- </basedir>
- </drift-definition>
- </server>
-</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/parent_resource_type-plugin.xml b/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/parent_resource_type-plugin.xml
deleted file mode 100644
index 853e423..0000000
--- a/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/parent_resource_type-plugin.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<plugin name="ParentResourceTypeTestPlugin" displayName="Test Plugin" package="org.rhq.plugins.test"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:xmlns:rhq-plugin"
- xmlns:c="urn:xmlns:rhq-configuration">
-
- <server name="Server A First Level" description="Server A description">
- <server name="Server B Second Level" description="Server B description"/>
- <service name="Service A Second Level" description="Service A description"/>
- </server>
-
- <server name="Server C First Level" description="Server C description">
- <runs-inside>
- <parent-resource-type name="Server B Second Level" plugin="ParentResourceTypeTestPlugin"/>
- </runs-inside>
- </server>
-
- <service name="Service B First Level" description="Service B description">
- <runs-inside>
- <parent-resource-type name="Server B Second Level" plugin="ParentResourceTypeTestPlugin"/>
- </runs-inside>
- </service>
-
- <service name="Service C First Level" description="Service C description">
- <runs-inside>
- <parent-resource-type name="Service A Second Level" plugin="ParentResourceTypeTestPlugin"/>
- </runs-inside>
- </service>
-
-</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/plugin_v1.xml b/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/plugin_v1.xml
deleted file mode 100644
index 88cd39c..0000000
--- a/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/plugin_v1.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<plugin name="TestPlugin" displayName="Test Plugin" package="org.rhq.plugins.test"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:xmlns:rhq-plugin"
- xmlns:c="urn:xmlns:rhq-configuration">
- <server name="ServerA" description="Server A description">
- <subcategories>
- <subcategory name="Resources" description="Resources subcategory"/>
- <subcategory name="Applications" description="Applications subcategory"/>
- </subcategories>
-
- <plugin-configuration>
- <c:simple-property name="connectionPropertyX" default="x"/>
- <c:simple-property name="connectionPropertyY" default="y"/>
- </plugin-configuration>
-
- <process-scan name="serverA" query="process|basename|match=^java.*,arg|org.jboss.Main|match=.*"/>
-
- <operation name="start">
- <parameters>
- <c:simple-property name="immediate" type="boolean"/>
- </parameters>
- <results>
- <c:simple-property name="exitCode" type="integer"/>
- </results>
- </operation>
-
- <operation name="stop">
- <parameters>
- <c:simple-property name="immediate" type="boolean"/>
- </parameters>
- <results>
- <c:simple-property name="exitCode" type="integer"/>
- </results>
- </operation>
-
- <metric displayName="Metric 1" property="metric1" displayType="summary" defaultInterval="300000"/>
- <metric displayName="Metric 2" property="metric2" displayType="summary" defaultInterval="300000" dataType="trait"/>
-
- <event name="logAEntry" description="an entry was appended to a log file"/>
- <event name="logBEntry" description="an entry was appended to a log file"/>
-
- <content name="ServerA.Content.1" category="deployable">
- <configuration>
- <c:simple-property name="ServerA.Content.1.version"/>
- </configuration>
- </content>
-
- <content name="ServerA.Content.2" category="deployable">
- <configuration>
- <c:simple-property name="ServerA.Content.2.version"/>
- </configuration>
- </content>
-
- <drift-definition name="drift-pc">
- <basedir>
- <value-context>pluginConfiguration</value-context>
- <value-name>connectionPropertyX</value-name>
- </basedir>
- <interval>123456</interval>
- <includes>
- <include path="foo/bar" pattern="**/*.blech"/>
- </includes>
- <excludes>
- <exclude path="/wot/gorilla" pattern="*.xml" />
- <exclude path="/hello"/>
- </excludes>
- </drift-definition>
-
- <drift-definition name="drift-fs">
- <basedir>
- <value-context>fileSystem</value-context>
- <value-name>/</value-name>
- </basedir>
- </drift-definition>
-
- <bundle-target>
- <destination-base-dir name="bundleTarget-pc" description="pc-description">
- <value-context>pluginConfiguration</value-context>
- <value-name>connectionPropertyY</value-name>
- </destination-base-dir>
- <destination-base-dir name="bundleTarget-fs"> <!-- note: no description, so we can test for proper null handling -->
- <value-context>fileSystem</value-context>
- <value-name>/wot/gorilla</value-name>
- </destination-base-dir>
- </bundle-target>
-
- <service name="Child1" description="Child 1 description"/>
- <service name="Child2" description="Child 2 description"/>
- </server>
-
- <server name="ServerB" description="Server B description"/>
-</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/plugin_v2.xml b/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/plugin_v2.xml
deleted file mode 100644
index a89f679..0000000
--- a/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/plugin_v2.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<plugin name="TestPlugin" displayName="Test Plugin" package="org.rhq.plugins.test"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:xmlns:rhq-plugin"
- xmlns:c="urn:xmlns:rhq-configuration">
- <server name="ServerA" description="Server A description">
-
- <subcategories>
- <subcategory name="Resources" description="Resources subcategory"/>
- <subcategory name="Applications" description="Applications subcategory"/>
- </subcategories>
-
- <plugin-configuration>
- <c:simple-property name="connectionPropertyX" default="x"/>
- <c:simple-property name="connectionPropertyY" default="y"/>
- </plugin-configuration>
-
- <process-scan name="processA" query="process|basename|match=^java.*,arg|org.jboss.MainA|match=.*"/>
- <process-scan name="processB" query="process|basename|match=^java.*,arg|org.jboss.MainB|match=.*"/>
-
- <operation name="start">
- <parameters>
- <c:simple-property name="immediate" type="boolean"/>
- </parameters>
- <results>
- <c:simple-property name="exitCode" type="integer"/>
- </results>
- </operation>
-
- <operation name="shutdown">
- <parameters>
- <c:simple-property name="immediate" type="boolean"/>
- </parameters>
- <results>
- <c:simple-property name="exitCode" type="integer"/>
- </results>
- </operation>
-
- <operation name="restart">
- <parameters>
- <c:simple-property name="immediate" type="boolean"/>
- </parameters>
- <results>
- <c:simple-property name="exitCode" type="integer"/>
- </results>
- </operation>
-
- <metric displayName="Metric 1" property="metric1" displayType="summary" defaultInterval="300000"/>
- <metric displayName="Metric 2" property="metric2" displayType="summary" defaultInterval="300000" dataType="trait"/>
-
- <event name="logAEntry" description="an entry was appended to a log file"/>
- <event name="logCEntry" description="an entry was appended to a log file"/>
-
- <content name="ServerA.Content.1" category="configuration">
- <configuration>
- <c:simple-property name="ServerA.Content.1.property1"/>
- <c:simple-property name="ServerA.Content.1.property2"/>
- </configuration>
- </content>
-
- <content name="ServerA.Content.3" category="deployable">
- <configuration>
- <c:simple-property name="ServerA.Content.3.version"/>
- </configuration>
- </content>
-
- <drift-definition name="drift-rc">
- <basedir>
- <!-- this resource doesn't really have this resource config prop
- but today we do not check for validity so this is OK. In the future, if we do
- check, our tests will fail and we'll need to change this test drift config -->
- <value-context>resourceConfiguration</value-context>
- <value-name>resourceConfig1</value-name>
- </basedir>
- </drift-definition>
-
- <drift-definition name="drift-mt">
- <basedir>
- <!-- this resource doesn't really have this metric trait
- but today we do not check for validity so this is OK. In the future, if we do
- check, our tests will fail and we'll need to change this test drift config -->
- <value-context>measurementTrait</value-context>
- <value-name>trait1</value-name>
- </basedir>
- </drift-definition>
-
- <bundle-target>
- <destination-base-dir name="bundleTarget-rc" description="rc-description">
- <!-- this resource doesn't really have this resource config prop
- but today we do not check for validity so this is OK. In the future, if we do
- check, our tests will fail and we'll need to change this test drift config -->
- <value-context>resourceConfiguration</value-context>
- <value-name>resourceConfig1</value-name>
- </destination-base-dir>
- <destination-base-dir name="bundleTarget-mt" description="mt-description">
- <!-- this resource doesn't really have this metric trait
- but today we do not check for validity so this is OK. In the future, if we do
- check, our tests will fail and we'll need to change this test drift config -->
- <value-context>measurementTrait</value-context>
- <value-name>trait1</value-name>
- </destination-base-dir>
- </bundle-target>
-
- <service name="Child1"/>
- <service name="Child3"/>
- </server>
-
- <server name="ServerB" description="Server B description">
- <service name="Child2"/>
- </server>
-</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/remove_bundle_drift_config_v1.xml b/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/remove_bundle_drift_config_v1.xml
deleted file mode 100644
index 460954b..0000000
--- a/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/remove_bundle_drift_config_v1.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<plugin name="TestPlugin" displayName="Test Plugin" package="org.rhq.plugins.test"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:xmlns:rhq-plugin"
- xmlns:c="urn:xmlns:rhq-configuration">
- <server name="ServerWithBundleAndDriftConfig">
- <drift-definition name="drift1">
- <basedir>
- <value-context>fileSystem</value-context>
- <value-name>/dirA</value-name>
- </basedir>
- </drift-definition>
-
- <bundle-target>
- <destination-base-dir name="destdir1">
- <value-context>fileSystem</value-context>
- <value-name>/dirB</value-name>
- </destination-base-dir>
- </bundle-target>
- </server>
-</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/remove_bundle_drift_config_v2.xml b/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/remove_bundle_drift_config_v2.xml
deleted file mode 100644
index c92919d..0000000
--- a/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/remove_bundle_drift_config_v2.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<plugin name="TestPlugin" displayName="Test Plugin" package="org.rhq.plugins.test"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:xmlns:rhq-plugin"
- xmlns:c="urn:xmlns:rhq-configuration">
- <server name="ServerWithBundleAndDriftConfig">
- </server>
-</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/remove_types_v1.xml b/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/remove_types_v1.xml
deleted file mode 100644
index 60a9f93..0000000
--- a/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/remove_types_v1.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<plugin name="RemoveTypesPlugin" displayName="Remove Types Plugin" package="org.rhq.plugins.test"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:xmlns:rhq-plugin"
- xmlns:c="urn:xmlns:rhq-configuration">
- <server name="ServerC" description="Server C description">
-
- <subcategories>
- <subcategory name="ServerC.Category1">
- <subcategory name="ServerC.NestedCategory1"/>
- </subcategory>
- <subcategory name="ServerC.Category2"/>
- </subcategories>
-
- <bundle type="Test Bundle"/>
-
- <process-scan name="scan1" query="process|basename|match=^java.*,arg|org.rhq.serverC1|match=.*"/>
- <process-scan name="scan2" query="process|basename|match=^java.*,arg|org.rhq.serverC2|match=.*"/>
-
- <operation name="run">
- <parameters>
- <c:simple-property name="script"/>
- </parameters>
- <results>
- <c:simple-property name="errors"/>
- </results>
- </operation>
-
- <metric displayName="Metric 1" property="ServerC::metric1" displayType="summary" defaultInterval="300000"/>
-
- <event name="serverCEvent" description="an entry was appended to a log file"/>
-
- <content name="ServerC.Content" category="deployable">
- <configuration>
- <c:simple-property name="ServerC.Content.version"/>
- </configuration>
- </content>
- </server>
-
- <server name="ServerD">
- <service name="ServerD.Child1">
- <service name="ServerD.GrandChild1"/>
- </service>
- </server>
-
- <server name="ServerE">
- <service name="ServiceE1">
- <service name="ServiceE2">
- <service name="ServiceE3">
- <service name="serviceE4"/>
- </service>
- </service>
- </service>
- </server>
-</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/remove_types_v2.xml b/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/remove_types_v2.xml
deleted file mode 100644
index 6b0cdb0..0000000
--- a/modules/enterprise/server/itests-2/src/test/resources/obsolete/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/remove_types_v2.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<plugin name="RemoveTypesPlugin" displayName="Remove Types Plugin" package="org.rhq.plugins.test"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:xmlns:rhq-plugin"
- xmlns:c="urn:xmlns:rhq-configuration">
- <server name="ServerD">
- <service name="ServerD.GrandChild1"/>
- </server>
-</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/AlertMetadataManagerBeanTest/plugin_v1.xml b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/AlertMetadataManagerBeanTest/plugin_v1.xml
new file mode 100644
index 0000000..3b9ad64
--- /dev/null
+++ b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/AlertMetadataManagerBeanTest/plugin_v1.xml
@@ -0,0 +1,8 @@
+<plugin name="AlertMetadataManagerBeanTestPlugin"
+ displayName="AlertMetadataManagerBean Test Plugin"
+ package="org.rhq.plugins.test"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="urn:xmlns:rhq-plugin"
+ xmlns:c="urn:xmlns:rhq-configuration">
+ <server name="AlertServer"/>
+</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/AlertMetadataManagerBeanTest/plugin_v2.xml b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/AlertMetadataManagerBeanTest/plugin_v2.xml
new file mode 100644
index 0000000..f2664dc
--- /dev/null
+++ b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/AlertMetadataManagerBeanTest/plugin_v2.xml
@@ -0,0 +1,7 @@
+<plugin name="AlertMetadataManagerBeanTestPlugin"
+ displayName="AlertMetadataManagerBean Test Plugin"
+ package="org.rhq.plugins.test"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="urn:xmlns:rhq-plugin"
+ xmlns:c="urn:xmlns:rhq-configuration">
+</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ContentMetadataManagerBeanTest/plugin_v1.xml b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ContentMetadataManagerBeanTest/plugin_v1.xml
new file mode 100644
index 0000000..79f9296
--- /dev/null
+++ b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ContentMetadataManagerBeanTest/plugin_v1.xml
@@ -0,0 +1,45 @@
+<plugin name="ContentMetadataManagerBeanTestPlugin"
+ displayName="ContentMetadataManagerBean Test Plugin"
+ package="org.rhq.plugins.test"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="urn:xmlns:rhq-plugin"
+ xmlns:c="urn:xmlns:rhq-configuration">
+ <server name="ContentServer">
+ <content name="ContentServer.Content.1" category="deployable"/>
+ </server>
+
+ <server name="ContentServer1"/>
+
+ <server name="ContentServer2">
+ <content name="ContentServer2.Content.1" category="executableScript"/>
+ </server>
+
+ <server name="ContentServer3">
+ <content name="ContentServer3.Content.1" category="deployable"/>
+ <content name="ContentServer3.Content.2" category="deployable"/>
+ <content name="ContentServer3.Content.3" category="deployable"/>
+ </server>
+
+ <server name="ContentServer4">
+ <content name="ContentServer4.Content.1" category="deployable"/>
+ </server>
+
+ <server name="ContentServer5">
+ <content name="ContentServer5.Content.1" category="deployable">
+ <configuration>
+ <c:simple-property name="x"/>
+ </configuration>
+ </content>
+ <content name="ContentServer5.Content.2" category="deployable">
+ <configuration>
+ <c:simple-property name="x"/>
+ </configuration>
+ </content>
+ </server>
+
+ <server name="ContentServer6"/>
+
+ <server name="ContentServer7">
+ <bundle type="ContentServer.Bundle.1"/>
+ </server>
+</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ContentMetadataManagerBeanTest/plugin_v2.xml b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ContentMetadataManagerBeanTest/plugin_v2.xml
new file mode 100644
index 0000000..f0cd7b8
--- /dev/null
+++ b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ContentMetadataManagerBeanTest/plugin_v2.xml
@@ -0,0 +1,49 @@
+<plugin name="ContentMetadataManagerBeanTestPlugin"
+ displayName="ContentMetadataManagerBean Test Plugin"
+ package="org.rhq.plugins.test"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="urn:xmlns:rhq-plugin"
+ xmlns:c="urn:xmlns:rhq-configuration">
+ <server name="ContentServer">
+ <content name="ContentServer.Content.1" category="deployable">
+ <configuration>
+ <c:simple-property name="version"/>
+ </configuration>
+ </content>
+ </server>
+
+ <server name="ContentServer1">
+ <content name="ContentServer1.Content.1" category="deployable"/>
+ <content name="ContentServer1.Content.2" category="configuration"/>
+ </server>
+
+ <server name="ContentServer2"/>
+
+ <server name="ContentServer3">
+ <content name="ContentServer3.Content.2" category="deployable"/>
+ <content name="ContentServer3.Content.3" category="deployable"/>
+ </server>
+
+ <server name="ContentServer4">
+ <content name="ContentServer4.Content.1" category="deployable"/>
+ <content name="ContentServer4.Content.2" category="deployable"/>
+ </server>
+
+ <server name="ContentServer5">
+ <content name="ContentServer5.Content.1" category="deployable">
+ <configuration>
+ <c:simple-property name="x"/>
+ <c:simple-property name="y"/>
+ </configuration>
+ </content>
+ <content name="ContentServer5.Content.2" category="deployable"/>
+ </server>
+
+ <server name="ContentServer6">
+ <bundle type="ContentServer6.Bundle.1"/>
+ </server>
+
+ <server name="ContentServer7">
+ <bundle type="ContentServer.Bundle.2"/>
+ </server>
+</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/EventMetadataManagerBeanTest/plugin_v1.xml b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/EventMetadataManagerBeanTest/plugin_v1.xml
new file mode 100644
index 0000000..2786b05
--- /dev/null
+++ b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/EventMetadataManagerBeanTest/plugin_v1.xml
@@ -0,0 +1,23 @@
+<plugin name="EventMetadataManagerBeanTestPlugin"
+ displayName="MeasurementMetadataManagerBean Test Plugin"
+ package="org.rhq.plugins.test"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="urn:xmlns:rhq-plugin"
+ xmlns:c="urn:xmlns:rhq-configuration">
+ <server name="EventServer1">
+ <event name="event1" description="Event 1"/>
+ <event name="event2" description="Event 2"/>
+ </server>
+
+ <server name="EventServer2"/>
+
+ <server name="EventServer3">
+ <event name="event1" description="Event 1"/>
+ <event name="event2" description="Event 2"/>
+ </server>
+
+ <server name="EventServer4">
+ <event name="event1" description="Event 1"/>
+ <event name="event2" description="Event 2"/>
+ </server>
+</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/EventMetadataManagerBeanTest/plugin_v2.xml b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/EventMetadataManagerBeanTest/plugin_v2.xml
new file mode 100644
index 0000000..f4f765f
--- /dev/null
+++ b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/EventMetadataManagerBeanTest/plugin_v2.xml
@@ -0,0 +1,23 @@
+<plugin name="EventMetadataManagerBeanTestPlugin"
+ displayName="ContentMetadataManagerBean Test Plugin"
+ package="org.rhq.plugins.test"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="urn:xmlns:rhq-plugin"
+ xmlns:c="urn:xmlns:rhq-configuration">
+ <server name="EventServer1">
+ <event name="event1" description="Event 1"/>
+ <event name="event2" description="Event 2"/>
+ </server>
+
+ <server name="EventServer2">
+ <event name="event1" description="Event 1"/>
+ <event name="event2" description="Event 2"/>
+ </server>
+
+ <server name="EventServer3"/>
+
+ <server name="EventServer4">
+ <event name="event1" description="EVENT ONE"/>
+ <event name="event3" description="Event 3"/>
+ </server>
+</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBeanTest/plugin_v1.xml b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBeanTest/plugin_v1.xml
new file mode 100644
index 0000000..0202079
--- /dev/null
+++ b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBeanTest/plugin_v1.xml
@@ -0,0 +1,48 @@
+<plugin name="MeasurementMetadataManagerBeanTestPlugin"
+ displayName="MeasurementMetadataManagerBean Test Plugin"
+ package="org.rhq.plugins.test"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="urn:xmlns:rhq-plugin"
+ xmlns:c="urn:xmlns:rhq-configuration">
+ <server name="MetricServer1">
+ <metric displayName="metric1" property="metric1" dataType="trait" displayType="summary"
+ description="Metric 1" category="availability" defaultInterval="30000" defaultOn="true"
+ units="milliseconds"/>
+ <metric displayName="metric2" property="metric2" dataType="measurement" displayType="detail"
+ description="Metric 2" category="performance" defaultInterval="30000" defaultOn="true"
+ units="megabytes" measurementType="trendsup"/>
+ <metric displayName="metric3" property="metric3" dataType="calltime" displayType="detail"
+ description="Metric 3" category="throughput" defaultInterval="30000" defaultOn="true"
+ units="milliseconds" destinationType="myMethod"/>
+ </server>
+ <server name="MetricServer2"/>
+ <server name="MetricServer3">
+ <metric displayName="metric1" property="metric1" dataType="trait" displayType="summary"
+ description="Metric 1" category="availability" defaultInterval="30000" defaultOn="true"
+ units="milliseconds"/>
+
+ <service name="MetricService1">
+ <metric property="rhq.availability" defaultInterval="120000" defaultOn="false" />
+ </service>
+ <service name="MetricService2" />
+ </server>
+ <server name="MetricServer4">
+ <metric displayName="metric1" property="metric1" dataType="trait" displayType="summary"
+ description="Metric 1" category="availability" defaultInterval="30000" defaultOn="true"
+ units="milliseconds"/>
+ </server>
+ <server name="MetricServer5">
+ <!--
+ Need to use names for these metrics that are unique across the plugin because the resource
+ type will be deleted and the metric definition cannot be looked up by resource type. We will
+ instead look them up by name only.
+ -->
+ <metric displayName="metric1" property="MetricServer5.metric1" dataType="trait" displayType="summary"
+ description="Metric 1" category="availability" defaultInterval="30000" defaultOn="true"
+ units="milliseconds"/>
+ <metric displayName="metric3" property="MetricServer5.metric3" dataType="calltime" displayType="detail"
+ description="Metric 3" category="throughput" defaultInterval="30000" defaultOn="true"
+ units="milliseconds" destinationType="myMethod"/>
+ </server>
+
+</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBeanTest/plugin_v2.xml b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBeanTest/plugin_v2.xml
new file mode 100644
index 0000000..d949778
--- /dev/null
+++ b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBeanTest/plugin_v2.xml
@@ -0,0 +1,40 @@
+<plugin name="MeasurementMetadataManagerBeanTestPlugin"
+ displayName="MeasurementMetadataManagerBean Test Plugin"
+ package="org.rhq.plugins.test"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="urn:xmlns:rhq-plugin"
+ xmlns:c="urn:xmlns:rhq-configuration">
+ <server name="MetricServer1">
+ <metric displayName="metric1" property="metric1" dataType="trait" displayType="summary"
+ description="Metric 1" category="availability" defaultInterval="30000" defaultOn="true"
+ units="milliseconds"/>
+ <metric displayName="metric2" property="metric2" dataType="measurement" displayType="detail"
+ description="Metric 2" category="performance" defaultInterval="30000" defaultOn="true"
+ units="megabytes" measurementType="trendsup"/>
+ <metric displayName="metric3" property="metric3" dataType="calltime" displayType="detail"
+ description="Metric 3" category="throughput" defaultInterval="30000" defaultOn="true"
+ units="milliseconds" destinationType="myMethod"/>
+ <metric displayName="cannotBeSet" property="rhq.availability"
+ description="cannotBeSet" defaultInterval="120000" defaultOn="true"/>
+ </server>
+ <server name="MetricServer2">
+ <metric displayName="metric1" property="metric1" dataType="trait" displayType="summary"
+ description="Metric 1" category="availability" defaultInterval="30000" defaultOn="true"
+ units="milliseconds"/>
+ </server>
+ <server name="MetricServer3">
+ <metric displayName="metric1" property="metric1" dataType="measurement" displayType="detail"
+ description="Metric One" category="performance" defaultInterval="60000" defaultOn="false"
+ units="milliseconds" measurementType="trendsup"/>
+
+ <service name="MetricService1">
+ <metric displayName="cannotBeSet" property="rhq.availability"
+ description="cannotBeSet" defaultInterval="240000" defaultOn="true" />
+ </service>
+ <service name="MetricService2">
+ <metric displayName="cannotBeSet" property="rhq.availability"
+ description="cannotBeSet" defaultInterval="480000" defaultOn="true" />
+ </service>
+ </server>
+ <server name="MetricServer4"/>
+</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/MetadataTest.xml b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/MetadataTest.xml
new file mode 100644
index 0000000..e914562
--- /dev/null
+++ b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/MetadataTest.xml
@@ -0,0 +1,298 @@
+<dataset>
+ <rhq_config_def/>
+ <rhq_config_prop_grp_def/>
+ <rhq_config_prop_def/>
+ <rhq_config_pd_osrc/>
+ <rhq_conf_prop_def_enum/>
+ <rhq_config_prop_constr/>
+ <rhq_config/>
+ <rhq_config_property/>
+ <rhq_config_template/>
+ <rhq_raw_config/>
+ <rhq_affinity_group/>
+ <rhq_server/>
+ <rhq_agent/>
+ <rhq_partition_event/>
+ <rhq_partition_details/>
+ <rhq_failover_list/>
+ <rhq_failover_details/>
+ <rhq_principal id="2" PRINCIPAL="rhqadmin" PASSWORD="x1XwrxKuPvYUILiOnOZTLg=="/>
+ <rhq_subject
+ ID="1"
+ NAME="admin"
+ FIRST_NAME="Super"
+ LAST_NAME="User"
+ FSYSTEM="1"/>
+ <rhq_subject
+ ID="2"
+ NAME="rhqadmin"
+ FIRST_NAME="RHQ"
+ LAST_NAME="Administrator"
+ EMAIL_ADDRESS="nobody@localhost"
+ FSYSTEM="0"/>
+ <rhq_resource_type/>
+ <rhq_resource_subcat/>
+ <rhq_resource_type_parents/>
+ <rhq_process_scan/>
+ <rhq_prd_ver/>
+ <rhq_resource/>
+ <rhq_resource_error/>
+ <rhq_group_def/>
+ <rhq_resource_group/>
+ <rhq_resource_group_res_imp_map/>
+ <rhq_resource_group_res_exp_map/>
+ <rhq_config_group_update/>
+ <rhq_config_update/>
+ <rhq_tagging/>
+ <rhq_tagging_resource_map/>
+ <rhq_tagging_res_group_map/>
+ <rhq_role
+ ID="1"
+ NAME="Super User Role"
+ FSYSTEM="1"
+ DESCRIPTION="System superuser role that provides full access to everything. This role cannot be modified."/>
+ <rhq_role
+ ID="2"
+ NAME="All Resources Role"
+ FSYSTEM="0"
+ DESCRIPTION="Provides full access to all resources in inventory. Cannot modify users, roles or server settings."/>
+ <rhq_role_resource_group_map/>
+ <rhq_role_ldap_group/>
+ <rhq_permission ROLE_ID="1" OPERATION="0"/> <!-- Permission.MANAGE_SECURITY -->
+ <rhq_permission ROLE_ID="1" OPERATION="1"/> <!-- Permission.MANAGE_INVENTORY -->
+ <rhq_permission ROLE_ID="1" OPERATION="2"/> <!-- Permission.MANAGE_SETTINGS -->
+ <rhq_permission ROLE_ID="1" OPERATION="12"/> <!-- Permission.MANAGE_BUNDLE -->
+ <rhq_permission ROLE_ID="1" OPERATION="15"/> <!-- Permission.MANAGE_REPOSITORIES -->
+ <!-- resource permissions start here-->
+ <rhq_permission ROLE_ID="1" OPERATION="3"/> <!-- Permission.VIEW_RESOURCE -->
+ <rhq_permission ROLE_ID="1" OPERATION="4"/> <!-- Permission.MODIFY_RESOURCE -->
+ <rhq_permission ROLE_ID="1" OPERATION="5"/> <!-- Permission.DELETE_RESOURCE -->
+ <rhq_permission ROLE_ID="1" OPERATION="6"/> <!-- Permission.CREATE_CHILD_RESOURCES -->
+ <rhq_permission ROLE_ID="1" OPERATION="7"/> <!-- Permission.MANAGE_ALERTS -->
+ <rhq_permission ROLE_ID="1" OPERATION="8"/> <!-- Permission.MANAGE_MEASUREMENTS -->
+ <rhq_permission ROLE_ID="1" OPERATION="9"/> <!-- Permission.MANAGE_CONTENT -->
+ <rhq_permission ROLE_ID="1" OPERATION="10"/> <!-- Permission.CONTROL -->
+ <rhq_permission ROLE_ID="1" OPERATION="11"/> <!-- Permission.CONFIGURE -->
+ <rhq_permission ROLE_ID="1" OPERATION="14"/> <!-- Permission.MANAGE_EVENTS -->
+
+ <!-- give all-resources-role all permissions (resource perms is mainly just to show on view-role page) -->
+ <rhq_permission ROLE_ID="2" OPERATION="1"/> <!-- Permission.MANAGE_INVENTORY -->
+ <rhq_permission ROLE_ID="2" OPERATION="12"/> <!-- Permission.MANAGE_BUNDLE -->
+ <!-- resource permissions start here-->
+ <rhq_permission ROLE_ID="2" OPERATION="3"/> <!-- Permission.VIEW_RESOURCE -->
+ <rhq_permission ROLE_ID="2" OPERATION="4"/> <!-- Permission.MODIFY_RESOURCE -->
+ <rhq_permission ROLE_ID="2" OPERATION="5"/> <!-- Permission.DELETE_RESOURCE -->
+ <rhq_permission ROLE_ID="2" OPERATION="6"/> <!-- Permission.CREATE_CHILD_RESOURCES -->
+ <rhq_permission ROLE_ID="2" OPERATION="7"/> <!-- Permission.MANAGE_ALERTS -->
+ <rhq_permission ROLE_ID="2" OPERATION="8"/> <!-- Permission.MANAGE_MEASUREMENTS -->
+ <rhq_permission ROLE_ID="2" OPERATION="9"/> <!-- Permission.MANAGE_CONTENT -->
+ <rhq_permission ROLE_ID="2" OPERATION="10"/> <!-- Permission.CONTROL -->
+ <rhq_permission ROLE_ID="2" OPERATION="11"/> <!-- Permission.CONFIGURE -->
+ <rhq_permission ROLE_ID="2" OPERATION="14"/> <!-- Permission.MANAGE_EVENTS -->
+ <rhq_subject_role_map SUBJECT_ID="1" ROLE_ID="1"/>
+ <rhq_subject_role_map SUBJECT_ID="2" ROLE_ID="1"/>
+ <rhq_subject_role_ldap_map/>
+ <rhq_saved_search/>
+ <rhq_dashboard/>
+ <rhq_dashboard_portlet/>
+ <rhq_operation_def/>
+ <rhq_operation_history/>
+ <rhq_operation_schedule/>
+ <rhq_event_def/>
+ <rhq_event_source/>
+ <rhq_event/>
+ <rhq_alert_definition/>
+ <rhq_alert_dampen_event/>
+ <rhq_alert_condition/>
+ <rhq_alert/>
+ <rhq_alert_notif_log/>
+ <rhq_alert_condition_log/>
+ <rhq_alert_notification/>
+ <rhq_plugin/>
+ <rhq_measurement_def/>
+ <rhq_measurement_sched/>
+ <rhq_measurement_bline/>
+ <rhq_measurement_data_num_1h/>
+ <rhq_measurement_data_num_6h/>
+ <rhq_measurement_data_num_1d/>
+ <rhq_measurement_data_trait/>
+ <rhq_calltime_data_key/>
+ <rhq_calltime_data_value/>
+ <rhq_availability/>
+ <rhq_resource_avail/>
+ <rhq_measurement_oob/>
+ <rhq_measurement_oob_tmp/>
+ <rhq_numbers i="0"/>
+ <rhq_numbers i="1"/>
+ <rhq_numbers i="2"/>
+ <rhq_numbers i="3"/>
+ <rhq_numbers i="4"/>
+ <rhq_numbers i="5"/>
+ <rhq_numbers i="6"/>
+ <rhq_numbers i="7"/>
+ <rhq_numbers i="8"/>
+ <rhq_numbers i="9"/>
+ <rhq_numbers i="10"/>
+ <rhq_numbers i="11"/>
+ <rhq_numbers i="12"/>
+ <rhq_numbers i="13"/>
+ <rhq_numbers i="14"/>
+ <rhq_numbers i="15"/>
+ <rhq_numbers i="16"/>
+ <rhq_numbers i="17"/>
+ <rhq_numbers i="18"/>
+ <rhq_numbers i="19"/>
+ <rhq_numbers i="20"/>
+ <rhq_numbers i="21"/>
+ <rhq_numbers i="22"/>
+ <rhq_numbers i="23"/>
+ <rhq_numbers i="24"/>
+ <rhq_numbers i="25"/>
+ <rhq_numbers i="26"/>
+ <rhq_numbers i="27"/>
+ <rhq_numbers i="28"/>
+ <rhq_numbers i="29"/>
+ <rhq_numbers i="30"/>
+ <rhq_numbers i="31"/>
+ <rhq_numbers i="32"/>
+ <rhq_numbers i="33"/>
+ <rhq_numbers i="34"/>
+ <rhq_numbers i="35"/>
+ <rhq_numbers i="36"/>
+ <rhq_numbers i="37"/>
+ <rhq_numbers i="38"/>
+ <rhq_numbers i="39"/>
+ <rhq_numbers i="40"/>
+ <rhq_numbers i="41"/>
+ <rhq_numbers i="42"/>
+ <rhq_numbers i="43"/>
+ <rhq_numbers i="44"/>
+ <rhq_numbers i="45"/>
+ <rhq_numbers i="46"/>
+ <rhq_numbers i="47"/>
+ <rhq_numbers i="48"/>
+ <rhq_numbers i="49"/>
+ <rhq_numbers i="50"/>
+ <rhq_numbers i="51"/>
+ <rhq_numbers i="52"/>
+ <rhq_numbers i="53"/>
+ <rhq_numbers i="54"/>
+ <rhq_numbers i="55"/>
+ <rhq_numbers i="56"/>
+ <rhq_numbers i="57"/>
+ <rhq_numbers i="58"/>
+ <rhq_numbers i="59"/>
+ <rhq_meas_data_num_r00/>
+ <rhq_meas_data_num_r01/>
+ <rhq_meas_data_num_r02/>
+ <rhq_meas_data_num_r03/>
+ <rhq_meas_data_num_r04/>
+ <rhq_meas_data_num_r05/>
+ <rhq_meas_data_num_r06/>
+ <rhq_meas_data_num_r07/>
+ <rhq_meas_data_num_r08/>
+ <rhq_meas_data_num_r09/>
+ <rhq_meas_data_num_r10/>
+ <rhq_meas_data_num_r11/>
+ <rhq_meas_data_num_r12/>
+ <rhq_meas_data_num_r13/>
+ <rhq_meas_data_num_r14/>
+ <rhq_architecture id="1" name="noarch"/>
+ <rhq_architecture id="2" name="i386"/>
+ <rhq_architecture id="3" name="i486"/>
+ <rhq_architecture id="4" name="i586"/>
+ <rhq_architecture id="5" name="i686"/>
+ <rhq_architecture id="6" name="alpha"/>
+ <rhq_architecture id="7" name="alphaev6"/>
+ <rhq_architecture id="8" name="ia64"/>
+ <rhq_architecture id="9" name="sparc"/>
+ <rhq_architecture id="10" name="sparcv9"/>
+ <rhq_architecture id="11" name="sparc64"/>
+ <rhq_architecture id="12" name="src"/>
+ <rhq_architecture id="13" name="s390"/>
+ <rhq_architecture id="14" name="athlon"/>
+ <rhq_architecture id="15" name="s390x"/>
+ <rhq_architecture id="16" name="ppc"/>
+ <rhq_architecture id="17" name="ppc64"/>
+ <rhq_architecture id="18" name="pSeries"/>
+ <rhq_architecture id="19" name="iSeries"/>
+ <rhq_architecture id="20" name="x86_64"/>
+ <rhq_architecture id="21" name="ppc64iseries"/>
+ <rhq_architecture id="22" name="ppc64pseries"/>
+ <rhq_architecture id="23" name="sparc-solaris"/>
+ <rhq_architecture id="24" name="sparc.sun4u-solaris"/>
+ <rhq_architecture id="25" name="tar"/>
+ <rhq_architecture id="26" name="ia32e"/>
+ <rhq_architecture id="27" name="amd64"/>
+ <rhq_architecture id="28" name="i386-solaris"/>
+ <rhq_architecture id="29" name="nosrc"/>
+ <rhq_architecture id="30" name="sparc-solaris-patch"/>
+ <rhq_architecture id="31" name="i386-solaris-patch"/>
+ <rhq_architecture id="32" name="sparc-solaris-patch-cluster"/>
+ <rhq_architecture id="33" name="i386-solaris-patch-cluster"/>
+ <rhq_architecture id="34" name="noarch-solaris"/>
+ <rhq_architecture id="35" name="noarch-solaris-patch"/>
+ <rhq_architecture id="36" name="noarch-solaris-patch-cluster"/>
+ <rhq_architecture id="37" name="solaris-patch"/>
+ <rhq_architecture id="38" name="solaris-patch-cluster"/>
+ <rhq_repo_group_type id="1" name="family"/>
+ <rhq_repo_group/>
+ <rhq_content_source_type/>
+ <rhq_content_source/>
+ <rhq_repo/>
+ <rhq_repo_relation_type id="1" name="parent"/>
+ <rhq_repo_relation_type id="2" name="clone"/>
+ <rhq_repo_relation/>
+ <rhq_package_type/>
+ <rhq_package/>
+ <rhq_package_bits/>
+ <rhq_package_version/>
+ <rhq_content_req/>
+ <rhq_installed_package/>
+ <rhq_installed_pkg_hist/>
+ <rhq_content_src_sync/>
+ <rhq_repo_sync/>
+ <rhq_package_inst_step/>
+ <rhq_repo_resource_map/>
+ <rhq_repo_content_src_map/>
+ <rhq_repo_repo_group_map/>
+ <rhq_repo_repo_relation_map/>
+ <rhq_repo_pkg_version_map/>
+ <rhq_pkg_ver_content_src_map/>
+ <rhq_pkg_prd_map/>
+ <rhq_distribution_type id="1" name="kickstart" description="Linux kickstart distribution"/>
+ <rhq_distribution_type id="2" name="jumpstart" description="solaris jumpstart distribution"/>
+ <rhq_distribution/>
+ <rhq_repo_distribution/>
+ <rhq_distribution_file/>
+ <rhq_advisory/>
+ <rhq_advisory_package/>
+ <rhq_cve/>
+ <rhq_advisory_cve/>
+ <rhq_advisory_buglist/>
+ <rhq_repo_advisory/>
+ <rhq_bundle_type/>
+ <rhq_bundle/>
+ <rhq_bundle_version/>
+ <rhq_bundle_version_repo/>
+ <rhq_bundle_file/>
+ <rhq_bundle_destination/>
+ <rhq_bundle_deployment/>
+ <rhq_bundle_res_deploy/>
+ <rhq_bundle_res_dep_hist/>
+ <rhq_tagging_bundle_map/>
+ <rhq_tagging_bundle_version_map/>
+ <rhq_tagging_bundle_deploy_map/>
+ <rhq_tagging_bundle_dest_map/>
+ <rhq_create_res_hist/>
+ <rhq_delete_res_hist/>
+ <rhq_drift_def_template/>
+ <rhq_drift_definition/>
+ <rhq_drift_change_set/>
+ <jms_messages/>
+ <jms_transactions/>
+ <jms_users/>
+ <jms_roles/>
+ <jms_subscriptions/>
+</dataset>
+
diff --git a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionMetadataTest/child1_plugin_v1.xml b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionMetadataTest/child1_plugin_v1.xml
new file mode 100644
index 0000000..befc699
--- /dev/null
+++ b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionMetadataTest/child1_plugin_v1.xml
@@ -0,0 +1,19 @@
+<plugin name="PluginExtensionMetadataChild1TestPlugin"
+ version="1.0"
+ displayName="Plugin Extension Metadata Child 1 Test Plugin"
+ package="org.rhq.plugins.test.child1"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="urn:xmlns:rhq-plugin"
+ xmlns:c="urn:xmlns:rhq-configuration">
+
+ <server name="OuterServerA">
+ <server name="Child1ServerA"
+ description="Child 1 Server type that extends Parent Server type"
+ discovery="Child1DiscoveryComponent"
+ class="Child1Component"
+ sourcePlugin="MultiplePluginExtensionMetadataParentTestPlugin"
+ sourceType="ParentServerA">
+ </server>
+ </server>
+
+</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionMetadataTest/child2_plugin_v1.xml b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionMetadataTest/child2_plugin_v1.xml
new file mode 100644
index 0000000..0dafa9b
--- /dev/null
+++ b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionMetadataTest/child2_plugin_v1.xml
@@ -0,0 +1,19 @@
+<plugin name="PluginExtensionMetadataChild2TestPlugin"
+ version="1.0"
+ displayName="Plugin Extension Metadata Child 2 Test Plugin"
+ package="org.rhq.plugins.test.child2"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="urn:xmlns:rhq-plugin"
+ xmlns:c="urn:xmlns:rhq-configuration">
+
+
+ <server name="Child2ServerA"
+ description="Child 2 Server type that extends Parent Server type"
+ discovery="Child2DiscoveryComponent"
+ class="Child2Component"
+ sourcePlugin="MultiplePluginExtensionMetadataParentTestPlugin"
+ sourceType="ParentServerA">
+ </server>
+
+
+</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionMetadataTest/parent_plugin_v1.xml b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionMetadataTest/parent_plugin_v1.xml
new file mode 100644
index 0000000..627c5a8
--- /dev/null
+++ b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionMetadataTest/parent_plugin_v1.xml
@@ -0,0 +1,18 @@
+<plugin name="MultiplePluginExtensionMetadataParentTestPlugin"
+ version="1.0"
+ displayName="Multiple Plugin Extension Metadata Parent Test Plugin"
+ package="org.rhq.plugins.test.parent"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="urn:xmlns:rhq-plugin"
+ xmlns:c="urn:xmlns:rhq-configuration">
+
+ <server name="ParentServerA"
+ description="Parent Server type that can be extended by a Child Server type"
+ discovery="ParentDiscoveryComponent"
+ class="ParentComponent">
+
+ <operation name="A-op" timeout="123456" description="a op"></operation>
+
+ </server>
+
+</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionMetadataTest/parent_plugin_v2.xml b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionMetadataTest/parent_plugin_v2.xml
new file mode 100644
index 0000000..2c0e9d8
--- /dev/null
+++ b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionMetadataTest/parent_plugin_v2.xml
@@ -0,0 +1,18 @@
+<plugin name="MultiplePluginExtensionMetadataParentTestPlugin"
+ version="2.0"
+ displayName="Multiple Plugin Extension Metadata Parent Test Plugin"
+ package="org.rhq.plugins.test.parent"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="urn:xmlns:rhq-plugin"
+ xmlns:c="urn:xmlns:rhq-configuration">
+
+ <server name="ParentServerA"
+ description="Parent Server type that can be extended by a Child Server type"
+ discovery="ParentDiscoveryComponent"
+ class="ParentComponent">
+
+ <operation name="A-op-NEW" timeout="987654" description="a new op"></operation>
+
+ </server>
+
+</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionSinglePluginDescriptorMetadataTest/child_plugin_v1.xml b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionSinglePluginDescriptorMetadataTest/child_plugin_v1.xml
new file mode 100644
index 0000000..08ea056
--- /dev/null
+++ b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionSinglePluginDescriptorMetadataTest/child_plugin_v1.xml
@@ -0,0 +1,29 @@
+<plugin name="MultiplePluginExtensionSinglePluginDescriptorMetadataChildTestPlugin"
+ version="1.0"
+ displayName="Multiple Plugin Extension Single Descriptor Metadata Child Test Plugin"
+ package="org.rhq.plugins.test.child"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="urn:xmlns:rhq-plugin"
+ xmlns:c="urn:xmlns:rhq-configuration">
+
+ <server name="OuterServerA">
+ <server name="Child1ServerA"
+ description="Child 1 Server type that extends Parent Server type"
+ discovery="Child1DiscoveryComponent"
+ class="Child1Component"
+ sourcePlugin="MultiplePluginExtensionSinglePluginDescriptorMetadataParentTestPlugin"
+ sourceType="ParentServerA">
+ </server>
+ </server>
+
+ <server name="OuterServerB">
+ <server name="Child2ServerA"
+ description="Child 2 Server type that extends Parent Server type"
+ discovery="Child2DiscoveryComponent"
+ class="Child2Component"
+ sourcePlugin="MultiplePluginExtensionSinglePluginDescriptorMetadataParentTestPlugin"
+ sourceType="ParentServerA">
+ </server>
+ </server>
+
+</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionSinglePluginDescriptorMetadataTest/parent_plugin_v1.xml b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionSinglePluginDescriptorMetadataTest/parent_plugin_v1.xml
new file mode 100644
index 0000000..be977e7
--- /dev/null
+++ b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionSinglePluginDescriptorMetadataTest/parent_plugin_v1.xml
@@ -0,0 +1,24 @@
+<plugin name="MultiplePluginExtensionSinglePluginDescriptorMetadataParentTestPlugin"
+ version="1.0"
+ displayName="Multiple Plugin Extension Metadata Parent Test Plugin"
+ package="org.rhq.plugins.test.parent"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="urn:xmlns:rhq-plugin"
+ xmlns:c="urn:xmlns:rhq-configuration">
+
+ <server name="ParentServerA"
+ description="Parent Server type that can be extended by a Child Server type"
+ discovery="ParentDiscoveryComponent"
+ class="ParentComponent">
+
+ <operation name="A-op" timeout="123456" description="a op"></operation>
+
+ <!-- BZ 789420 - if that bug isn't fixed and you uncomment this, the child plugin will fail to register properly
+ <service name="InnerServiceA">
+ <metric property="inner-A-metric" />
+ </service>
+ -->
+
+ </server>
+
+</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionSinglePluginDescriptorMetadataTest/parent_plugin_v2.xml b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionSinglePluginDescriptorMetadataTest/parent_plugin_v2.xml
new file mode 100644
index 0000000..9f02834
--- /dev/null
+++ b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionSinglePluginDescriptorMetadataTest/parent_plugin_v2.xml
@@ -0,0 +1,24 @@
+<plugin name="MultiplePluginExtensionSinglePluginDescriptorMetadataParentTestPlugin"
+ version="2.0"
+ displayName="Multiple Plugin Extension Metadata Parent Test Plugin"
+ package="org.rhq.plugins.test.parent"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="urn:xmlns:rhq-plugin"
+ xmlns:c="urn:xmlns:rhq-configuration">
+
+ <server name="ParentServerA"
+ description="Parent Server type that can be extended by a Child Server type"
+ discovery="ParentDiscoveryComponent"
+ class="ParentComponent">
+
+ <operation name="A-op-NEW" timeout="987654" description="a new op"></operation>
+
+ <!-- BZ 789420 - if that bug isn't fixed and you uncomment this, the child plugin will fail to register properly
+ <service name="InnerServiceA">
+ <metric property="inner-A-metric" />
+ </service>
+ -->
+
+ </server>
+
+</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/OperationMetadataManagerBeanTest/plugin_v1.xml b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/OperationMetadataManagerBeanTest/plugin_v1.xml
new file mode 100644
index 0000000..93a15ef
--- /dev/null
+++ b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/OperationMetadataManagerBeanTest/plugin_v1.xml
@@ -0,0 +1,42 @@
+<plugin name="OperationMetadataManagerBeanTestPlugin"
+ displayName="OperationMetadataManagerBean Test Plugin"
+ package="org.rhq.plugins.test"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="urn:xmlns:rhq-plugin"
+ xmlns:c="urn:xmlns:rhq-configuration">
+ <server name="OperationServer1">
+ <operation name="OperationServer1.Operation1"/>
+ </server>
+ <server name="OperationServer11">
+ <operation name="OperationServer11.Operation1">
+ <parameters>
+ <c:simple-property name="param1"/>
+ <c:simple-property name="param2"/>
+ </parameters>
+ </operation>
+ </server>
+
+ <server name="OperationServer2"/>
+ <server name="OperationServer21">
+ <operation name="OperationServer21.Operation1"/>
+ </server>
+ <server name="OperationServer22">
+ <operation name="OperationServer22.Operation1">
+ <parameters>
+ <c:simple-property name="param1"/>
+ <c:simple-property name="param2"/>
+ </parameters>
+ </operation>
+ </server>
+ <server name="OperationServer23">
+ <operation name="OperationServer23.Operation1"/>
+ </server>
+ <server name="OperationServer24">
+ <operation name="OperationServer24.Operation1"/>
+ <operation name="OperationServer24.Operation2">
+ <results>
+ <c:simple-property name="exitCode"/>
+ </results>
+ </operation>
+ </server>
+</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/OperationMetadataManagerBeanTest/plugin_v2.xml b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/OperationMetadataManagerBeanTest/plugin_v2.xml
new file mode 100644
index 0000000..a86fbcf
--- /dev/null
+++ b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/OperationMetadataManagerBeanTest/plugin_v2.xml
@@ -0,0 +1,41 @@
+<plugin name="OperationMetadataManagerBeanTestPlugin"
+ displayName="OperationMetadataManagerBean Test Plugin"
+ package="org.rhq.plugins.test"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="urn:xmlns:rhq-plugin"
+ xmlns:c="urn:xmlns:rhq-configuration">
+ <server name="OperationServer1">
+ <operation name="OperationServer1.Operation1"/>
+ </server>
+ <server name="OperationServer11">
+ <operation name="OperationServer11.Operation1">
+ <parameters>
+ <c:simple-property name="param1"/>
+ <c:simple-property name="param2"/>
+ </parameters>
+ </operation>
+ </server>
+
+ <server name="OperationServer2">
+ <operation name="OperationServer2.Operation1"/>
+ </server>
+ <server name="OperationServer21"/>
+ <server name="OperationServer22">
+ <operation name="OperationServer22.Operation1"/>
+ </server>
+ <server name="OperationServer23">
+ <operation name="OperationServer23.Operation1">
+ <results>
+ <c:simple-property name="exitCode"/>
+ </results>
+ </operation>
+ </server>
+ <server name="OperationServer24">
+ <operation name="OperationServer24.Operation1">
+ <parameters>
+ <c:simple-property name="param1"/>
+ </parameters>
+ </operation>
+ <operation name="OperationServer24.Operation2"/>
+ </server>
+</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginExtensionMetadataTest/child_plugin_v1.xml b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginExtensionMetadataTest/child_plugin_v1.xml
new file mode 100644
index 0000000..ddedf10
--- /dev/null
+++ b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginExtensionMetadataTest/child_plugin_v1.xml
@@ -0,0 +1,17 @@
+<plugin name="PluginExtensionMetadataChildTestPlugin"
+ version="1.0"
+ displayName="Plugin Extension Metadata Child Test Plugin"
+ package="org.rhq.plugins.test.child"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="urn:xmlns:rhq-plugin"
+ xmlns:c="urn:xmlns:rhq-configuration">
+
+ <server name="ChildServerA"
+ description="Child Server type that extends Parent Server type"
+ discovery="ChildDiscoveryComponent"
+ class="ChildComponent"
+ sourcePlugin="PluginExtensionMetadataParentTestPlugin"
+ sourceType="ParentServerA">
+ </server>
+
+</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginExtensionMetadataTest/parent_plugin_v1.xml b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginExtensionMetadataTest/parent_plugin_v1.xml
new file mode 100644
index 0000000..e640187
--- /dev/null
+++ b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginExtensionMetadataTest/parent_plugin_v1.xml
@@ -0,0 +1,49 @@
+<plugin name="PluginExtensionMetadataParentTestPlugin"
+ version="1.0"
+ displayName="Plugin Extension Metadata Parent Test Plugin"
+ package="org.rhq.plugins.test.parent"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="urn:xmlns:rhq-plugin"
+ xmlns:c="urn:xmlns:rhq-configuration">
+
+ <server name="ParentServerA"
+ description="Parent Server type that can be extended by a Child Server type"
+ discovery="ParentDiscoveryComponent"
+ class="ParentComponent">
+
+ <subcategories>
+ <subcategory name="A-subcat" displayName="a subcat"/>
+ </subcategories>
+
+ <plugin-configuration>
+ <c:group name="A-pc-group" hiddenByDefault="true">
+ <c:simple-property name="A-pc-prop" description="test plugin config prop" required="false" />
+ </c:group>
+ </plugin-configuration>
+
+ <process-scan name="A-process-scan" query="process|basename|match=A.exe"/>
+ <operation name="A-op" timeout="123456" description="a op"></operation>
+ <metric property="A-metric" defaultInterval="123456"></metric>
+ <event name="A-event" description="a event"></event>
+
+ <resource-configuration>
+ <c:simple-property name="A-rc-prop" description="test resource config prop" required="false" />
+ </resource-configuration>
+
+ <drift-definition name="A-drift-def">
+ <basedir>
+ <value-context>pluginConfiguration</value-context>
+ <value-name>A-pc-prop</value-name>
+ </basedir>
+ </drift-definition>
+
+ <bundle-target>
+ <destination-base-dir name="A-bundle-basedir">
+ <value-context>resourceConfiguration</value-context>
+ <value-name>A-rc-prop</value-name>
+ </destination-base-dir>
+ </bundle-target>
+
+ </server>
+
+</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginExtensionMetadataTest/parent_plugin_v2.xml b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginExtensionMetadataTest/parent_plugin_v2.xml
new file mode 100644
index 0000000..b0d4027
--- /dev/null
+++ b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginExtensionMetadataTest/parent_plugin_v2.xml
@@ -0,0 +1,67 @@
+<plugin name="PluginExtensionMetadataParentTestPlugin"
+ version="2.0"
+ displayName="Plugin Extension Metadata Parent Test Plugin"
+ package="org.rhq.plugins.test.parent"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="urn:xmlns:rhq-plugin"
+ xmlns:c="urn:xmlns:rhq-configuration">
+
+ <server name="ParentServerA"
+ description="Parent Server type that can be extended by a Child Server type"
+ discovery="ParentDiscoveryComponent"
+ class="ParentComponent">
+
+ <subcategories>
+ <subcategory name="A-subcat" displayName="a subcat"/>
+ </subcategories>
+
+ <plugin-configuration>
+ <c:group name="A-pc-group" hiddenByDefault="false">
+ <c:simple-property name="A-pc-prop-CHANGED" description="A-pc-prop desc 1" required="true" />
+ </c:group>
+ <c:group name="A-pc-group-NEW" hiddenByDefault="true">
+ <c:simple-property name="A-pc-prop-NEW" description="A-pc-prop desc 2" required="false" />
+ </c:group>
+ </plugin-configuration>
+
+ <process-scan name="A-process-scan" query="process|basename|match=CHANGED.exe"/> <!-- CHANGED, but same name -->
+ <process-scan name="A-process-scan-NEW" query="process|basename|match=NEW.exe"/>
+ <operation name="A-op" timeout="987654" description="a changed op"></operation> <!-- CHANGED, but same name -->
+ <operation name="A-op-NEW" timeout="111111" description="a new op"></operation>
+ <metric property="A-metric" defaultInterval="555555"></metric> <!-- CHANGED, but same name -->
+ <metric property="A-metric-NEW" defaultInterval="98765"></metric>
+ <event name="A-event-CHANGED" description="a changed event"></event>
+ <event name="A-event-NEW" description="a new event"></event>
+
+ <resource-configuration>
+ <c:simple-property name="A-rc-prop-CHANGED" description="test resource config prop 1" required="true" />
+ <c:simple-property name="A-rc-prop-NEW" description="test resource config prop 2" required="false" />
+ </resource-configuration>
+
+ <drift-definition name="A-drift-def-CHANGED">
+ <basedir>
+ <value-context>pluginConfiguration</value-context>
+ <value-name>A-pc-prop</value-name>
+ </basedir>
+ </drift-definition>
+ <drift-definition name="A-drift-def-NEW">
+ <basedir>
+ <value-context>resourceConfiguration</value-context>
+ <value-name>A-rc-prop</value-name>
+ </basedir>
+ </drift-definition>
+
+ <bundle-target>
+ <destination-base-dir name="A-bundle-basedir-CHANGED">
+ <value-context>resourceConfiguration</value-context>
+ <value-name>A-rc-prop</value-name>
+ </destination-base-dir>
+ <destination-base-dir name="A-bundle-basedir-NEW">
+ <value-context>pluginConfiguration</value-context>
+ <value-name>A-pc-prop</value-name>
+ </destination-base-dir>
+ </bundle-target>
+
+ </server>
+
+</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_1.xml b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_1.xml
new file mode 100644
index 0000000..6680aa6
--- /dev/null
+++ b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_1.xml
@@ -0,0 +1,7 @@
+<plugin name="PluginManagerBeanTestPlugin1"
+ package="org.rhq.plugins.test"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="urn:xmlns:rhq-plugin"
+ xmlns:c="urn:xmlns:rhq-configuration">
+ <server name="TestServer1"/>
+</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_2.xml b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_2.xml
new file mode 100644
index 0000000..c6f8736
--- /dev/null
+++ b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_2.xml
@@ -0,0 +1,10 @@
+<plugin name="PluginManagerBeanTestPlugin2"
+ package="org.rhq.plugins.test"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="urn:xmlns:rhq-plugin"
+ xmlns:c="urn:xmlns:rhq-configuration">
+
+ <depends plugin="PluginManagerBeanTestPlugin1" useClasses="true"/>
+
+ <server name="TestServer2"/>
+</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_3.1.xml b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_3.1.xml
new file mode 100644
index 0000000..e885167
--- /dev/null
+++ b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_3.1.xml
@@ -0,0 +1,8 @@
+<plugin name="PluginManagerBeanTestPlugin3.1"
+ package="org.rhq.plugins.test"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="urn:xmlns:rhq-plugin"
+ xmlns:c="urn:xmlns:rhq-configuration">
+
+ <server name="TestServer3.1"/>
+</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_3.xml b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_3.xml
new file mode 100644
index 0000000..78184bf
--- /dev/null
+++ b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_3.xml
@@ -0,0 +1,8 @@
+<plugin name="PluginManagerBeanTestPlugin3"
+ package="org.rhq.plugins.test"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="urn:xmlns:rhq-plugin"
+ xmlns:c="urn:xmlns:rhq-configuration">
+
+ <server name="TestServer3"/>
+</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/dup_drift.xml b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/dup_drift.xml
new file mode 100644
index 0000000..bd9728b
--- /dev/null
+++ b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/dup_drift.xml
@@ -0,0 +1,19 @@
+<plugin name="TestPlugin" displayName="Test Plugin" package="org.rhq.plugins.test"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="urn:xmlns:rhq-plugin"
+ xmlns:c="urn:xmlns:rhq-configuration">
+ <server name="ServerWithDupDrift" description="has duplicate drift config names and thus is invalid">
+ <drift-definition name="drift-one">
+ <basedir>
+ <value-context>fileSystem</value-context>
+ <value-name>/a</value-name>
+ </basedir>
+ </drift-definition>
+ <drift-definition name="drift-one">
+ <basedir>
+ <value-context>fileSystem</value-context>
+ <value-name>/b</value-name>
+ </basedir>
+ </drift-definition>
+ </server>
+</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/parent_resource_type-plugin.xml b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/parent_resource_type-plugin.xml
new file mode 100644
index 0000000..853e423
--- /dev/null
+++ b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/parent_resource_type-plugin.xml
@@ -0,0 +1,29 @@
+<plugin name="ParentResourceTypeTestPlugin" displayName="Test Plugin" package="org.rhq.plugins.test"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="urn:xmlns:rhq-plugin"
+ xmlns:c="urn:xmlns:rhq-configuration">
+
+ <server name="Server A First Level" description="Server A description">
+ <server name="Server B Second Level" description="Server B description"/>
+ <service name="Service A Second Level" description="Service A description"/>
+ </server>
+
+ <server name="Server C First Level" description="Server C description">
+ <runs-inside>
+ <parent-resource-type name="Server B Second Level" plugin="ParentResourceTypeTestPlugin"/>
+ </runs-inside>
+ </server>
+
+ <service name="Service B First Level" description="Service B description">
+ <runs-inside>
+ <parent-resource-type name="Server B Second Level" plugin="ParentResourceTypeTestPlugin"/>
+ </runs-inside>
+ </service>
+
+ <service name="Service C First Level" description="Service C description">
+ <runs-inside>
+ <parent-resource-type name="Service A Second Level" plugin="ParentResourceTypeTestPlugin"/>
+ </runs-inside>
+ </service>
+
+</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/plugin_v1.xml b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/plugin_v1.xml
new file mode 100644
index 0000000..88cd39c
--- /dev/null
+++ b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/plugin_v1.xml
@@ -0,0 +1,92 @@
+<plugin name="TestPlugin" displayName="Test Plugin" package="org.rhq.plugins.test"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="urn:xmlns:rhq-plugin"
+ xmlns:c="urn:xmlns:rhq-configuration">
+ <server name="ServerA" description="Server A description">
+ <subcategories>
+ <subcategory name="Resources" description="Resources subcategory"/>
+ <subcategory name="Applications" description="Applications subcategory"/>
+ </subcategories>
+
+ <plugin-configuration>
+ <c:simple-property name="connectionPropertyX" default="x"/>
+ <c:simple-property name="connectionPropertyY" default="y"/>
+ </plugin-configuration>
+
+ <process-scan name="serverA" query="process|basename|match=^java.*,arg|org.jboss.Main|match=.*"/>
+
+ <operation name="start">
+ <parameters>
+ <c:simple-property name="immediate" type="boolean"/>
+ </parameters>
+ <results>
+ <c:simple-property name="exitCode" type="integer"/>
+ </results>
+ </operation>
+
+ <operation name="stop">
+ <parameters>
+ <c:simple-property name="immediate" type="boolean"/>
+ </parameters>
+ <results>
+ <c:simple-property name="exitCode" type="integer"/>
+ </results>
+ </operation>
+
+ <metric displayName="Metric 1" property="metric1" displayType="summary" defaultInterval="300000"/>
+ <metric displayName="Metric 2" property="metric2" displayType="summary" defaultInterval="300000" dataType="trait"/>
+
+ <event name="logAEntry" description="an entry was appended to a log file"/>
+ <event name="logBEntry" description="an entry was appended to a log file"/>
+
+ <content name="ServerA.Content.1" category="deployable">
+ <configuration>
+ <c:simple-property name="ServerA.Content.1.version"/>
+ </configuration>
+ </content>
+
+ <content name="ServerA.Content.2" category="deployable">
+ <configuration>
+ <c:simple-property name="ServerA.Content.2.version"/>
+ </configuration>
+ </content>
+
+ <drift-definition name="drift-pc">
+ <basedir>
+ <value-context>pluginConfiguration</value-context>
+ <value-name>connectionPropertyX</value-name>
+ </basedir>
+ <interval>123456</interval>
+ <includes>
+ <include path="foo/bar" pattern="**/*.blech"/>
+ </includes>
+ <excludes>
+ <exclude path="/wot/gorilla" pattern="*.xml" />
+ <exclude path="/hello"/>
+ </excludes>
+ </drift-definition>
+
+ <drift-definition name="drift-fs">
+ <basedir>
+ <value-context>fileSystem</value-context>
+ <value-name>/</value-name>
+ </basedir>
+ </drift-definition>
+
+ <bundle-target>
+ <destination-base-dir name="bundleTarget-pc" description="pc-description">
+ <value-context>pluginConfiguration</value-context>
+ <value-name>connectionPropertyY</value-name>
+ </destination-base-dir>
+ <destination-base-dir name="bundleTarget-fs"> <!-- note: no description, so we can test for proper null handling -->
+ <value-context>fileSystem</value-context>
+ <value-name>/wot/gorilla</value-name>
+ </destination-base-dir>
+ </bundle-target>
+
+ <service name="Child1" description="Child 1 description"/>
+ <service name="Child2" description="Child 2 description"/>
+ </server>
+
+ <server name="ServerB" description="Server B description"/>
+</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/plugin_v2.xml b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/plugin_v2.xml
new file mode 100644
index 0000000..a89f679
--- /dev/null
+++ b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/plugin_v2.xml
@@ -0,0 +1,110 @@
+<plugin name="TestPlugin" displayName="Test Plugin" package="org.rhq.plugins.test"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="urn:xmlns:rhq-plugin"
+ xmlns:c="urn:xmlns:rhq-configuration">
+ <server name="ServerA" description="Server A description">
+
+ <subcategories>
+ <subcategory name="Resources" description="Resources subcategory"/>
+ <subcategory name="Applications" description="Applications subcategory"/>
+ </subcategories>
+
+ <plugin-configuration>
+ <c:simple-property name="connectionPropertyX" default="x"/>
+ <c:simple-property name="connectionPropertyY" default="y"/>
+ </plugin-configuration>
+
+ <process-scan name="processA" query="process|basename|match=^java.*,arg|org.jboss.MainA|match=.*"/>
+ <process-scan name="processB" query="process|basename|match=^java.*,arg|org.jboss.MainB|match=.*"/>
+
+ <operation name="start">
+ <parameters>
+ <c:simple-property name="immediate" type="boolean"/>
+ </parameters>
+ <results>
+ <c:simple-property name="exitCode" type="integer"/>
+ </results>
+ </operation>
+
+ <operation name="shutdown">
+ <parameters>
+ <c:simple-property name="immediate" type="boolean"/>
+ </parameters>
+ <results>
+ <c:simple-property name="exitCode" type="integer"/>
+ </results>
+ </operation>
+
+ <operation name="restart">
+ <parameters>
+ <c:simple-property name="immediate" type="boolean"/>
+ </parameters>
+ <results>
+ <c:simple-property name="exitCode" type="integer"/>
+ </results>
+ </operation>
+
+ <metric displayName="Metric 1" property="metric1" displayType="summary" defaultInterval="300000"/>
+ <metric displayName="Metric 2" property="metric2" displayType="summary" defaultInterval="300000" dataType="trait"/>
+
+ <event name="logAEntry" description="an entry was appended to a log file"/>
+ <event name="logCEntry" description="an entry was appended to a log file"/>
+
+ <content name="ServerA.Content.1" category="configuration">
+ <configuration>
+ <c:simple-property name="ServerA.Content.1.property1"/>
+ <c:simple-property name="ServerA.Content.1.property2"/>
+ </configuration>
+ </content>
+
+ <content name="ServerA.Content.3" category="deployable">
+ <configuration>
+ <c:simple-property name="ServerA.Content.3.version"/>
+ </configuration>
+ </content>
+
+ <drift-definition name="drift-rc">
+ <basedir>
+ <!-- this resource doesn't really have this resource config prop
+ but today we do not check for validity so this is OK. In the future, if we do
+ check, our tests will fail and we'll need to change this test drift config -->
+ <value-context>resourceConfiguration</value-context>
+ <value-name>resourceConfig1</value-name>
+ </basedir>
+ </drift-definition>
+
+ <drift-definition name="drift-mt">
+ <basedir>
+ <!-- this resource doesn't really have this metric trait
+ but today we do not check for validity so this is OK. In the future, if we do
+ check, our tests will fail and we'll need to change this test drift config -->
+ <value-context>measurementTrait</value-context>
+ <value-name>trait1</value-name>
+ </basedir>
+ </drift-definition>
+
+ <bundle-target>
+ <destination-base-dir name="bundleTarget-rc" description="rc-description">
+ <!-- this resource doesn't really have this resource config prop
+ but today we do not check for validity so this is OK. In the future, if we do
+ check, our tests will fail and we'll need to change this test drift config -->
+ <value-context>resourceConfiguration</value-context>
+ <value-name>resourceConfig1</value-name>
+ </destination-base-dir>
+ <destination-base-dir name="bundleTarget-mt" description="mt-description">
+ <!-- this resource doesn't really have this metric trait
+ but today we do not check for validity so this is OK. In the future, if we do
+ check, our tests will fail and we'll need to change this test drift config -->
+ <value-context>measurementTrait</value-context>
+ <value-name>trait1</value-name>
+ </destination-base-dir>
+ </bundle-target>
+
+ <service name="Child1"/>
+ <service name="Child3"/>
+ </server>
+
+ <server name="ServerB" description="Server B description">
+ <service name="Child2"/>
+ </server>
+</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/remove_bundle_drift_config_v1.xml b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/remove_bundle_drift_config_v1.xml
new file mode 100644
index 0000000..460954b
--- /dev/null
+++ b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/remove_bundle_drift_config_v1.xml
@@ -0,0 +1,20 @@
+<plugin name="TestPlugin" displayName="Test Plugin" package="org.rhq.plugins.test"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="urn:xmlns:rhq-plugin"
+ xmlns:c="urn:xmlns:rhq-configuration">
+ <server name="ServerWithBundleAndDriftConfig">
+ <drift-definition name="drift1">
+ <basedir>
+ <value-context>fileSystem</value-context>
+ <value-name>/dirA</value-name>
+ </basedir>
+ </drift-definition>
+
+ <bundle-target>
+ <destination-base-dir name="destdir1">
+ <value-context>fileSystem</value-context>
+ <value-name>/dirB</value-name>
+ </destination-base-dir>
+ </bundle-target>
+ </server>
+</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/remove_bundle_drift_config_v2.xml b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/remove_bundle_drift_config_v2.xml
new file mode 100644
index 0000000..c92919d
--- /dev/null
+++ b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/remove_bundle_drift_config_v2.xml
@@ -0,0 +1,7 @@
+<plugin name="TestPlugin" displayName="Test Plugin" package="org.rhq.plugins.test"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="urn:xmlns:rhq-plugin"
+ xmlns:c="urn:xmlns:rhq-configuration">
+ <server name="ServerWithBundleAndDriftConfig">
+ </server>
+</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/remove_types_v1.xml b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/remove_types_v1.xml
new file mode 100644
index 0000000..60a9f93
--- /dev/null
+++ b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/remove_types_v1.xml
@@ -0,0 +1,54 @@
+<plugin name="RemoveTypesPlugin" displayName="Remove Types Plugin" package="org.rhq.plugins.test"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="urn:xmlns:rhq-plugin"
+ xmlns:c="urn:xmlns:rhq-configuration">
+ <server name="ServerC" description="Server C description">
+
+ <subcategories>
+ <subcategory name="ServerC.Category1">
+ <subcategory name="ServerC.NestedCategory1"/>
+ </subcategory>
+ <subcategory name="ServerC.Category2"/>
+ </subcategories>
+
+ <bundle type="Test Bundle"/>
+
+ <process-scan name="scan1" query="process|basename|match=^java.*,arg|org.rhq.serverC1|match=.*"/>
+ <process-scan name="scan2" query="process|basename|match=^java.*,arg|org.rhq.serverC2|match=.*"/>
+
+ <operation name="run">
+ <parameters>
+ <c:simple-property name="script"/>
+ </parameters>
+ <results>
+ <c:simple-property name="errors"/>
+ </results>
+ </operation>
+
+ <metric displayName="Metric 1" property="ServerC::metric1" displayType="summary" defaultInterval="300000"/>
+
+ <event name="serverCEvent" description="an entry was appended to a log file"/>
+
+ <content name="ServerC.Content" category="deployable">
+ <configuration>
+ <c:simple-property name="ServerC.Content.version"/>
+ </configuration>
+ </content>
+ </server>
+
+ <server name="ServerD">
+ <service name="ServerD.Child1">
+ <service name="ServerD.GrandChild1"/>
+ </service>
+ </server>
+
+ <server name="ServerE">
+ <service name="ServiceE1">
+ <service name="ServiceE2">
+ <service name="ServiceE3">
+ <service name="serviceE4"/>
+ </service>
+ </service>
+ </service>
+ </server>
+</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/remove_types_v2.xml b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/remove_types_v2.xml
new file mode 100644
index 0000000..6b0cdb0
--- /dev/null
+++ b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/remove_types_v2.xml
@@ -0,0 +1,8 @@
+<plugin name="RemoveTypesPlugin" displayName="Remove Types Plugin" package="org.rhq.plugins.test"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="urn:xmlns:rhq-plugin"
+ xmlns:c="urn:xmlns:rhq-configuration">
+ <server name="ServerD">
+ <service name="ServerD.GrandChild1"/>
+ </server>
+</plugin>
\ No newline at end of file
commit 4e826fb67ab76b81338a88983405cd10602b48f9
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Tue Nov 27 17:17:35 2012 -0500
Make a note that this src branch should go away after the jndi asccess
tests have been fixed. The new home is in server/itests-2.
diff --git a/modules/integration-tests/jndi-access/jndi-access-test/src/test/java/org/rhq/jndi/test/JndiAccessTest.java b/modules/integration-tests/jndi-access/jndi-access-test/src/test/java/org/rhq/jndi/test/JndiAccessTest.java
index abfd376..05c59b6 100644
--- a/modules/integration-tests/jndi-access/jndi-access-test/src/test/java/org/rhq/jndi/test/JndiAccessTest.java
+++ b/modules/integration-tests/jndi-access/jndi-access-test/src/test/java/org/rhq/jndi/test/JndiAccessTest.java
@@ -51,7 +51,12 @@ import org.rhq.jndi.AllowRhqServerInternalsAccessPermission;
import org.rhq.test.PortScout;
/**
+ *
+ * !!!!!!! THIS TEST CLASS HAS BEEN MOVED TO ENTERPRISE/SERVER/ITESTS-2 !!!!!!
*
+ * TODO: since this class has been updated and now differs from the version in itests-2 it is left here for
+ * reference. Also, the jndi access strategy needs to be updated for AS7. When all is settled, this
+ * whole src branch should be deleted.
*
* @author Lukas Krejci
*/
commit b450670dad5fee5909ca21a417249d76c24911aa
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Tue Nov 27 17:16:52 2012 -0500
Fix version of javax mail to be the version provided by AS7.
diff --git a/.classpath b/.classpath
index 4470eb3..996b0fc 100644
--- a/.classpath
+++ b/.classpath
@@ -229,7 +229,7 @@
<classpathentry exported="true" kind="var" path="M2_REPO/com/sun/facelets/jsf-facelets/1.1.15.B1/jsf-facelets-1.1.15.B1.jar" sourcepath="/M2_REPO/com/sun/facelets/jsf-facelets/1.1.15.B1/jsf-facelets-1.1.15.B1-sources.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/mc4j/org-mc4j-ems/1.3/org-mc4j-ems-1.3.jar" sourcepath="/M2_REPO/mc4j/org-mc4j-ems/1.3/org-mc4j-ems-1.3-sources.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/org/opensymphony/quartz/quartz/1.6.5/quartz-1.6.5.jar" sourcepath="/M2_REPO/org/opensymphony/quartz/quartz/1.6.5/quartz-1.6.5-sources.jar"/>
- <classpathentry exported="true" kind="var" path="M2_REPO/javax/mail/mail/1.4/mail-1.4.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/javax/mail/mail/1.4.4/mail-1.4.4.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/org/richfaces/framework/richfaces-api/3.3.3.Final/richfaces-api-3.3.3.Final.jar" sourcepath="/M2_REPO/org/richfaces/framework/richfaces-api/3.1.3.GA/richfaces-api-3.1.3.GA-sources.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/org/richfaces/framework/richfaces-impl/3.3.3.Final/richfaces-impl-3.3.3.Final.jar" sourcepath="/M2_REPO/org/richfaces/framework/richfaces-impl/3.3.0.GA/richfaces-impl-3.3.0.GA-sources.jar"/>
11 years, 6 months
- 1
- 0
[rhq] modules/enterprise
by John Sanda
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.java | 29 ++++++++++
1 file changed, 29 insertions(+)
New commits:
commit e499abf813bf6e92f7359d58ffd6f2ca442c5140
Author: John Sanda <jsanda(a)redhat.com>
Date: Tue Dec 4 20:26:00 2012 -0500
adding test for getAggregate method when fetching raw data
The method under test is used for the measurement tables in the UI.
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.java
index 190c3d5..9c2882c 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.java
@@ -61,6 +61,7 @@ import org.rhq.enterprise.server.drift.DriftServerPluginService;
import org.rhq.enterprise.server.measurement.util.MeasurementDataManagerUtility;
import org.rhq.enterprise.server.test.AbstractEJB3Test;
import org.rhq.enterprise.server.test.TransactionCallback;
+import org.rhq.test.AssertUtils;
/**
* @author John Sanda
@@ -168,6 +169,34 @@ public class MeasurementDataManagerBeanTest extends AbstractEJB3Test {
actualData.get(29));
}
+ @Test(enabled = true)
+ public void getRawAggregate() {
+ DateTime now = new DateTime();
+ DateTime beginTime = now.minusHours(4);
+ DateTime endTime = now;
+
+ Buckets buckets = new Buckets(beginTime, endTime);
+
+ MeasurementScheduleRequest request = new MeasurementScheduleRequest(dynamicSchedule);
+ MeasurementReport report = new MeasurementReport();
+ report.addData(new MeasurementDataNumeric(buckets.get(0) + 10, request, 1.1));
+ report.addData(new MeasurementDataNumeric(buckets.get(0) + 20, request, 2.2));
+ report.addData(new MeasurementDataNumeric(buckets.get(0) + 30, request, 3.3));
+ report.addData(new MeasurementDataNumeric(buckets.get(59) + 10, request, 4.4));
+ report.addData(new MeasurementDataNumeric(buckets.get(59) + 20, request, 5.5));
+ report.addData(new MeasurementDataNumeric(buckets.get(59) + 30, request, 6.6));
+
+ dataManager.mergeMeasurementReport(report);
+
+ MeasurementAggregate actual = dataManager.getAggregate(overlord, dynamicSchedule.getId(),
+ beginTime.getMillis(), endTime.getMillis());
+
+ MeasurementAggregate expected = new MeasurementAggregate(1.1, (1.1 + 2.2 + 3.3 + 4.4 + 5.5 + 6.6) / 6,
+ 6.6);
+
+ AssertUtils.assertPropertiesMatch(expected, actual, "Aggregate does not match");
+ }
+
@Test(enabled = ENABLED)
public void find1HourNumericData() throws Exception {
DateTime now = new DateTime();
11 years, 6 months
- 1
- 0
[rhq] Branch 'jsanda/cassandra-plugin' - 3 commits - .classpath modules/plugins
by snegrea
.classpath | 1
modules/plugins/cassandra/pom.xml | 95 +++
modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/ColumnFamilyComponent.java | 4
modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/ComplexConfigurationResourceComponent.java | 7
modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/KeyspaceComponent.java | 2
modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml | 16
modules/plugins/cassandra/src/test/java/org/rhq/plugins/cassandra/itest/DiscoveryAndConfigurationTest.java | 268 ++++++++++
7 files changed, 382 insertions(+), 11 deletions(-)
New commits:
commit 699deb319b7f540b788aabd059576073121013a5
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Tue Dec 4 16:02:41 2012 -0600
Avoid logging warning due to missing dependencies.
diff --git a/modules/plugins/cassandra/pom.xml b/modules/plugins/cassandra/pom.xml
index 432c2ae..a65384c 100644
--- a/modules/plugins/cassandra/pom.xml
+++ b/modules/plugins/cassandra/pom.xml
@@ -70,7 +70,6 @@
<artifactId>snakeyaml</artifactId>
<version>1.10</version>
</dependency>
-
<dependency>
<groupId>${rhq.groupId}</groupId>
<artifactId>rhq-core-plugin-test-api</artifactId>
@@ -123,6 +122,11 @@
<version>1.6.0</version>
</artifactItem>
<artifactItem>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.6.0</version>
+ </artifactItem>
+ <artifactItem>
<groupId>org.apache.cassandra</groupId>
<artifactId>cassandra-thrift</artifactId>
<version>1.1.5</version>
commit dfcfdb564e62e8d609e07a8450225e3df7f2fda5
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Tue Dec 4 15:27:10 2012 -0600
Add cassandra integration tests.
diff --git a/.classpath b/.classpath
index 1b27446..c111713 100644
--- a/.classpath
+++ b/.classpath
@@ -175,6 +175,7 @@
<classpathentry excluding="**" kind="src" path="modules/enterprise/agent/src/main/resources"/>
<classpathentry excluding="**" kind="src" path="modules/enterprise/agent/src/test/resources"/>
<classpathentry kind="src" path="modules/plugins/cassandra/src/main/java"/>
+ <classpathentry kind="src" path="modules/plugins/cassandra/src/test/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
<accessrules>
<accessrule kind="accessible" pattern="sun/misc/**"/>
diff --git a/modules/plugins/cassandra/pom.xml b/modules/plugins/cassandra/pom.xml
index 7b4f506..432c2ae 100644
--- a/modules/plugins/cassandra/pom.xml
+++ b/modules/plugins/cassandra/pom.xml
@@ -70,6 +70,21 @@
<artifactId>snakeyaml</artifactId>
<version>1.10</version>
</dependency>
+
+ <dependency>
+ <groupId>${rhq.groupId}</groupId>
+ <artifactId>rhq-core-plugin-test-api</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>${rhq.groupId}</groupId>
+ <artifactId>rhq-core-plugin-test-util</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
@@ -191,6 +206,82 @@
<goal>run</goal>
</goals>
</execution>
+
+ <execution>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <target>
+ <echo>Setting up plugin dependencies...</echo>
+ <property name="settings.localRepository" location="${user.home}/.m2/repository" />
+ <mkdir dir="target/testsetup" />
+
+ <mkdir dir="target/testsetup/plugins" />
+ <copy toDir="target/testsetup/plugins" flatten="true">
+ <fileset dir="${settings.localRepository}/">
+ <include name="org/rhq/rhq-jmx-plugin/${project.version}/rhq-jmx-plugin-${project.version}.jar" />
+ </fileset>
+ <fileset dir="${rhq.deploymentDir}">
+ <include name="${project.artifactId}-${project.version}.jar" />
+ </fileset>
+ <fileset dir="${project.build.directory}" includes="${project.artifactId}-${project.version}.jar" />
+ </copy>
+
+ <mkdir dir="target/testsetup/lib" />
+ <unzip dest="target/testsetup/lib">
+ <fileset dir="${settings.localRepository}/org/hyperic/sigar-dist/${sigar.version}" includes="*.zip" />
+ <patternset>
+ <include name="**/lib/sigar.jar" />
+ <include name="**/lib/bcel*.jar" />
+ <include name="**/lib/*.so" />
+ <include name="**/lib/*.sl" />
+ <include name="**/lib/*.dll" />
+ <include name="**/lib/*.dylib" />
+ </patternset>
+ </unzip>
+ <move todir="target/testsetup/lib" flatten="true">
+ <fileset dir="target/testsetup/lib">
+ <include name="**/lib/*" />
+ </fileset>
+ </move>
+ <delete dir="target/testsetup/lib/hyperic-sigar-${sigar.version}" />
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ <executions>
+ <execution>
+ <id>surefire-it</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <skip>${maven.test.skip}</skip>
+ <excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
+ <useSystemClassLoader>false</useSystemClassLoader>
+ <argLine>-Dorg.hyperic.sigar.path=${basedir}/target/testsetup/lib</argLine>
+ <systemProperties>
+ <property>
+ <name>project.artifactId</name>
+ <value>${project.artifactId}</value>
+ </property>
+ <property>
+ <name>project.version</name>
+ <value>${project.version}</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </execution>
</executions>
</plugin>
</plugins>
diff --git a/modules/plugins/cassandra/src/test/java/org/rhq/plugins/cassandra/itest/DiscoveryAndConfigurationTest.java b/modules/plugins/cassandra/src/test/java/org/rhq/plugins/cassandra/itest/DiscoveryAndConfigurationTest.java
new file mode 100644
index 0000000..c7296fd
--- /dev/null
+++ b/modules/plugins/cassandra/src/test/java/org/rhq/plugins/cassandra/itest/DiscoveryAndConfigurationTest.java
@@ -0,0 +1,268 @@
+/*
+ * RHQ Management Platform
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.plugins.cassandra.itest;
+
+import java.io.File;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.Queue;
+import java.util.Set;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.testng.Assert;
+import org.testng.annotations.AfterSuite;
+import org.testng.annotations.BeforeSuite;
+import org.testng.annotations.Test;
+
+import org.rhq.core.clientapi.agent.configuration.ConfigurationUpdateRequest;
+import org.rhq.core.clientapi.server.configuration.ConfigurationUpdateResponse;
+import org.rhq.core.clientapi.server.discovery.InventoryReport;
+import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.measurement.DataType;
+import org.rhq.core.domain.measurement.MeasurementData;
+import org.rhq.core.domain.measurement.MeasurementDefinition;
+import org.rhq.core.domain.measurement.MeasurementReport;
+import org.rhq.core.domain.measurement.MeasurementScheduleRequest;
+import org.rhq.core.domain.resource.Resource;
+import org.rhq.core.pc.PluginContainer;
+import org.rhq.core.pc.PluginContainerConfiguration;
+import org.rhq.core.pc.configuration.ConfigurationManager;
+import org.rhq.core.pc.plugin.FileSystemPluginFinder;
+import org.rhq.core.pc.plugin.PluginEnvironment;
+import org.rhq.core.pc.plugin.PluginManager;
+import org.rhq.core.pluginapi.inventory.ResourceComponent;
+import org.rhq.core.pluginapi.measurement.MeasurementFacet;
+import org.rhq.core.pluginapi.operation.OperationFacet;
+import org.rhq.core.pluginapi.operation.OperationResult;
+
+/**
+ * @author Stefan Negrea
+ *
+ */
+@Test(groups = { "integration" }, singleThreaded = true)
+public class DiscoveryAndConfigurationTest {
+
+ private static final int TYPE_HIERARCHY_DEPTH = 6;
+ protected static final String PLUGIN_NAME = "Cassandra";
+
+ private Log log = LogFactory.getLog(this.getClass());
+ private ConfigurationManager configManager;
+
+
+ protected int getTypeHierarchyDepth() {
+ return TYPE_HIERARCHY_DEPTH;
+ }
+
+ protected String getPluginName() {
+ return PLUGIN_NAME;
+ }
+
+ @BeforeSuite
+ public void setupTestResources() {
+ try {
+ File pluginDir = new File("target/testsetup/plugins");
+ PluginContainerConfiguration pcConfig = new PluginContainerConfiguration();
+ pcConfig.setPluginFinder(new FileSystemPluginFinder(pluginDir));
+ pcConfig.setPluginDirectory(pluginDir);
+
+ pcConfig.setInsideAgent(false);
+ PluginContainer.getInstance().setConfiguration(pcConfig);
+ PluginContainer.getInstance().initialize();
+ log.info("PC started.");
+ for (String plugin : PluginContainer.getInstance().getPluginManager().getMetadataManager().getPluginNames()) {
+ log.info("...Loaded plugin: " + plugin);
+ }
+
+ configManager = PluginContainer.getInstance().getConfigurationManager();
+ configManager.initialize();
+ Thread.sleep(10 * 1000L);
+
+ } catch (Exception e) {
+ log.info("Error initializing the context", e);
+ }
+ }
+
+ @AfterSuite
+ public void stopTestResources() {
+ PluginContainer.getInstance().shutdown();
+ }
+
+ @Test
+ public void pluginLoad() {
+ PluginManager pluginManager = PluginContainer.getInstance().getPluginManager();
+ PluginEnvironment pluginEnvironment = pluginManager.getPlugin(PLUGIN_NAME);
+ assert (pluginEnvironment != null) : "Null environment, plugin not loaded";
+ assert (pluginEnvironment.getPluginName().equals(PLUGIN_NAME));
+ }
+
+ @Test(dependsOnMethods = "pluginLoad")
+ public void discoverResources() throws Exception {
+ InventoryReport report = PluginContainer.getInstance().getInventoryManager().executeServerScanImmediately();
+ Assert.assertNotNull(report);
+ log.info("Discovery took: " + (report.getEndTime() - report.getStartTime()) + "ms");
+
+ Thread.sleep(1000);
+
+ report = PluginContainer.getInstance().getInventoryManager().executeServiceScanImmediately();
+ Assert.assertNotNull(report);
+ log.info("Discovery took: " + (report.getEndTime() - report.getStartTime()) + "ms");
+
+ Set<String> ignoredResourceTypes = new HashSet<String>();
+ ignoredResourceTypes.add("Cassandra Server JVM");
+
+ Set<String> ignoredResourceNames = new HashSet<String>();
+ ignoredResourceNames.add("system");
+
+ Set<Resource> resources = findResourcesForTest(PluginContainer.getInstance().getInventoryManager().getPlatform(),
+ ignoredResourceTypes, ignoredResourceNames);
+ log.info("Found " + resources.size() + " Cassandra resources.");
+
+ Assert.assertNotEquals(resources.size(), 0, "No cassandra or related instances found.");
+
+ for (Object resource : resources.toArray()) {
+ loadResourceMetrics((Resource) resource);
+ loadUpdateResourceConfiguration((Resource) resource);
+ executeResourceOperations((Resource) resource);
+ }
+ }
+
+ private void loadUpdateResourceConfiguration(Resource resource) throws Exception {
+ if (resource.getResourceType().getResourceConfigurationDefinition() != null
+ && resource.getResourceType().getResourceConfigurationDefinition().getPropertyDefinitions().size() != 0) {
+ try {
+ Configuration configUnderTest = configManager.loadResourceConfiguration(resource.getId());
+
+ ConfigurationUpdateRequest updateRequest = new ConfigurationUpdateRequest(1, configUnderTest,
+ resource.getId());
+ ConfigurationUpdateResponse updateResponse = configManager
+ .executeUpdateResourceConfigurationImmediately(updateRequest);
+
+ if (updateResponse == null) {
+ log.error("------------------------------");
+ log.error(resource);
+ log.error("Update Response is NULL!!!!");
+ log.error("------------------------------\n");
+ }
+ if (updateResponse.getErrorMessage() != null) {
+ log.error("------------------------------");
+ log.error(resource);
+ log.error(updateResponse.getErrorMessage());
+ log.error("------------------------------\n");
+ }
+ } catch (Exception e) {
+ log.error(resource, e);
+ }
+ }
+ }
+
+ @SuppressWarnings("rawtypes")
+ private void loadResourceMetrics(Resource resource) throws Exception {
+ ResourceComponent resourceComponent = PluginContainer.getInstance().getInventoryManager()
+ .getResourceComponent(resource);
+
+ if (resourceComponent instanceof MeasurementFacet) {
+ for (MeasurementDefinition def : resource.getResourceType().getMetricDefinitions()) {
+ Set<MeasurementScheduleRequest> metricList = new HashSet<MeasurementScheduleRequest>();
+ metricList.add(new MeasurementScheduleRequest(1, def.getName(), 1000, true, def.getDataType(), null));
+ MeasurementReport report = new MeasurementReport();
+ ((MeasurementFacet) resourceComponent).getValues(report, metricList);
+
+ if (def.getDataType().equals(DataType.TRAIT)) {
+ MeasurementData data = report.getTraitData().iterator().next();
+ Assert.assertNotNull(data, "Unable to collect trait [" + def.getName() + "] on " + resource);
+ log.info("Measurement: " + def.getName() + "=" + data.getValue());
+ } else if (def.getDataType().equals(DataType.MEASUREMENT)) {
+ MeasurementData data = report.getNumericData().iterator().next();
+ Assert.assertNotNull(data, "Unable to collect measurement [" + def.getName() + "] on " + resource);
+ log.info("Measurement: " + def.getName() + "=" + data.getValue());
+ }
+ }
+ }
+ }
+
+ private void executeResourceOperations(Resource resource) throws Exception {
+ String resourceTypeName = resource.getResourceType().getName();
+
+ if (resourceTypeName.equals("CacheService")) {
+ Configuration config = new Configuration();
+ executeOperation(resource, "saveCaches", config);
+ executeOperation(resource, "invalidateKeyCache", config);
+ executeOperation(resource, "invalidateRowCache", config);
+ } else if (resourceTypeName.equals("Keyspace")) {
+ Configuration config = new Configuration();
+ executeOperation(resource, "repair", config);
+ executeOperation(resource, "compact", config);
+ executeOperation(resource, "takeSnapshot", config);
+ } else if (resourceTypeName.equals("ColumnFamily")) {
+ Configuration config = new Configuration();
+ executeOperation(resource, "repair", config);
+ executeOperation(resource, "compact", config);
+ executeOperation(resource, "takeSnapshot", config);
+ executeOperation(resource, "disableAutoCompaction", config);
+ }
+ }
+
+ @SuppressWarnings("rawtypes")
+ private void executeOperation(Resource resource, String operationName, Configuration config) throws Exception {
+ ResourceComponent resourceComponent = PluginContainer.getInstance().getInventoryManager()
+ .getResourceComponent(resource);
+
+ OperationResult result = ((OperationFacet) resourceComponent).invokeOperation(operationName, config);
+
+ if (result != null) {
+ log.info("Result of operation " + operationName + " was: " + result.getSimpleResult());
+ if (result.getErrorMessage() != null) {
+ Assert.fail("Operation execution failed");
+ }
+ }
+ }
+
+ private Set<Resource> findResourcesForTest(Resource parent, Set<String> ignoredResourceTypes,
+ Set<String> ignoredResourceNames) {
+ Set<Resource> foundResources = new HashSet<Resource>();
+
+ Queue<Resource> discoveryQueue = new LinkedList<Resource>();
+ discoveryQueue.add(parent);
+
+ while (!discoveryQueue.isEmpty()) {
+ Resource currentResource = discoveryQueue.poll();
+
+ if (ignoredResourceTypes.contains(currentResource.getResourceType().getName())
+ || ignoredResourceNames.contains(currentResource.getName())) {
+ continue;
+ }
+
+ log.info("Discovered resource of type: " + currentResource.getResourceType().getName());
+ if (currentResource.getResourceType().getPlugin().equals(PLUGIN_NAME)) {
+ foundResources.add(currentResource);
+ }
+
+ if (currentResource.getChildResources() != null) {
+ for (Resource child : currentResource.getChildResources()) {
+ discoveryQueue.add(child);
+ }
+ }
+ }
+
+ return foundResources;
+ }
+}
\ No newline at end of file
commit 481cd803151127c4e0b4a6b9c4c38697e1d8a612
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Tue Dec 4 15:26:47 2012 -0600
A few plugin descriptor and code updates based on integration test results.
diff --git a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/ColumnFamilyComponent.java b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/ColumnFamilyComponent.java
index 845b2fb..f58de06 100644
--- a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/ColumnFamilyComponent.java
+++ b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/ColumnFamilyComponent.java
@@ -47,13 +47,11 @@ import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport;
import org.rhq.core.pluginapi.inventory.ResourceContext;
import org.rhq.core.pluginapi.operation.OperationResult;
import org.rhq.core.util.file.FileUtil;
-import org.rhq.plugins.jmx.JMXComponent;
-import org.rhq.plugins.jmx.MBeanResourceComponent;
/**
* @author John Sanda
*/
-public class ColumnFamilyComponent extends MBeanResourceComponent<JMXComponent<?>> {
+public class ColumnFamilyComponent extends ComplexConfigurationResourceComponent {
private Log log = LogFactory.getLog(ColumnFamilyComponent.class);
diff --git a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/ComplexConfigurationResourceComponent.java b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/ComplexConfigurationResourceComponent.java
index 583e2c4..f8c93a0 100644
--- a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/ComplexConfigurationResourceComponent.java
+++ b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/ComplexConfigurationResourceComponent.java
@@ -36,6 +36,7 @@ import org.rhq.core.domain.configuration.definition.PropertyDefinition;
import org.rhq.core.domain.configuration.definition.PropertyDefinitionList;
import org.rhq.core.domain.configuration.definition.PropertyDefinitionMap;
import org.rhq.core.domain.configuration.definition.PropertyDefinitionSimple;
+import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport;
import org.rhq.plugins.jmx.JMXComponent;
import org.rhq.plugins.jmx.MBeanResourceComponent;
@@ -110,4 +111,10 @@ public class ComplexConfigurationResourceComponent extends MBeanResourceComponen
return configuration;
}
+
+ @Override
+ public void updateResourceConfiguration(ConfigurationUpdateReport report) {
+ // don't try to update the read only properties, it will fail
+ super.updateResourceConfiguration(report, true);
+ }
}
diff --git a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/KeyspaceComponent.java b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/KeyspaceComponent.java
index 5b15ee4..45b9351 100644
--- a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/KeyspaceComponent.java
+++ b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/KeyspaceComponent.java
@@ -36,6 +36,7 @@ import org.mc4j.ems.connection.bean.attribute.EmsAttribute;
import org.mc4j.ems.connection.bean.operation.EmsOperation;
import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.configuration.ConfigurationUpdateStatus;
import org.rhq.core.domain.configuration.PropertyList;
import org.rhq.core.domain.configuration.PropertyMap;
import org.rhq.core.domain.configuration.PropertySimple;
@@ -107,6 +108,7 @@ public class KeyspaceComponent implements ResourceComponent<ResourceComponent<?>
@Override
public void updateResourceConfiguration(ConfigurationUpdateReport report) {
+ report.setStatus(ConfigurationUpdateStatus.NOCHANGE);
}
@Override
diff --git a/modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml
index 246d002..65dde69 100644
--- a/modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml
@@ -80,7 +80,6 @@
</plugin-configuration>
</server>
-
<service name="StorageProxy"
discovery="org.rhq.plugins.jmx.MBeanResourceDiscoveryComponent"
class="org.rhq.plugins.jmx.MBeanResourceComponent"
@@ -104,10 +103,11 @@
<metric property="TotalWriteLatencyMicros" measurementType="trendsup" displayType="detail" displayName="Total Write Latency (microseconds)" description="The latency of all write operations since execution start"/>
<metric property="WriteOperations" measurementType="trendsup" displayType="summary" description="Total number of write operations since execution start"/>
+
<resource-configuration>
<c:simple-property name="HintedHandoffEnabled" type="boolean" required="true" description="Hinted Handoff Enabled"/>
- <c:simple-property name="MaxHintsInProgress" type="long" required="true" description="Max Hints in Progress"/>
- <c:simple-property name="MaxHintWindow" type="long" required="true" description="Max Hint Window"/>
+ <c:simple-property name="MaxHintsInProgress" type="integer" required="true" description="Max Hints in Progress"/>
+ <c:simple-property name="MaxHintWindow" type="integer" required="true" description="Max Hint Window"/>
<c:simple-property name="RPCTimeout" type="long" required="true" displayName="RPC Timeout" description="RPC Timeout"/>
</resource-configuration>
</service>
@@ -162,7 +162,7 @@
<metric property="Load" dataType="measurement" units="bytes" displayType="summary" description="Amount of load in disk usage on the node being queried"/>
<metric property="OperationMode" dataType="trait" displayType="summary" description="Current operation mode"/>
<metric property="ReleaseVersion" dataType="trait" displayType="summary" description="Cassandra version"/>
- <metric property="RPCServiceRunning" dataType="trait" displayType="summary" displayName="RPC Service Running" description="RPC Service Running"/>
+ <metric property="RPCServerRunning" dataType="trait" displayType="summary" displayName="RPC Service Running" description="RPC Service Running"/>
<metric property="SchemaVersion" dataType="trait" displayType="summary"
description="The current schema version for this node. The value is calculated as a checksum of all rows
in the system.schema_* column families. This value is used in an algorithm to compare schema versions
@@ -240,7 +240,7 @@
<c:simple-property name="nameTemplate" readOnly="true" type="string" default="Commit Log" />
</plugin-configuration>
- <metric property="TotalCommitLogSize" measurementType="trendsup" displayType="summary" description="Size of all commit log segments"/>
+ <metric property="TotalCommitlogSize" measurementType="trendsup" dataType="measurement" displayType="summary" description="Size of all commit log segments"/>
<metric property="PendingTasks" measurementType="dynamic" displayType="summary" description="Number of tasks waiting to be executed"/>
<metric property="CompletedTasks" measurementType="trendsup" displayType="summary" description="Number of completed tasks"/>
</service>
@@ -343,7 +343,7 @@
<operation name="invalidateRowCache" description="Invalidate the row cache."/>
<metric property="KeyCacheHits" measurementType="dynamic" displayType="summary" description="Number of key cache hits"/>
- <metric property="RowCacheHists" measurementType="dynamic" displayType="summary" description="Number of row cache hits"/>
+ <metric property="RowCacheHits" measurementType="dynamic" displayType="summary" description="Number of row cache hits"/>
<metric property="KeyCacheRequests" measurementType="dynamic" displayType="summary" description="Number of key cache requests"/>
<metric property="RowCacheRequests" measurementType="dynamic" displayType="summary" description="Number of row cache requests"/>
@@ -552,7 +552,7 @@
</plugin-configuration>
<metric property="TotalTimeouts" measurementType="trendsup" displayType="detail" description="Total timeouts."/>
- <metric property="RecentTotalTimeouts" measurementType="trendsup" displayType="detail" description="Recent total timeouts."/>
+ <metric property="RecentTotalTimouts" measurementType="trendsup" displayType="detail" description="Recent total timeouts."/>
<resource-configuration>
<c:list-property name="CommandPendingTasks" readOnly="true">
@@ -737,7 +737,7 @@
defaults to 10 days and allows for a large amount of time for consistency to be achived prior to deletion. In a single node cluster
this can be reduced to zero."/>
<c:simple-property name="CompactionStrategyClass" type="string" required="true" description="Compaction strategy class name."/>
- <c:simple-property name="CompressionParameters" type="string" required="true" description="Compression parameters"/>
+ <c:simple-property name="CompressionParameters" type="string" readOnly="true" description="Compression parameters"/>
<c:simple-property name="MinimumCompactionThreshold" type="integer" required="true" description="Minimum number of sstables in queue before compaction kicks off."/>
<c:simple-property name="MaximumCompactionThreshold" type="integer" required="true" description="Maximum number of sstables in queue before compaction kicks off."/>
<c:list-property name="snapshots" readOnly="true" required="false">
11 years, 6 months
- 1
- 0
[rhq] Branch 'rhq-on-as7' - 2 commits - modules/enterprise
by mazz
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/AbstractDriftServerTest.java | 6 +-
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java | 5 ++
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/inventory/UninventoryTest.java | 15 +++++-
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/test/AvailabilityManagerTest.java | 2
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/test/MeasurementBaselineManagerTest.java | 2
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java | 7 +++
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java | 23 +++++-----
7 files changed, 45 insertions(+), 15 deletions(-)
New commits:
commit 9c86cb4f8d7aea240dbe409f6702e2b6eb5a0316
Merge: 288582b 0be34a8
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Dec 4 16:21:53 2012 -0500
Merge remote-tracking branch 'origin/master' into rhq-on-as7
commit 0be34a847aa77afbcd05dd96624af2a11386746c
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Tue Dec 4 16:18:06 2012 -0500
First really clean run of server integration tests (itests-2)
- Fix another issue in AbstractDriftServerTest cleanup code
- Fix additional cleanup issues where we needed to deploy ytest services
- uninventoty requires test agents (comm) service
- system config requires (drift) server plugin service
- Fix some JDoc in AbstractEJB3Test
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/AbstractDriftServerTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/AbstractDriftServerTest.java
index 1bb0e0c..5f7d95c 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/AbstractDriftServerTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/AbstractDriftServerTest.java
@@ -142,8 +142,10 @@ public abstract class AbstractDriftServerTest extends AbstractEJB3Test {
"delete from JPADriftChangeSet cs where cs.id in ( select cast(ddt.changeSetId as int) from DriftDefinitionTemplate ddt where ddt.name like"
+ name + ")").executeUpdate();
- em.createNativeQuery(
- "delete from rhq_drift_set ds where not exists ( select * from rhq_drift d where d.drift_set_id = ds.id ) ")
+ em.createNativeQuery("" //
+ + "delete from rhq_drift_set ds " //
+ + " where not exists ( select * from rhq_drift d where d.drift_set_id = ds.id ) " //
+ + " and not exists ( select * from rhq_drift_change_set cs where cs.drift_set_id = ds.id ) ")
.executeUpdate();
em.createQuery("delete from JPADriftFile df where df.hashId like" + name).executeUpdate();
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java
index 03cffdc..aa42a11 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java
@@ -94,6 +94,10 @@ public class DriftManagerBeanTest extends AbstractEJB3Test {
prepareScheduler();
+ DriftServerPluginService driftServerPluginService = new DriftServerPluginService();
+ prepareCustomServerPluginService(driftServerPluginService);
+ driftServerPluginService.masterConfig.getPluginDirectory().mkdirs();
+
deleteDriftFiles();
newResource = createNewResource();
@@ -104,6 +108,7 @@ public class DriftManagerBeanTest extends AbstractEJB3Test {
try {
deleteNewResource(newResource);
} finally {
+ unprepareServerPluginService();
unprepareForTestAgents();
unprepareScheduler();
}
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/inventory/UninventoryTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/inventory/UninventoryTest.java
index a7c0021..ab95c23 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/inventory/UninventoryTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/inventory/UninventoryTest.java
@@ -48,10 +48,19 @@ public class UninventoryTest extends AbstractEJB3Test {
private Resource newResource;
@Override
+ protected void beforeMethod() throws Exception {
+ prepareForTestAgents();
+ }
+
+ @Override
protected void afterMethod() throws Exception {
- if (newResource != null) {
- deleteNewResource(newResource);
- newResource = null;
+ try {
+ if (newResource != null) {
+ deleteNewResource(newResource);
+ newResource = null;
+ }
+ } finally {
+ unprepareForTestAgents();
}
}
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/test/AvailabilityManagerTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/test/AvailabilityManagerTest.java
index 5ac610e..f180036 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/test/AvailabilityManagerTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/test/AvailabilityManagerTest.java
@@ -108,8 +108,10 @@ public class AvailabilityManagerTest extends AbstractEJB3Test {
if (theResource != null) {
// perform in-band and out-of-band work in quick succession
// this also deletes our attached agent
+ prepareForTestAgents();
resourceManager.uninventoryResource(overlord, theResource.getId());
resourceManager.uninventoryResourceAsyncWork(overlord, theResource.getId());
+ unprepareForTestAgents();
theResource = null;
}
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/test/MeasurementBaselineManagerTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/test/MeasurementBaselineManagerTest.java
index 5e41732..e8f8162 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/test/MeasurementBaselineManagerTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/test/MeasurementBaselineManagerTest.java
@@ -72,10 +72,12 @@ public class MeasurementBaselineManagerTest extends AbstractEJB3Test {
this.overlord = LookupUtil.getSubjectManager().getOverlord();
this.prepareScheduler();
+ this.prepareForTestAgents();
}
@Override
protected void afterMethod() throws Exception {
+ this.unprepareForTestAgents();
this.unprepareScheduler();
}
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java
index 7c815b7..f05e079 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java
@@ -50,6 +50,7 @@ import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.domain.util.PageList;
import org.rhq.core.util.MessageDigestGenerator;
+import org.rhq.enterprise.server.drift.DriftServerPluginService;
import org.rhq.enterprise.server.resource.ResourceManagerLocal;
import org.rhq.enterprise.server.resource.ResourceTypeManagerLocal;
import org.rhq.enterprise.server.resource.metadata.PluginManagerLocal;
@@ -76,6 +77,11 @@ public class UpdatePluginMetadataTestBase extends AbstractEJB3Test {
prepareMockAgentServiceContainer();
prepareScheduler();
preparePluginScannerService();
+ // we perform lookups of config settings from SystemManagerBean.
+ // SystemManagerBean.getDriftServerPluginManager method requires drift server plugin.
+ DriftServerPluginService driftServerPluginService = new DriftServerPluginService();
+ prepareCustomServerPluginService(driftServerPluginService);
+ driftServerPluginService.masterConfig.getPluginDirectory().mkdirs();
pluginMgr = LookupUtil.getPluginManager();
resourceTypeManager = LookupUtil.getResourceTypeManager();
@@ -86,6 +92,7 @@ public class UpdatePluginMetadataTestBase extends AbstractEJB3Test {
protected void afterMethod() throws Exception {
cleanupTest();
+ unprepareServerPluginService();
unpreparePluginScannerService();
unprepareScheduler();
unprepareForTestAgents();
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java
index d8db4b9..f1ba91f 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java
@@ -462,7 +462,7 @@ public abstract class AbstractEJB3Test extends Arquillian {
} catch (Throwable t) {
// Arquillian is eating these, make sure they show up in some way
- System.out.println("BEFORE METHOD FAILURE, TEST DID NOT RUN!!! ");
+ System.out.println("BEFORE METHOD FAILURE, TEST DID NOT RUN!!! [" + method.getName() + "]");
t.printStackTrace();
throw t;
}
@@ -484,7 +484,8 @@ public abstract class AbstractEJB3Test extends Arquillian {
}
} catch (Throwable t) {
System.out
- .println("AFTER METHOD FAILURE, TEST CLEAN UP FAILED!!! MAY NEED TO CLEAN DB BEFORE RUNNING MORE TESTS!");
+ .println("AFTER METHOD FAILURE, TEST CLEAN UP FAILED!!! MAY NEED TO CLEAN DB BEFORE RUNNING MORE TESTS! ["
+ + method.getName() + "]");
t.printStackTrace();
throw t;
}
@@ -722,11 +723,12 @@ public abstract class AbstractEJB3Test extends Arquillian {
}
/**
- * If you need to test server plugins, you must first prepare the server plugin service.
- * After this returns, the caller must explicitly start the PC by using the appropriate API
- * on the given mbean; this method will only start the service, it will NOT start the master PC.
+ * This will register any custom service, replacing any service with the same objectName.
+ * <br/>
+ * It does nothing more than registration, any calls to the service (e.g. start) are up to the caller.
*
- * @param testServiceMBean the object that will house your test server plugins
+ * @param testServiceMBean the test service MBean to register
+ * @param objectNameStr the name of the service, which will be converted to an ObjectName
*
* @throws RuntimeException
*/
@@ -740,11 +742,12 @@ public abstract class AbstractEJB3Test extends Arquillian {
}
/**
- * If you need to test server plugins, you must first prepare the server plugin service.
- * After this returns, the caller must explicitly start the PC by using the appropriate API
- * on the given mbean; this method will only start the service, it will NOT start the master PC.
+ * This will register any custom service, replacing any service with the same objectName.
+ * <br/>
+ * It does nothing more than registration, any calls to the service (e.g. start) are up to the caller.
*
- * @param testServiceMBean the object that will house your test server plugins
+ * @param testServiceMBean the test service MBean to register
+ * @param objectName the name of the service
*
* @throws RuntimeException
*/
11 years, 6 months
- 1
- 0
[rhq] modules/enterprise
by Jay Shaughnessy
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/AbstractDriftServerTest.java | 6 +-
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java | 5 ++
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/inventory/UninventoryTest.java | 15 +++++-
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/test/AvailabilityManagerTest.java | 2
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/test/MeasurementBaselineManagerTest.java | 2
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java | 7 +++
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java | 23 +++++-----
7 files changed, 45 insertions(+), 15 deletions(-)
New commits:
commit 0be34a847aa77afbcd05dd96624af2a11386746c
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Tue Dec 4 16:18:06 2012 -0500
First really clean run of server integration tests (itests-2)
- Fix another issue in AbstractDriftServerTest cleanup code
- Fix additional cleanup issues where we needed to deploy ytest services
- uninventoty requires test agents (comm) service
- system config requires (drift) server plugin service
- Fix some JDoc in AbstractEJB3Test
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/AbstractDriftServerTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/AbstractDriftServerTest.java
index 1bb0e0c..5f7d95c 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/AbstractDriftServerTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/AbstractDriftServerTest.java
@@ -142,8 +142,10 @@ public abstract class AbstractDriftServerTest extends AbstractEJB3Test {
"delete from JPADriftChangeSet cs where cs.id in ( select cast(ddt.changeSetId as int) from DriftDefinitionTemplate ddt where ddt.name like"
+ name + ")").executeUpdate();
- em.createNativeQuery(
- "delete from rhq_drift_set ds where not exists ( select * from rhq_drift d where d.drift_set_id = ds.id ) ")
+ em.createNativeQuery("" //
+ + "delete from rhq_drift_set ds " //
+ + " where not exists ( select * from rhq_drift d where d.drift_set_id = ds.id ) " //
+ + " and not exists ( select * from rhq_drift_change_set cs where cs.drift_set_id = ds.id ) ")
.executeUpdate();
em.createQuery("delete from JPADriftFile df where df.hashId like" + name).executeUpdate();
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java
index 03cffdc..aa42a11 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java
@@ -94,6 +94,10 @@ public class DriftManagerBeanTest extends AbstractEJB3Test {
prepareScheduler();
+ DriftServerPluginService driftServerPluginService = new DriftServerPluginService();
+ prepareCustomServerPluginService(driftServerPluginService);
+ driftServerPluginService.masterConfig.getPluginDirectory().mkdirs();
+
deleteDriftFiles();
newResource = createNewResource();
@@ -104,6 +108,7 @@ public class DriftManagerBeanTest extends AbstractEJB3Test {
try {
deleteNewResource(newResource);
} finally {
+ unprepareServerPluginService();
unprepareForTestAgents();
unprepareScheduler();
}
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/inventory/UninventoryTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/inventory/UninventoryTest.java
index a7c0021..ab95c23 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/inventory/UninventoryTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/inventory/UninventoryTest.java
@@ -48,10 +48,19 @@ public class UninventoryTest extends AbstractEJB3Test {
private Resource newResource;
@Override
+ protected void beforeMethod() throws Exception {
+ prepareForTestAgents();
+ }
+
+ @Override
protected void afterMethod() throws Exception {
- if (newResource != null) {
- deleteNewResource(newResource);
- newResource = null;
+ try {
+ if (newResource != null) {
+ deleteNewResource(newResource);
+ newResource = null;
+ }
+ } finally {
+ unprepareForTestAgents();
}
}
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/test/AvailabilityManagerTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/test/AvailabilityManagerTest.java
index 5ac610e..f180036 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/test/AvailabilityManagerTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/test/AvailabilityManagerTest.java
@@ -108,8 +108,10 @@ public class AvailabilityManagerTest extends AbstractEJB3Test {
if (theResource != null) {
// perform in-band and out-of-band work in quick succession
// this also deletes our attached agent
+ prepareForTestAgents();
resourceManager.uninventoryResource(overlord, theResource.getId());
resourceManager.uninventoryResourceAsyncWork(overlord, theResource.getId());
+ unprepareForTestAgents();
theResource = null;
}
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/test/MeasurementBaselineManagerTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/test/MeasurementBaselineManagerTest.java
index 5e41732..e8f8162 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/test/MeasurementBaselineManagerTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/test/MeasurementBaselineManagerTest.java
@@ -72,10 +72,12 @@ public class MeasurementBaselineManagerTest extends AbstractEJB3Test {
this.overlord = LookupUtil.getSubjectManager().getOverlord();
this.prepareScheduler();
+ this.prepareForTestAgents();
}
@Override
protected void afterMethod() throws Exception {
+ this.unprepareForTestAgents();
this.unprepareScheduler();
}
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java
index 7c815b7..f05e079 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java
@@ -50,6 +50,7 @@ import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.domain.util.PageList;
import org.rhq.core.util.MessageDigestGenerator;
+import org.rhq.enterprise.server.drift.DriftServerPluginService;
import org.rhq.enterprise.server.resource.ResourceManagerLocal;
import org.rhq.enterprise.server.resource.ResourceTypeManagerLocal;
import org.rhq.enterprise.server.resource.metadata.PluginManagerLocal;
@@ -76,6 +77,11 @@ public class UpdatePluginMetadataTestBase extends AbstractEJB3Test {
prepareMockAgentServiceContainer();
prepareScheduler();
preparePluginScannerService();
+ // we perform lookups of config settings from SystemManagerBean.
+ // SystemManagerBean.getDriftServerPluginManager method requires drift server plugin.
+ DriftServerPluginService driftServerPluginService = new DriftServerPluginService();
+ prepareCustomServerPluginService(driftServerPluginService);
+ driftServerPluginService.masterConfig.getPluginDirectory().mkdirs();
pluginMgr = LookupUtil.getPluginManager();
resourceTypeManager = LookupUtil.getResourceTypeManager();
@@ -86,6 +92,7 @@ public class UpdatePluginMetadataTestBase extends AbstractEJB3Test {
protected void afterMethod() throws Exception {
cleanupTest();
+ unprepareServerPluginService();
unpreparePluginScannerService();
unprepareScheduler();
unprepareForTestAgents();
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java
index d8db4b9..f1ba91f 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java
@@ -462,7 +462,7 @@ public abstract class AbstractEJB3Test extends Arquillian {
} catch (Throwable t) {
// Arquillian is eating these, make sure they show up in some way
- System.out.println("BEFORE METHOD FAILURE, TEST DID NOT RUN!!! ");
+ System.out.println("BEFORE METHOD FAILURE, TEST DID NOT RUN!!! [" + method.getName() + "]");
t.printStackTrace();
throw t;
}
@@ -484,7 +484,8 @@ public abstract class AbstractEJB3Test extends Arquillian {
}
} catch (Throwable t) {
System.out
- .println("AFTER METHOD FAILURE, TEST CLEAN UP FAILED!!! MAY NEED TO CLEAN DB BEFORE RUNNING MORE TESTS!");
+ .println("AFTER METHOD FAILURE, TEST CLEAN UP FAILED!!! MAY NEED TO CLEAN DB BEFORE RUNNING MORE TESTS! ["
+ + method.getName() + "]");
t.printStackTrace();
throw t;
}
@@ -722,11 +723,12 @@ public abstract class AbstractEJB3Test extends Arquillian {
}
/**
- * If you need to test server plugins, you must first prepare the server plugin service.
- * After this returns, the caller must explicitly start the PC by using the appropriate API
- * on the given mbean; this method will only start the service, it will NOT start the master PC.
+ * This will register any custom service, replacing any service with the same objectName.
+ * <br/>
+ * It does nothing more than registration, any calls to the service (e.g. start) are up to the caller.
*
- * @param testServiceMBean the object that will house your test server plugins
+ * @param testServiceMBean the test service MBean to register
+ * @param objectNameStr the name of the service, which will be converted to an ObjectName
*
* @throws RuntimeException
*/
@@ -740,11 +742,12 @@ public abstract class AbstractEJB3Test extends Arquillian {
}
/**
- * If you need to test server plugins, you must first prepare the server plugin service.
- * After this returns, the caller must explicitly start the PC by using the appropriate API
- * on the given mbean; this method will only start the service, it will NOT start the master PC.
+ * This will register any custom service, replacing any service with the same objectName.
+ * <br/>
+ * It does nothing more than registration, any calls to the service (e.g. start) are up to the caller.
*
- * @param testServiceMBean the object that will house your test server plugins
+ * @param testServiceMBean the test service MBean to register
+ * @param objectName the name of the service
*
* @throws RuntimeException
*/
11 years, 6 months
- 1
- 0
[rhq] Branch 'rhq-on-as7' - modules/enterprise
by mazz
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java | 3
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/PluginDeploymentScanner.java | 39 +++++++---
2 files changed, 31 insertions(+), 11 deletions(-)
New commits:
commit 288582ba14c3bf65eda3468806dbb6f5e18a2ede
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Dec 4 16:15:14 2012 -0500
do not look up coreservice mbean if we already set our plugin dirs (like we will do in our tests)
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java
index d8db4b9..65e3904 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java
@@ -948,7 +948,8 @@ public abstract class AbstractEJB3Test extends Arquillian {
PluginDeploymentScanner scanner = new PluginDeploymentScanner();
String pluginDirPath = getTempDir() + "/plugins";
scanner.setAgentPluginDir(pluginDirPath); // we don't want to scan for these
- scanner.setServerPluginDir(null); // we don't want to scan for these
+ scanner.setServerPluginDir("ignore no plugins here"); // we don't want to scan for these
+ scanner.setUserPluginDir("ignore no plugins here"); // we don't want to scan for these
scanner.setScanPeriod("9999999"); // we want to manually scan - don't allow for auto-scan to happen
return preparePluginScannerService(scanner);
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/PluginDeploymentScanner.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/PluginDeploymentScanner.java
index a674f23..688359c 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/PluginDeploymentScanner.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/PluginDeploymentScanner.java
@@ -153,16 +153,35 @@ public class PluginDeploymentScanner implements PluginDeploymentScannerMBean {
// the server's internal EJB/SLSBs are ready and can be called. This means we are allowed to start.
// NOTE: Make sure we are called BEFORE the master plugin container is started!
- // setup our attributes
- File homeDir = LookupUtil.getCoreServer().getInstallDir();
- File earDir = LookupUtil.getCoreServer().getEarDeploymentDir();
- setUserPluginDir(new File(homeDir, "plugins").getAbsolutePath());
- setAgentPluginDir(new File(earDir, "rhq-downloads/rhq-plugins").getAbsolutePath());
- setServerPluginDir(new File(earDir, "rhq-serverplugins").getAbsolutePath());
-
- log.info("user plugin dir=" + getUserPluginDir());
- log.info("agent plugin dir=" + getAgentPluginDir());
- log.info("server plugin dir=" + getServerPluginDir());
+ // setup our attributes - skip if the plugin dirs were already set (e.g. from test code)
+ String upd = getUserPluginDir();
+ String apd = getAgentPluginDir();
+ String spd = getServerPluginDir();
+
+ // don't look up the core server mbean if we don't need do
+ if (upd == null || apd == null || spd == null) {
+ File homeDir = LookupUtil.getCoreServer().getInstallDir();
+ File earDir = LookupUtil.getCoreServer().getEarDeploymentDir();
+
+ if (upd == null) {
+ upd = new File(homeDir, "plugins").getAbsolutePath();
+ setUserPluginDir(upd);
+ }
+
+ if (apd == null) {
+ apd = new File(earDir, "rhq-downloads/rhq-plugins").getAbsolutePath();
+ setAgentPluginDir(apd);
+ }
+
+ if (spd == null) {
+ spd = new File(earDir, "rhq-serverplugins").getAbsolutePath();
+ setServerPluginDir(spd);
+ }
+ }
+
+ log.info("user plugin dir=" + upd);
+ log.info("agent plugin dir=" + apd);
+ log.info("server plugin dir=" + spd);
// This will check to see if there are any agent plugin records in the database
// that do not have content associated with them and if so, will stream
11 years, 6 months
- 1
- 0
[rhq] Branch 'feature/cassandra-backend' - modules/enterprise
by John Sanda
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBean.java | 26 ++++++++--
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MetricsManagerBean.java | 8 +++
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MetricsManagerLocal.java | 3 +
3 files changed, 34 insertions(+), 3 deletions(-)
New commits:
commit 9b12d240d7ad39628eeec70ddcfc31de0c0c4c0c
Author: John Sanda <jsanda(a)redhat.com>
Date: Tue Dec 4 15:57:45 2012 -0500
adding intial support for fetching raw data for group from cassandra
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBean.java
index 815c1f6..458d13a 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBean.java
@@ -53,6 +53,7 @@ import org.jboss.ejb3.annotation.TransactionTimeout;
import org.rhq.core.domain.auth.Subject;
import org.rhq.core.domain.common.EntityContext;
import org.rhq.core.domain.criteria.MeasurementDataTraitCriteria;
+import org.rhq.core.domain.criteria.MeasurementScheduleCriteria;
import org.rhq.core.domain.measurement.DataType;
import org.rhq.core.domain.measurement.DisplayType;
import org.rhq.core.domain.measurement.MeasurementData;
@@ -71,6 +72,7 @@ import org.rhq.core.domain.resource.composite.ResourceIdWithAgentComposite;
import org.rhq.core.domain.resource.group.ResourceGroup;
import org.rhq.core.domain.server.PersistenceUtility;
import org.rhq.core.domain.util.OrderingField;
+import org.rhq.core.domain.util.PageControl;
import org.rhq.core.domain.util.PageList;
import org.rhq.core.domain.util.PageOrdering;
import org.rhq.core.util.collection.ArrayUtils;
@@ -735,7 +737,7 @@ public class MeasurementDataManagerBean implements MeasurementDataManagerLocal,
EntityContext context, int definitionId, long beginTime, long endTime, int numDataPoints) {
if (context.type == EntityContext.Type.Resource) {
- if (authorizationManager.canViewResource(subject, context.resourceId) == false) {
+ if (!authorizationManager.canViewResource(subject, context.resourceId)) {
throw new PermissionException("User [" + subject.getName()
+ "] does not have permission to view measurement data for resource[id=" + context.resourceId + "]");
}
@@ -747,13 +749,23 @@ public class MeasurementDataManagerBean implements MeasurementDataManagerLocal,
return data;
} else if (context.type == EntityContext.Type.ResourceGroup) {
- if (authorizationManager.canViewGroup(subject, context.groupId) == false) {
+ if (!authorizationManager.canViewGroup(subject, context.groupId)) {
throw new PermissionException("User [" + subject.getName()
+ "] does not have permission to view measurement data for resourceGroup[id=" + context.groupId
+ "]");
}
+ MeasurementScheduleCriteria criteria = new MeasurementScheduleCriteria();
+ criteria.addFilterResourceGroupId(context.getGroupId());
+ criteria.setPageControl(PageControl.getUnlimitedInstance());
+ PageList<MeasurementSchedule> schedules = measurementScheduleManager.findSchedulesByCriteria(subject,
+ criteria);
+ List<List<MeasurementDataNumericHighLowComposite>> data =
+ new ArrayList<List<MeasurementDataNumericHighLowComposite>>();
+ data.add(metricsManager.findDataForResourceGroup(map(schedules), beginTime, endTime));
+
+ return data;
} else if (context.type == EntityContext.Type.AutoGroup) {
- if (authorizationManager.canViewAutoGroup(subject, context.parentResourceId, context.resourceTypeId) == false) {
+ if (!authorizationManager.canViewAutoGroup(subject, context.parentResourceId, context.resourceTypeId)) {
throw new PermissionException("User [" + subject.getName()
+ "] does not have permission to view measurement data for autoGroup[parentResourceId="
+ context.parentResourceId + ", resourceTypeId=" + context.resourceTypeId + "]");
@@ -765,6 +777,14 @@ public class MeasurementDataManagerBean implements MeasurementDataManagerLocal,
return results;
}
+ private List<Integer> map(List<MeasurementSchedule> schedules) {
+ List<Integer> scheduleIds = new ArrayList<Integer>(schedules.size());
+ for (MeasurementSchedule schedule : schedules) {
+ scheduleIds.add(schedule.getId());
+ }
+ return scheduleIds;
+ }
+
public List<List<MeasurementDataNumericHighLowComposite>> findDataForResource(Subject subject, int resourceId,
int[] definitionIds, long beginTime, long endTime, int numDataPoints) {
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MetricsManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MetricsManagerBean.java
index f820549..0ebb42e 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MetricsManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MetricsManagerBean.java
@@ -69,6 +69,14 @@ public class MetricsManagerBean implements MetricsManagerLocal {
return metricsServer.findDataForResource(scheduleId, beginTime, endTime);
}
+ @Override
+ @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
+ public List<MeasurementDataNumericHighLowComposite> findDataForResourceGroup(List<Integer> scheduleIds,
+ long beginTime, long endTime) {
+ MetricsServer metricsServer = getMetricsServer();
+ return metricsServer.findDataForGroup(scheduleIds, beginTime, endTime);
+ }
+
private MetricsServer getMetricsServer() {
MetricsServer metricsServer = new MetricsServer();
metricsServer.setSession(sessionManager.getSession());
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MetricsManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MetricsManagerLocal.java
index a43a271..0cb6709 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MetricsManagerLocal.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MetricsManagerLocal.java
@@ -50,4 +50,7 @@ public interface MetricsManagerLocal {
List<MeasurementDataNumericHighLowComposite> findDataForResource(int scheduleId, long beginTime, long endTime);
+ List<MeasurementDataNumericHighLowComposite> findDataForResourceGroup(List<Integer> scheduleIds, long beginTime,
+ long endTime);
+
}
11 years, 6 months
- 1
- 0