.classpath
| 2
modules/core/plugin-container/src/main/java/org/rhq/core/pc/measurement/MeasurementManager.java
| 34 -
modules/enterprise/agent/ant-run.xml
| 4
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBeanTest.java
| 37 -
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MetadataBeanTest.java
| 37 -
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest.java
| 16
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java
| 110 +--
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java
| 74
++
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
| 7
modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_2.xml
| 10
modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_3.1.xml
| 8
modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_3.xml
| 8
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/jar/src/main/java/org/rhq/enterprise/server/rest/GroupHandlerBean.java
|
15
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/GroupHandlerLocal.java
|
6
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ResourceHandlerBean.java
|
51 +
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ResourceHandlerLocal.java
|
11
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
pom.xml
| 5
81 files changed, 1567 insertions(+), 1410 deletions(-)
New commits:
commit 2a697b6c844152ae08dcbb1373c0f2b7e13e7dca
Merge: b63b3f9 24a906c
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Fri Nov 30 11:05:22 2012 -0500
Merge remote-tracking branch 'origin/master' into rhq-on-as7
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"/>
commit 257e056801c29bc241b7c292008326be14faffb9
Author: Thomas SEGISMONT <tsegismo(a)redhat.com>
Date: Thu Nov 29 14:54:08 2012 +0100
[BZ-871873] Availability check change is not automatically picked up
Set availability schedule data if present in ResourceMeasurementScheduleRequest
diff --git
a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/measurement/MeasurementManager.java
b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/measurement/MeasurementManager.java
index 3bb1f99..8e8c399 100644
---
a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/measurement/MeasurementManager.java
+++
b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/measurement/MeasurementManager.java
@@ -123,6 +123,7 @@ public class MeasurementManager extends AgentService implements
MeasurementAgent
super(MeasurementAgentService.class);
}
+ @Override
public void initialize() {
LOG.info("Initializing Measurement Manager...");
@@ -167,6 +168,7 @@ public class MeasurementManager extends AgentService implements
MeasurementAgent
}
class MeasurementCollectionRequester implements Runnable {
+ @Override
public void run() {
try {
while (!collectorThreadPool.isShutdown()) {
@@ -288,6 +290,7 @@ public class MeasurementManager extends AgentService implements
MeasurementAgent
}
}
+ @Override
public void shutdown() {
PluginContainer pluginContainer = PluginContainer.getInstance();
@@ -311,6 +314,7 @@ public class MeasurementManager extends AgentService implements
MeasurementAgent
}
}
+ @Override
public void setConfiguration(PluginContainerConfiguration configuration) {
this.configuration = configuration;
}
@@ -324,16 +328,22 @@ public class MeasurementManager extends AgentService implements
MeasurementAgent
*
* @param scheduleRequests
*/
+ @Override
public synchronized void
updateCollection(Set<ResourceMeasurementScheduleRequest> scheduleRequests) {
InventoryManager im = PluginContainer.getInstance().getInventoryManager();
for (ResourceMeasurementScheduleRequest resourceRequest : scheduleRequests) {
ResourceContainer resourceContainer =
im.getResourceContainer(resourceRequest.getResourceId());
if (resourceContainer != null) {
-
resourceContainer.updateMeasurementSchedule(resourceRequest.getMeasurementSchedules()); //
this is where we want to update rather than overwrite, right?
-
- //
resourceContainer.setMeasurementSchedule(resourceRequest.getMeasurementSchedules());
+ // Update (not overwrite) measurement schedule data ...
+
resourceContainer.updateMeasurementSchedule(resourceRequest.getMeasurementSchedules());
+ // ... and then reschedule collection
scheduleCollection(resourceRequest.getResourceId(),
resourceRequest.getMeasurementSchedules());
+ if (resourceRequest.getAvailabilitySchedule() != null) {
+ // Set availability schedule data if present
+ // This method also triggers a reschedule of availability check
+
resourceContainer.setAvailabilitySchedule(resourceRequest.getAvailabilitySchedule());
+ }
} else {
// This will happen when the server sends down schedules to an agent with
a cleaned inventory
// Its ok to skip these because the agent will request a reschedule once
its been able to synchronize
@@ -359,16 +369,20 @@ public class MeasurementManager extends AgentService implements
MeasurementAgent
*
* @param scheduleRequests
*/
+ @Override
public synchronized void
scheduleCollection(Set<ResourceMeasurementScheduleRequest> scheduleRequests) {
InventoryManager im = PluginContainer.getInstance().getInventoryManager();
for (ResourceMeasurementScheduleRequest resourceRequest : scheduleRequests) {
ResourceContainer resourceContainer =
im.getResourceContainer(resourceRequest.getResourceId());
if (resourceContainer != null) {
- //
resourceContainer.updateMeasurementSchedule(resourceRequest.getMeasurementSchedules());
// this is where we want to update rather than overwrite, right?
+ // Set measurement schedule data ...
resourceContainer.setMeasurementSchedule(resourceRequest.getMeasurementSchedules());
-
resourceContainer.setAvailabilitySchedule(resourceRequest.getAvailabilitySchedule());
+ // ... and then reschedule collection
scheduleCollection(resourceRequest.getResourceId(),
resourceRequest.getMeasurementSchedules());
+ // Set availability schedule data
+ // This method also triggers a reschedule of availability check
+
resourceContainer.setAvailabilitySchedule(resourceRequest.getAvailabilitySchedule());
} else {
// This will happen when the server sends down schedules to an agent with
a cleaned inventory
// It's ok to skip these because the agent will request a reschedule
once its been able to synchronize
@@ -415,6 +429,7 @@ public class MeasurementManager extends AgentService implements
MeasurementAgent
}
}
+ @Override
public synchronized void unscheduleCollection(Set<Integer> resourceIds) {
Iterator<ScheduledMeasurementInfo> itr =
this.scheduledRequests.iterator();
while (itr.hasNext()) {
@@ -442,6 +457,7 @@ public class MeasurementManager extends AgentService implements
MeasurementAgent
// spinder 12/16/11. BZ 760139. Modified to return empty sets instead of
'null' even for erroneous conditions.
// Server side logging or erroneous runtime conditions still occurs, but
callers to getRealTimeMeasurementValues
// won't have to additionally check for null values now. This is a safe
and better pattern.
+ @Override
public Set<MeasurementData> getRealTimeMeasurementValue(int resourceId,
Set<MeasurementScheduleRequest> requests) {
if (requests.size() == 0) {
// There's no need to even call getValues() on the ResourceComponent if
the list of metric names is empty.
@@ -498,6 +514,7 @@ public class MeasurementManager extends AgentService implements
MeasurementAgent
return values;
}
+ @Override
public long getNextExpectedCollectionTime() {
ScheduledMeasurementInfo nextScheduledMeasurement =
this.scheduledRequests.peek();
if (nextScheduledMeasurement == null) {
@@ -629,6 +646,7 @@ public class MeasurementManager extends AgentService implements
MeasurementAgent
return perMinuteValue;
}
+ @Override
public Map<String, Object> getMeasurementScheduleInfoForResource(int
resourceId) {
Map<String, Object> results = null;
@@ -692,10 +710,12 @@ public class MeasurementManager extends AgentService implements
MeasurementAgent
// -- MBean monitoring methods
+ @Override
public long getMeasurementsCollected() {
return this.collectedMeasurements.get();
}
+ @Override
public long getMeasurementsCollectedPerMinute() {
long now = System.currentTimeMillis();
@@ -718,14 +738,17 @@ public class MeasurementManager extends AgentService implements
MeasurementAgent
return ret;
}
+ @Override
public long getCurrentlyScheduleMeasurements() {
return this.scheduledRequests.size();
}
+ @Override
public long getTotalTimeCollectingMeasurements() {
return this.totalTimeCollecting.get();
}
+ @Override
public long getLateCollections() {
return lateCollections.get();
}
@@ -751,6 +774,7 @@ public class MeasurementManager extends AgentService implements
MeasurementAgent
this.failedCollection.addAndGet(count);
}
+ @Override
public long getFailedCollections() {
return failedCollection.get();
}
commit 62c3c8ee54a41df94f65bb185dc0d12f76ae0c22
Author: Simeon Pinder <spinder(a)fulliautomatix.conchfritter.com>
Date: Thu Nov 29 08:55:48 2012 -0500
[BZ 880795] upgrade augeas library to 0.9.0-4.
diff --git a/modules/enterprise/agent/ant-run.xml b/modules/enterprise/agent/ant-run.xml
index a765b43..4085efd 100644
--- a/modules/enterprise/agent/ant-run.xml
+++ b/modules/enterprise/agent/ant-run.xml
@@ -12,11 +12,11 @@ Ant Script that provides ways to package the Agent.
<property name="settings.localRepository"
location="${user.home}/.m2/repository"/>
<property name="project.version" value="2.0.0-SNAPSHOT"/>
<property name="sigar.version" value="1.6.5.132-3"/>
- <property name="augeas.version" value="0.9.0"/>
+ <property name="augeas.version" value="0.9.0-4"/>
<property name="augeas.classifier" value="el5"/>
<property name="augeas.zip.location"
value="${settings.localRepository}/net/augeas/augeas-native/${augeas.version}/"/>
<property name="augeas.zip.mask"
value="*-${augeas.classifier}.zip"/>
- <property name="augeas.zip.version" value="0.9.0"/>
+ <property name="augeas.zip.version" value="0.9.0-4"/>
<property name="getopt.version" value="1.0.13"/>
<property name="jaxb-api.version" value="2.1"/>
<property name="jaxb-impl.version" value="2.1"/>
diff --git a/pom.xml b/pom.xml
index 3c844b6..57be9a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -129,9 +129,9 @@
<twitter4j.version>2.2.4</twitter4j.version>
<commons-codec.version>1.4</commons-codec.version>
<testng.version>6.5.2</testng.version>
- <augeas.version>0.9.0</augeas.version>
+ <augeas.version>0.9.0-4</augeas.version>
<augeas.classifier>el5</augeas.classifier>
- <augeas.zip.version>0.9.0</augeas.zip.version>
+ <augeas.zip.version>0.9.0-4</augeas.zip.version>
<augeas.zip.location>${settings.localRepository}/net/augeas/augeas-native/${augeas.version}</augeas.zip.location>
<augeas.zip.mask>*-${augeas.classifier}.zip</augeas.zip.mask>
<ant.contrib.version>1.0b3</ant.contrib.version>
@@ -1247,7 +1247,6 @@
</snapshots>
</repository>
-
</repositories>
<pluginRepositories>
commit cd40200ad13c0abf7adcf1e021db81c1c8d967a8
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Thu Nov 29 11:56:01 2012 +0100
Add support for searching of resources, groups and group definitions by name via ?q=
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/GroupHandlerBean.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/GroupHandlerBean.java
index f3bcdff..d051585 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/GroupHandlerBean.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/GroupHandlerBean.java
@@ -22,13 +22,13 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.rhq.core.domain.criteria.ResourceGroupCriteria;
+import org.rhq.core.domain.criteria.ResourceGroupDefinitionCriteria;
import org.rhq.core.domain.measurement.DataType;
import org.rhq.core.domain.measurement.MeasurementDefinition;
import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.domain.resource.group.GroupDefinition;
import org.rhq.core.domain.resource.group.ResourceGroup;
-import org.rhq.core.domain.util.PageControl;
import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.server.resource.ResourceManagerLocal;
import org.rhq.enterprise.server.resource.ResourceTypeManagerLocal;
@@ -64,9 +64,12 @@ public class GroupHandlerBean extends AbstractRestBean implements
GroupHandlerLo
@EJB
GroupDefinitionManagerLocal definitionManager;
- public Response getGroups(@Context Request request, @Context HttpHeaders headers,
@Context UriInfo uriInfo) {
+ public Response getGroups(String q, @Context Request request, @Context HttpHeaders
headers, @Context UriInfo uriInfo) {
ResourceGroupCriteria criteria = new ResourceGroupCriteria();
+ if (q!=null) {
+ criteria.addFilterName(q);
+ }
List<ResourceGroup> groups =
resourceGroupManager.findResourceGroupsByCriteria(caller,criteria);
List<GroupRest> list = new ArrayList<GroupRest>(groups.size());
@@ -299,10 +302,14 @@ public class GroupHandlerBean extends AbstractRestBean implements
GroupHandlerLo
}
@Override
- public Response getGroupDefinitions(@Context Request request, @Context HttpHeaders
headers,
+ public Response getGroupDefinitions(String q, @Context Request request, @Context
HttpHeaders headers,
@Context UriInfo uriInfo) {
- PageList<GroupDefinition> gdlist =
definitionManager.getGroupDefinitions(caller,new PageControl());
+ ResourceGroupDefinitionCriteria criteria = new
ResourceGroupDefinitionCriteria();
+ if (q!=null) {
+ criteria.addFilterName(q);
+ }
+ PageList<GroupDefinition> gdlist =
definitionManager.findGroupDefinitionsByCriteria(caller, criteria);
List<GroupDefinitionRest> list = new
ArrayList<GroupDefinitionRest>(gdlist.getTotalSize());
for (GroupDefinition def: gdlist) {
GroupDefinitionRest definitionRest = buildGDRestFromDefinition(def);
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/GroupHandlerLocal.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/GroupHandlerLocal.java
index 39e0c2a..1cfc171 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/GroupHandlerLocal.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/GroupHandlerLocal.java
@@ -44,7 +44,8 @@ public interface GroupHandlerLocal {
@GET
@Path("/")
@ApiOperation(value = "List all groups", multiValueResponse = true)
- public Response getGroups(@Context Request request, @Context HttpHeaders headers,
+ public Response getGroups(@ApiParam("String to search in the group name")
@QueryParam("q") String q,
+ @Context Request request, @Context HttpHeaders headers,
@Context UriInfo uriInfo);
@Cache(isPrivate = true,maxAge = 60)
@@ -129,7 +130,8 @@ public interface GroupHandlerLocal {
@GET
@Path("/definitions")
@ApiOperation(value="List all existing GroupDefinitions",multiValueResponse
= true)
- public Response getGroupDefinitions(@Context Request request, @Context HttpHeaders
headers,
+ public Response getGroupDefinitions(@ApiParam("String to search in the group
definition name") @QueryParam("q") String q,
+ @Context Request request, @Context HttpHeaders
headers,
@Context UriInfo uriInfo);
@GZIP
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ResourceHandlerBean.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ResourceHandlerBean.java
index c0efed4..9709fd6 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ResourceHandlerBean.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ResourceHandlerBean.java
@@ -33,9 +33,6 @@ import javax.ejb.Stateless;
import javax.interceptor.Interceptors;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
import javax.ws.rs.core.EntityTag;
import javax.ws.rs.core.GenericEntity;
import javax.ws.rs.core.HttpHeaders;
@@ -48,6 +45,7 @@ import javax.ws.rs.core.UriInfo;
import org.rhq.core.domain.alert.Alert;
import org.rhq.core.domain.criteria.AlertCriteria;
import org.rhq.core.domain.criteria.AvailabilityCriteria;
+import org.rhq.core.domain.criteria.ResourceCriteria;
import org.rhq.core.domain.discovery.AvailabilityReport;
import org.rhq.core.domain.measurement.Availability;
import org.rhq.core.domain.measurement.AvailabilityType;
@@ -93,7 +91,7 @@ public class ResourceHandlerBean extends AbstractRestBean implements
ResourceHan
private EntityManager entityManager;
@Override
- public Response getResource(int id, @Context Request request, @Context HttpHeaders
headers, @Context UriInfo uriInfo) {
+ public Response getResource(int id, Request request, HttpHeaders headers, UriInfo
uriInfo) {
Resource res;
res = fetchResource(id);
@@ -121,13 +119,39 @@ public class ResourceHandlerBean extends AbstractRestBean implements
ResourceHan
}
@Override
- public Response getPlatforms(@Context Request request, @Context HttpHeaders headers,
@Context UriInfo uriInfo) {
+ public Response getResourcesByQuery(String q, Request request, HttpHeaders headers,
+ UriInfo uriInfo) {
+ ResourceCriteria criteria = new ResourceCriteria();
+ criteria.addFilterName(q);
+ List<Resource> ret = resMgr.findResourcesByCriteria(caller,criteria);
+
+ Response.ResponseBuilder builder =
getResponseBuilderForResourceList(headers,uriInfo,ret);
+
+ return builder.build();
+ }
+
+ @Override
+ public Response getPlatforms(Request request, HttpHeaders headers, UriInfo uriInfo)
{
PageControl pc = new PageControl();
List<Resource> ret = resMgr.findResourcesByCategory(caller,
ResourceCategory.PLATFORM,
InventoryStatus.COMMITTED, pc);
- List<ResourceWithType> rwtList = new
ArrayList<ResourceWithType>(ret.size());
- for (Resource r : ret) {
+ Response.ResponseBuilder builder = getResponseBuilderForResourceList(headers,
uriInfo, ret);
+
+ return builder.build();
+ }
+
+ /**
+ * Translate the passed list of resources into a response according to the acceptable
mime types etc.
+ * @param headers HttpHeaders from the request
+ * @param uriInfo Uri from the request
+ * @param resources List of resources
+ * @return An initialized ResponseBuilder
+ */
+ private Response.ResponseBuilder getResponseBuilderForResourceList(HttpHeaders
headers, UriInfo uriInfo,
+
List<Resource> resources) {
+ List<ResourceWithType> rwtList = new
ArrayList<ResourceWithType>(resources.size());
+ for (Resource r : resources) {
putToCache(r.getId(), Resource.class, r);
ResourceWithType rwt = fillRWT(r, uriInfo);
rwtList.add(rwt);
@@ -143,8 +167,7 @@ public class ResourceHandlerBean extends AbstractRestBean implements
ResourceHan
};
builder = Response.ok(list);
}
-
- return builder.build();
+ return builder;
}
@Override
@@ -267,7 +290,7 @@ public class ResourceHandlerBean extends AbstractRestBean implements
ResourceHan
}
public Response getSchedules(int resourceId, String scheduleType, boolean
enabledOnly, String name,
- @Context Request request, @Context HttpHeaders headers, @Context UriInfo uriInfo)
{
+ Request request, HttpHeaders headers, UriInfo uriInfo) {
// allow metric as input
if (scheduleType.equals("metric"))
@@ -333,7 +356,7 @@ public class ResourceHandlerBean extends AbstractRestBean implements
ResourceHan
}
@Override
- public Response getChildren(int id, @Context Request request, @Context HttpHeaders
headers, @Context UriInfo uriInfo) {
+ public Response getChildren(int id, Request request, HttpHeaders headers, UriInfo
uriInfo) {
PageControl pc = new PageControl();
Resource parent;
parent = fetchResource(id);
@@ -387,7 +410,7 @@ public class ResourceHandlerBean extends AbstractRestBean implements
ResourceHan
}
@Override
- public Response createPlatform(@PathParam("name") String name, StringValue
typeValue, @Context UriInfo uriInfo) {
+ public Response createPlatform(String name, StringValue typeValue, UriInfo uriInfo)
{
String typeName = typeValue.getValue();
ResourceType type =
resourceTypeManager.getResourceTypeByNameAndPlugin(typeName,"Platforms");
@@ -462,8 +485,8 @@ public class ResourceHandlerBean extends AbstractRestBean implements
ResourceHan
}
@Override
- public Response createResource(@PathParam("name") String name, StringValue
typeValue,
- @QueryParam("plugin") String plugin, int
parentId, UriInfo uriInfo) {
+ public Response createResource(String name, StringValue typeValue,
+ String plugin, int parentId, UriInfo uriInfo) {
Resource parent = resMgr.getResourceById(caller,parentId);
if (parent==null)
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ResourceHandlerLocal.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ResourceHandlerLocal.java
index b30f8ce..935f875 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ResourceHandlerLocal.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ResourceHandlerLocal.java
@@ -56,7 +56,7 @@ import org.rhq.enterprise.server.rest.domain.*;
@Produces({MediaType.APPLICATION_JSON,MediaType.APPLICATION_XML,MediaType.TEXT_HTML})
@Path("/resource")
@Local
-@Api(value="Resource related", description = "This endpoint deals with
single resources, not groups")
+@Api(value="Resource related", description = "This endpoint deals with
individual resources, not resource groups")
public interface ResourceHandlerLocal {
static String NO_RESOURCE_FOR_ID = "If no resource with the passed id
exists";
@@ -75,6 +75,13 @@ public interface ResourceHandlerLocal {
@Context Request request, @Context HttpHeaders headers,
@Context UriInfo uriInfo);
+ @GET
+ @Path("/")
+ @ApiOperation(value = "Search for resources by the given search string",
responseClass = "ResourceWithType")
+ Response getResourcesByQuery(@ApiParam("String to search in the resource
name") @QueryParam("q")String q,
+ @Context Request request, @Context HttpHeaders headers,
+ @Context UriInfo uriInfo);
+
@GZIP
@GET
@Path("/platforms")
@@ -170,7 +177,7 @@ public interface ResourceHandlerLocal {
@ApiOperation(value = "Create a resource with a given type below a certain
parent")
@POST
@Path("{name}")
- public javax.ws.rs.core.Response createResource(
+ public Response createResource(
@ApiParam("Name of the new resource") @PathParam("name")
String name,
@ApiParam("Name of the Resource tpye") StringValue type,
@ApiParam("Name of the plugin providing the type")
@QueryParam("plugin") String plugin,