2:48 p.m.
etc/eclipse-tools/RHQ
| 21 +++
modules/enterprise/server/itests-2/pom.xml
| 51
++++-----
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/AbstractDriftServerTest.java
| 34 ++++--
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/DriftTemplateManagerBeanTest.java
| 53 +++++-----
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/JPADriftServerBeanTest.java
| 8 -
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/ManageDriftDefinitionsTest.java
| 16 +--
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/ManageSnapshotsTest.java
| 16 +--
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MetadataBeanTest.java
| 1
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java
| 46 ++++----
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java
| 2
modules/enterprise/server/itests-2/src/test/resources/arquillian.xml
| 1
modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/dup_drift.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/plugin_v1.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/plugin_v2.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/remove_bundle_drift_config_v1.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/remove_bundle_drift_config_v2.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/alerts/type-with-metric.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/BZ_573034_v1.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/BZ_573034_v2.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/addDeleteTemplate1.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/addDeleteTemplate2.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/addDeleteTemplate3.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/constraint.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/constraintMinMax.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupDeleted-v1.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupDeleted-v2.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupPropDeleted-v1.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupPropDeleted-v2.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupPropDeleted-v3.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupPropDeleted-v4.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupPropMoved-v1.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupPropMoved-v2.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyChanging-v1.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyChanging-v2.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyList-simple.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyList-v1.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyList-v2.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyMap-v1.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyMap-v2.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/update5-v1_0.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/update5-v2_0.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/updateDefaultTemplate1.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/updateDefaultTemplate2.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/events/event1-1.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/events/event1-2.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/measurementDeletion-v1_0.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/measurementDeletion-v2_0.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/update-v1_0.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/update-v2_0.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/update6-1.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/update6-2.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/update7-1.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/update7-2.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/natives/update5-v1_0.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/natives/update5-v2_0.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/noTypes.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/operation1-1.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/operation1-2.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/operation2-1.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/operation2-2.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/operation3-1.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/operation3-2.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/update3-v1_0.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/update3-v2_0.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/duplicateResourceType.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/update2-v1_0.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/update2-v2_0.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/update4-v1_0.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/update4-v2_0.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/updateResourceTypeBundleTarget-v1.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/updateResourceTypeBundleTarget-v2.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/illegal-subcat-1.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-2children.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-grandchild.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-services-v1_0.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-services-v2_0.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-v1_0.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-v1_1.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-v2_0.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/no-subcat.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v1_0.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v1_1.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v2_0.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v3_0.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/services-v1_0.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/services-v2_0.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/test-subcategories.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/test-subcategories2.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/test-subcategories3.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/two-subcat.xml
| 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/undefined-child-subcat-1.xml
| 2
91 files changed, 226 insertions(+), 183 deletions(-)
New commits:
commit 1e9d28d27bb1ba742dce4d4a946d56da4f7a9c39
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Mon Dec 3 15:48:05 2012 -0500
Variety of work to eliminate itest interaction issues (more work still in progress)
- Improve the cleanup in AbstractDriftServerTest. The cleanup here was
very aggressive, wiping pretty much all of the drift tables, including
any data still in use by other test classes. Added more easily identifiable
naming for the test drift entities to allow for more targeted cleanup.
- Add itest.debug support in itests-2 (from mazz's branch work)
- Use more unique (avoid clashing) and identifiable (trace back to creator)
plugin names in test plugin xml files.
diff --git a/etc/eclipse-tools/RHQ Remote Debugging - itest.launch b/etc/eclipse-tools/RHQ
Remote Debugging - itest.launch
new file mode 100644
index 0000000..1ea5d31
--- /dev/null
+++ b/etc/eclipse-tools/RHQ Remote Debugging - itest.launch
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"
standalone="no"?>
+<launchConfiguration
type="org.eclipse.jdt.launching.remoteJavaApplication">
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/rhq"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="4"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.debug.core.source_locator_id"
value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
+<stringAttribute key="org.eclipse.debug.core.source_locator_memento"
value="<?xml version="1.0"
encoding="UTF-8"
standalone="no"?> <sourceLookupDirector> <sourceContainers
duplicates="false"> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject
name=&quot;rhq&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/jboss/integration/jboss-profileservice-spi/5.1.0.SP1/jboss-profileservice-spi-5.1.0.SP1.jar&quot;/&gt;&#13;&#10;"
typeId="org.ec
lipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/jboss/man/jboss-managed/2.1.1.GA/jboss-managed-2.1.1.GA.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/jboss/man/jboss-metatype/2.1.1.GA/jboss-metatype-2.1.1.GA.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot; encodi
ng=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/apache/commons/commons-io/1.3.2/commons-io-1.3.2.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/com/sun/xml/bind/jaxb-impl/2.1.12/jaxb-impl-2.1.12.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/i18nlog/i18nlog/1.0.10/i18nlog-1.
0.10.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/gnu-getopt/getopt/1.0.13/getopt-1.0.13.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/commons-httpclient/commons-httpclient/3.0.1/commons-httpclient-3.0.1.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento=
"&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/jboss/jboss-remoting/2.2.2.SP8/jboss-remoting-2.2.2.SP8.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/oswego-concurrent/concurrent/1.3.4/concurrent-1.3.4.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVari
able
path=&quot;M2_REPO/rss4j/rss4j/0.92-on.2/rss4j-0.92-on.2.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/apache/ant/ant/1.8.0/ant-1.8.0.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/apache/ant/ant-nodeps/1.8.0/ant-nodeps-1.8.0.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"
/> <container memento="&lt;?xml
version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/struts/struts/1.2.9/struts-1.2.9.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;class
pathVariable
path=&quot;M2_REPO/javax/servlet/jsp-api/2.0/jsp-api-2.0.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/commons-validator/commons-validator/1.1.4/commons-validator-1.1.4.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/testng/testng/6.1.1/testng-6.1.1.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContai
ner.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/snmp4j/snmp4j/1.8.2/snmp4j-1.8.2.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&
#10;&lt;classpathVariable
path=&quot;M2_REPO/tomcat/tomcat-jk/4.1.31/tomcat-jk-4.1.31.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/jdom/jdom/1.0/jdom-1.0.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/commons-collections/commons-collections/3.2/commons-collections-3.2.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sour
ceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/jboss/jboss-jmx/4.2.3.GA/jboss-jmx-4.2.3.GA.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot; standalone=&
;quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/tomcat/catalina/5.5.20/catalina-5.5.20.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/taglibs/standard/1.1.2/standard-1.1.2.jar&quot;/&gt;&#13;&#1
0;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/jboss/jboss-common/1.2.1.GA/jboss-common-1.2.1.GA.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/javax/servlet/jstl/1.1.2/jstl-1.1.2.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&
quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/struts-menu/struts-menu/2.3/struts-menu-2.3.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/junit/junit/3.8.2/junit-3.8.2.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/apache/velocity/velocity/1.5/velocity-1.5.jar&quot;/&gt;&am
p;#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/xalan/xalan/2.5.1/xalan-2.5.1.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&qu
ot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/javax/xml/bind/jsr173_api/1.0/jsr173_api-1.0.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/jboss/jboss-embeddable-ejb3/jboss-ejb3-all/1.0.0.Alpha9/jboss-ejb3-all-1.0.0.Alpha9.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/jboss/jbpm/3.1.1/j
bpm-3.1.1.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/jboss/jboss-embeddable-ejb3/hibernate-all/1.0.0.Alpha9/hibernate-all-1.0.0.Alpha9.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/jetbrains/annotations/7.0.2/annotations-7.0.2.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/>
3; <container memento="&lt;?xml
version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/apache/ant/ant-launcher/1.8.0/ant-launcher-1.8.0.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&
lt;classpathVariable
path=&quot;M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/commons-lang/commons-lang/2.4/commons-lang-2.4.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/javax/faces/jsf-api/1.2_14/jsf-api-1.2_14.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launch
ing.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/javax/faces/jsf-impl/1.2_14/jsf-impl-1.2_14.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/javax/el/el-api/1.0/el-api-1.0.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?
&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/com/sun/facelets/jsf-facelets/1.1.15.B1/jsf-facelets-1.1.15.B1.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/mc4j/org-mc4j-ems/1.2.16/org-mc4j-ems-1.2.16.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/opensymphony/quartz/quartz/1.6.5/quartz-1.6.5.jar&quot;/&gt;&#13;&#10;&q
uot;
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/javax/mail/mail/1.4.2/mail-1.4.2.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot; encodi
ng=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/richfaces/framework/richfaces-api/3.3.3.Final/richfaces-api-3.3.3.Final.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/richfaces/framework/richfaces-impl/3.3.3.Final/richfaces-impl-3.3.3.Final.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&
amp;quot;M2_REPO/org/richfaces/ui/richfaces-ui/3.3.3.Final/richfaces-ui-3.3.3.Final.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/postgresql/postgresql/9.0-801.jdbc4/postgresql-9.0-801.jdbc4.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/jboss/jboss-cache/1.4.1.SP9/jboss-cache-1.4.1.SP9.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.laun
ching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/hyperic/sigar/1.6.5.132/sigar-1.6.5.132.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/jboss/transaction/jboss-jta/4.2.3.SP5/jboss-jta-4.2.3.SP5.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot; s
tandalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/jboss/transaction/jboss-jts-common/4.2.3.SP5/jboss-jts-common-4.2.3.SP5.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/jboss/jbossws-spi/1.1.1.GA/jbossws-spi-1.1.1.GA.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/jboss/jbossws/jbossws-native-core/3
.1.1.GA/jbossws-native-core-3.1.1.GA.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/apache/maven/maven-project/2.0.8/maven-project-2.0.8.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/apache/maven/maven-plugin-api/2.0.8/maven-plugin-api-2.0.8.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariabl
e"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/codehaus/swizzle/swizzle-confluence/1.6.1/swizzle-confluence-1.6.1.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/jvnet/inflector/0.7.0/inflector-0.7.0.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot; standalone=&quot;no&quot
;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/net/augeas/augeas/0.0.2/augeas-0.0.2.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/json/json/20080701/json-20080701.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/net/java/dev/jna/jna/3.2.5/jna-3.2.5.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.s
ourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/freemarker/freemarker/2.3.11/freemarker-2.3.11.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/jboss/seam/jboss-seam/2.1.0.SP1/jboss-seam-2.1.0.SP1.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot; standa
lone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/jboss/seam/jboss-seam-ui/2.1.0.SP1/jboss-seam-ui-2.1.0.SP1.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/hibernate/hibernate3/3.2.r14201-2/hibernate3-3.2.r14201-2.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/jline/jline/0.9.94/jline-0.9.94.jar&quot;/&
gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/javassist/javassist/3.9.0.GA/javassist-3.9.0.GA.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/net/sf/opencsv/opencsv/1.8/opencsv-1.8.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&
quot; encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/bouncycastle/bcpg-jdk15/140/bcpg-jdk15-140.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/bouncycastle/bcprov-jdk15/140/bcprov-jdk15-140.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/apache/xmlrpc/xmlrpc-client/3.1
.2/xmlrpc-client-3.1.2.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/apache/xmlrpc/xmlrpc-common/3.1.2/xmlrpc-common-3.1.2.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/apache/ws/commons/util/ws-commons-util/1.0.2/ws-commons-util-1.0.2.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable&quo
t;/> <container memento="&lt;?xml
version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/commons-digester/commons-digester/1.8.1/commons-digester-1.8.1.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/commons-codec/commons-codec/1.4/commons-codec-1.4.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&am
p;gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/pircbot/pircbot/1.4.2/pircbot-1.4.2.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/twitter4j/twitter4j-core/2.2.4/twitter4j-core-2.2.4.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/jmock/jmock/2.5.1/jmock-2.5.1.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.l
aunching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/antlr/antlr-runtime/3.2/antlr-runtime-3.2.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/jboss/web/jbossweb/2.0.1.GA/jbossweb-2.0.1.GA.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/libvirt/libvirt/0.4.1/libvirt-0.4.1.jar&quot;/&gt;&#13;&am
p;#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/jboss/byteman/byteman/1.2.1/byteman-1.2.1.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/fedorahosted/cobbler/cobbler4j/0.1/cobbler4j-0.1.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quo
t; encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/com/google/gwt/gwt-user/2.4.0/gwt-user-2.4.0.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/com/google/gwt/gwt-dev/2.4.0/gwt-dev-2.4.0.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/com/smartgwt/smartgwt/3.0/smartgwt-3.0.j
ar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/com/google/code/gwt-log/gwt-log/3.1.0/gwt-log-3.1.0.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/ca/nanometrics/gflot/1.0.0/gflot-1.0.0.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml vers
ion=&quot;1.0&quot; encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/com/jcraft/jsch/0.1.29/jsch-0.1.29.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/commons-jxpath/commons-jxpath/1.3/commons-jxpath-1.3.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/dbunit/dbun
it/2.4.8/dbunit-2.4.8.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/apache/poi/poi/3.7/poi-3.7.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/bsh/bsh/1.3.0/bsh-1.3.0.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot
;1.0&quot; encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/unitils/unitils-core/3.1/unitils-core-3.1.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/unitils/unitils-dbunit/3.1/unitils-dbunit-3.1.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/unitils/unitils-
orm/3.1/unitils-orm-3.1.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/unitils/unitils-testng/3.1/unitils-testng-3.1.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/codehaus/jackson/jackson-core-asl/1.7.4/jackson-core-asl-1.7.4.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/>
; <container memento="&lt;?xml
version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/codehaus/jackson/jackson-mapper-asl/1.7.4/jackson-mapper-asl-1.7.4.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/mongodb/mongo-java-driver/2.6.5/mongo-java-driver-2.6.5.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot; standalone=&quot;no&qu
ot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/com/googlecode/java-diff-utils/diffutils/1.2.1/diffutils-1.2.1.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/com/google/code/morphia/morphia/1.00-SNAPSHOT/morphia-1.00-SNAPSHOT.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/jboss/resteasy/resteasy-links/2.3.3.Final/resteasy-links-2.3.
3.Final.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/jboss/resteasy/resteasy-jaxrs/2.3.3.Final/resteasy-jaxrs-2.3.3.Final.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/jboss/resteasy/resteasy-jackson-provider/2.3.3.Final/resteasy-jackson-provider-2.3.3.Final.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContain
er.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/jboss/resteasy/jaxrs-api/2.3.3.Final/jaxrs-api-2.3.3.Final.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/jboss/sasl/jboss-sasl/1.0.0.Beta9/jboss-sasl-1.0.0.Beta9.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot; st
andalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;JDK_HOME/lib/tools.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/mockito/mockito-all/1.9.0/mockito-all-1.9.0.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/powermock/powermock-api-mockito/1.4.11/powermock-api-mockito-1.4.11.jar&quot;/&gt;&#13;&#
10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/powermock/powermock-core/1.4.11/powermock-core-1.4.11.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/powermock/powermock-api-support/1.4.11/powermock-api-support-1.4.11.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml v
ersion=&quot;1.0&quot; encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/powermock/powermock-module-testng-common/1.4.11/powermock-module-testng-common-1.4.11.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/powermock/powermock-module-testng/1.4.11/powermock-module-testng-1.4.11.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&
amp;#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/liquibase/liquibase-core/2.0.3/liquibase-core-2.0.3.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/jboss/shrinkwrap/shrinkwrap-impl-base/1.0.0/shrinkwrap-impl-base-1.0.0.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/jboss/shrinkwrap/shrinkwrap-api/1.0.0/shrinkwrap-api-1.0.0.jar&quot;/&
amp;gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/jboss/shrinkwrap/shrinkwrap-spi/1.0.0/shrinkwrap-spi-1.0.0.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/jboss/shrinkwrap/descriptors/shrinkwrap-descriptors-api-base/2.0.0-alpha-2/shrinkwrap-descriptors-api-base-2.0.0-alpha-2.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.
classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/jboss/shrinkwrap/resolver/shrinkwrap-resolver-api/1.0.0-beta-6/shrinkwrap-resolver-api-1.0.0-beta-6.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/jboss/shrinkwrap/resolver/shrinkwrap-resolver-api-maven/1.0.0-beta-6/shrinkwrap-resolver-api-maven-1.0.0-beta-6.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
mem
ento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/jboss/arquillian/test/arquillian-test-spi/1.0.0.Final/arquillian-test-spi-1.0.0.Final.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/jboss/arquillian/test/arquillian-test-api/1.0.0.Final/arquillian-test-api-1.0.0.Final.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot; stan
dalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/jboss/arquillian/core/arquillian-core-spi/1.0.0.Final/arquillian-core-spi-1.0.0.Final.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/jboss/arquillian/core/arquillian-core-api/1.0.0.Final/arquillian-core-api-1.0.0.Final.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quo
t;M2_REPO/org/jboss/arquillian/container/arquillian-container-spi/1.0.0.Final/arquillian-container-spi-1.0.0.Final.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/jboss/arquillian/container/arquillian-container-test-api/1.0.0.Final/arquillian-container-test-api-1.0.0.Final.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable
path=&quot;M2_REPO/org/jboss/arquillian/testng/arquillian-testng
-core/1.0.0.Final/arquillian-testng-core-1.0.0.Final.jar&quot;/&gt;&#13;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container
memento="&lt;?xml version=&quot;1.0&quot;
encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;default/&gt;&#13;&#10;"
typeId="org.eclipse.debug.core.containerType.default"/> </sourceContainers> </sourceLookupDirector> "/>
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.jdt.launching.ALLOW_TERMINATE"
value="true"/>
+<mapAttribute key="org.eclipse.jdt.launching.CONNECT_MAP">
+<mapEntry key="hostname" value="localhost"/>
+<mapEntry key="port" value="8798"/>
+</mapAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR"
value="rhq"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_CONNECTOR_ID"
value="org.eclipse.jdt.launching.socketAttachConnector"/>
+</launchConfiguration>
diff --git a/modules/enterprise/server/itests-2/pom.xml
b/modules/enterprise/server/itests-2/pom.xml
index f0c179f..1b50266 100644
--- a/modules/enterprise/server/itests-2/pom.xml
+++ b/modules/enterprise/server/itests-2/pom.xml
@@ -1,6 +1,4 @@
-<project
- xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -25,13 +23,14 @@
<properties>
<jboss.zip>${settings.localRepository}/org/jboss/as/jboss-as-dist/${jboss.version}/jboss-as-dist-${jboss.version}.zip</jboss.zip>
<jboss.unzip.location>${basedir}/target/jboss-as-${jboss.version}</jboss.unzip.location>
+ <jboss.vm.args>-Xmx700m -XX:MaxPermSize=200m</jboss.vm.args>
+ <jboss.vm.args.debug></jboss.vm.args.debug> <!-- -Ditest.debug can
override this, see below -->
</properties>
<dependencies>
<!--================ Test Deps ================ -->
- <!-- Note, the test dep ordering can be important. Maven orders the [test]
classpath in the order listed
- in the pom. -->
+ <!-- Note, the test dep ordering can be important. Maven orders the [test]
classpath in the order listed in the pom. -->
<dependency>
<groupId>org.jboss.as</groupId>
@@ -222,13 +221,9 @@
<configuration>
<target>
<echo>Unzipping JBossAS ${jboss.version} found at
${jboss.zip}</echo>
- <unzip
- src="${jboss.zip}"
- dest="${jboss.unzip.location}/.." />
+ <unzip src="${jboss.zip}"
dest="${jboss.unzip.location}/.." />
<echo>JBossAS ${jboss.version} should now be at:
${jboss.unzip.location}</echo>
- <property
- name="jboss.conf"
-
location="${jboss.unzip.location}/standalone/configuration/standalone.xml"
/>
+ <property name="jboss.conf"
location="${jboss.unzip.location}/standalone/configuration/standalone.xml"
/>
<echo>Will now add test configuration to JBossAS config file:
${jboss.conf}</echo>
<replace file="${jboss.conf}">
@@ -420,15 +415,10 @@
</replace>
- <property
- name="jboss.modules.dir"
- location="${jboss.unzip.location}/modules" />
+ <property name="jboss.modules.dir"
location="${jboss.unzip.location}/modules" />
<echo>Adding JDBC modules to ${jboss.modules.dir} ...</echo>
- <copy
-
file="${settings.localRepository}/com/oracle/ojdbc6/${ojdbc6.version}/ojdbc6-${ojdbc6.version}.jar"
- toDir="${jboss.modules.dir}/org/rhq/oracle/main"
- failonerror="false"
- verbose="true" />
+ <copy
file="${settings.localRepository}/com/oracle/ojdbc6/${ojdbc6.version}/ojdbc6-${ojdbc6.version}.jar"
+ toDir="${jboss.modules.dir}/org/rhq/oracle/main"
failonerror="false" verbose="true" />
<echo
file="${jboss.modules.dir}/org/rhq/oracle/main/module.xml"><![CDATA[<?xml
version="1.0" encoding="UTF-8"?>
<module xmlns="urn:jboss:module:1.1" name="org.rhq.oracle">
<resources>
@@ -442,8 +432,7 @@
]]></echo>
<copy
file="${settings.localRepository}/postgresql/postgresql/${postgresql.version}/postgresql-${postgresql.version}.jar"
- toDir="${jboss.modules.dir}/org/rhq/postgres/main"
- verbose="true" />
+ toDir="${jboss.modules.dir}/org/rhq/postgres/main"
verbose="true" />
<echo
file="${jboss.modules.dir}/org/rhq/postgres/main/module.xml"><![CDATA[<?xml
version="1.0" encoding="UTF-8"?>
<module xmlns="urn:jboss:module:1.1" name="org.rhq.postgres">
<resources>
@@ -469,9 +458,7 @@
<configuration>
<skip>${skip.postgres}</skip>
<target>
- <property
- name="jboss.conf"
-
location="${jboss.unzip.location}/standalone/configuration/standalone.xml"
/>
+ <property name="jboss.conf"
location="${jboss.unzip.location}/standalone/configuration/standalone.xml"
/>
<echo>Will now add test configuration datasource to JBossAS config
file: ${jboss.conf}</echo>
<replace file="${jboss.conf}">
@@ -546,9 +533,7 @@
<configuration>
<skip>${skip.oracle}</skip>
<target>
- <property
- name="jboss.conf"
-
location="${jboss.unzip.location}/standalone/configuration/standalone.xml"
/>
+ <property name="jboss.conf"
location="${jboss.unzip.location}/standalone/configuration/standalone.xml"
/>
<echo>Will now add test configuration datasource to JBossAS config
file: ${jboss.conf}</echo>
<replace file="${jboss.conf}">
@@ -705,5 +690,17 @@
<skip.oracle>false</skip.oracle>
</properties>
</profile>
+
+ <profile>
+ <id>itest.debug</id>
+ <activation>
+ <property>
+ <name>itest.debug</name>
+ </property>
+ </activation>
+ <properties>
+
<jboss.vm.args.debug>-Xrunjdwp:transport=dt_socket,address=8798,server=y,suspend=y</jboss.vm.args.debug>
+ </properties>
+ </profile>
</profiles>
</project>
diff --git
a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/AbstractDriftServerTest.java
b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/AbstractDriftServerTest.java
index e8a8897..1bb0e0c 100644
---
a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/AbstractDriftServerTest.java
+++
b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/AbstractDriftServerTest.java
@@ -48,11 +48,13 @@ import org.rhq.enterprise.server.util.ResourceTreeHelper;
@Test(groups = "drift", singleThreaded = true)
public abstract class AbstractDriftServerTest extends AbstractEJB3Test {
- protected final String RESOURCE_TYPE_NAME = getClass().getSimpleName() +
"_RESOURCE_TYPE";
+ protected final String NAME_PREFIX = getClass().getSimpleName() + "_";
- protected final String AGENT_NAME = getClass().getSimpleName() + "_AGENT";
+ protected final String RESOURCE_TYPE_NAME = NAME_PREFIX + "RESOURCE_TYPE";
- protected final String RESOURCE_NAME = getClass().getSimpleName() +
"_RESOURCE";
+ protected final String AGENT_NAME = NAME_PREFIX + "AGENT";
+
+ protected final String RESOURCE_NAME = NAME_PREFIX + "RESOURCE";
protected DriftServerPluginService driftServerPluginService;
@@ -128,13 +130,27 @@ public abstract class AbstractDriftServerTest extends
AbstractEJB3Test {
executeInTransaction(false, new TransactionCallback() {
@Override
public void execute() throws Exception {
+ String name = " '" + NAME_PREFIX + "%' ";
+
+ em.createQuery("delete from JPADrift d where d.newDriftFile
like" + name).executeUpdate();
+
+ em.createQuery(
+ "delete from JPADriftChangeSet cs where cs.id in ( select cs1.id
from JPADriftChangeSet cs1 where cs1.driftDefinition.name like"
+ + name + ")").executeUpdate();
+
+ em.createQuery(
+ "delete from JPADriftChangeSet cs where cs.id in ( select
cast(ddt.changeSetId as int) from DriftDefinitionTemplate ddt where ddt.name like"
+ + name + ")").executeUpdate();
+
+ em.createNativeQuery(
+ "delete from rhq_drift_set ds where not exists ( select * from
rhq_drift d where d.drift_set_id = ds.id ) ")
+ .executeUpdate();
+
+ em.createQuery("delete from JPADriftFile df where df.hashId
like" + name).executeUpdate();
+
+ em.createQuery("delete from DriftDefinition dd where dd.name
like" + name).executeUpdate();
- em.createQuery("delete from JPADrift ").executeUpdate();
- em.createQuery("delete from
JPADriftChangeSet").executeUpdate();
- em.createQuery("delete from JPADriftSet").executeUpdate();
- em.createQuery("delete from JPADriftFile").executeUpdate();
- em.createQuery("delete from DriftDefinition").executeUpdate();
- em.createQuery("delete from
DriftDefinitionTemplate").executeUpdate();
+ em.createQuery("delete from DriftDefinitionTemplate ddt where
ddt.name like" + name).executeUpdate();
deleteEntity(Resource.class, RESOURCE_NAME);
deleteEntity(Agent.class, AGENT_NAME);
diff --git
a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/DriftTemplateManagerBeanTest.java
b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/DriftTemplateManagerBeanTest.java
index c877368..9e70997 100644
---
a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/DriftTemplateManagerBeanTest.java
+++
b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/DriftTemplateManagerBeanTest.java
@@ -64,17 +64,18 @@ import org.rhq.test.AssertUtils;
public class DriftTemplateManagerBeanTest extends AbstractDriftServerTest {
- private static final String TEST_CREATE_TEMPLATE =
"test-createTemplateForNegativeUpdateTests";
- private static final String TEST_PIN_TEMPLATE = "test-pinTemplate";
+ private static final String drift1Path = "drift.1";
+ private static final String drift2Path = "drift.2";
+
+ private final String TEST_CREATE_TEMPLATE = NAME_PREFIX +
"createTemplateForNegativeUpdateTests";
+ private final String TEST_PIN_TEMPLATE = NAME_PREFIX + "pinTemplate";
+
+ private final String driftFile1Hash = NAME_PREFIX + "a1b2c3";
+ private final String driftFile2Hash = NAME_PREFIX + "1a2b3c";
private DriftTemplateManagerLocal templateMgr;
private DriftManagerLocal driftMgr;
- private static final String drift1Path = "drift.1";
- private static final String drift2Path = "drift.2";
-
- private static final String driftFile1Hash = "a1b2c3";
- private static final String driftFile2Hash = "1a2b3c";
// Note: Arquillian currently (1.0.2) runs each test in its own testng lifecycle.
Think of it as each
// test being in its own suite, and the test class being new'd for each test.
Instance variables
@@ -127,7 +128,7 @@ public class DriftTemplateManagerBeanTest extends
AbstractDriftServerTest {
@Test(dependsOnGroups = "pinning")
public void createNewTemplate() {
final DriftDefinition definition = new DriftDefinition(new Configuration());
- definition.setName("test-createNewTemplate");
+ definition.setName(NAME_PREFIX + "createNewTemplate");
definition.setEnabled(true);
definition.setDriftHandlingMode(normal);
definition.setInterval(2400L);
@@ -265,7 +266,7 @@ public class DriftTemplateManagerBeanTest extends
AbstractDriftServerTest {
//@Test(groups = "negativeUpdate", dependsOnMethods =
"createTemplateForNegativeUpdateTests", expectedExceptions = EJBException.class,
expectedExceptionsMessageRegExp = ".*name.*cannot be modified")
private void doNotAllowTemplateNameToBeUpdated() {
DriftDefinitionTemplate template = loadTemplate(TEST_CREATE_TEMPLATE);
- template.setName("A new name");
+ template.setName(NAME_PREFIX + "A new name");
templateMgr.updateTemplate(getOverlord(), template);
}
@@ -286,7 +287,7 @@ public class DriftTemplateManagerBeanTest extends
AbstractDriftServerTest {
public void createAndUpdateTemplate() {
// create the template
DriftDefinition definition = new DriftDefinition(new Configuration());
- definition.setName("test-updateTemplate");
+ definition.setName(NAME_PREFIX + "test-updateTemplate");
definition.setDescription("update template test");
definition.setEnabled(true);
definition.setDriftHandlingMode(normal);
@@ -297,10 +298,10 @@ public class DriftTemplateManagerBeanTest extends
AbstractDriftServerTest {
definition);
// next create some definitions from the template
- final DriftDefinition attachedDef1 = createDefinition(template,
"attachedDef1", true);
- final DriftDefinition attachedDef2 = createDefinition(template,
"attachedDef2", true);
- final DriftDefinition detachedDef1 = createDefinition(template,
"detachedDef1", false);
- final DriftDefinition detachedDef2 = createDefinition(template,
"detachedDef2", false);
+ final DriftDefinition attachedDef1 = createDefinition(template, NAME_PREFIX +
"attachedDef1", true);
+ final DriftDefinition attachedDef2 = createDefinition(template, NAME_PREFIX +
"attachedDef2", true);
+ final DriftDefinition detachedDef1 = createDefinition(template, NAME_PREFIX +
"detachedDef1", false);
+ final DriftDefinition detachedDef2 = createDefinition(template, NAME_PREFIX +
"detachedDef2", false);
driftMgr.updateDriftDefinition(getOverlord(), forResource(resource.getId()),
attachedDef1);
driftMgr.updateDriftDefinition(getOverlord(), forResource(resource.getId()),
attachedDef2);
@@ -384,10 +385,10 @@ public class DriftTemplateManagerBeanTest extends
AbstractDriftServerTest {
templateDef);
// next create some resource level definitions
- final DriftDefinition attachedDef1 = createDefinition(template,
"attachedDef1", true);
- final DriftDefinition attachedDef2 = createDefinition(template,
"attachedDef2", true);
- final DriftDefinition detachedDef1 = createDefinition(template,
"detachedDef1", false);
- final DriftDefinition detachedDef2 = createDefinition(template,
"detachedDef2", false);
+ final DriftDefinition attachedDef1 = createDefinition(template, NAME_PREFIX +
"attachedDef1", true);
+ final DriftDefinition attachedDef2 = createDefinition(template, NAME_PREFIX +
"attachedDef2", true);
+ final DriftDefinition detachedDef1 = createDefinition(template, NAME_PREFIX +
"detachedDef1", false);
+ final DriftDefinition detachedDef2 = createDefinition(template, NAME_PREFIX +
"detachedDef2", false);
// create initial change set from which the snapshot will be generated
final JPADriftChangeSet changeSet0 = new JPADriftChangeSet(resource, 0, COVERAGE,
attachedDef1);
@@ -474,7 +475,9 @@ public class DriftTemplateManagerBeanTest extends
AbstractDriftServerTest {
// get the attached definitions
List<DriftDefinition> attachedDefs = new
LinkedList<DriftDefinition>();
for (DriftDefinition d : template.getDriftDefinitions()) {
- if (d.isAttached() && (d.getName().equals("attachedDef1")
|| d.getName().equals("attachedDef2"))) {
+ if (d.isAttached()
+ && (d.getName().equals(NAME_PREFIX + "attachedDef1") ||
d.getName()
+ .equals(NAME_PREFIX + "attachedDef2"))) {
attachedDefs.add(d);
}
}
@@ -490,7 +493,9 @@ public class DriftTemplateManagerBeanTest extends
AbstractDriftServerTest {
// get the detached definitions
List<DriftDefinition> detachedDefs = new
LinkedList<DriftDefinition>();
for (DriftDefinition d : template.getDriftDefinitions()) {
- if (!d.isAttached() && (d.getName().equals("detachedDef1")
|| d.getName().equals("detachedDef2"))) {
+ if (!d.isAttached()
+ && (d.getName().equals(NAME_PREFIX + "detachedDef1") ||
d.getName()
+ .equals(NAME_PREFIX + "detachedDef2"))) {
detachedDefs.add(d);
}
}
@@ -513,10 +518,10 @@ public class DriftTemplateManagerBeanTest extends
AbstractDriftServerTest {
templateDef);
// next create some resource level definitions
- final DriftDefinition attachedDef1 = createDefinition(template,
"attachedDef1", true);
- final DriftDefinition attachedDef2 = createDefinition(template,
"attachedDef2", true);
- final DriftDefinition detachedDef1 = createDefinition(template,
"detachedDef1", false);
- final DriftDefinition detachedDef2 = createDefinition(template,
"detachedDef2", false);
+ final DriftDefinition attachedDef1 = createDefinition(template, NAME_PREFIX +
"attachedDef1", true);
+ final DriftDefinition attachedDef2 = createDefinition(template, NAME_PREFIX +
"attachedDef2", true);
+ final DriftDefinition detachedDef1 = createDefinition(template, NAME_PREFIX +
"detachedDef1", false);
+ final DriftDefinition detachedDef2 = createDefinition(template, NAME_PREFIX +
"detachedDef2", false);
// create some change sets
final JPADriftChangeSet changeSet0 = new JPADriftChangeSet(resource, 0, COVERAGE,
attachedDef1);
diff --git
a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/JPADriftServerBeanTest.java
b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/JPADriftServerBeanTest.java
index 8fe5ac5..edd5f01 100644
---
a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/JPADriftServerBeanTest.java
+++
b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/JPADriftServerBeanTest.java
@@ -57,9 +57,9 @@ public class JPADriftServerBeanTest extends AbstractDriftServerTest {
private JPADriftServerLocal jpaDriftServer;
- private final String DRIFT_FILE_1_ID = "a1b2c3d4";
+ private final String DRIFT_FILE_1_ID = NAME_PREFIX + "a1b2c3d4";
- private final String DRIFT_FILE_2_ID = "1ab2b3c4d";
+ private final String DRIFT_FILE_2_ID = NAME_PREFIX + "1ab2b3c4d";
private JPADriftFile driftFile1;
@@ -90,7 +90,7 @@ public class JPADriftServerBeanTest extends AbstractDriftServerTest {
public void persistResourceChangeSet() {
// first create and persist the drift definition
final DriftDefinition driftDef = new DriftDefinition(new Configuration());
- driftDef.setName("test::persistResourceChangeSet");
+ driftDef.setName(NAME_PREFIX + "persistResourceChangeSet");
driftDef.setEnabled(true);
driftDef.setDriftHandlingMode(normal);
driftDef.setInterval(2400L);
@@ -245,7 +245,7 @@ public class JPADriftServerBeanTest extends AbstractDriftServerTest {
// next create the drift definition
final DriftDefinition driftDef = new DriftDefinition(new Configuration());
- driftDef.setName("test::copyChangeSet");
+ driftDef.setName(NAME_PREFIX + "copyChangeSet");
driftDef.setEnabled(true);
driftDef.setDriftHandlingMode(normal);
driftDef.setInterval(2400L);
diff --git
a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/ManageDriftDefinitionsTest.java
b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/ManageDriftDefinitionsTest.java
index f31ffe5..18c7093 100644
---
a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/ManageDriftDefinitionsTest.java
+++
b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/ManageDriftDefinitionsTest.java
@@ -63,9 +63,9 @@ import org.rhq.test.AssertUtils;
@Test
public class ManageDriftDefinitionsTest extends AbstractDriftServerTest {
- private final String DRIFT_NOT_SUPPORTED_TYPE = getClass().getSimpleName() +
"DRIFT_NOT_SUPPORTED_RESOURCE_TYPE";
+ private final String DRIFT_NOT_SUPPORTED_TYPE = NAME_PREFIX +
"DRIFT_NOT_SUPPORTED_RESOURCE_TYPE";
- private final String DRIFT_NOT_SUPPORTED_RESOURCE = getClass().getSimpleName() +
"DRIFT_NOT_SUPPORTED_RESOURCE";
+ private final String DRIFT_NOT_SUPPORTED_RESOURCE = NAME_PREFIX +
"DRIFT_NOT_SUPPORTED_RESOURCE";
private DriftManagerLocal driftMgr;
@@ -94,7 +94,7 @@ public class ManageDriftDefinitionsTest extends AbstractDriftServerTest
{
public void createDefinitionFromUnpinnedTemplate() {
// first create a template
final DriftDefinition templateDef = new DriftDefinition(new Configuration());
- templateDef.setName("test_createUnpinnedDefinition");
+ templateDef.setName(NAME_PREFIX + "createUnpinnedDefinition");
templateDef.setEnabled(true);
templateDef.setDriftHandlingMode(normal);
templateDef.setInterval(2400L);
@@ -184,8 +184,8 @@ public class ManageDriftDefinitionsTest extends
AbstractDriftServerTest {
final JPADriftChangeSet changeSet0 = new JPADriftChangeSet(null, 0, COVERAGE,
null);
changeSet0.setDriftHandlingMode(DriftConfigurationDefinition.DriftHandlingMode.normal);
- final JPADriftFile driftFile1 = new JPADriftFile("a1b2c3");
- final JPADriftFile driftFile2 = new JPADriftFile("1a2b3c");
+ final JPADriftFile driftFile1 = new JPADriftFile(NAME_PREFIX +
"a1b2c3");
+ final JPADriftFile driftFile2 = new JPADriftFile(NAME_PREFIX +
"1a2b3c");
JPADrift drift1 = new JPADrift(changeSet0, "drift.1", FILE_ADDED, null,
driftFile1);
JPADrift drift2 = new JPADrift(changeSet0, "drift.2", FILE_ADDED, null,
driftFile2);
@@ -196,7 +196,7 @@ public class ManageDriftDefinitionsTest extends
AbstractDriftServerTest {
// create the template
final DriftDefinition templateDef = new DriftDefinition(new Configuration());
- templateDef.setName("test_createUnpinnedDefinition");
+ templateDef.setName(NAME_PREFIX + "createUnpinnedDefinition");
templateDef.setEnabled(true);
templateDef.setDriftHandlingMode(normal);
templateDef.setInterval(2400L);
@@ -288,7 +288,7 @@ public class ManageDriftDefinitionsTest extends
AbstractDriftServerTest {
public void unpinDefinition() {
// First create the template
final DriftDefinition templateDef = new DriftDefinition(new Configuration());
- templateDef.setName("test_unpin_def_template");
+ templateDef.setName(NAME_PREFIX + "unpin_def_template");
templateDef.setEnabled(true);
templateDef.setDriftHandlingMode(normal);
templateDef.setInterval(2400L);
@@ -299,7 +299,7 @@ public class ManageDriftDefinitionsTest extends
AbstractDriftServerTest {
// First create the definition
DriftDefinition definition = template.createDefinition();
- definition.setName("test_unpin");
+ definition.setName(NAME_PREFIX + "unpin");
definition.setEnabled(true);
definition.setBasedir(new DriftDefinition.BaseDirectory(fileSystem,
"/foo/bar/test"));
definition.setComplianceStatus(DriftComplianceStatus.OUT_OF_COMPLIANCE_DRIFT);
diff --git
a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/ManageSnapshotsTest.java
b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/ManageSnapshotsTest.java
index f1212fd..ed316a4 100644
---
a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/ManageSnapshotsTest.java
+++
b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/ManageSnapshotsTest.java
@@ -72,12 +72,12 @@ public class ManageSnapshotsTest extends AbstractDriftServerTest {
}
public void pinningSnapshotShouldSetDriftDefAsPinned() {
- final DriftDefinition driftDef =
createAndPersistDriftDef("test::setPinnedFlag");
+ final DriftDefinition driftDef = createAndPersistDriftDef(NAME_PREFIX +
"setPinnedFlag");
// create initial change set
final JPADriftChangeSet changeSet = new JPADriftChangeSet(resource, 0, COVERAGE,
driftDef);
- final JPADriftFile driftFile1 = new JPADriftFile("a1b2c3");
+ final JPADriftFile driftFile1 = new JPADriftFile(NAME_PREFIX +
"a1b2c3");
JPADrift drift = new JPADrift(changeSet, "drift.1", FILE_ADDED, null,
driftFile1);
final JPADriftSet driftSet = new JPADriftSet();
@@ -104,19 +104,19 @@ public class ManageSnapshotsTest extends AbstractDriftServerTest {
@SuppressWarnings("unchecked")
public void pinningSnapshotShouldMakeSnapshotTheInitialChangeSet() throws Exception
{
- final DriftDefinition driftDef =
createAndPersistDriftDef("test::makeSnapshotVersionZero");
+ final DriftDefinition driftDef = createAndPersistDriftDef(NAME_PREFIX +
"makeSnapshotVersionZero");
// create initial change set
final JPADriftChangeSet changeSet0 = new JPADriftChangeSet(resource, 0, COVERAGE,
driftDef);
- final JPADriftFile driftFile1 = new JPADriftFile("a1b2c3");
+ final JPADriftFile driftFile1 = new JPADriftFile(NAME_PREFIX +
"a1b2c3");
JPADrift drift1 = new JPADrift(changeSet0, "drift.1", FILE_ADDED, null,
driftFile1);
final JPADriftSet driftSet = new JPADriftSet();
driftSet.addDrift(drift1);
// create change set v1
- final JPADriftFile driftFile2 = new JPADriftFile("1a2b3c");
+ final JPADriftFile driftFile2 = new JPADriftFile(NAME_PREFIX +
"1a2b3c");
final JPADriftChangeSet changeSet1 = new JPADriftChangeSet(resource, 1, DRIFT,
driftDef);
final JPADrift drift2 = new JPADrift(changeSet1, "drift.2", FILE_ADDED,
null, driftFile2);
@@ -170,12 +170,12 @@ public class ManageSnapshotsTest extends AbstractDriftServerTest {
}
public void pinningSnapshotShouldSendRequestToAgent() {
- final DriftDefinition driftDef =
createAndPersistDriftDef("test::setPinnedFlag");
+ final DriftDefinition driftDef = createAndPersistDriftDef(NAME_PREFIX +
"setPinnedFlag");
// create initial change set
final JPADriftChangeSet changeSet = new JPADriftChangeSet(resource, 0, COVERAGE,
driftDef);
- final JPADriftFile driftFile1 = new JPADriftFile("a1b2c3");
+ final JPADriftFile driftFile1 = new JPADriftFile(NAME_PREFIX +
"a1b2c3");
JPADrift drift = new JPADrift(changeSet, "drift.1", FILE_ADDED, null,
driftFile1);
final JPADriftSet driftSet = new JPADriftSet();
@@ -221,7 +221,7 @@ public class ManageSnapshotsTest extends AbstractDriftServerTest {
public void doNotAllowSnapshotToBePinnedWhenDefinitionIsAttachedToPinnedTemplate() {
// First create the template
final DriftDefinition templateDef = new DriftDefinition(new Configuration());
- templateDef.setName("Template-Pinned_Test");
+ templateDef.setName(NAME_PREFIX + "Template-Pinned_Test");
templateDef.setEnabled(true);
templateDef.setDriftHandlingMode(normal);
templateDef.setInterval(2400L);
diff --git
a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MetadataBeanTest.java
b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MetadataBeanTest.java
index 38b1216..e5e5fea 100644
---
a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MetadataBeanTest.java
+++
b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MetadataBeanTest.java
@@ -197,6 +197,7 @@ public class MetadataBeanTest extends AbstractEJB3Test {
List<ResourceType> resourceTypes =
resourceTypeMgr.findResourceTypesByCriteria(subjectMgr.getOverlord(),
criteria);
+ assertEquals("too many types!", 1, resourceTypes.size());
ResourceType resourceType = resourceTypes.get(0);
Set<String> expectedSet = new HashSet<String>(expected);
List<String> missing = new ArrayList<String>();
diff --git
a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java
b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java
index a5e23ff..1b6ebad 100644
---
a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java
+++
b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java
@@ -53,13 +53,15 @@ import org.rhq.enterprise.server.util.LookupUtil;
@Test(groups = { "plugin.metadata" })
public class ResourceMetadataManagerBeanTest extends MetadataBeanTest {
+ private static final String PLUGIN_NAME =
"ResourceMetadataManagerBeanTestPlugin";
+
@Test(groups = { "plugin.resource.metadata.test", "NewPlugin" })
public void testRemovalOfObsoleteBundleAndDriftConfig() throws Exception {
// create the initial type that has bundle and drift definitions
createPlugin("test-plugin.jar", "1.0",
"remove_bundle_drift_config_v1.xml");
// make sure the drift definition was persisted, and remember the type
- ResourceType type1 =
assertResourceTypeAssociationEquals("ServerWithBundleAndDriftConfig",
"TestPlugin",
+ ResourceType type1 =
assertResourceTypeAssociationEquals("ServerWithBundleAndDriftConfig",
PLUGIN_NAME,
"driftDefinitionTemplates", asList("drift1"));
// sanity check, make sure our queries work and that we did persist these things
@@ -85,8 +87,6 @@ public class ResourceMetadataManagerBeanTest extends MetadataBeanTest {
getTransactionManager().commit();
}
- // make sure the bundle config was also persisted
- // NOTE: WHY DOES THIS WORK? I DIDN'T ASK TO FETCH IT AND IT IS MARKED AS
LAZY LOAD
assertNotNull(type1.getResourceTypeBundleConfiguration());
assertEquals("destdir1",
type1.getResourceTypeBundleConfiguration().getBundleDestinationBaseDirectories()
.iterator().next().getName());
@@ -139,14 +139,14 @@ public class ResourceMetadataManagerBeanTest extends
MetadataBeanTest {
@Test(dependsOnMethods = { "registerPlugin" }, groups = {
"plugin.resource.metadata.test", "NewPlugin" })
public void persistNewTypes() {
List<String> newTypes = asList("ServerA", "ServerB");
- assertTypesPersisted("Failed to persist new types", newTypes,
"TestPlugin");
+ assertTypesPersisted("Failed to persist new types", newTypes,
PLUGIN_NAME);
}
// @Test(dependsOnMethods = {"persistNewTypes"}, groups =
{"plugin.resource.metadata.test", "NewPlugin"})
// public void persistSubcategories() throws Exception {
// assertResourceTypeAssociationEquals(
// "ServerA",
- // "TestPlugin",
+ // PLUGIN_NAME,
// "childSubCategories",
// asList("Resources", "Applications")
// );
@@ -154,29 +154,30 @@ public class ResourceMetadataManagerBeanTest extends
MetadataBeanTest {
@Test(dependsOnMethods = { "persistNewTypes" }, groups = {
"plugin.resource.metadata.test", "NewPlugin" })
public void persistMeasurementDefinitions() throws Exception {
- assertResourceTypeAssociationEquals("ServerA", "TestPlugin",
"metricDefinitions",
+ assertResourceTypeAssociationEquals("ServerA", PLUGIN_NAME,
"metricDefinitions",
asList("metric1", "metric2",
"rhq.availability"));
}
@Test(dependsOnMethods = { "persistNewTypes" }, groups = {
"plugin.resource.metadata.test", "NewPlugin" })
public void persistEventDefinitions() throws Exception {
- assertResourceTypeAssociationEquals("ServerA", "TestPlugin",
"eventDefinitions",
+ assertResourceTypeAssociationEquals("ServerA", PLUGIN_NAME,
"eventDefinitions",
asList("logAEntry", "logBEntry"));
}
@Test(dependsOnMethods = { "persistNewTypes" }, groups = {
"plugin.resource.metadata.test", "NewPlugin" })
public void persistOperationDefinitions() throws Exception {
- assertResourceTypeAssociationEquals("ServerA", "TestPlugin",
"operationDefinitions", asList("start", "stop"));
+ assertResourceTypeAssociationEquals("ServerA", PLUGIN_NAME,
"operationDefinitions", asList("start", "stop"));
}
@Test(dependsOnMethods = { "persistNewTypes" }, groups = {
"plugin.resource.metadata.test", "NewPlugin" })
public void persistProcessScans() throws Exception {
- assertResourceTypeAssociationEquals("ServerA", "TestPlugin",
"processScans", asList("serverA"));
+ assertResourceTypeAssociationEquals("ServerA", PLUGIN_NAME,
"processScans", asList("serverA"));
}
+
@Test(dependsOnMethods = { "persistNewTypes" }, groups = {
"plugin.resource.metadata.test", "NewPlugin" })
public void persistDriftDefinitionTemplates() throws Exception {
- ResourceType type = assertResourceTypeAssociationEquals("ServerA",
"TestPlugin", "driftDefinitionTemplates",
+ ResourceType type = assertResourceTypeAssociationEquals("ServerA",
PLUGIN_NAME, "driftDefinitionTemplates",
asList("drift-pc", "drift-fs"));
DriftDefinition driftDef = null;
@@ -216,7 +217,7 @@ public class ResourceMetadataManagerBeanTest extends MetadataBeanTest
{
@Test(dependsOnMethods = { "persistNewTypes" }, groups = {
"plugin.resource.metadata.test", "NewPlugin" })
public void persistBundleTargetConfigurations() throws Exception {
String resourceTypeName = "ServerA";
- String plugin = "TestPlugin";
+ String plugin = PLUGIN_NAME;
SubjectManagerLocal subjectMgr = LookupUtil.getSubjectManager();
ResourceTypeManagerLocal resourceTypeMgr = LookupUtil.getResourceTypeManager();
@@ -227,6 +228,7 @@ public class ResourceMetadataManagerBeanTest extends MetadataBeanTest
{
criteria.fetchBundleConfiguration(true);
List<ResourceType> resourceTypes =
resourceTypeMgr.findResourceTypesByCriteria(subjectMgr.getOverlord(),
criteria);
+ assertEquals("too many types returned!", 1, resourceTypes.size());
ResourceType resourceType = resourceTypes.get(0);
ResourceTypeBundleConfiguration rtbc =
resourceType.getResourceTypeBundleConfiguration();
@@ -250,7 +252,7 @@ public class ResourceMetadataManagerBeanTest extends MetadataBeanTest
{
@Test(dependsOnMethods = { "persistNewTypes" }, groups = {
"plugin.resource.metadata.test", "NewPlugin" })
public void persistChildTypes() throws Exception {
- assertResourceTypeAssociationEquals("ServerA", "TestPlugin",
"childResourceTypes", asList("Child1", "Child2"));
+ assertResourceTypeAssociationEquals("ServerA", PLUGIN_NAME,
"childResourceTypes", asList("Child1", "Child2"));
}
@Test(dependsOnMethods = { "persistNewTypes" }, groups = {
"plugin.resource.metadata.test", "NewPlugin" })
@@ -260,7 +262,7 @@ public class ResourceMetadataManagerBeanTest extends MetadataBeanTest
{
@Test(dependsOnMethods = { "persistNewTypes" }, groups = {
"plugin.resource.metadata.test", "NewPlugin" })
public void persistPackageTypes() throws Exception {
- assertResourceTypeAssociationEquals("ServerA", "TestPlugin",
"packageTypes",
+ assertResourceTypeAssociationEquals("ServerA", PLUGIN_NAME,
"packageTypes",
asList("ServerA.Content.1", "ServerA.Content.2"));
}
@@ -271,34 +273,34 @@ public class ResourceMetadataManagerBeanTest extends
MetadataBeanTest {
@Test(dependsOnMethods = { "upgradePlugin" }, groups = {
"plugin.resource.metadata.test", "UpgradePlugin" })
public void upgradeOperationDefinitions() throws Exception {
- assertResourceTypeAssociationEquals("ServerA", "TestPlugin",
"operationDefinitions",
+ assertResourceTypeAssociationEquals("ServerA", PLUGIN_NAME,
"operationDefinitions",
asList("start", "shutdown", "restart"));
}
@Test(dependsOnMethods = { "upgradePlugin" }, groups = {
"plugin.resource.metadata.test", "UpgradePlugin" })
public void upgradeChildResources() throws Exception {
- assertResourceTypeAssociationEquals("ServerA", "TestPlugin",
"childResourceTypes", asList("Child1", "Child3"));
+ assertResourceTypeAssociationEquals("ServerA", PLUGIN_NAME,
"childResourceTypes", asList("Child1", "Child3"));
}
@Test(dependsOnMethods = { "upgradePlugin" }, groups = {
"plugin.resource.metadata.test", "UpgradePlugin" })
public void upgradeParentTypeOfChild() throws Exception {
- assertResourceTypeAssociationEquals("ServerB", "TestPlugin",
"childResourceTypes", asList("Child2"));
+ assertResourceTypeAssociationEquals("ServerB", PLUGIN_NAME,
"childResourceTypes", asList("Child2"));
}
@Test(dependsOnMethods = { "upgradePlugin" }, groups = {
"plugin.resource.metadata.test", "UpgradePlugin" })
public void upgradeEventDefinitions() throws Exception {
- assertResourceTypeAssociationEquals("ServerA", "TestPlugin",
"eventDefinitions",
+ assertResourceTypeAssociationEquals("ServerA", PLUGIN_NAME,
"eventDefinitions",
asList("logAEntry", "logCEntry"));
}
@Test(dependsOnMethods = { "upgradePlugin" }, groups = {
"plugin.resource.metadata.test", "UpgradePlugin" })
public void upgradeProcessScans() throws Exception {
- assertResourceTypeAssociationEquals("ServerA", "TestPlugin",
"processScans", asList("processA", "processB"));
+ assertResourceTypeAssociationEquals("ServerA", PLUGIN_NAME,
"processScans", asList("processA", "processB"));
}
@Test(dependsOnMethods = { "upgradePlugin" }, groups = {
"plugin.resource.metadata.test", "UpgradePlugin" })
public void upgradeDriftDefinitionTemplates() throws Exception {
- ResourceType type = assertResourceTypeAssociationEquals("ServerA",
"TestPlugin", "driftDefinitionTemplates",
+ ResourceType type = assertResourceTypeAssociationEquals("ServerA",
PLUGIN_NAME, "driftDefinitionTemplates",
asList("drift-rc", "drift-mt"));
DriftDefinition driftDef = null;
@@ -329,7 +331,7 @@ public class ResourceMetadataManagerBeanTest extends MetadataBeanTest
{
@Test(dependsOnMethods = { "upgradePlugin" }, groups = {
"plugin.resource.metadata.test", "UpgradePlugin" })
public void upgradeBundleTargetConfigurations() throws Exception {
String resourceTypeName = "ServerA";
- String plugin = "TestPlugin";
+ String plugin = PLUGIN_NAME;
SubjectManagerLocal subjectMgr = LookupUtil.getSubjectManager();
ResourceTypeManagerLocal resourceTypeMgr = LookupUtil.getResourceTypeManager();
@@ -363,7 +365,7 @@ public class ResourceMetadataManagerBeanTest extends MetadataBeanTest
{
@Test(dependsOnMethods = { "upgradePlugin" }, groups = {
"plugin.resource.metadata.test", "UpgradePlugin" })
public void upgradePackageTypes() throws Exception {
- assertResourceTypeAssociationEquals("ServerA", "TestPlugin",
"packageTypes",
+ assertResourceTypeAssociationEquals("ServerA", PLUGIN_NAME,
"packageTypes",
asList("ServerA.Content.1", "ServerA.Content.3"));
}
@@ -591,7 +593,7 @@ public class ResourceMetadataManagerBeanTest extends MetadataBeanTest
{
String fetch = "fetch" + WordUtils.capitalize(propertyName);
ResourceTypeCriteria criteria = new ResourceTypeCriteria();
criteria.addFilterName(resourceTypeName);
- criteria.addFilterPluginName("TestPlugin");
+ criteria.addFilterPluginName(PLUGIN_NAME);
MethodUtils.invokeMethod(criteria, fetch, true);
List<ResourceType> resourceTypes =
resourceTypeMgr.findResourceTypesByCriteria(subjectMgr.getOverlord(),
diff --git
a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java
b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java
index 7c4fa43..7c815b7 100644
---
a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java
+++
b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java
@@ -62,7 +62,7 @@ public class UpdatePluginMetadataTestBase extends AbstractEJB3Test {
protected TestServerCommunicationsService agentServiceContainer;
- protected static final String PLUGIN_NAME =
"ResourceMetaDataManagerBeanTest"; // don't change this - our test
descriptor .xml files use it as plugin name
+ protected static final String PLUGIN_NAME =
"UpdatePluginMetadataTestBasePlugin"; // don't change this - our test
descriptor .xml files use it as plugin name
protected static final String AGENT_NAME = "-dummy agent-";
protected static final String COMMON_PATH_PREFIX = "./test/metadata/";
diff --git a/modules/enterprise/server/itests-2/src/test/resources/arquillian.xml
b/modules/enterprise/server/itests-2/src/test/resources/arquillian.xml
index d473413..c1dcf1b 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/arquillian.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/arquillian.xml
@@ -21,6 +21,7 @@
<configuration>
<property
name="jbossHome">${jboss.unzip.location}</property>
+ <property name="javaVmArguments">${jboss.vm.args}
${jboss.vm.args.debug}</property>
</configuration>
</container>
</arquillian>
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/dup_drift.xml
b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/dup_drift.xml
index bd9728b..7f79c93 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/dup_drift.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/dup_drift.xml
@@ -1,4 +1,4 @@
-<plugin name="TestPlugin" displayName="Test Plugin"
package="org.rhq.plugins.test"
+<plugin name="ResourceMetadataManagerBeanTestPlugin" displayName="Test
Plugin" package="org.rhq.plugins.test"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
xmlns:c="urn:xmlns:rhq-configuration">
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/plugin_v1.xml
b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/plugin_v1.xml
index 88cd39c..8673ce4 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/plugin_v1.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/plugin_v1.xml
@@ -1,4 +1,4 @@
-<plugin name="TestPlugin" displayName="Test Plugin"
package="org.rhq.plugins.test"
+<plugin name="ResourceMetadataManagerBeanTestPlugin" displayName="Test
Plugin" package="org.rhq.plugins.test"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
xmlns:c="urn:xmlns:rhq-configuration">
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/plugin_v2.xml
b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/plugin_v2.xml
index a89f679..3f9cebe 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/plugin_v2.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/plugin_v2.xml
@@ -1,4 +1,4 @@
-<plugin name="TestPlugin" displayName="Test Plugin"
package="org.rhq.plugins.test"
+<plugin name="ResourceMetadataManagerBeanTestPlugin" displayName="Test
Plugin" package="org.rhq.plugins.test"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
xmlns:c="urn:xmlns:rhq-configuration">
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/remove_bundle_drift_config_v1.xml
b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/remove_bundle_drift_config_v1.xml
index 460954b..902dd0a 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/remove_bundle_drift_config_v1.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/remove_bundle_drift_config_v1.xml
@@ -1,4 +1,4 @@
-<plugin name="TestPlugin" displayName="Test Plugin"
package="org.rhq.plugins.test"
+<plugin name="ResourceMetadataManagerBeanTestPlugin" displayName="Test
Plugin" package="org.rhq.plugins.test"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
xmlns:c="urn:xmlns:rhq-configuration">
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/remove_bundle_drift_config_v2.xml
b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/remove_bundle_drift_config_v2.xml
index c92919d..83d80bb 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/remove_bundle_drift_config_v2.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/remove_bundle_drift_config_v2.xml
@@ -1,4 +1,4 @@
-<plugin name="TestPlugin" displayName="Test Plugin"
package="org.rhq.plugins.test"
+<plugin name="ResourceMetadataManagerBeanTestPlugin" displayName="Test
Plugin" package="org.rhq.plugins.test"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
xmlns:c="urn:xmlns:rhq-configuration">
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/alerts/type-with-metric.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/alerts/type-with-metric.xml
index 1af82a9..73e95e2 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/alerts/type-with-metric.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/alerts/type-with-metric.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Type with
Metric Test Plugin" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Type
with Metric Test Plugin" package="org.rhq.plugins.mock.jboss"
version="1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/BZ_573034_v1.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/BZ_573034_v1.xml
index 85de1cf..28680e5 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/BZ_573034_v1.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/BZ_573034_v1.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Bug 573034
Test Plugin" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Bug
573034 Test Plugin" package="org.rhq.plugins.mock.jboss"
version="1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/BZ_573034_v2.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/BZ_573034_v2.xml
index 15b8d74..493da85 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/BZ_573034_v2.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/BZ_573034_v2.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Bug 573034
Test Plugin" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Bug
573034 Test Plugin" package="org.rhq.plugins.mock.jboss"
version="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/addDeleteTemplate1.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/addDeleteTemplate1.xml
index bea3eef..c095380 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/addDeleteTemplate1.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/addDeleteTemplate1.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss
AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock
JBoss AS" package="org.rhq.plugins.mock.jboss"
version="1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/addDeleteTemplate2.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/addDeleteTemplate2.xml
index 47653a7..ccaf547 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/addDeleteTemplate2.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/addDeleteTemplate2.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss
AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock
JBoss AS" package="org.rhq.plugins.mock.jboss"
version="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/addDeleteTemplate3.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/addDeleteTemplate3.xml
index e57a2ab..b85bc51 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/addDeleteTemplate3.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/addDeleteTemplate3.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss
AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock
JBoss AS" package="org.rhq.plugins.mock.jboss"
version="3.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/constraint.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/constraint.xml
index 9c6cbe3..11462f4 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/constraint.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/constraint.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss
AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock
JBoss AS" package="org.rhq.plugins.mock.jboss"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
xmlns:c="urn:xmlns:rhq-configuration">
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/constraintMinMax.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/constraintMinMax.xml
index 2653ee3..44f1f00 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/constraintMinMax.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/constraintMinMax.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss
AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock
JBoss AS" package="org.rhq.plugins.mock.jboss"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
xmlns:c="urn:xmlns:rhq-configuration">
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupDeleted-v1.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupDeleted-v1.xml
index 4e3ef1d..74dc51b 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupDeleted-v1.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupDeleted-v1.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss
AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock
JBoss AS" package="org.rhq.plugins.mock.jboss"
version="1"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupDeleted-v2.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupDeleted-v2.xml
index 755ee5c..3d4c2d7 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupDeleted-v2.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupDeleted-v2.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss
AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock
JBoss AS" package="org.rhq.plugins.mock.jboss"
version="2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupPropDeleted-v1.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupPropDeleted-v1.xml
index b5daf46..8ca3d83 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupPropDeleted-v1.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupPropDeleted-v1.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss
AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock
JBoss AS" package="org.rhq.plugins.mock.jboss"
version="1"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupPropDeleted-v2.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupPropDeleted-v2.xml
index 3c16420..a197008 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupPropDeleted-v2.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupPropDeleted-v2.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss
AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock
JBoss AS" package="org.rhq.plugins.mock.jboss"
version="2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupPropDeleted-v3.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupPropDeleted-v3.xml
index 4360c2b..7bf6d2f 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupPropDeleted-v3.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupPropDeleted-v3.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss
AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock
JBoss AS" package="org.rhq.plugins.mock.jboss"
version="3"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupPropDeleted-v4.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupPropDeleted-v4.xml
index 6da4878..6687398 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupPropDeleted-v4.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupPropDeleted-v4.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss
AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock
JBoss AS" package="org.rhq.plugins.mock.jboss"
version="4"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupPropMoved-v1.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupPropMoved-v1.xml
index 2c73c28..04c23b7 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupPropMoved-v1.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupPropMoved-v1.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss
AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock
JBoss AS" package="org.rhq.plugins.mock.jboss"
version="1"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupPropMoved-v2.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupPropMoved-v2.xml
index 4b7588a..ed48555 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupPropMoved-v2.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupPropMoved-v2.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss
AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock
JBoss AS" package="org.rhq.plugins.mock.jboss"
version="2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyChanging-v1.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyChanging-v1.xml
index 7c137eb..e921ed5 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyChanging-v1.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyChanging-v1.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss
AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock
JBoss AS" package="org.rhq.plugins.mock.jboss"
version="1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyChanging-v2.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyChanging-v2.xml
index 442d64b..41c26e4 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyChanging-v2.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyChanging-v2.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss
AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock
JBoss AS" package="org.rhq.plugins.mock.jboss"
version="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyList-simple.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyList-simple.xml
index b64cbee..6fa92ed 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyList-simple.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyList-simple.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss
AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock
JBoss AS" package="org.rhq.plugins.mock.jboss"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
xmlns:c="urn:xmlns:rhq-configuration">
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyList-v1.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyList-v1.xml
index aebbbac..5362890 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyList-v1.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyList-v1.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss
AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock
JBoss AS" package="org.rhq.plugins.mock.jboss"
version="1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyList-v2.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyList-v2.xml
index 23c2100..fed5af6 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyList-v2.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyList-v2.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss
AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock
JBoss AS" package="org.rhq.plugins.mock.jboss"
version="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyMap-v1.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyMap-v1.xml
index 047a0a7..3ff2add 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyMap-v1.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyMap-v1.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss
AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock
JBoss AS" package="org.rhq.plugins.mock.jboss"
version="1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyMap-v2.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyMap-v2.xml
index d370778..4e34d4f 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyMap-v2.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyMap-v2.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss
AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock
JBoss AS" package="org.rhq.plugins.mock.jboss"
version="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/update5-v1_0.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/update5-v1_0.xml
index 036e44e..e73f094 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/update5-v1_0.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/update5-v1_0.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss
AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock
JBoss AS" package="org.rhq.plugins.mock.jboss"
version="1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/update5-v2_0.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/update5-v2_0.xml
index 8db93dd..21a8e9e 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/update5-v2_0.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/update5-v2_0.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss
AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock
JBoss AS" package="org.rhq.plugins.mock.jboss"
version="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/updateDefaultTemplate1.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/updateDefaultTemplate1.xml
index 0183c27..2293c7b 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/updateDefaultTemplate1.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/updateDefaultTemplate1.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss
AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock
JBoss AS" package="org.rhq.plugins.mock.jboss"
version="1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/updateDefaultTemplate2.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/updateDefaultTemplate2.xml
index 702de08..e493a44 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/updateDefaultTemplate2.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/updateDefaultTemplate2.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss
AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock
JBoss AS" package="org.rhq.plugins.mock.jboss"
version="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/events/event1-1.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/events/event1-1.xml
index 11f345e..f8e196a 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/events/event1-1.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/events/event1-1.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss
AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock
JBoss AS" package="org.rhq.plugins.mock.jboss"
version="1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/events/event1-2.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/events/event1-2.xml
index f2bc857..0f1aa83 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/events/event1-2.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/events/event1-2.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss
AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock
JBoss AS" package="org.rhq.plugins.mock.jboss"
version="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/measurementDeletion-v1_0.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/measurementDeletion-v1_0.xml
index db954f5..1200e34 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/measurementDeletion-v1_0.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/measurementDeletion-v1_0.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss
AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock
JBoss AS" package="org.rhq.plugins.mock.jboss"
version="1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/measurementDeletion-v2_0.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/measurementDeletion-v2_0.xml
index 721375a..8bab712 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/measurementDeletion-v2_0.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/measurementDeletion-v2_0.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss
AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock
JBoss AS" package="org.rhq.plugins.mock.jboss"
version="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/update-v1_0.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/update-v1_0.xml
index 6ba4994..d62f05d 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/update-v1_0.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/update-v1_0.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss
AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock
JBoss AS" package="org.rhq.plugins.mock.jboss"
version="1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/update-v2_0.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/update-v2_0.xml
index 419e171..a44a02c 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/update-v2_0.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/update-v2_0.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss
AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock
JBoss AS" package="org.rhq.plugins.mock.jboss"
version="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/update6-1.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/update6-1.xml
index df4caf1..185aae3 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/update6-1.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/update6-1.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss
AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock
JBoss AS" package="org.rhq.plugins.mock.jboss"
version="1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/update6-2.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/update6-2.xml
index 0c31c6d..d76ede1 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/update6-2.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/update6-2.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss
AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock
JBoss AS" package="org.rhq.plugins.mock.jboss"
version="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/update7-1.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/update7-1.xml
index cac3941..1c56093 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/update7-1.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/update7-1.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss
AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock
JBoss AS" package="org.rhq.plugins.mock.jboss"
version="1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/update7-2.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/update7-2.xml
index 99d5659..50e15fe 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/update7-2.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/update7-2.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss
AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock
JBoss AS" package="org.rhq.plugins.mock.jboss"
version="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/natives/update5-v1_0.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/natives/update5-v1_0.xml
index 036e44e..e73f094 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/natives/update5-v1_0.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/natives/update5-v1_0.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss
AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock
JBoss AS" package="org.rhq.plugins.mock.jboss"
version="1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/natives/update5-v2_0.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/natives/update5-v2_0.xml
index 8db93dd..21a8e9e 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/natives/update5-v2_0.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/natives/update5-v2_0.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss
AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock
JBoss AS" package="org.rhq.plugins.mock.jboss"
version="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/noTypes.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/noTypes.xml
index 72bc8df..a279437 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/noTypes.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/noTypes.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss
AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock
JBoss AS" package="org.rhq.plugins.mock.jboss"
version="1000.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/operation1-1.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/operation1-1.xml
index 4587815..0671e30 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/operation1-1.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/operation1-1.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss
AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock
JBoss AS" package="org.rhq.plugins.mock.jboss"
version="1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/operation1-2.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/operation1-2.xml
index f32b862..463cda1 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/operation1-2.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/operation1-2.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest"
+<plugin name="UpdatePluginMetadataTestBasePlugin"
version="2.0"
displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/operation2-1.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/operation2-1.xml
index c04bc55..0937efd 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/operation2-1.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/operation2-1.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss
AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock
JBoss AS" package="org.rhq.plugins.mock.jboss"
version="1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/operation2-2.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/operation2-2.xml
index d28dabc..c58f267 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/operation2-2.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/operation2-2.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss
AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock
JBoss AS" package="org.rhq.plugins.mock.jboss"
version="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/operation3-1.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/operation3-1.xml
index af34668..c2a98dd 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/operation3-1.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/operation3-1.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest"
+<plugin name="UpdatePluginMetadataTestBasePlugin"
version="1.0"
displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/operation3-2.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/operation3-2.xml
index 0589700..e43bba4 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/operation3-2.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/operation3-2.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest"
+<plugin name="UpdatePluginMetadataTestBasePlugin"
version="2.0"
displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/update3-v1_0.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/update3-v1_0.xml
index 658f24e..f45831e 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/update3-v1_0.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/update3-v1_0.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest"
+<plugin name="UpdatePluginMetadataTestBasePlugin"
version="1.0"
displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/update3-v2_0.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/update3-v2_0.xml
index 8a24c5d..3d3ead1 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/update3-v2_0.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/update3-v2_0.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest"
+<plugin name="UpdatePluginMetadataTestBasePlugin"
version="2.0"
displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/duplicateResourceType.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/duplicateResourceType.xml
index 5340b2e..689a922 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/duplicateResourceType.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/duplicateResourceType.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss
AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock
JBoss AS" package="org.rhq.plugins.mock.jboss"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
xmlns:c="urn:xmlns:rhq-configuration">
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/update2-v1_0.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/update2-v1_0.xml
index bb70c9b..ca404e2 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/update2-v1_0.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/update2-v1_0.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss
AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock
JBoss AS" package="org.rhq.plugins.mock.jboss"
version="1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/update2-v2_0.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/update2-v2_0.xml
index 91b63d9..62346a8 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/update2-v2_0.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/update2-v2_0.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss
AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock
JBoss AS" package="org.rhq.plugins.mock.jboss"
version="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/update4-v1_0.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/update4-v1_0.xml
index 614da65..cc55191 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/update4-v1_0.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/update4-v1_0.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss
AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock
JBoss AS" package="org.rhq.plugins.mock.jboss"
version="1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/update4-v2_0.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/update4-v2_0.xml
index e8b90b1..e032a92 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/update4-v2_0.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/update4-v2_0.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss
AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock
JBoss AS" package="org.rhq.plugins.mock.jboss"
version="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/updateResourceTypeBundleTarget-v1.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/updateResourceTypeBundleTarget-v1.xml
index aa29ffd..b3d6130 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/updateResourceTypeBundleTarget-v1.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/updateResourceTypeBundleTarget-v1.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock"
package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin"
displayName="Mock" package="org.rhq.plugins.mock.jboss"
version="1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/updateResourceTypeBundleTarget-v2.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/updateResourceTypeBundleTarget-v2.xml
index c4f11ad..b54f598 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/updateResourceTypeBundleTarget-v2.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/updateResourceTypeBundleTarget-v2.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock"
package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin"
displayName="Mock" package="org.rhq.plugins.mock.jboss"
version="1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/illegal-subcat-1.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/illegal-subcat-1.xml
index e653736..efc39ed 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/illegal-subcat-1.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/illegal-subcat-1.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss
AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock
JBoss AS" package="org.rhq.plugins.mock.jboss"
version="1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-2children.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-2children.xml
index 4aa4064..89cba82 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-2children.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-2children.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss
AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock
JBoss AS" package="org.rhq.plugins.mock.jboss"
version="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-grandchild.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-grandchild.xml
index 63afe40..d331fea 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-grandchild.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-grandchild.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss
AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock
JBoss AS" package="org.rhq.plugins.mock.jboss"
version="1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-services-v1_0.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-services-v1_0.xml
index 91d6463..17044bb 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-services-v1_0.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-services-v1_0.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss
AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock
JBoss AS" package="org.rhq.plugins.mock.jboss"
version="1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-services-v2_0.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-services-v2_0.xml
index 93310c1..6d73374 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-services-v2_0.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-services-v2_0.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss
AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock
JBoss AS" package="org.rhq.plugins.mock.jboss"
version="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-v1_0.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-v1_0.xml
index 18c05ef..c524878 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-v1_0.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-v1_0.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss
AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock
JBoss AS" package="org.rhq.plugins.mock.jboss"
version="1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-v1_1.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-v1_1.xml
index 0a13158..8309a8a 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-v1_1.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-v1_1.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss
AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock
JBoss AS" package="org.rhq.plugins.mock.jboss"
version="1.1"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-v2_0.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-v2_0.xml
index 56563dc..420ed34 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-v2_0.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-v2_0.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss
AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock
JBoss AS" package="org.rhq.plugins.mock.jboss"
version="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/no-subcat.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/no-subcat.xml
index 064753f..999eeb0 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/no-subcat.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/no-subcat.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss
AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock
JBoss AS" package="org.rhq.plugins.mock.jboss"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v1_0.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v1_0.xml
index c7d308e..ca33483 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v1_0.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v1_0.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss
AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock
JBoss AS" package="org.rhq.plugins.mock.jboss"
version="1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v1_1.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v1_1.xml
index 36d6acd..ce3bf70 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v1_1.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v1_1.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss
AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock
JBoss AS" package="org.rhq.plugins.mock.jboss"
version="1.1"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v2_0.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v2_0.xml
index 21a0134..54265b0 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v2_0.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v2_0.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss
AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock
JBoss AS" package="org.rhq.plugins.mock.jboss"
version="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v3_0.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v3_0.xml
index 05bca6a..a4315cc 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v3_0.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v3_0.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss
AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock
JBoss AS" package="org.rhq.plugins.mock.jboss"
version="3.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/services-v1_0.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/services-v1_0.xml
index 27908e4..b204150 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/services-v1_0.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/services-v1_0.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss
AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock
JBoss AS" package="org.rhq.plugins.mock.jboss"
version="1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/services-v2_0.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/services-v2_0.xml
index 0440e33..08fc0c3 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/services-v2_0.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/services-v2_0.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss
AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock
JBoss AS" package="org.rhq.plugins.mock.jboss"
version="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/test-subcategories.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/test-subcategories.xml
index 95f27d8..eaaa3b1 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/test-subcategories.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/test-subcategories.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss
AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock
JBoss AS" package="org.rhq.plugins.mock.jboss"
version="1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/test-subcategories2.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/test-subcategories2.xml
index ec1e69d..3bdec86 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/test-subcategories2.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/test-subcategories2.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss
AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock
JBoss AS" package="org.rhq.plugins.mock.jboss"
version="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/test-subcategories3.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/test-subcategories3.xml
index 505a361..d97e4a4 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/test-subcategories3.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/test-subcategories3.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss
AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock
JBoss AS" package="org.rhq.plugins.mock.jboss"
version="3.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/two-subcat.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/two-subcat.xml
index 2f44202..3573e1e 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/two-subcat.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/two-subcat.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest" displayName="Mock JBoss
AS" package="org.rhq.plugins.mock.jboss"
+<plugin name="UpdatePluginMetadataTestBasePlugin" displayName="Mock
JBoss AS" package="org.rhq.plugins.mock.jboss"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
diff --git
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/undefined-child-subcat-1.xml
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/undefined-child-subcat-1.xml
index 9870576..2caa635 100644
---
a/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/undefined-child-subcat-1.xml
+++
b/modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/undefined-child-subcat-1.xml
@@ -1,4 +1,4 @@
-<plugin name="ResourceMetaDataManagerBeanTest"
+<plugin name="UpdatePluginMetadataTestBasePlugin"
version="1.0"
displayName="Mock JBoss AS"
package="org.rhq.plugins.mock.jboss"