[rhq] Branch 'release/jon3.1.x' - 2 commits - modules/core modules/enterprise modules/plugins
by Simeon Pinder
modules/core/domain/src/main/java/org/rhq/core/domain/configuration/definition/PropertyDefinitionMap.java | 114 +++++++---
modules/core/gui/src/main/java/org/rhq/core/gui/configuration/ConfigRenderer.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/AggregateConfigurationBuilder.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationComparisonView.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java | 35 ++-
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java | 4
modules/enterprise/server/xml-schemas/src/main/java/org/rhq/enterprise/server/xmlschema/ConfigurationInstanceDescriptorUtil.java | 4
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingDirectivePerMap.java | 2
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingDirectivePerMapIndex.java | 2
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingParamPerMap.java | 2
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingToAugeasDirectivePerMap.java | 2
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingToAugeasDirectivePerMapIndex.java | 2
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingToAugeasParamPerMap.java | 2
modules/plugins/augeas/src/main/java/org/rhq/plugins/augeas/AugeasConfigurationComponent.java | 4
modules/plugins/augeas/src/main/java/org/rhq/rhqtransform/impl/AugeasToConfigurationSimple.java | 2
modules/plugins/augeas/src/main/java/org/rhq/rhqtransform/impl/ConfigurationToAugeasSimple.java | 2
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/adapter/impl/configuration/PropertyMapToCompositeValueSupportAdapter.java | 2
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/adapter/impl/configuration/custom/JMSSecurityConfigAdapter.java | 2
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/util/ConversionUtils.java | 7
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadDelegate.java | 2
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationWriteDelegate.java | 2
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/JBossProductType.java | 7
22 files changed, 141 insertions(+), 65 deletions(-)
New commits:
commit beeb84d5f0fe7bd3038972a1e0912ca298a3e2a5
Author: Simeon Pinder <spinder(a)fulliautomatix.conchfritter.com>
Date: Tue Dec 4 07:50:29 2012 -0500
[BZ 871535] update product types to support EPP->JPP rename.
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/JBossProductType.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/JBossProductType.java
index 87e31f3..7239c02 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/JBossProductType.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/JBossProductType.java
@@ -34,6 +34,7 @@ public enum JBossProductType {
EAP("EAP", "JBoss EAP 6", "JBoss Enterprise Application Platform 6", "EAP"),
JDG("JDG", "JBoss JDG 6", "JBoss Data Grid 6", "Data Grid"),
EPP("EPP", "JBoss EAP 6", "JBoss Enterprise Portal Platform 6", "EPP"),
+ JPP("JPP", "JBoss EAP 6", "JBoss Portal Platform 6", "JPP"),
// EWP("EWP", "JBoss EWP 6", "JBoss Enterprise Web Platform 6", "EWP"),
SOA("SOA-P", "JBoss SOA-P 6", "JBoss Enterprise SOA Platform (ESB)", "SOAP");
@@ -97,8 +98,10 @@ public enum JBossProductType {
productType = JBossProductType.EAP;
} else if (slot.equals("jdg")) {
productType = JBossProductType.JDG;
- } else if (slot.equals("epp")) {
+ } else if (slot.equals("epp")) {//old EPP
productType = JBossProductType.EPP;
+ } else if (slot.equals("jpp")) {//new EPP->JPP plugin
+ productType = JBossProductType.JPP;
} else if (slot.equals("soa-p")) {
productType = JBossProductType.SOA;
} else {
@@ -122,6 +125,8 @@ public enum JBossProductType {
productType = JBossProductType.JDG;
} else if (homeDirName.contains("-epp-")) {
productType = JBossProductType.EPP;
+ } else if (homeDirName.contains("-jpp-")) {
+ productType = JBossProductType.JPP;
} else if (homeDirName.contains("soa-p-")) {
productType = JBossProductType.SOA;
} else {
commit d75db5b158f787a264e7ad0c4939c90ad8830f0b
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Fri Nov 16 10:16:24 2012 -0500
[Bug 877179 -revert changes to plugin api signature for PropertyDefinitionMap.getPropertyDefinitions()]
While maintaining the fix done for Bug 786416, restore the public API that
was broken in the original fix work. Also, maintain as much of the API
introduced in that fix work just in case it is now in use.
Also fixed PropertyDefinitionMap.put(PropertyDefinition) to be more careful
, and well-defined, about how it handles ordering.
Conflicts:
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/definition/PropertyDefinitionMap.java b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/definition/PropertyDefinitionMap.java
index 53ba6ce..4265168 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/definition/PropertyDefinitionMap.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/definition/PropertyDefinitionMap.java
@@ -23,11 +23,13 @@
package org.rhq.core.domain.configuration.definition;
import java.util.ArrayList;
-import java.util.Collections;
+import java.util.Collection;
import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.SortedMap;
+import java.util.TreeMap;
import javax.persistence.CascadeType;
import javax.persistence.DiscriminatorValue;
@@ -75,7 +77,7 @@ public class PropertyDefinitionMap extends PropertyDefinition {
}
/**
- * @return The <name,propDef> Mapping. This guarantees no ordering.
+ * @return The <name,propDef> Map. This guarantees no ordering.
*/
@NotNull
public Map<String, PropertyDefinition> getMap() {
@@ -91,45 +93,78 @@ public class PropertyDefinitionMap extends PropertyDefinition {
}
/**
- * Convenience routine to get the ordered properties from the Map.
+ * For public API compatibility.
+ * @deprecated use {@link #setMap(Map)}
+ */
+ public void setPropertyDefinitions(@NotNull Map<String, PropertyDefinition> propertyDefinitions) {
+ setMap(propertyDefinitions);
+ }
+
+ /**
+ * This returned {@link Map} is backed by a {@link SortedMap} sorted on PropertyDefinition.order. This means that
+ * result.keySet() and result.values() will be sorted by PropertyDefinition.order, ascending. Min(order) is 0.
+ * <p>
+ * For an unsorted Map use {@link #getMap()}.</p>
*
- * @return Not Null. The map's property definitions sorted by PropertyDefinition.order, ascending. Min(order) is 0.
+ * @return The map's property definitions sorted by PropertyDefinition.order, ascending. Min(order) is 0.
*/
- public List<PropertyDefinition> getPropertyDefinitions() {
- final List<PropertyDefinition> propDefs = new ArrayList<PropertyDefinition>(getMap().values());
+ @NotNull
+ public Map<String, PropertyDefinition> getPropertyDefinitions() {
+ Map<String, PropertyDefinition> map = getMap();
+
+ // if there is nothing to sort just return it.
+ if (map.size() <= 1) {
+ return map;
+ }
- Collections.sort(propDefs, new Comparator<PropertyDefinition>() {
- public int compare(PropertyDefinition o1, PropertyDefinition o2) {
- return Integer.valueOf(o1.getOrder()).compareTo(o2.getOrder());
+ // a funky comparator that compares index order given prop def names (i.e. keys)
+ Comparator<String> orderComparator = new Comparator<String>() {
+ public int compare(String o1, String o2) {
+ return Integer.valueOf(get(o1).getOrder()).compareTo(get(o2).getOrder());
}
- });
+ };
+
+ final Map<String, PropertyDefinition> result = new TreeMap<String, PropertyDefinition>(orderComparator);
+ for (String key : map.keySet()) {
+ result.put(key, map.get(key));
+ }
- return propDefs;
+ return result;
}
/**
- * Helper to get only the summary properties for this map definition. If no properties were defined as summary
- * properties in the plugin descriptor, the full list of properties will be returned.
+ * Convenience routine to get the ordered property definitions from the Map.
+ *
+ * @return The map's property definitions sorted by PropertyDefinition.order, ascending. Min(order) is 0.
+ */
+ @NotNull
+ public Collection<PropertyDefinition> getOrderedPropertyDefinitions() {
+ return getPropertyDefinitions().values();
+ }
+
+ /**
+ * Convenience routine to get only the summary property definitions.
*
- * @return the member properties that are marked as summary properties; the properties will be returned in the same
- * order they were defined in the plugin descriptor; if no properties were defined as summary properties in
- * the plugin descriptor, the full list of properties will be returned
+ * @return the summary property definitions. If no property definitions were defined
+ * as summary properties in the plugin descriptor, all property definitions will be returned.
+ * The property definitions will be sorted by PropertyDefinition.order, ascending. Min(order) is 0.
*/
@NotNull
public List<PropertyDefinition> getSummaryPropertyDefinitions() {
- List<PropertyDefinition> summaryDefinitions = new ArrayList<PropertyDefinition>();
- for (PropertyDefinition propertyDefinition : getMap().values()) {
- if (propertyDefinition.isSummary()) {
- summaryDefinitions.add(propertyDefinition);
+ List<PropertyDefinition> result = new ArrayList<PropertyDefinition>();
+ Collection<PropertyDefinition> propDefs = getOrderedPropertyDefinitions();
+
+ for (PropertyDefinition pd : propDefs) {
+ if (pd.isSummary()) {
+ result.add(pd);
}
}
- if (summaryDefinitions.isEmpty()) {
- // No properties were defined as summary properties - return the full list of properties.
- summaryDefinitions.addAll(getMap().values());
+ if (result.isEmpty()) {
+ result.addAll(propDefs);
}
- return summaryDefinitions;
+ return result;
}
public PropertyDefinitionSimple getPropertyDefinitionSimple(String name) {
@@ -149,13 +184,36 @@ public class PropertyDefinitionMap extends PropertyDefinition {
}
/**
- * If an order index is not set on the propertyDefinition it will be set to the current number
- * of propDefs for the map. So, adding props to the map in the desired order will
- * the
+ * If propertyDefinition.order is <= 0 or > Map.size() it will be set to the current number of propDefs for
+ * the map (placing it at the end). Otherwise, it will be inserted, incrementing the order of existing
+ * Map entries.
+ *
* @param propertyDefinition
*/
public void put(PropertyDefinition propertyDefinition) {
- getMap().put(propertyDefinition.getName(), propertyDefinition);
+ Map<String, PropertyDefinition> map = getMap();
+
+ if (map.isEmpty()) {
+ propertyDefinition.setOrder(0);
+
+ } else {
+ int order = propertyDefinition.getOrder();
+ int size = map.size();
+
+ if ((order <= 0) || (order >= size)) {
+ propertyDefinition.setOrder(size);
+
+ } else {
+ // insert into existing ordering by bumping up existing entries
+ for (PropertyDefinition p : map.values()) {
+ if (p.getOrder() >= order) {
+ p.setOrder(p.getOrder() + 1);
+ }
+ }
+ }
+ }
+
+ map.put(propertyDefinition.getName(), propertyDefinition);
propertyDefinition.setParentPropertyMapDefinition(this);
}
}
\ No newline at end of file
diff --git a/modules/core/gui/src/main/java/org/rhq/core/gui/configuration/ConfigRenderer.java b/modules/core/gui/src/main/java/org/rhq/core/gui/configuration/ConfigRenderer.java
index 7a94fed..319335e 100644
--- a/modules/core/gui/src/main/java/org/rhq/core/gui/configuration/ConfigRenderer.java
+++ b/modules/core/gui/src/main/java/org/rhq/core/gui/configuration/ConfigRenderer.java
@@ -476,7 +476,7 @@ public class ConfigRenderer extends Renderer {
.getPropertyDefinitionList(listName).getMemberDefinition();
String mapName = mapDefinition.getName();
PropertyMap newMap = new PropertyMap(mapName);
- for (PropertyDefinition mapMemberDefinition : mapDefinition.getPropertyDefinitions()) {
+ for (PropertyDefinition mapMemberDefinition : mapDefinition.getOrderedPropertyDefinitions()) {
PropertyDefinitionSimple simpleDefinition = (PropertyDefinitionSimple) mapMemberDefinition;
newMap.put(new PropertySimple(simpleDefinition.getName(), (simpleDefinition.isRequired()) ? "" : null));
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/AggregateConfigurationBuilder.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/AggregateConfigurationBuilder.java
index 5ef910b..15e01ef 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/AggregateConfigurationBuilder.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/AggregateConfigurationBuilder.java
@@ -20,6 +20,7 @@
package org.rhq.enterprise.gui.coregui.client.components.configuration;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -103,7 +104,7 @@ public class AggregateConfigurationBuilder {
private static void buildAggregatePropertyMap(PropertyDefinitionMap propertyDefinitionMap,
List<AbstractPropertyMap> sourceParentPropertyMaps, AbstractPropertyMap targetParentPropertyMap) {
- List<PropertyDefinition> childPropertyDefinitions = propertyDefinitionMap.getPropertyDefinitions();
+ Collection<PropertyDefinition> childPropertyDefinitions = propertyDefinitionMap.getOrderedPropertyDefinitions();
if (!childPropertyDefinitions.isEmpty()) {
for (PropertyDefinition childPropertyDefinition : childPropertyDefinitions)
buildAggregateProperty(childPropertyDefinition, sourceParentPropertyMaps, targetParentPropertyMap);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationComparisonView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationComparisonView.java
index 62eab7d..9448dd9 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationComparisonView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationComparisonView.java
@@ -176,7 +176,7 @@ public class ConfigurationComparisonView extends VLayout {
for (AbstractPropertyMap map : maps) {
properties.add((PropertyMap) map);
}
- buildNode(mapNode, defMap.getPropertyDefinitions(), properties);
+ buildNode(mapNode, defMap.getOrderedPropertyDefinitions(), properties);
if (!mapNode.getAttributeAsBoolean(ATTRIB_ALL_SAME)) {
parent.setAttribute(ATTRIB_ALL_SAME, false);
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java
index 71b5abe..ebf3507 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java
@@ -43,6 +43,7 @@ import com.smartgwt.client.util.BooleanCallback;
import com.smartgwt.client.util.SC;
import com.smartgwt.client.util.ValueCallback;
import com.smartgwt.client.widgets.Canvas;
+import com.smartgwt.client.widgets.HTMLFlow;
import com.smartgwt.client.widgets.IButton;
import com.smartgwt.client.widgets.Label;
import com.smartgwt.client.widgets.Window;
@@ -373,9 +374,9 @@ public class ConfigurationEditor extends LocatableVLayout {
this.originalConfiguration = configuration.deepCopy();
}
- String oobProp = this.configuration.getSimpleValue("__OOB",null);
- if (oobProp!=null) {
- Message msg = new Message(oobProp,Message.Severity.Warning,EnumSet.of(Message.Option.Transient));
+ String oobProp = this.configuration.getSimpleValue("__OOB", null);
+ if (oobProp != null) {
+ Message msg = new Message(oobProp, Message.Severity.Warning, EnumSet.of(Message.Option.Transient));
CoreGUI.getMessageCenter().notify(msg);
}
@@ -778,9 +779,12 @@ public class ConfigurationEditor extends LocatableVLayout {
}
LocatableVLayout layout = new LocatableVLayout(parentLocatorId + "_Layout");
+ HTMLFlow description = new HTMLFlow(propertyDefinitionMap.getDescription());
+ layout.addMember(description);
+
final PropertyDefinitionMap propertyDefinitionMapFinal = propertyDefinitionMap;
LocatableDynamicForm valuesCanvas = buildPropertiesForm(layout.getLocatorId(),
- propertyDefinitionMapFinal.getPropertyDefinitions(), propertyMap);
+ propertyDefinitionMapFinal.getOrderedPropertyDefinitions(), propertyMap);
layout.addMember(valuesCanvas);
if (isDynamic && !isReadOnly(propertyDefinitionMap, propertyMap)) {
@@ -940,7 +944,8 @@ public class ConfigurationEditor extends LocatableVLayout {
summaryTable.setRecordEnabledProperty(null);
List<ListGridField> fieldsList = new ArrayList<ListGridField>();
- final List<PropertyDefinition> propertyDefinitions = memberPropertyDefinitionMap.getPropertyDefinitions();
+ final List<PropertyDefinition> propertyDefinitions = new ArrayList<PropertyDefinition>(
+ memberPropertyDefinitionMap.getOrderedPropertyDefinitions());
List<PropertyDefinition> summaryPropertyDefinitions = new ArrayList<PropertyDefinition>();
for (PropertyDefinition subDef : propertyDefinitions) {
@@ -998,12 +1003,17 @@ public class ConfigurationEditor extends LocatableVLayout {
SC.confirm(MSG.view_configEdit_confirm_2(), new BooleanCallback() {
public void execute(Boolean confirmed) {
if (confirmed) {
- PropertyMapListGridRecord recordToBeDeleted = (PropertyMapListGridRecord) recordClickEvent
- .getRecord();
- propertyList.getList().remove(recordToBeDeleted.getIndex());
- ListGridRecord[] rows = buildSummaryRecords(propertyList, propertyDefinitions);
- summaryTable.setData(rows);
- firePropertyChangedEvent(propertyList, propertyDefinitionList, true);
+ if (summaryTable.getRecordList().getLength() <= propertyDefinitionList.getMin()) {
+ SC.say(MSG.view_configEdit_minBoundsExceeded(String.valueOf(propertyDefinitionList
+ .getMin())));
+ } else {
+ PropertyMapListGridRecord recordToBeDeleted = (PropertyMapListGridRecord) recordClickEvent
+ .getRecord();
+ propertyList.getList().remove(recordToBeDeleted.getIndex());
+ ListGridRecord[] rows = buildSummaryRecords(propertyList, propertyDefinitions);
+ summaryTable.setData(rows);
+ firePropertyChangedEvent(propertyList, propertyDefinitionList, true);
+ }
}
}
});
@@ -1638,7 +1648,8 @@ public class ConfigurationEditor extends LocatableVLayout {
final PropertyDefinitionList propertyDefinitionList, final PropertyList propertyList,
PropertyDefinitionMap memberMapDefinition, final PropertyMap memberMap, final boolean mapReadOnly) {
- final List<PropertyDefinition> memberDefinitions = memberMapDefinition.getPropertyDefinitions();
+ final List<PropertyDefinition> memberDefinitions = new ArrayList<PropertyDefinition>(
+ memberMapDefinition.getOrderedPropertyDefinitions());
final boolean newRow = (memberMap == null);
final PropertyMap workingMap = (newRow) ? new PropertyMap(memberMapDefinition.getName()) : memberMap
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java
index 6f18088..2165fa8 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java
@@ -2475,7 +2475,7 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
handlePDS(subject, pds);
} else if (memberDef instanceof PropertyDefinitionMap) {
PropertyDefinitionMap pdm = (PropertyDefinitionMap) memberDef;
- for (PropertyDefinition inner : pdm.getPropertyDefinitions()) {
+ for (PropertyDefinition inner : pdm.getOrderedPropertyDefinitions()) {
if (inner instanceof PropertyDefinitionSimple) {
handlePDS(subject, (PropertyDefinitionSimple) inner);
}
@@ -2487,7 +2487,7 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
} else if (pd instanceof PropertyDefinitionMap) {
PropertyDefinitionMap pdm = (PropertyDefinitionMap) pd;
- for (PropertyDefinition inner : pdm.getPropertyDefinitions()) {
+ for (PropertyDefinition inner : pdm.getOrderedPropertyDefinitions()) {
if (inner instanceof PropertyDefinitionSimple) {
handlePDS(subject, (PropertyDefinitionSimple) inner);
} else {
diff --git a/modules/enterprise/server/xml-schemas/src/main/java/org/rhq/enterprise/server/xmlschema/ConfigurationInstanceDescriptorUtil.java b/modules/enterprise/server/xml-schemas/src/main/java/org/rhq/enterprise/server/xmlschema/ConfigurationInstanceDescriptorUtil.java
index 85f4a45..7c6687a 100644
--- a/modules/enterprise/server/xml-schemas/src/main/java/org/rhq/enterprise/server/xmlschema/ConfigurationInstanceDescriptorUtil.java
+++ b/modules/enterprise/server/xml-schemas/src/main/java/org/rhq/enterprise/server/xmlschema/ConfigurationInstanceDescriptorUtil.java
@@ -214,7 +214,7 @@ public class ConfigurationInstanceDescriptorUtil {
setCommonProps(ret, def, true);
- for (PropertyDefinition mem : def.getPropertyDefinitions()) {
+ for (PropertyDefinition mem : def.getOrderedPropertyDefinitions()) {
ConfigurationProperty memDef = convertDefinition(mem);
addToJAXBElementList(ret.getConfigurationProperty(), ConfigurationProperty.class, memDef,
@@ -353,7 +353,7 @@ public class ConfigurationInstanceDescriptorUtil {
setCommonProps(ret, def, false);
List<JAXBElement<? extends ConfigurationProperty>> elements = ret.getConfigurationProperty();
- for (PropertyDefinition el : def.getPropertyDefinitions()) {
+ for (PropertyDefinition el : def.getOrderedPropertyDefinitions()) {
ConfigurationProperty prop = convertDefinition(el);
QName tagName = getTagName(prop);
addToJAXBElementList(elements, ConfigurationProperty.class, prop, tagName);
diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingDirectivePerMap.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingDirectivePerMap.java
index addd917..e5209c9 100644
--- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingDirectivePerMap.java
+++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingDirectivePerMap.java
@@ -70,7 +70,7 @@ public class MappingDirectivePerMap extends AugeasToConfigurationSimple {
PropertyMap map = new PropertyMap(directiveName);
int idx = 0;
- for (PropertyDefinition propDef : propDefMap.getPropertyDefinitions()) {
+ for (PropertyDefinition propDef : propDefMap.getOrderedPropertyDefinitions()) {
if (propDef instanceof PropertyDefinitionSimple) {
if (params.size() > idx) {
String value = params.get(idx);
diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingDirectivePerMapIndex.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingDirectivePerMapIndex.java
index 7198240..3882938 100644
--- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingDirectivePerMapIndex.java
+++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingDirectivePerMapIndex.java
@@ -55,7 +55,7 @@ public class MappingDirectivePerMapIndex extends MappingDirectivePerMap {
PropertyMap map = new PropertyMap(directiveName);
int idx = 0;
- for (PropertyDefinition propDef : propDefMap.getPropertyDefinitions()) {
+ for (PropertyDefinition propDef : propDefMap.getOrderedPropertyDefinitions()) {
if (propDef instanceof PropertyDefinitionSimple) {
if (ApacheServerComponent.AUXILIARY_INDEX_PROP.equals(propDef.getName())) {
map.put(new PropertySimple(ApacheServerComponent.AUXILIARY_INDEX_PROP, node.getSeq()));
diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingParamPerMap.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingParamPerMap.java
index 5237817..4f4676a 100644
--- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingParamPerMap.java
+++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingParamPerMap.java
@@ -85,7 +85,7 @@ public class MappingParamPerMap extends AugeasToConfigurationSimple {
int idx = i;
PropertyMap map = new PropertyMap(mapDef.getName());
propList.add(map);
- for (PropertyDefinition def : mapDef.getPropertyDefinitions()) {
+ for (PropertyDefinition def : mapDef.getOrderedPropertyDefinitions()) {
if (ApacheServerComponent.AUXILIARY_INDEX_PROP.equals(def.getName())) {
map.put(new PropertySimple(ApacheServerComponent.AUXILIARY_INDEX_PROP, directiveNode.getSeq()));
} else {
diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingToAugeasDirectivePerMap.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingToAugeasDirectivePerMap.java
index 0daf099..8ca1597 100644
--- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingToAugeasDirectivePerMap.java
+++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingToAugeasDirectivePerMap.java
@@ -91,7 +91,7 @@ public class MappingToAugeasDirectivePerMap extends ConfigurationToAugeasApacheB
StringBuffer param = new StringBuffer();
- for (PropertyDefinition propVal : propDefMap.getPropertyDefinitions()) {
+ for (PropertyDefinition propVal : propDefMap.getOrderedPropertyDefinitions()) {
PropertySimple property = propMap.getSimple(propVal.getName());
if (property != null) {
diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingToAugeasDirectivePerMapIndex.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingToAugeasDirectivePerMapIndex.java
index 492e7a9..7193813 100644
--- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingToAugeasDirectivePerMapIndex.java
+++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingToAugeasDirectivePerMapIndex.java
@@ -95,7 +95,7 @@ public class MappingToAugeasDirectivePerMapIndex extends ConfigurationToAugeasAp
String propertyName = prop.getName();
StringBuffer param = new StringBuffer();
- for (PropertyDefinition propVal : propDefMap.getPropertyDefinitions()) {
+ for (PropertyDefinition propVal : propDefMap.getOrderedPropertyDefinitions()) {
PropertySimple property = propMap.getSimple(propVal.getName());
if (property != null) {
diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingToAugeasParamPerMap.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingToAugeasParamPerMap.java
index a12374f..ae2054d 100644
--- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingToAugeasParamPerMap.java
+++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingToAugeasParamPerMap.java
@@ -87,7 +87,7 @@ public class MappingToAugeasParamPerMap extends ConfigurationToAugeasApacheBase
StringBuffer param = new StringBuffer();
for (List<PropertyMap> directive : map) {
for (PropertyMap propMap : directive) {
- for (PropertyDefinition propDefMap : memberPropDef.getPropertyDefinitions()) {//for (Property propVal : propMap.getMap().values()){
+ for (PropertyDefinition propDefMap : memberPropDef.getOrderedPropertyDefinitions()) {//for (Property propVal : propMap.getMap().values()){
Property propVal = propMap.get(propDefMap.getName());
if (propVal != null)
if (!propVal.getName().equals("_index")) {
diff --git a/modules/plugins/augeas/src/main/java/org/rhq/plugins/augeas/AugeasConfigurationComponent.java b/modules/plugins/augeas/src/main/java/org/rhq/plugins/augeas/AugeasConfigurationComponent.java
index 5e6f431..5976ad8 100644
--- a/modules/plugins/augeas/src/main/java/org/rhq/plugins/augeas/AugeasConfigurationComponent.java
+++ b/modules/plugins/augeas/src/main/java/org/rhq/plugins/augeas/AugeasConfigurationComponent.java
@@ -486,7 +486,7 @@ public class AugeasConfigurationComponent<T extends ResourceComponent<?>> implem
protected void populatePropertyMap(PropertyDefinitionMap propDefMap, PropertyMap propMap, Augeas augeas,
AugeasNode mapNode) {
- for (PropertyDefinition mapEntryPropDef : propDefMap.getPropertyDefinitions()) {
+ for (PropertyDefinition mapEntryPropDef : propDefMap.getOrderedPropertyDefinitions()) {
loadProperty(mapEntryPropDef, propMap, augeas, mapNode);
}
}
@@ -559,7 +559,7 @@ public class AugeasConfigurationComponent<T extends ResourceComponent<?>> implem
protected void setNodeFromPropertyMap(PropertyDefinitionMap propDefMap, PropertyMap propMap, Augeas augeas,
AugeasNode mapNode) {
- for (PropertyDefinition mapEntryPropDef : propDefMap.getPropertyDefinitions()) {
+ for (PropertyDefinition mapEntryPropDef : propDefMap.getOrderedPropertyDefinitions()) {
setNode(mapEntryPropDef, propMap, augeas, mapNode);
}
}
diff --git a/modules/plugins/augeas/src/main/java/org/rhq/rhqtransform/impl/AugeasToConfigurationSimple.java b/modules/plugins/augeas/src/main/java/org/rhq/rhqtransform/impl/AugeasToConfigurationSimple.java
index 0a2f8d1..584f6dc 100644
--- a/modules/plugins/augeas/src/main/java/org/rhq/rhqtransform/impl/AugeasToConfigurationSimple.java
+++ b/modules/plugins/augeas/src/main/java/org/rhq/rhqtransform/impl/AugeasToConfigurationSimple.java
@@ -106,7 +106,7 @@ public class AugeasToConfigurationSimple implements AugeasToConfiguration {
public PropertyMap createPropertyMap(PropertyDefinitionMap propDefMap, AugeasNode node) throws AugeasRhqException {
PropertyMap propMap = new PropertyMap(propDefMap.getName());
- for (PropertyDefinition mapEntryPropDef : propDefMap.getPropertyDefinitions()) {
+ for (PropertyDefinition mapEntryPropDef : propDefMap.getOrderedPropertyDefinitions()) {
propMap.put(loadProperty(mapEntryPropDef, node));
}
return propMap;
diff --git a/modules/plugins/augeas/src/main/java/org/rhq/rhqtransform/impl/ConfigurationToAugeasSimple.java b/modules/plugins/augeas/src/main/java/org/rhq/rhqtransform/impl/ConfigurationToAugeasSimple.java
index 91a8eb1..fb571d3 100644
--- a/modules/plugins/augeas/src/main/java/org/rhq/rhqtransform/impl/ConfigurationToAugeasSimple.java
+++ b/modules/plugins/augeas/src/main/java/org/rhq/rhqtransform/impl/ConfigurationToAugeasSimple.java
@@ -106,7 +106,7 @@ public class ConfigurationToAugeasSimple implements ConfigurationToAugeas {
i = seq - 1;
}
- for (PropertyDefinition mapEntryPropDef : propDefMap.getPropertyDefinitions()) {
+ for (PropertyDefinition mapEntryPropDef : propDefMap.getOrderedPropertyDefinitions()) {
updateProperty(mapEntryPropDef, map, nodes.get(i), 0);
}
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/adapter/impl/configuration/PropertyMapToCompositeValueSupportAdapter.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/adapter/impl/configuration/PropertyMapToCompositeValueSupportAdapter.java
index c040b9b..d9edd45 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/adapter/impl/configuration/PropertyMapToCompositeValueSupportAdapter.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/adapter/impl/configuration/PropertyMapToCompositeValueSupportAdapter.java
@@ -65,7 +65,7 @@ public class PropertyMapToCompositeValueSupportAdapter extends AbstractPropertyM
: "none";
compositeMetaType = new MutableCompositeMetaType(name, desc);
if (propDefMap != null) {
- for (PropertyDefinition mapMemberPropDef : propDefMap.getPropertyDefinitions()) {
+ for (PropertyDefinition mapMemberPropDef : propDefMap.getOrderedPropertyDefinitions()) {
String mapMemberDesc = (propDefMap.getDescription() != null) ? propDefMap.getDescription() : "none";
MetaType mapMemberMetaType = ConversionUtils.convertPropertyDefinitionToMetaType(mapMemberPropDef);
compositeMetaType.addItem(mapMemberPropDef.getName(), mapMemberDesc, mapMemberMetaType);
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/adapter/impl/configuration/custom/JMSSecurityConfigAdapter.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/adapter/impl/configuration/custom/JMSSecurityConfigAdapter.java
index b08a37b..e7f5233 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/adapter/impl/configuration/custom/JMSSecurityConfigAdapter.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/adapter/impl/configuration/custom/JMSSecurityConfigAdapter.java
@@ -116,7 +116,7 @@ public class JMSSecurityConfigAdapter extends AbstractPropertyListAdapter {
: "none";
MutableCompositeMetaType compositeMetaType = new MutableCompositeMetaType(name, desc);
if (propDefMap != null) {
- for (PropertyDefinition mapMemberPropDef : propDefMap.getPropertyDefinitions()) {
+ for (PropertyDefinition mapMemberPropDef : propDefMap.getOrderedPropertyDefinitions()) {
if (mapMemberPropDef.getName().equals("name"))
continue;
String mapMemberDesc = (propDefMap.getDescription() != null) ? propDefMap.getDescription() : "none";
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/util/ConversionUtils.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/util/ConversionUtils.java
index c3758a6..839b9a9 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/util/ConversionUtils.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/util/ConversionUtils.java
@@ -22,9 +22,9 @@
*/
package org.rhq.plugins.jbossas5.util;
+import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -235,11 +235,12 @@ public class ConversionUtils {
// TODO (very low priority, since lists of lists are not going to be at all common)
memberMetaType = null;
} else if (propDef instanceof PropertyDefinitionMap) {
- List<PropertyDefinition> memberPropDefs = ((PropertyDefinitionMap) propDef).getPropertyDefinitions();
+ Collection<PropertyDefinition> memberPropDefs = ((PropertyDefinitionMap) propDef)
+ .getOrderedPropertyDefinitions();
if (memberPropDefs.isEmpty())
throw new IllegalStateException("PropertyDefinitionMap doesn't contain any member PropertyDefinitions.");
// NOTE: We assume member prop defs are all of the same type, since for MapCompositeMetaTypes, they have to be.
- PropertyDefinition mapMemberPropDef = memberPropDefs.get(0);
+ PropertyDefinition mapMemberPropDef = memberPropDefs.iterator().next();
MetaType mapMemberMetaType = convertPropertyDefinitionToMetaType(mapMemberPropDef);
memberMetaType = new MapCompositeMetaType(mapMemberMetaType);
} else {
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadDelegate.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadDelegate.java
index 2fdff39..f71bcfc 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadDelegate.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadDelegate.java
@@ -334,7 +334,7 @@ public class ConfigurationLoadDelegate implements ConfigurationFacet {
propertyMap.put(additionalNameProperty);
}
- List<PropertyDefinition> propDefs = propDefMap.getPropertyDefinitions();
+ Collection<PropertyDefinition> propDefs = propDefMap.getOrderedPropertyDefinitions();
if (propDefName.endsWith(":collapsed")) {
// The result is a map of {" a" : " b" }, while the propdef is in the form
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationWriteDelegate.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationWriteDelegate.java
index aad2105..42d59a8 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationWriteDelegate.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationWriteDelegate.java
@@ -216,7 +216,7 @@ public class ConfigurationWriteDelegate implements ConfigurationFacet {
}
}
- definitions = definitionMap.getPropertyDefinitions();
+ definitions = new ArrayList<PropertyDefinition>(definitionMap.getOrderedPropertyDefinitions());
PropertyMap map = conf.getMap(mapName);
for (PropertyDefinition def : definitions) {
createWriteAttribute(cop, address1, def, map.get(def.getName()));
11 years, 5 months
- 1
- 0
[rhq] Branch 'feature/cassandra-backend' - modules/enterprise
by John Sanda
modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml | 6 ++++++
1 file changed, 6 insertions(+)
New commits:
commit 0d7e8ff6150f7787f9657367a16e6e2548086791
Author: John Sanda <jsanda(a)redhat.com>
Date: Mon Dec 3 16:42:12 2012 -0500
adding cassandra username/properties to rhq-server.properties
diff --git a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
index 42eb164..6b09faa 100644
--- a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
+++ b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
@@ -567,6 +567,12 @@ rhq.autoinstall.public-endpoint-address=
#############################################
# Cassandra cluster configuration settings
#############################################
+# The username RHQ will use to authenticate against Cassandra.
+rhq.cassandra.username=${rhq.cassandra.username}
+
+# The password RHQ will use to authenticate against Cassandra.
+rhq.cassandra.password=${rhq.cassandra.password}
+
# A comma-delimited list of hostnames on which Cassandra will run. Cassandra
# nodes use this list to discover other nodes and learn about the cluster
# topology.
11 years, 5 months
- 1
- 0
[rhq] Branch 'feature/cassandra-backend' - modules/common modules/enterprise
by John Sanda
modules/common/cassandra-common-itests/src/main/java/org/rhq/cassandra/CassandraClusterManager.java | 2
modules/common/cassandra-common-itests/src/main/java/org/rhq/cassandra/DeployCluster.java | 10 ++++
modules/common/cassandra-common/src/main/java/org/rhq/cassandra/BootstrapDeployer.java | 5 +-
modules/common/cassandra-common/src/main/java/org/rhq/cassandra/DeploymentOptions.java | 24 ++++++++++
modules/common/cassandra-common/src/main/resources/cassandra.properties | 6 ++
modules/common/cassandra-common/src/main/resources/deploy.xml | 13 +++++
modules/common/cassandra-common/src/main/resources/passwd.properties | 2
modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsDAOTest.java | 3 -
8 files changed, 60 insertions(+), 5 deletions(-)
New commits:
commit b35943f028a8cc84db2d4d8f106588234734721a
Author: John Sanda <jsanda(a)redhat.com>
Date: Mon Dec 3 16:33:24 2012 -0500
parameterize cassandra username/password
diff --git a/modules/common/cassandra-common-itests/src/main/java/org/rhq/cassandra/CassandraClusterManager.java b/modules/common/cassandra-common-itests/src/main/java/org/rhq/cassandra/CassandraClusterManager.java
index 9f35d9c..02b7eba 100644
--- a/modules/common/cassandra-common-itests/src/main/java/org/rhq/cassandra/CassandraClusterManager.java
+++ b/modules/common/cassandra-common-itests/src/main/java/org/rhq/cassandra/CassandraClusterManager.java
@@ -86,6 +86,8 @@ public class CassandraClusterManager implements IInvokedMethodListener {
DeploymentOptions deploymentOptions = new DeploymentOptions();
deploymentOptions.setClusterDir(clusterDir.getAbsolutePath());
deploymentOptions.setNumNodes(numNodes);
+ deploymentOptions.setUsername(annotation.username());
+ deploymentOptions.setPassword(annotation.password());
try {
deploymentOptions.load();
} catch (IOException e) {
diff --git a/modules/common/cassandra-common-itests/src/main/java/org/rhq/cassandra/DeployCluster.java b/modules/common/cassandra-common-itests/src/main/java/org/rhq/cassandra/DeployCluster.java
index 3b4bee4..78f3608 100644
--- a/modules/common/cassandra-common-itests/src/main/java/org/rhq/cassandra/DeployCluster.java
+++ b/modules/common/cassandra-common-itests/src/main/java/org/rhq/cassandra/DeployCluster.java
@@ -57,4 +57,14 @@ public @interface DeployCluster {
*/
boolean waitForSchemaAgreement() default true;
+ /**
+ * @return The username with which to authenticate against Cassandra
+ */
+ String username() default "rhqadmin";
+
+ /**
+ * @return The password with which to authenticate against Cassandra
+ */
+ String password() default "rhqadmin";
+
}
diff --git a/modules/common/cassandra-common/src/main/java/org/rhq/cassandra/BootstrapDeployer.java b/modules/common/cassandra-common/src/main/java/org/rhq/cassandra/BootstrapDeployer.java
index ee3b633..b5b5f32 100644
--- a/modules/common/cassandra-common/src/main/java/org/rhq/cassandra/BootstrapDeployer.java
+++ b/modules/common/cassandra-common/src/main/java/org/rhq/cassandra/BootstrapDeployer.java
@@ -88,6 +88,7 @@ public class BootstrapDeployer {
File bundleDir = null;
try {
+ deploymentOptions.load();
bundleZipeFile = unpackBundleZipFile();
bundleDir = unpackBundle(bundleZipeFile);
@@ -100,7 +101,7 @@ public class BootstrapDeployer {
Properties props = new Properties();
props.put("cluster.name", "rhq");
props.put("cluster.dir", clusterDir.getAbsolutePath());
- props.put("auto.bootstrap", "false");
+ props.put("auto.bootstrap", deploymentOptions.isAutoDeploy());
props.put("data.dir", "data");
props.put("commitlog.dir", "commit_log");
props.put("log.dir", "logs");
@@ -115,6 +116,8 @@ public class BootstrapDeployer {
props.put("listen.address", address);
props.put("rpc.address", address);
props.put("logging.level", deploymentOptions.getLoggingLevel());
+ props.put("rhq.cassandra.username", deploymentOptions.getUsername());
+ props.put("rhq.cassandra.password", deploymentOptions.getPassword());
if (deploymentOptions.getRingDelay() != null) {
props.put("cassandra.ring.delay.property", "-Dcassandra.ring_delay_ms=");
diff --git a/modules/common/cassandra-common/src/main/java/org/rhq/cassandra/DeploymentOptions.java b/modules/common/cassandra-common/src/main/java/org/rhq/cassandra/DeploymentOptions.java
index d15983e..ef1e29a 100644
--- a/modules/common/cassandra-common/src/main/java/org/rhq/cassandra/DeploymentOptions.java
+++ b/modules/common/cassandra-common/src/main/java/org/rhq/cassandra/DeploymentOptions.java
@@ -51,6 +51,8 @@ public class DeploymentOptions {
private Integer numTokens;
private Integer nativeTransportPort;
private Integer nativeTransportMaxThreads;
+ private String username;
+ private String password;
public DeploymentOptions() {
}
@@ -98,6 +100,8 @@ public class DeploymentOptions {
setNativeTransportPort(Integer.valueOf(loadProperty("rhq.cassandra.native-transport-port", properties)));
setNativeTransportMaxThreads(Integer.valueOf(loadProperty("rhq.casandra.native-transport-max-threads",
properties)));
+ setUsername(loadProperty("rhq.cassandra.username", properties));
+ setPassword(loadProperty("rhq.cassandra.password", properties));
}
private String loadProperty(String key, Properties properties) {
@@ -228,4 +232,24 @@ public class DeploymentOptions {
}
}
+ public String getUsername() {
+ return username;
+ }
+
+ public void setUsername(String username) {
+ if (this.username == null) {
+ this.username = username;
+ }
+ }
+
+ public String getPassword() {
+ return password;
+ }
+
+ public void setPassword(String password) {
+ if (this.password == null) {
+ this.password = password;
+ }
+ }
+
}
diff --git a/modules/common/cassandra-common/src/main/resources/cassandra.properties b/modules/common/cassandra-common/src/main/resources/cassandra.properties
index a9201df..9b9f0b9 100644
--- a/modules/common/cassandra-common/src/main/resources/cassandra.properties
+++ b/modules/common/cassandra-common/src/main/resources/cassandra.properties
@@ -6,6 +6,12 @@ rhq.cassandra.bundle.filename=/cassandra-bundle.zip
rhq.cassandra.bundle.name=RHQ Cassandra Bundle
rhq.cassandra.bundle.version=1.0
+# The username with which to authenticate requests to Cassandra.
+rhq.cassandra.username=rhqadmin
+
+# The password with which to authenticate requests to Cassandra.
+rhq.cassandra.password=rhqadmin
+
# When a node initializes it contacts a seed and then sleeps for RING_DELAY (milliseconds)
# to learn about other nodes in the cluster. This defaults to 30 seconds. Cassandra gets
# the value from the cassandra.ring_delay_ms system property
diff --git a/modules/common/cassandra-common/src/main/resources/deploy.xml b/modules/common/cassandra-common/src/main/resources/deploy.xml
index 17d427a..7625fbe 100644
--- a/modules/common/cassandra-common/src/main/resources/deploy.xml
+++ b/modules/common/cassandra-common/src/main/resources/deploy.xml
@@ -144,6 +144,16 @@
defaultValue="../conf/access.properties"
type="file"/>
+ <rhq:input-property name="rhq.cassandra.username"
+ description="The username with which to authenticate requests to Cassandra."
+ required="true"
+ type="string"/>
+
+ <rhq:input-property name="rhq.cassandra.password"
+ description="The password with which to authenticate requests to Cassandra."
+ required="true"
+ type="string"/>
+
<rhq:deployment-unit name="cassandra" preinstallTarget="pre-install" postinstallTarget="post-install">
<!--
<rhq:file name="dbsetup.script" destinationFile="scripts/dbsetup.script" replace="true"/>
@@ -159,6 +169,9 @@
<rhq:fileset dir="conf">
<include name="log4j-server.properties"/>
</rhq:fileset>
+ <rhq:fileset dir="conf">
+ <include name="passwd.properties"/>
+ </rhq:fileset>
<!--
<rhq:fileset dir="scripts">
<include name="dbsetup.script"/>
diff --git a/modules/common/cassandra-common/src/main/resources/passwd.properties b/modules/common/cassandra-common/src/main/resources/passwd.properties
index 708a1d0..f8b374c 100644
--- a/modules/common/cassandra-common/src/main/resources/passwd.properties
+++ b/modules/common/cassandra-common/src/main/resources/passwd.properties
@@ -20,4 +20,4 @@
# in mind when setting file mode and ownership).
#jsmith=havebadpass
-rhqadmin=rhqadmin
+@@rhq.cassandra.username@@=@@rhq.cassandra.password(a)@
diff --git a/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsDAOTest.java b/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsDAOTest.java
index 4899bd6..d5ed264 100644
--- a/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsDAOTest.java
+++ b/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsDAOTest.java
@@ -62,9 +62,6 @@ public class MetricsDAOTest extends CassandraIntegrationTest {
@BeforeClass
public void initDAO() throws Exception {
-// Cluster cluster = Cluster.builder().addContactPoints("127.0.0.1", "127.0.0.2").build();
-// session = cluster.connect("rhq");
-//
dao = new MetricsDAO(session);
}
11 years, 5 months
- 1
- 0
[rhq] Branch 'rhq-on-as7' - 2 commits - etc/eclipse-tools modules/enterprise
by mazz
etc/eclipse-tools/RHQ | 21 +++
modules/enterprise/server/itests-2/pom.xml | 55 +++-------
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/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
90 files changed, 220 insertions(+), 192 deletions(-)
New commits:
commit 9eb1aa6aaf572db579cc5f67efdb84c80b2f22aa
Merge: 63715b4 1e9d28d
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Mon Dec 3 16:10:07 2012 -0500
Merge remote-tracking branch 'origin/master' into rhq-on-as7
Conflicts:
modules/enterprise/server/itests-2/pom.xml
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"
11 years, 5 months
- 1
- 0
[rhq] Branch 'feature/cassandra-backend' - modules/common modules/enterprise pom.xml
by John Sanda
modules/common/cassandra-auth/src/main/java/org/rhq/cassandra/auth/SimpleAuthenticator.java | 147 ++++++++++
modules/common/cassandra-auth/src/main/java/org/rhq/cassandra/auth/SimpleAuthority.java | 145 +++++++++
modules/common/cassandra-common/pom.xml | 4
modules/common/cassandra-common/src/main/java/org/rhq/cassandra/BootstrapDeployer.java | 3
modules/common/cassandra-common/src/main/resources/access.properties | 46 +++
modules/common/cassandra-common/src/main/resources/cassandra-1.2.0-beta2/conf/cassandra-env.sh | 2
modules/common/cassandra-common/src/main/resources/cassandra-1.2.0-beta2/conf/cassandra.yaml | 4
modules/common/cassandra-common/src/main/resources/cassandra.properties | 16 +
modules/common/cassandra-common/src/main/resources/deploy.xml | 23 +
modules/common/cassandra-common/src/main/resources/passwd.properties | 23 +
modules/common/pom.xml | 1
modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/CassandraIntegrationTest.java | 12
modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsDAOTest.java | 11
pom.xml | 2
14 files changed, 425 insertions(+), 14 deletions(-)
New commits:
commit 57c1b62d95aab2013637b2b871f52d091c2a7f7b
Author: John Sanda <jsanda(a)redhat.com>
Date: Mon Dec 3 15:58:19 2012 -0500
adding initial support for authentication and authorization
diff --git a/modules/common/cassandra-auth/src/main/java/org/rhq/cassandra/auth/SimpleAuthenticator.java b/modules/common/cassandra-auth/src/main/java/org/rhq/cassandra/auth/SimpleAuthenticator.java
new file mode 100644
index 0000000..f3a7031
--- /dev/null
+++ b/modules/common/cassandra-auth/src/main/java/org/rhq/cassandra/auth/SimpleAuthenticator.java
@@ -0,0 +1,147 @@
+/*
+ *
+ * * RHQ Management Platform
+ * * Copyright (C) 2005-2012 Red Hat, Inc.
+ * * All rights reserved.
+ * *
+ * * This program is free software; you can redistribute it and/or modify
+ * * it under the terms of the GNU General Public License, version 2, as
+ * * published by the Free Software Foundation, and/or the GNU Lesser
+ * * General Public License, version 2.1, also as published by the Free
+ * * Software Foundation.
+ * *
+ * * This program is distributed in the hope that it will be useful,
+ * * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * * GNU General Public License and the GNU Lesser General Public License
+ * * for more details.
+ * *
+ * * You should have received a copy of the GNU General Public License
+ * * and the GNU Lesser General Public License along with this program;
+ * * if not, write to the Free Software Foundation, Inc.,
+ * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+package org.rhq.cassandra.auth;
+
+import java.io.BufferedInputStream;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.security.MessageDigest;
+import java.util.Map;
+import java.util.Properties;
+
+import org.apache.cassandra.auth.AuthenticatedUser;
+import org.apache.cassandra.auth.IAuthenticator;
+import org.apache.cassandra.exceptions.ConfigurationException;
+import org.apache.cassandra.io.util.FileUtils;
+import org.apache.cassandra.thrift.AuthenticationException;
+import org.apache.cassandra.utils.FBUtilities;
+import org.apache.cassandra.utils.Hex;
+
+/**
+ * @author John Sanda
+ */
+public class SimpleAuthenticator implements IAuthenticator {
+ public final static String PASSWD_FILENAME_PROPERTY = "passwd.properties";
+ public final static String PMODE_PROPERTY = "passwd.mode";
+ public static final String USERNAME_KEY = "username";
+ public static final String PASSWORD_KEY = "password";
+
+ public enum PasswordMode { PLAIN, MD5 }
+
+ public AuthenticatedUser defaultUser() {
+ // users must log in
+ return null;
+ }
+
+ public AuthenticatedUser authenticate(Map<? extends CharSequence, ? extends CharSequence> credentials) throws
+ AuthenticationException {
+ String pmode_plain = System.getProperty(PMODE_PROPERTY);
+ PasswordMode mode = PasswordMode.PLAIN;
+
+ if (pmode_plain != null) {
+ try {
+ mode = PasswordMode.valueOf(pmode_plain);
+ } catch (Exception e) {
+ // this is not worth a StringBuffer
+ String mode_values = "";
+ for (PasswordMode pm : PasswordMode.values())
+ mode_values += "'" + pm + "', ";
+
+ mode_values += "or leave it unspecified.";
+ throw new AuthenticationException("The requested password check mode '" + pmode_plain +
+ "' is not a valid mode. Possible values are " + mode_values);
+ }
+ }
+
+ String pfilename = System.getProperty(PASSWD_FILENAME_PROPERTY);
+
+ String username = null;
+ CharSequence user = credentials.get(USERNAME_KEY);
+ if (user == null)
+ throw new AuthenticationException(
+ "Authentication request was missing the required key '" + USERNAME_KEY + "'");
+ else
+ username = user.toString();
+
+ String password = null;
+ CharSequence pass = credentials.get(PASSWORD_KEY);
+ if (pass == null)
+ throw new AuthenticationException(
+ "Authentication request was missing the required key '" + PASSWORD_KEY + "'");
+ else
+ password = pass.toString();
+
+ boolean authenticated = false;
+
+ InputStream in = null;
+ try {
+ in = new BufferedInputStream(new FileInputStream(pfilename));
+ Properties props = new Properties();
+ props.load(in);
+
+ // note we keep the message here and for the wrong password exactly the same to prevent attackers from guessing what users are valid
+ if (props.getProperty(username) == null)
+ throw new AuthenticationException(authenticationErrorMessage(mode, username));
+ switch (mode) {
+ case PLAIN:
+ authenticated = password.equals(props.getProperty(username));
+ break;
+ case MD5:
+ authenticated = MessageDigest
+ .isEqual(FBUtilities.threadLocalMD5Digest().digest(password.getBytes()),
+ Hex.hexToBytes(props.getProperty(username)));
+ break;
+ default:
+ throw new RuntimeException("Unknown PasswordMode " + mode);
+ }
+ } catch (IOException e) {
+ throw new RuntimeException(
+ "Authentication table file given by property " + PASSWD_FILENAME_PROPERTY + " could not be opened: " +
+ e.getMessage());
+ } catch (Exception e) {
+ throw new RuntimeException("Unexpected authentication problem", e);
+ } finally {
+ FileUtils.closeQuietly(in);
+ }
+
+ if (!authenticated) throw new AuthenticationException(authenticationErrorMessage(mode, username));
+
+ return new AuthenticatedUser(username);
+ }
+
+ public void validateConfiguration() throws ConfigurationException {
+ String pfilename = System.getProperty(SimpleAuthenticator.PASSWD_FILENAME_PROPERTY);
+ if (pfilename == null) {
+ throw new ConfigurationException("When using " + this.getClass().getCanonicalName() + " " +
+ SimpleAuthenticator.PASSWD_FILENAME_PROPERTY + " properties must be defined.");
+ }
+ }
+
+ static String authenticationErrorMessage(PasswordMode mode, String username) {
+ return String.format("Given password in password mode %s could not be validated for user %s", mode, username);
+ }
+}
diff --git a/modules/common/cassandra-auth/src/main/java/org/rhq/cassandra/auth/SimpleAuthority.java b/modules/common/cassandra-auth/src/main/java/org/rhq/cassandra/auth/SimpleAuthority.java
new file mode 100644
index 0000000..6ab67e8
--- /dev/null
+++ b/modules/common/cassandra-auth/src/main/java/org/rhq/cassandra/auth/SimpleAuthority.java
@@ -0,0 +1,145 @@
+/*
+ *
+ * * RHQ Management Platform
+ * * Copyright (C) 2005-2012 Red Hat, Inc.
+ * * All rights reserved.
+ * *
+ * * This program is free software; you can redistribute it and/or modify
+ * * it under the terms of the GNU General Public License, version 2, as
+ * * published by the Free Software Foundation, and/or the GNU Lesser
+ * * General Public License, version 2.1, also as published by the Free
+ * * Software Foundation.
+ * *
+ * * This program is distributed in the hope that it will be useful,
+ * * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * * GNU General Public License and the GNU Lesser General Public License
+ * * for more details.
+ * *
+ * * You should have received a copy of the GNU General Public License
+ * * and the GNU Lesser General Public License along with this program;
+ * * if not, write to the Free Software Foundation, Inc.,
+ * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+package org.rhq.cassandra.auth;
+
+import java.io.BufferedInputStream;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Properties;
+
+import org.apache.cassandra.auth.AuthenticatedUser;
+import org.apache.cassandra.auth.IAuthority;
+import org.apache.cassandra.auth.Permission;
+import org.apache.cassandra.auth.Resources;
+import org.apache.cassandra.exceptions.ConfigurationException;
+import org.apache.cassandra.io.util.FileUtils;
+
+/**
+ * @author John Sanda
+ */
+public class SimpleAuthority implements IAuthority {
+ public final static String ACCESS_FILENAME_PROPERTY = "access.properties";
+ // magical property for WRITE permissions to the keyspaces list
+ public final static String KEYSPACES_WRITE_PROPERTY = "<modify-keyspaces>";
+
+ public EnumSet<Permission> authorize(AuthenticatedUser user, List<Object> resource) {
+ if (resource.size() < 2 || !Resources.ROOT.equals(resource.get(0)) ||
+ !Resources.KEYSPACES.equals(resource.get(1)))
+ return Permission.NONE;
+
+ String keyspace, columnFamily = null;
+ EnumSet<Permission> authorized = Permission.NONE;
+
+ // /cassandra/keyspaces
+ if (resource.size() == 2) {
+ keyspace = KEYSPACES_WRITE_PROPERTY;
+ authorized = EnumSet.of(Permission.READ);
+ }
+ // /cassandra/keyspaces/<keyspace name>
+ else if (resource.size() == 3) {
+ keyspace = (String) resource.get(2);
+ }
+ // /cassandra/keyspaces/<keyspace name>/<cf name>
+ else if (resource.size() == 4) {
+ keyspace = (String) resource.get(2);
+ columnFamily = (String) resource.get(3);
+ } else {
+ // We don't currently descend any lower in the hierarchy.
+ throw new UnsupportedOperationException();
+ }
+
+ String accessFilename = System.getProperty(ACCESS_FILENAME_PROPERTY);
+ InputStream in = null;
+ try {
+ in = new BufferedInputStream(new FileInputStream(accessFilename));
+ Properties accessProperties = new Properties();
+ accessProperties.load(in);
+
+ // Special case access to the keyspace list
+ if (keyspace == KEYSPACES_WRITE_PROPERTY) {
+ String kspAdmins = accessProperties.getProperty(KEYSPACES_WRITE_PROPERTY);
+ for (String admin : kspAdmins.split(","))
+ if (admin.equals(user.username))
+ return Permission.ALL;
+ }
+
+ boolean canRead = false, canWrite = false;
+ String readers = null, writers = null;
+
+ if (columnFamily == null) {
+ readers = accessProperties.getProperty(keyspace + ".<ro>");
+ writers = accessProperties.getProperty(keyspace + ".<rw>");
+ } else {
+ readers = accessProperties.getProperty(keyspace + "." + columnFamily + ".<ro>");
+ writers = accessProperties.getProperty(keyspace + "." + columnFamily + ".<rw>");
+ }
+
+ if (readers != null) {
+ for (String reader : readers.split(",")) {
+ if (reader.equals(user.username)) {
+ canRead = true;
+ break;
+ }
+ }
+ }
+
+ if (writers != null) {
+ for (String writer : writers.split(",")) {
+ if (writer.equals(user.username)) {
+ canWrite = true;
+ break;
+ }
+ }
+ }
+
+ if (canWrite)
+ authorized = Permission.ALL;
+ else if (canRead)
+ authorized = EnumSet.of(Permission.READ);
+
+ } catch (IOException e) {
+ throw new RuntimeException(String.format("Authorization table file '%s' could not be opened: %s",
+ accessFilename,
+ e.getMessage()));
+ } finally {
+ FileUtils.closeQuietly(in);
+ }
+
+ return authorized;
+ }
+
+ public void validateConfiguration() throws ConfigurationException {
+ String afilename = System.getProperty(ACCESS_FILENAME_PROPERTY);
+ if (afilename == null) {
+ throw new ConfigurationException(String.format("When using %s, '%s' property must be defined.",
+ this.getClass().getCanonicalName(),
+ ACCESS_FILENAME_PROPERTY));
+ }
+ }
+}
diff --git a/modules/common/cassandra-common/pom.xml b/modules/common/cassandra-common/pom.xml
index 2ef4b9d..438b155 100644
--- a/modules/common/cassandra-common/pom.xml
+++ b/modules/common/cassandra-common/pom.xml
@@ -121,6 +121,10 @@
<property name="cassandra.distro.filename" value="cassandra.zip"/>
<property name="cassandra.distro.zip"
value="${project.build.outputDirectory}/${cassandra.distro.filename}"/>
+ <copy file="${settings.localRepository}/org/rhq/rhq-cassandra-auth/${project.version}/rhq-cassandra-auth-${project.version}.jar"
+ todir="${cassandra.dir}/lib"/>
+ <move file="${project.build.outputDirectory}/passwd.properties" todir="${cassandra.dir}/conf"/>
+ <move file="${project.build.outputDirectory}/access.properties" todir="${cassandra.dir}/conf"/>
<zip basedir="${cassandra.dir}" destfile="${cassandra.distro.zip}"/>
<delete dir="${cassandra.dir}"/>
<zip basedir="${project.build.outputDirectory}"
diff --git a/modules/common/cassandra-common/src/main/java/org/rhq/cassandra/BootstrapDeployer.java b/modules/common/cassandra-common/src/main/java/org/rhq/cassandra/BootstrapDeployer.java
index c4ea13c..ee3b633 100644
--- a/modules/common/cassandra-common/src/main/java/org/rhq/cassandra/BootstrapDeployer.java
+++ b/modules/common/cassandra-common/src/main/java/org/rhq/cassandra/BootstrapDeployer.java
@@ -220,7 +220,8 @@ public class BootstrapDeployer {
ProcessExecution cliExe = ProcessExecutionUtility.createProcessExecution(script);
cliExe.setWaitForCompletion(30000L);
cliExe.setCaptureOutput(true);
- cliExe.setArguments(asList("-3", "--debug", "-f", dbsetupFile.getAbsolutePath()));
+ cliExe.setArguments(asList("-3", "--debug", "-u", "rhqadmin", "-p", "rhqadmin", "-f",
+ dbsetupFile.getAbsolutePath()));
ProcessExecutionResults results = systemInfo.executeProcess(cliExe);
String output = results.getCapturedOutput();
diff --git a/modules/common/cassandra-common/src/main/resources/access.properties b/modules/common/cassandra-common/src/main/resources/access.properties
new file mode 100644
index 0000000..9119e14
--- /dev/null
+++ b/modules/common/cassandra-common/src/main/resources/access.properties
@@ -0,0 +1,46 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# This is a sample access file for SimpleAuthority. The format of this file
+# is KEYSPACE[.COLUMNFAMILY].PERMISSION=USERS, where:
+#
+# * KEYSPACE is the keyspace name.
+# * COLUMNFAMILY is the column family name.
+# * PERMISSION is one of <ro> or <rw> for read-only or read-write respectively.
+# * USERS is a comma delimited list of users from passwd.properties.
+#
+# See below for example entries.
+
+# NOTE: This file contains potentially sensitive information, please keep
+# this in mind when setting its mode and ownership.
+
+# The magical '<modify-keyspaces>' property lists users who can modify the
+# list of keyspaces: all users will be able to view the list of keyspaces.
+#<modify-keyspaces>=jsmith
+
+# Access to Keyspace1 (add/remove column families, etc).
+Keyspace1.<ro>=jsmith,Elvis Presley
+Keyspace1.<rw>=dilbert
+
+# Access to Standard1 (keyspace Keyspace1)
+#Keyspace1.Standard1.<rw>=jsmith,Elvis Presley,dilbert
+
+system.local.<ro>=rhqadmin
+system.peers.<ro>=rhqadmin
+system.schema_keyspaces.<ro>=rhqadmin
+system.schema_columnfamilies.<ro>=rhqadmin
+system.schema_columns.<ro>=rhqadmin
+rhq.<rw>=rhqadmin
\ No newline at end of file
diff --git a/modules/common/cassandra-common/src/main/resources/cassandra-1.2.0-beta2/conf/cassandra-env.sh b/modules/common/cassandra-common/src/main/resources/cassandra-1.2.0-beta2/conf/cassandra-env.sh
index 79b1369..a80b05b 100644
--- a/modules/common/cassandra-common/src/main/resources/cassandra-1.2.0-beta2/conf/cassandra-env.sh
+++ b/modules/common/cassandra-common/src/main/resources/cassandra-1.2.0-beta2/conf/cassandra-env.sh
@@ -145,6 +145,8 @@ JMX_PORT="@@jmx.port(a)@"
# starting cassandra.
JVM_EXTRA_OPTS="@@cassandra.ring.delay.property@@@@cassandra.ring.delay(a)@"
+JVM_EXTRA_OPTS="$JVM_EXTRA_OPTS -Dpasswd.properties=@@rhq.cassandra.password.properties.file(a)@"
+JVM_EXTRA_OPTS="$JVM_EXTRA_OPTS -Daccess.properties=@@rhq.cassandra.access.properties.file(a)@"
# enable assertions. disabling this in production will give a modest
# performance benefit (around 5%).
diff --git a/modules/common/cassandra-common/src/main/resources/cassandra-1.2.0-beta2/conf/cassandra.yaml b/modules/common/cassandra-common/src/main/resources/cassandra-1.2.0-beta2/conf/cassandra.yaml
index ae78ad2..bddb5b0 100644
--- a/modules/common/cassandra-common/src/main/resources/cassandra-1.2.0-beta2/conf/cassandra.yaml
+++ b/modules/common/cassandra-common/src/main/resources/cassandra-1.2.0-beta2/conf/cassandra.yaml
@@ -54,10 +54,10 @@ max_hints_delivery_threads: 2
# populate_io_cache_on_flush: false
# authentication backend, implementing IAuthenticator; used to identify users
-authenticator: org.apache.cassandra.auth.AllowAllAuthenticator
+authenticator: @@rhq.cassandra.authenticator(a)@
# authorization backend, implementing IAuthority; used to limit access/provide permissions
-authority: org.apache.cassandra.auth.AllowAllAuthority
+authority: @@rhq.cassandra.authority(a)@
# The partitioner is responsible for distributing rows (by key) across
# nodes in the cluster. Any IPartitioner may be used, including your
diff --git a/modules/common/cassandra-common/src/main/resources/cassandra.properties b/modules/common/cassandra-common/src/main/resources/cassandra.properties
index 799584a..a9201df 100644
--- a/modules/common/cassandra-common/src/main/resources/cassandra.properties
+++ b/modules/common/cassandra-common/src/main/resources/cassandra.properties
@@ -19,6 +19,22 @@ rhq.cassandra.bundle.version=1.0
# or increasing the number of nodes in the cluster will help even out the distribution.
rhq.cassandra.num-tokens=256
+# A class that performs authentication. The value should be a fully qualified class name
+# and implement IAuthenticator.
+rhq.cassandra.authenticator=org.rhq.cassandra.auth.SimpleAuthenticator
+
+# A class that performs authorization. Used to limit/provide permissions. The value should
+# be a fully qualified class name and implement IAuthority.
+rhq.cassandra.authority=org.rhq.cassandra.auth.SimpleAuthority
+
+# The location of the password properties file used by SimpleAuthenticator. If a relative
+# path is specified, its location is resolved relative to Cassandra's bin directory.
+rhq.cassandra.password.properties.file=../conf/passwd.properties
+
+# The location of the authorization properties file used by SimpleAuthority. If a relative
+# path is specified, its location is resolved relative to Cassandra's bin directory.
+rhq.cassandra.access.properties.file=../conf/access.properties
+
# The maximum number of threads handling native CQL requests.
rhq.casandra.native-transport-max-threads=64
diff --git a/modules/common/cassandra-common/src/main/resources/deploy.xml b/modules/common/cassandra-common/src/main/resources/deploy.xml
index 69b02e9..17d427a 100644
--- a/modules/common/cassandra-common/src/main/resources/deploy.xml
+++ b/modules/common/cassandra-common/src/main/resources/deploy.xml
@@ -120,6 +120,29 @@
defaultValue="9042"
type="integer"/>
+ <rhq:input-property name="rhq.cassandra.authenticator"
+ description="A class that performs authentication. The value should be a fully qualified class name and implement IAuthenticator."
+ required="false"
+ defaultValue="org.rhq.cassandra.auth.SimpleAuthenticator"
+ type="string"/>
+
+ <rhq:input-property name="rhq.cassandra.authority"
+ description="A class that performs authorization. Used to limit/provide permissions. The value should be a fully qualified class name and implement IAuthority."
+ required="false"
+ defaultValue="org.rhq.cassandra.auth.SimpleAuthority"
+ type="string"/>
+
+ <rhq:input-property name="rhq.cassandra.password.properties.file"
+ description="The location of the password properties file used by SimpleAuthenticator. If a relative path is specified, its location is resolved relative to Cassandra's bin directory."
+ required="false"
+ defaultValue="../conf/passwd.properties"
+ type="file"/>
+
+ <rhq:input-property name="rhq.cassandra.access.properties.file"
+ description="The location of the authorization properties file used by SimpleAuthority. If a relative path is specified, its location is resolved relative to Cassandra's bin directory."
+ required="false"
+ defaultValue="../conf/access.properties"
+ type="file"/>
<rhq:deployment-unit name="cassandra" preinstallTarget="pre-install" postinstallTarget="post-install">
<!--
diff --git a/modules/common/cassandra-common/src/main/resources/passwd.properties b/modules/common/cassandra-common/src/main/resources/passwd.properties
new file mode 100644
index 0000000..708a1d0
--- /dev/null
+++ b/modules/common/cassandra-common/src/main/resources/passwd.properties
@@ -0,0 +1,23 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# This is a sample password file for SimpleAuthenticator. The format of
+# this file is username=password. If -Dpasswd.mode=MD5 then the password
+# is represented as an md5 digest, otherwise it is cleartext (keep this
+# in mind when setting file mode and ownership).
+
+#jsmith=havebadpass
+rhqadmin=rhqadmin
diff --git a/modules/common/pom.xml b/modules/common/pom.xml
index 30bf202..c11c096 100644
--- a/modules/common/pom.xml
+++ b/modules/common/pom.xml
@@ -30,6 +30,7 @@
<module>ant-bundle</module>
<module>drift</module>
<module>jboss-as-dmr-client</module>
+ <module>cassandra-auth</module>
<module>cassandra-common</module>
<module>cassandra-common-itests</module>
</modules>
diff --git a/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/CassandraIntegrationTest.java b/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/CassandraIntegrationTest.java
index 854e791..92a1607 100644
--- a/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/CassandraIntegrationTest.java
+++ b/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/CassandraIntegrationTest.java
@@ -27,6 +27,7 @@ package org.rhq.server.metrics;
import com.datastax.driver.core.Cluster;
import com.datastax.driver.core.Session;
+import com.datastax.driver.core.SimpleAuthInfoProvider;
import org.joda.time.DateTime;
import org.testng.annotations.AfterClass;
@@ -48,10 +49,17 @@ public class CassandraIntegrationTest {
private DateTimeService dateTimeService;
@BeforeClass
- @DeployCluster
+ @DeployCluster(numNodes = 2)
public void deployCluster() throws Exception {
dateTimeService = new DateTimeService();
- Cluster cluster = Cluster.builder().addContactPoints("127.0.0.1", "127.0.0.2").build();
+
+ SimpleAuthInfoProvider authInfoProvider = new SimpleAuthInfoProvider();
+ authInfoProvider.add("username", "rhqadmin").add("password", "rhqadmin");
+
+ Cluster cluster = Cluster.builder()
+ .addContactPoints("127.0.0.1", "127.0.0.2")
+ .withAuthInfoProvider(authInfoProvider)
+ .build();
session = cluster.connect("rhq");
}
diff --git a/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsDAOTest.java b/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsDAOTest.java
index 7a9e669..4899bd6 100644
--- a/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsDAOTest.java
+++ b/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsDAOTest.java
@@ -41,9 +41,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import com.datastax.driver.core.Cluster;
-import com.datastax.driver.core.Session;
-
import org.joda.time.DateTime;
import org.joda.time.Hours;
import org.testng.annotations.BeforeClass;
@@ -61,15 +58,13 @@ public class MetricsDAOTest extends CassandraIntegrationTest {
private final long MINUTE = 60 * SECOND;
- private Session session;
-
private MetricsDAO dao;
@BeforeClass
public void initDAO() throws Exception {
- Cluster cluster = Cluster.builder().addContactPoints("127.0.0.1", "127.0.0.2").build();
- session = cluster.connect("rhq");
-
+// Cluster cluster = Cluster.builder().addContactPoints("127.0.0.1", "127.0.0.2").build();
+// session = cluster.connect("rhq");
+//
dao = new MetricsDAO(session);
}
diff --git a/pom.xml b/pom.xml
index 0780b74..dea634a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -142,7 +142,7 @@
<opencsv.version>1.8</opencsv.version>
<!-- cassandra dependency versions -->
- <cassandra.version>1.2.0-beta1</cassandra.version>
+ <cassandra.version>1.2.0-beta2</cassandra.version>
<cassandra.thrift.version>0.7.0</cassandra.thrift.version>
<cassandra.jdbc.version>1.2.0-SNAPSHOT</cassandra.jdbc.version>
<!--
11 years, 5 months
- 1
- 0
[rhq] Branch 'rhq-on-as7' - 3 commits - modules/enterprise
by mazz
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/TestServerPluginService.java | 2
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/bundle/TestBundleServerPluginService.java | 2
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/content/test/ContentUIManagerBeanTest.java | 11
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java | 8
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/core/plugin/DatabaseAndFilePluginDeploymentTest.java | 7
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java | 2
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.java | 25
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/plugin/pc/content/TestContentServerPluginService.java | 2
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/plugin/pc/generic/TestGenericServerPluginService.java | 2
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MetadataBeanTest.java | 35
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest.java | 6
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginScanningExtensionMetadataTest.java | 12
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/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java | 46 -
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/OldAbstractEJB3Test.java | 445 ----------
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/StandardServerPluginService.java | 2
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/TestServerPluginService.java | 2
17 files changed, 90 insertions(+), 521 deletions(-)
New commits:
commit 63715b4348d2109050a81c18c7f15ec2cbb3b314
Merge: 51ed8e9 b12f68c
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Mon Dec 3 15:48:59 2012 -0500
Merge remote-tracking branch 'origin/master' into rhq-on-as7
Conflicts:
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java
diff --cc modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java
index 42a8cda,02a2fbc..0e25ee4
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java
@@@ -531,22 -531,17 +531,22 @@@ public class CoreServerServiceImplTest
@Override
public File getJBossServerHomeDir() {
- return null;
- return getTempDir();
++ return new File(getTempDir(), "CoreServerServiceImplTest");
}
@Override
public File getJBossServerDataDir() {
- return new File(System.getProperty("java.io.tmpdir"), "CoreServerServiceImplTest");
- return null;
++ return new File(getTempDir(), "CoreServerServiceImplTest");
}
@Override
public File getJBossServerTempDir() {
-- return null;
++ return new File(getTempDir(), "CoreServerServiceImplTest");
+ }
+
+ @Override
+ public File getEarDeploymentDir() {
- return new File(System.getProperty("java.io.tmpdir"), "CoreServerServiceImplTest");
++ return new File(getTempDir(), "CoreServerServiceImplTest");
}
@Override
commit b12f68cf0ed1cd6f890d2b11b61a0ac818c1491e
Author: John Sanda <jsanda(a)redhat.com>
Date: Mon Dec 3 11:21:20 2012 -0500
fixing exception in JPQL query in set up/tear down code
Also removing references to LookUtil since we can directly inject managed
components into tests.
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.java
index 95a4dbe..a3ae638 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.java
@@ -38,6 +38,8 @@ import java.sql.Statement;
import java.util.Collections;
import java.util.List;
+import javax.ejb.EJB;
+
import org.joda.time.DateTime;
import org.joda.time.Hours;
import org.testng.annotations.Test;
@@ -58,13 +60,22 @@ import org.rhq.enterprise.server.auth.SubjectManagerLocal;
import org.rhq.enterprise.server.measurement.util.MeasurementDataManagerUtility;
import org.rhq.enterprise.server.test.AbstractEJB3Test;
import org.rhq.enterprise.server.test.TransactionCallback;
-import org.rhq.enterprise.server.util.LookupUtil;
/**
* @author John Sanda
*/
public class MeasurementDataManagerBeanTest extends AbstractEJB3Test {
+ // Tests in this class are failing currently do to a system initialization problem.
+ // MeasurementDataManagerUtility looks up config settings from SystemManagerBean.
+ // SystemManagerBean is however failing in its getDriftServerPluginManager method on
+ // the call to LookupUtil.getServerPluginService(). An InstanceNotFoundException is
+ // thrown,
+ //
+ // javax.management.InstanceNotFoundException: rhq:service=ServerPluginService
+ //
+ // Looks like the server plugin service is not getting deployed.
+
//private final Log log = LogFactory.getLog(MeasurementDataManagerBeanTest.class);
private static final boolean ENABLED = true;
@@ -99,9 +110,14 @@ public class MeasurementDataManagerBeanTest extends AbstractEJB3Test {
private Subject overlord;
+ @EJB
+ private SubjectManagerLocal subjectManager;
+
+ @EJB
+ private MeasurementDataManagerLocal dataManager;
+
@Override
protected void beforeMethod() throws Exception {
- SubjectManagerLocal subjectManager = LookupUtil.getSubjectManager();
overlord = subjectManager.getOverlord();
createInventory();
@@ -130,7 +146,6 @@ public class MeasurementDataManagerBeanTest extends AbstractEJB3Test {
report.addData(new MeasurementDataNumeric(buckets.get(59) + 20, request, 5.5));
report.addData(new MeasurementDataNumeric(buckets.get(59) + 30, request, 6.6));
- MeasurementDataManagerLocal dataManager = LookupUtil.getMeasurementDataManager();
dataManager.mergeMeasurementReport(report);
List<MeasurementDataNumericHighLowComposite> actualData = findDataForContext(overlord,
@@ -254,7 +269,7 @@ public class MeasurementDataManagerBeanTest extends AbstractEJB3Test {
em.createQuery("delete from MeasurementDefinition " +
"where dataType = :dataType and " +
"name = :name")
- .setParameter("dataType", DYNAMIC)
+ .setParameter("dataType", MEASUREMENT)
.setParameter("name", DYNAMIC_DEF_NAME)
.executeUpdate();
}
@@ -291,7 +306,6 @@ public class MeasurementDataManagerBeanTest extends AbstractEJB3Test {
MeasurementReport dummyReport = new MeasurementReport();
dummyReport.addData(new MeasurementDataNumeric(now.getMillis(), -1, 0.0));
- MeasurementDataManagerLocal dataManager = LookupUtil.getMeasurementDataManager();
dataManager.mergeMeasurementReport(dummyReport);
}
@@ -380,7 +394,6 @@ public class MeasurementDataManagerBeanTest extends AbstractEJB3Test {
private List<MeasurementDataNumericHighLowComposite> findDataForContext(Subject subject, EntityContext context,
MeasurementSchedule schedule, long beginTime, long endTime) {
- MeasurementDataManagerLocal dataManager = LookupUtil.getMeasurementDataManager();
List<List<MeasurementDataNumericHighLowComposite>> data = dataManager.findDataForContext(subject, context,
schedule.getDefinition().getId(), beginTime, endTime, 60);
commit a8d94d9619c760f372499502be72db3384487154
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Sat Dec 1 19:29:10 2012 -0500
Server i-test work to address many test interaction issues ( ** There are still some test failures ** )
- thin rhq.ear by removing the services SAR. The standard services actually
just get in the way, tests are responsible for prepare/unprepare of any
services they need and should not depend on the production services, which
may perform undesired work anyway.
- Add AbstractEJB3Test.preparePluginScannerService(), which will prepare a default
test deployment scanner, and make use of it in more classes that
need that service deployed, and were previously depending on the production
deployment scanner.
- Apply more consistent temp directory usage by settling on
java.io.tmpdir/rhq/<class.simplename> as the convention. Add
AbstractEJB3Test.getTempDir() and use it ubiquitously. This consolidates
the test files under and "rhq" root dir and also identofies them by creating
class name.
- DatabaseAndFilePluginDeploymentTest
- make a non-test method private, not public so it doesn't execute as a test
- remove the obsolete OldAbstractEJB3Test class
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/TestServerPluginService.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/TestServerPluginService.java
index be9b752..796a562 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/TestServerPluginService.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/TestServerPluginService.java
@@ -53,7 +53,7 @@ public abstract class TestServerPluginService extends ServerPluginService implem
protected TestServerPluginService() {
// build the config at constructor time so tests have it even before the PC is initialized
- File dir = new File(System.getProperty("java.io.tmpdir"), "test-server-plugins");
+ File dir = new File(System.getProperty("java.io.tmpdir") + "/rhq", this.getClass().getSimpleName());
this.masterConfig = new MasterServerPluginContainerConfiguration(dir, dir, dir, null);
}
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/bundle/TestBundleServerPluginService.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/bundle/TestBundleServerPluginService.java
index 61c53d3..45f210c 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/bundle/TestBundleServerPluginService.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/bundle/TestBundleServerPluginService.java
@@ -68,7 +68,7 @@ public class TestBundleServerPluginService extends ServerPluginService implement
public TestBundleServerPluginService() {
// build the config at constructor time so tests have it even before the PC is initialized
- File dir = new File(System.getProperty("java.io.tmpdir"), "test-server-plugins");
+ File dir = new File(System.getProperty("java.io.tmpdir") + "/rhq", this.getClass().getSimpleName());
this.masterConfig = new MasterServerPluginContainerConfiguration(dir, dir, dir, null);
}
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/content/test/ContentUIManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/content/test/ContentUIManagerBeanTest.java
index 311d521..51bd984 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/content/test/ContentUIManagerBeanTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/content/test/ContentUIManagerBeanTest.java
@@ -268,12 +268,13 @@ public class ContentUIManagerBeanTest extends AbstractEJB3Test {
// contents into memory every time.
// destination once pulled from db
- String pulledFilename = System.getProperty("java.io.tmpdir") + "/"
- + this.getClass().getSimpleName()
- + "/pulled.jar";
- File retrieved = new File(pulledFilename);
+ File tempDir = getTempDir();
+ if (!tempDir.exists()) {
+ assertTrue("Unable to mkdirs " + tempDir + " for test.", tempDir.mkdirs());
+ }
+ File retrieved = new File(tempDir, "pulled.jar");
if (retrieved.exists()) {
- assertTrue("Unable to delete " + pulledFilename + " for test cleanup.", retrieved.delete());
+ assertTrue("Unable to delete " + retrieved.getPath() + " for test cleanup.", retrieved.delete());
}
//any jar should be fine. Use canned jar
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java
index 645e35c..02a2fbc 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java
@@ -531,7 +531,7 @@ public class CoreServerServiceImplTest extends AbstractEJB3Test {
@Override
public File getJBossServerHomeDir() {
- return new File(System.getProperty("java.io.tmpdir"), "CoreServerServiceImplTest");
+ return getTempDir();
}
@Override
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/core/plugin/DatabaseAndFilePluginDeploymentTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/core/plugin/DatabaseAndFilePluginDeploymentTest.java
index 6d649f5..d031926 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/core/plugin/DatabaseAndFilePluginDeploymentTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/core/plugin/DatabaseAndFilePluginDeploymentTest.java
@@ -48,13 +48,12 @@ import org.rhq.enterprise.server.util.LookupUtil;
//make sure we run this after the plugins.metadata tests are done so that
//the db contents don't interfere
-@Test
-//(dependsOnGroups = "plugin.metadata")
+//@Test(dependsOnGroups = "plugin.metadata")
public class DatabaseAndFilePluginDeploymentTest extends AbstractEJB3Test {
private static final String PLUGIN_NAME = "DeployTest"; // as defined in our test descriptors
private static final String DESCRIPTORS_LOCATION = "test/deployment/";
- private static final String TEST_DIR = System.getProperty("java.io.tmpdir") + "/"
+ private static final String TEST_DIR = System.getProperty("java.io.tmpdir") + "/rhq/"
+ DatabaseAndFilePluginDeploymentTest.class.getName() + "/";
private static final String JARS_LOCATION = TEST_DIR + "jars";
private static final String DEPLOY_LOCATION = TEST_DIR + "deploy";
@@ -116,7 +115,7 @@ public class DatabaseAndFilePluginDeploymentTest extends AbstractEJB3Test {
// is important that afterClassStandIn() have a dependency such that it runs in the last test-set.
//@BeforeClass
- public void beforeClass() throws Exception {
+ private void beforeClass() throws Exception {
Calendar cal = Calendar.getInstance();
cal.set(2009, Calendar.FEBRUARY, 1, 1, 0, 0);
cal.set(Calendar.MILLISECOND, 0);
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java
index 8389f17..03cffdc 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java
@@ -111,7 +111,7 @@ public class DriftManagerBeanTest extends AbstractEJB3Test {
@Test
public void testStoreChangeSet() throws Exception {
- File rootDir = new File(System.getProperty("java.io.tmpdir"));
+ File rootDir = getTempDir();
File changeSetsDir = new File(rootDir, "changesets");
deleteDirectory(changeSetsDir);
changeSetsDir.mkdirs();
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/plugin/pc/content/TestContentServerPluginService.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/plugin/pc/content/TestContentServerPluginService.java
index da94c58..5850985 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/plugin/pc/content/TestContentServerPluginService.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/plugin/pc/content/TestContentServerPluginService.java
@@ -86,7 +86,7 @@ public class TestContentServerPluginService extends ServerPluginService implemen
protected MasterServerPluginContainer createMasterPluginContainer() {
MasterServerPluginContainer master = new TestMasterServerPluginContainer();
- File dir = new File(System.getProperty("java.io.tmpdir"), "test-server-plugins");
+ File dir = new File(System.getProperty("java.io.tmpdir") + "/rhq", this.getClass().getSimpleName());
MasterServerPluginContainerConfiguration config = new MasterServerPluginContainerConfiguration(dir, dir, dir,
null);
master.initialize(config);
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/plugin/pc/generic/TestGenericServerPluginService.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/plugin/pc/generic/TestGenericServerPluginService.java
index e8cdb51..85f45d0 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/plugin/pc/generic/TestGenericServerPluginService.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/plugin/pc/generic/TestGenericServerPluginService.java
@@ -57,7 +57,7 @@ public class TestGenericServerPluginService extends ServerPluginService implemen
public TestGenericServerPluginService() {
// build the config at constructor time so tests have it even before the PC is initialized
- File dir = new File(System.getProperty("java.io.tmpdir"), "test-server-plugins");
+ File dir = new File(System.getProperty("java.io.tmpdir" + "/rhq"), this.getClass().getSimpleName());
this.masterConfig = new MasterServerPluginContainerConfiguration(dir, dir, dir, null);
}
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MetadataBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MetadataBeanTest.java
index dbdb765..38b1216 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MetadataBeanTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MetadataBeanTest.java
@@ -39,7 +39,6 @@ import org.rhq.core.util.MessageDigestGenerator;
import org.rhq.core.util.stream.StreamUtil;
import org.rhq.enterprise.server.auth.SubjectManagerLocal;
import org.rhq.enterprise.server.bundle.TestBundleServerPluginService;
-import org.rhq.enterprise.server.core.plugin.PluginDeploymentScanner;
import org.rhq.enterprise.server.resource.ResourceTypeManagerLocal;
import org.rhq.enterprise.server.scheduler.jobs.PurgePluginsJob;
import org.rhq.enterprise.server.scheduler.jobs.PurgeResourceTypesJob;
@@ -48,8 +47,6 @@ import org.rhq.enterprise.server.util.LookupUtil;
public class MetadataBeanTest extends AbstractEJB3Test {
- protected PluginDeploymentScanner pluginScanner;
-
private List<Integer> pluginIds = new ArrayList<Integer>();
/**
@@ -81,6 +78,7 @@ public class MetadataBeanTest extends AbstractEJB3Test {
prepareCustomServerPluginService(bundleService);
bundleService.startMasterPluginContainerWithoutSchedulingJobs();
prepareScheduler();
+ preparePluginScannerService();
}
/**
@@ -91,6 +89,7 @@ public class MetadataBeanTest extends AbstractEJB3Test {
@Override
protected void afterMethod() throws Exception {
+ unpreparePluginScannerService();
unprepareServerPluginService();
unprepareScheduler();
}
@@ -145,7 +144,7 @@ public class MetadataBeanTest extends AbstractEJB3Test {
protected void createPlugin(String pluginFileName, String version, String descriptorFileName) throws Exception {
URL descriptorURL = getDescriptorURL(descriptorFileName);
PluginDescriptor pluginDescriptor = loadPluginDescriptor(descriptorURL);
- String pluginFilePath = getPluginWorkDir() + "/" + pluginFileName + ".jar";
+ String pluginFilePath = getPluginScannerService().getAgentPluginDir() + "/" + pluginFileName + ".jar";
Plugin plugin = new Plugin(pluginDescriptor.getName(), pluginFilePath);
plugin.setDisplayName(pluginDescriptor.getName());
@@ -162,37 +161,11 @@ public class MetadataBeanTest extends AbstractEJB3Test {
pluginIds.add(plugin.getId());
}
- protected void preparePluginScannerService() {
- if (this.pluginScanner == null) {
- this.pluginScanner = new PluginDeploymentScanner();
-
- String pluginDirPath = null;
- try {
- pluginDirPath = getPluginWorkDir();
- } catch (Exception e) {
- throw new RuntimeException("Cannot determine where to put the plugin jar files", e);
- }
- this.pluginScanner.setAgentPluginDir(pluginDirPath); // we don't want to scan for these
- this.pluginScanner.setServerPluginDir(null); // we don't want to scan for these
- this.pluginScanner.setScanPeriod("9999999"); // we want to manually scan - don't allow for auto-scan to happen
- }
-
- preparePluginScannerService(this.pluginScanner);
- }
-
private URL getDescriptorURL(String descriptor) {
String dir = getClass().getSimpleName();
return getClass().getResource(dir + "/" + descriptor);
}
- protected String getPluginWorkDir() throws Exception {
- return getCurrentWorkingDir() + "/" + this.getClass().getSimpleName() + "/" + "plugins";
- }
-
- protected String getCurrentWorkingDir() throws Exception {
- return System.getProperty("java.io.tmpdir");
- }
-
String getAmpsVersion(PluginDescriptor pluginDescriptor) {
if (pluginDescriptor.getAmpsVersion() == null) {
return "2.0";
@@ -283,7 +256,7 @@ public class MetadataBeanTest extends AbstractEJB3Test {
InputStream in = null;
try {
- String pluginDirPath = getPluginWorkDir();
+ String pluginDirPath = getPluginScannerService().getAgentPluginDir();
File pluginDir = new File(pluginDirPath);
pluginDir.mkdirs();
File jarFile = new File(pluginDir, jarName);
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest.java
index 36b0821..befaa1a 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest.java
@@ -55,9 +55,7 @@ public class PluginManagerBeanTest extends MetadataBeanTest {
subjectMgr = LookupUtil.getSubjectManager();
pluginMgr = LookupUtil.getPluginManager();
- FileUtil.purge(new File(getPluginWorkDir()), true);
-
- preparePluginScannerService();
+ FileUtil.purge(new File(getPluginScannerService().getAgentPluginDir()), true);
}
@Override
@@ -88,7 +86,7 @@ public class PluginManagerBeanTest extends MetadataBeanTest {
createPluginJarFile("test-plugin3.jar", "plugin_3.xml");
createPluginJarFile("test-plugin3.1.jar", "plugin_3.1.xml");
- pluginScanner.startDeployment();
+ getPluginScannerService().startDeployment();
}
@Test(dependsOnMethods = { "registerPlugins" })
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginScanningExtensionMetadataTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginScanningExtensionMetadataTest.java
index 5417305..1667dee 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginScanningExtensionMetadataTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginScanningExtensionMetadataTest.java
@@ -56,8 +56,6 @@ public class PluginScanningExtensionMetadataTest extends MetadataBeanTest {
protected void beforeMethod() throws Exception {
super.beforeMethod();
- preparePluginScannerService();
-
subjectMgr = LookupUtil.getSubjectManager();
resourceTypeMgr = LookupUtil.getResourceTypeManager();
@@ -80,8 +78,6 @@ public class PluginScanningExtensionMetadataTest extends MetadataBeanTest {
}
createdJarFiles.clear();
- unpreparePluginScannerService();
-
super.afterMethod();
}
@@ -110,7 +106,7 @@ public class PluginScanningExtensionMetadataTest extends MetadataBeanTest {
private void registerParentPluginV1() throws Exception {
// register the plugin, load the new type and test to make sure its what we expect
createdJarFiles.add(createPluginJarFile("parent-plugin.jar", "parent_plugin_v1.xml"));
- this.pluginScanner.startDeployment(); // first time we need to scan so call startDeployment which will call scanAndRegister
+ getPluginScannerService().startDeployment(); // first time we need to scan so call startDeployment which will call scanAndRegister
ResourceType resourceType = loadResourceTypeFully(TYPE_NAME_PARENT, PLUGIN_NAME_PARENT);
assert resourceType.getName().equals(TYPE_NAME_PARENT);
assert resourceType.getPlugin().equals(PLUGIN_NAME_PARENT);
@@ -120,7 +116,7 @@ public class PluginScanningExtensionMetadataTest extends MetadataBeanTest {
private void registerChild1PluginV1() throws Exception {
// register the plugin, load the new type and test to make sure its what we expect
createdJarFiles.add(createPluginJarFile("child1-plugin.jar", "child1_plugin_v1.xml"));
- this.pluginScanner.scanAndRegister();
+ getPluginScannerService().scanAndRegister();
ResourceType resourceType = loadResourceTypeFully(TYPE_NAME_CHILD1, PLUGIN_NAME_CHILD1);
assert resourceType.getName().equals(TYPE_NAME_CHILD1);
assert resourceType.getPlugin().equals(PLUGIN_NAME_CHILD1);
@@ -137,7 +133,7 @@ public class PluginScanningExtensionMetadataTest extends MetadataBeanTest {
private void registerChild2PluginV1() throws Exception {
// register the plugin, load the new type and test to make sure its what we expect
createdJarFiles.add(createPluginJarFile("child2-plugin.jar", "child2_plugin_v1.xml"));
- this.pluginScanner.scanAndRegister();
+ getPluginScannerService().scanAndRegister();
ResourceType resourceType = loadResourceTypeFully(TYPE_NAME_CHILD2, PLUGIN_NAME_CHILD2);
assert resourceType.getName().equals(TYPE_NAME_CHILD2);
assert resourceType.getPlugin().equals(PLUGIN_NAME_CHILD2);
@@ -147,7 +143,7 @@ public class PluginScanningExtensionMetadataTest extends MetadataBeanTest {
private void registerParentPluginV2() throws Exception {
// register the plugin, load the new type and test to make sure its what we expect
createdJarFiles.add(createPluginJarFile("parent-plugin.jar", "parent_plugin_v2.xml"));
- this.pluginScanner.scanAndRegister();
+ getPluginScannerService().scanAndRegister();
ResourceType resourceType = loadResourceTypeFully(TYPE_NAME_PARENT, PLUGIN_NAME_PARENT);
assert resourceType.getName().equals(TYPE_NAME_PARENT);
assert resourceType.getPlugin().equals(PLUGIN_NAME_PARENT);
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java
index ddf59f0..7c4fa43 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java
@@ -75,6 +75,7 @@ public class UpdatePluginMetadataTestBase extends AbstractEJB3Test {
agentServiceContainer = prepareForTestAgents();
prepareMockAgentServiceContainer();
prepareScheduler();
+ preparePluginScannerService();
pluginMgr = LookupUtil.getPluginManager();
resourceTypeManager = LookupUtil.getResourceTypeManager();
@@ -85,6 +86,7 @@ public class UpdatePluginMetadataTestBase extends AbstractEJB3Test {
protected void afterMethod() throws Exception {
cleanupTest();
+ unpreparePluginScannerService();
unprepareScheduler();
unprepareForTestAgents();
}
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java
index 975efb8..d8db4b9 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java
@@ -58,6 +58,7 @@ import org.rhq.core.util.stream.StreamUtil;
import org.rhq.enterprise.server.RHQConstants;
import org.rhq.enterprise.server.auth.SessionManager;
import org.rhq.enterprise.server.core.comm.ServerCommunicationsServiceMBean;
+import org.rhq.enterprise.server.core.plugin.PluginDeploymentScanner;
import org.rhq.enterprise.server.core.plugin.PluginDeploymentScannerMBean;
import org.rhq.enterprise.server.plugin.pc.ServerPluginService;
import org.rhq.enterprise.server.plugin.pc.ServerPluginServiceMBean;
@@ -292,9 +293,10 @@ public abstract class AbstractEJB3Test extends Arquillian {
EnterpriseArchive testEar = ShrinkWrap.create(EnterpriseArchive.class, "rhq.ear");
EnterpriseArchive rhqEar = earResolver.artifact("org.rhq:rhq-enterprise-server-ear:ear:4.6.0-SNAPSHOT")
.resolveAs(EnterpriseArchive.class).iterator().next();
- // merge rhq.ear into testEar but include only the EJB jars, the SAR, and the supporting libraries
- testEar = testEar.merge(rhqEar,
- Filters.include("/lib.*|/rhq.*ejb3\\.jar.*|/rhq-enterprise-server-services-sar.*"));
+ // merge rhq.ear into testEar but include only the EJB jars and the supporting libraries. Note that we
+ // don't include the services sar because tests are responsible for prepare/unprepare of all required services,
+ // we don't want the production services performig any unexpected work.
+ testEar = testEar.merge(rhqEar, Filters.include("/lib.*|/rhq.*ejb3\\.jar.*"));
// remove startup beans and shutdown listeners, we don't want this to be a full server deployment. The tests
// start/stop what they need, typically with test services or mocks.
testEar.delete(ArchivePaths
@@ -932,12 +934,33 @@ public abstract class AbstractEJB3Test extends Arquillian {
}
/**
+ * Prepares a test deployment scanner with the following characteristics<br/>.
+ * - start() is called but startDeployment() is not called.<br/>
+ * - agentPluginDir is set to getTempDir() + "/plugins"<br/>
+ * - serverPluginDir is set to null (no scanning for server plugins)<br/>
+ * - scanPeriod is set to 9999999 (basically prevent autoscan)<br/>
+ */
+ protected PluginDeploymentScannerMBean preparePluginScannerService() {
+ if (null != pluginScannerService) {
+ return pluginScannerService;
+ }
+
+ PluginDeploymentScanner scanner = new PluginDeploymentScanner();
+ String pluginDirPath = getTempDir() + "/plugins";
+ scanner.setAgentPluginDir(pluginDirPath); // we don't want to scan for these
+ scanner.setServerPluginDir(null); // we don't want to scan for these
+ scanner.setScanPeriod("9999999"); // we want to manually scan - don't allow for auto-scan to happen
+
+ return preparePluginScannerService(scanner);
+ }
+
+ /**
* Note that the standard plugin scanner service is deployed automatically with the test rhq ear,
* this is only necessary if you want a custom service.
*
* @param scannerService
*/
- public void preparePluginScannerService(PluginDeploymentScannerMBean scannerService) {
+ public PluginDeploymentScannerMBean preparePluginScannerService(PluginDeploymentScannerMBean scannerService) {
try {
MBeanServer mbs = getPlatformMBeanServer();
if (mbs.isRegistered(PluginDeploymentScannerMBean.OBJECT_NAME)) {
@@ -949,6 +972,8 @@ public abstract class AbstractEJB3Test extends Arquillian {
pluginScannerService = scannerService;
pluginScannerService.start();
+ return pluginScannerService;
+
} catch (Exception e) {
e.printStackTrace();
throw new RuntimeException(e);
@@ -998,7 +1023,7 @@ public abstract class AbstractEJB3Test extends Arquillian {
* @throws Exception
*/
protected void writeObjects(String filename, Object... objects) throws Exception {
- File file = new File(System.getProperty("java.io.tmpdir"), this.getClass().getName() + "-" + filename);
+ File file = new File(getTempDir(), "-" + filename);
file.delete();
ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream(file));
for (Object o : objects) {
@@ -1021,7 +1046,7 @@ public abstract class AbstractEJB3Test extends Arquillian {
ObjectInputStream ois = null;
try {
- File file = new File(System.getProperty("java.io.tmpdir"), this.getClass().getName() + "-" + filename);
+ File file = new File(getTempDir(), "-" + filename);
ois = new ObjectInputStream(new FileInputStream(file));
for (int i = 0; i < numObjects; ++i) {
result.add(ois.readObject());
@@ -1040,8 +1065,15 @@ public abstract class AbstractEJB3Test extends Arquillian {
* @return true if deleted, false otherwise.
*/
protected boolean deleteObjects(String filename) {
- File file = new File(System.getProperty("java.io.tmpdir"), this.getClass().getName() + "-" + filename);
+ File file = new File(getTempDir(), "-" + filename);
return file.delete();
}
+ /**
+ * @return a temp directory for testing that is specific to this test class.
+ */
+ protected File getTempDir() {
+ return new File(System.getProperty("java.io.tmpdir") + "/rhq", this.getClass().getSimpleName());
+ }
+
}
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/OldAbstractEJB3Test.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/OldAbstractEJB3Test.java
deleted file mode 100644
index a8337b7..0000000
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/OldAbstractEJB3Test.java
+++ /dev/null
@@ -1,445 +0,0 @@
-///*
-// * RHQ Management Platform
-// * Copyright (C) 2005-2008 Red Hat, Inc.
-// * All rights reserved.
-// *
-// * This program is free software; you can redistribute it and/or modify
-// * it under the terms of the GNU General Public License as published by
-// * the Free Software Foundation version 2 of the License.
-// *
-// * This program is distributed in the hope that it will be useful,
-// * but WITHOUT ANY WARRANTY; without even the implied warranty of
-// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// * GNU General Public License for more details.
-// *
-// * You should have received a copy of the GNU General Public License
-// * along with this program; if not, write to the Free Software
-// * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-// */
-package org.rhq.enterprise.server.test;
-
-import org.testng.AssertJUnit;
-
-
-//import static org.rhq.test.JPAUtils.lookupEntityManager;
-//import static org.rhq.test.JPAUtils.lookupTransactionManager;
-//
-//import java.sql.Connection;
-//import java.sql.SQLException;
-//import java.util.Hashtable;
-//import java.util.Properties;
-//
-//import javax.management.MBeanServer;
-//import javax.management.MBeanServerFactory;
-//import javax.naming.InitialContext;
-//import javax.naming.NamingException;
-//import javax.persistence.EntityManager;
-//import javax.transaction.TransactionManager;
-//
-//import org.hibernate.SessionFactory;
-//import org.hibernate.stat.Statistics;
-//import org.testng.AssertJUnit;
-//import org.testng.annotations.AfterMethod;
-//import org.testng.annotations.AfterSuite;
-//import org.testng.annotations.BeforeMethod;
-//import org.testng.annotations.BeforeSuite;
-//
-//import org.jboss.ejb3.embedded.EJB3StandaloneBootstrap;
-//import org.jboss.ejb3.embedded.EJB3StandaloneDeployer;
-//import org.jboss.mx.util.MBeanServerLocator;
-//
-//import org.rhq.core.db.DatabaseTypeFactory;
-//import org.rhq.core.db.PostgresqlDatabaseType;
-//import org.rhq.core.domain.auth.Subject;
-//import org.rhq.core.domain.server.PersistenceUtility;
-//import org.rhq.enterprise.server.RHQConstants;
-//import org.rhq.enterprise.server.auth.SessionManager;
-//import org.rhq.enterprise.server.content.ContentSourceManagerBean;
-//import org.rhq.enterprise.server.core.comm.ServerCommunicationsServiceMBean;
-//import org.rhq.enterprise.server.core.plugin.PluginDeploymentScanner;
-//import org.rhq.enterprise.server.core.plugin.PluginDeploymentScannerMBean;
-//import org.rhq.enterprise.server.plugin.pc.ServerPluginService;
-//import org.rhq.enterprise.server.plugin.pc.ServerPluginServiceMBean;
-//import org.rhq.enterprise.server.scheduler.SchedulerService;
-//import org.rhq.enterprise.server.scheduler.SchedulerServiceMBean;
-//import org.rhq.enterprise.server.util.LookupUtil;
-//
-////
-/////**
-//// * This is the abstract test base for server jar tests.
-//// *
-//// * @author Greg Hinkle
-//// */
-public abstract class OldAbstractEJB3Test extends AssertJUnit {
- //
- // private static EJB3StandaloneDeployer deployer;
- // private static Statistics stats;
- // @SuppressWarnings("unused")
- // private static long start; // see endTest() if you want to output this
- // private SchedulerService schedulerService;
- // private ServerPluginService serverPluginService;
- // private MBeanServer dummyJBossMBeanServer;
- // private PluginDeploymentScannerMBean pluginScannerService;
- //
- //
- // //@BeforeSuite(groups = {"integration.ejb3","PERF"}) // TODO investigate again
- // @BeforeSuite(alwaysRun = true)
- // public static void startupEmbeddedJboss() throws Exception {
- // // The embeddedDeployment property needs to be set for running tests
- // // with the embedded container. It is set in the surefire configuration
- // // in pom.xml but setting here makes it easier to run tests directly
- // // from your IDE.
- // //
- // // jsanda
- // System.setProperty("embeddedDeployment", "true");
- //
- // // Setting content location to the tmp dir
- // System.setProperty(ContentSourceManagerBean.FILESYSTEM_PROPERTY, System.getProperty("java.io.tmpdir"));
- //
- // System.out.println("Starting JBoss EJB3 Embedded Container...");
- // String deployDir = System.getProperty("deploymentDirectory", "target/classes");
- // System.out.println("Loading EJB3 deployments from directory: " + deployDir);
- // try {
- // EJB3StandaloneBootstrap.boot(null);
- // // EJB3StandaloneBootstrap.scanClasspath();
- //
- // System.err.println("...... embedded container booted....");
- //
- // deployer = EJB3StandaloneBootstrap.createDeployer();
- //
- // deployer.setClassLoader(AbstractEJB3Test.class.getClassLoader());
- // System.err.println("...... embedded container classloader set....");
- //
- // deployer.getArchivesByResource().add("META-INF/persistence.xml");
- // System.err.println("...... embedded container persistence xml deployed....");
- //
- // deployer.getArchivesByResource().add("META-INF/ejb-jar.xml");
- // System.err.println("...... embedded container ejb-jar xml deployed....");
- //
- // EJB3StandaloneBootstrap.deployXmlResource("jboss-jms-beans.xml");
- // System.err.println("...... embedded container jboss-jms-beans xml deployed....");
- //
- // EJB3StandaloneBootstrap.deployXmlResource("rhq-mdb-beans.xml");
- // System.err.println("...... embedded container rhq-mdb-beans xml deployed....");
- //
- // /*
- // * File core = new File(deployDir, "on-core-domain-ejb.ejb3"); if (!core.exists())
- // * System.err.println("Deployment directory does not exist: " + core.getAbsolutePath());
- // * deployer.getArchives().add(core.toURI().toURL());
- // *
- // * File server = new File(deployDir, "on-enterprise-server-ejb.ejb3"); if (!server.exists())
- // * System.err.println("Deployment directory does not exist: " + server.getAbsolutePath());
- // * deployer.getArchives().add(server.toURI().toURL());
- // *
- // */
- //
- // //deployer.setKernel(EJB3StandaloneBootstrap.getKernel());
- // deployer.create();
- // System.err.println("...... deployer created....");
- //
- // deployer.start();
- // System.err.println("...... deployer started....");
- //
- // System.err.println("...... start statistics");
- // SessionFactory sessionFactory = PersistenceUtility.getHibernateSession(getEntityManager())
- // .getSessionFactory();
- // stats = sessionFactory.getStatistics();
- // stats.setStatisticsEnabled(true);
- //
- // System.err.println("...... embedded container initialized and ready for testing....");
- //
- // } catch (Throwable t) {
- // // Catch RuntimeExceptions and Errors and dump their stack trace, because Surefire will completely swallow them
- // // and throw a cryptic NPE (see http://jira.codehaus.org/browse/SUREFIRE-157)!
- // t.printStackTrace();
- // throw new RuntimeException(t);
- // }
- // }
- //
- // //@Configuration(groups = "integration.ejb3", afterSuite = true)
- // @AfterSuite(alwaysRun = true)
- // public static void shutdownEmbeddedJboss() {
- // System.out.println("Stopping JBoss EJB3 Embedded Container...");
- //
- // System.err.println("!!! Any errors occurring after this point !!!");
- // System.err.println("!!! occurred during embedded server shutdown !!!");
- // System.err.println("!!! and are probably not a real problem. !!!");
- // if (deployer != null) {
- // try {
- // deployer.stop();
- // deployer.destroy();
- // deployer = null;
- // } catch (Throwable t) {
- // System.err.println("Failed to stop embedded deployer");
- // t.printStackTrace(System.err);
- // }
- // }
- // EJB3StandaloneBootstrap.shutdown();
- // }
- //
- // @BeforeMethod
- // public static void startTest() {
- // if (DatabaseTypeFactory.getDefaultDatabaseType() == null) {
- // try {
- // Connection conn = getConnection();
- // DatabaseTypeFactory.setDefaultDatabaseType(DatabaseTypeFactory.getDatabaseType(conn));
- // } catch (Exception e) {
- // System.err.println("!!! WARNING !!! cannot set default database type, some tests may fail");
- // e.printStackTrace();
- // }
- // }
- //
- // if (stats != null)
- // start = stats.getQueryExecutionCount();
- // else
- // start = 0;
- // }
- //
- // public static Connection getConnection() throws SQLException {
- // return LookupUtil.getDataSource().getConnection();
- // }
- //
- // @AfterMethod
- // public static void endTest() {
- // //System.out.println("Connections used: " + (stats.getQueryExecutionCount() - start));
- // }
- //
- // public TransactionManager getTransactionManager() {
- // return lookupTransactionManager();
- // }
- //
- // public static EntityManager getEntityManager() {
- // return lookupEntityManager();
- // }
- //
- // public static InitialContext getInitialContext() {
- // Hashtable<String, String> env = new Hashtable<String, String>();
- // env.put("java.naming.factory.initial", "org.jnp.interfaces.LocalOnlyContextFactory");
- // env.put("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces");
- // try {
- // return new InitialContext(env);
- // } catch (NamingException e) {
- // e.printStackTrace();
- // throw new RuntimeException("Failed to load initial context", e);
- // }
- // }
- //
- // public boolean isPostgres() throws Exception {
- // return DatabaseTypeFactory.getDatabaseType(getInitialContext(), RHQConstants.DATASOURCE_JNDI_NAME) instanceof PostgresqlDatabaseType;
- // }
- //
- // /**
- // * This creates a session for the given user and associates that session with the subject. You can test the security
- // * annotations by creating sessions for different users with different permissions.
- // *
- // * @param subject a JON subject
- // * @return the session activated subject, a copy of the subject passed in.
- // */
- // public Subject createSession(Subject subject) {
- // return SessionManager.getInstance().put(subject);
- // }
- //
- // /**
- // * Returns an MBeanServer that simulates the JBossAS MBeanServer.
- // *
- // * @return MBeanServer instance
- // */
- // public MBeanServer getJBossMBeanServer() {
- // if (dummyJBossMBeanServer == null) {
- // dummyJBossMBeanServer = MBeanServerFactory.createMBeanServer("jboss");
- // MBeanServerLocator.setJBoss(dummyJBossMBeanServer);
- // }
- //
- // return dummyJBossMBeanServer;
- // }
- //
- // public void releaseJBossMBeanServer() {
- // if (dummyJBossMBeanServer != null) {
- // MBeanServerFactory.releaseMBeanServer(dummyJBossMBeanServer);
- // dummyJBossMBeanServer = null;
- // }
- // }
- //
- // /**
- // * If you need to test round trips from server to agent and back, you first must install the server communications
- // * service that houses all the agent clients. Call this method and add your test agent services to the public fields
- // * in the returned object.
- // *
- // * @return the object that will house your test agent service impls and the agent clients.
- // *
- // * @throws RuntimeException
- // */
- // public TestServerCommunicationsService prepareForTestAgents() {
- // try {
- // MBeanServer mbs = getJBossMBeanServer();
- // if (mbs.isRegistered(ServerCommunicationsServiceMBean.OBJECT_NAME)) {
- // mbs.unregisterMBean(ServerCommunicationsServiceMBean.OBJECT_NAME);
- // }
- // TestServerCommunicationsService testAgentContainer = new TestServerCommunicationsService();
- // mbs.registerMBean(testAgentContainer, ServerCommunicationsServiceMBean.OBJECT_NAME);
- // return testAgentContainer;
- // } catch (Exception e) {
- // throw new RuntimeException(e);
- // }
- // }
- //
- // /**
- // * Call this after your tests have finished. You only need to call this if your test previously called
- // * {@link #prepareForTestAgents()}.
- // */
- // public void unprepareForTestAgents() {
- // unprepareForTestAgents(false);
- // }
- //
- // public void unprepareForTestAgents(boolean beanOnly) {
- // try {
- // if (beanOnly) {
- // MBeanServer mbs = getJBossMBeanServer();
- // if (mbs.isRegistered(ServerCommunicationsServiceMBean.OBJECT_NAME)) {
- // mbs.unregisterMBean(ServerCommunicationsServiceMBean.OBJECT_NAME);
- // }
- // } else {
- // releaseJBossMBeanServer();
- // }
- // } catch (Exception e) {
- // throw new RuntimeException(e);
- // }
- // }
- //
- // /**
- // * If you need to test server plugins, you must first prepare the server plugin service.
- // * After this returns, the caller must explicitly start the PC by using the appropriate API
- // * on the given mbean; this method will only start the service, it will NOT start the master PC.
- // *
- // * @param testServiceMBean the object that will house your test server plugins
- // *
- // * @throws RuntimeException
- // */
- // public void prepareCustomServerPluginService(ServerPluginService testServiceMBean) {
- // try {
- // MBeanServer mbs = getJBossMBeanServer();
- // testServiceMBean.start();
- // mbs.registerMBean(testServiceMBean, ServerPluginServiceMBean.OBJECT_NAME);
- // serverPluginService = testServiceMBean;
- // return;
- // } catch (Exception e) {
- // throw new RuntimeException(e);
- // }
- // }
- //
- // public void unprepareServerPluginService() throws Exception {
- // unprepareServerPluginService(false);
- // }
- //
- // public void unprepareServerPluginService(boolean beanOnly) throws Exception {
- // if (serverPluginService != null) {
- // serverPluginService.stopMasterPluginContainer();
- // serverPluginService.stop();
- // if (beanOnly) {
- // MBeanServer mbs = getJBossMBeanServer();
- // if (mbs.isRegistered(ServerPluginService.OBJECT_NAME)) {
- // getJBossMBeanServer().unregisterMBean(ServerPluginService.OBJECT_NAME);
- // }
- // if (mbs.isRegistered(ServerPluginServiceMBean.OBJECT_NAME)) {
- // getJBossMBeanServer().unregisterMBean(ServerPluginServiceMBean.OBJECT_NAME);
- // }
- //
- // } else {
- // releaseJBossMBeanServer();
- // }
- // serverPluginService = null;
- // }
- // }
- //
- // public SchedulerService getSchedulerService() {
- // return schedulerService;
- // }
- //
- // public void prepareScheduler() {
- // try {
- // if (schedulerService != null) {
- // return;
- // }
- //
- // Properties quartzProps = new Properties();
- // quartzProps.load(this.getClass().getClassLoader().getResourceAsStream("test-scheduler.properties"));
- //
- // schedulerService = new SchedulerService();
- // schedulerService.setQuartzProperties(quartzProps);
- // schedulerService.start();
- // getJBossMBeanServer().registerMBean(schedulerService, SchedulerServiceMBean.SCHEDULER_MBEAN_NAME);
- // schedulerService.startQuartzScheduler();
- // return;
- // } catch (Exception e) {
- // e.printStackTrace();
- // throw new RuntimeException(e);
- // }
- // }
- //
- // public void unprepareScheduler() throws Exception {
- // unprepareScheduler(false);
- // }
- //
- // public void unprepareScheduler(boolean beanOnly) throws Exception {
- // if (schedulerService != null) {
- // schedulerService.stop();
- // if (beanOnly) {
- // MBeanServer mbs = getJBossMBeanServer();
- // if (mbs.isRegistered(SchedulerServiceMBean.SCHEDULER_MBEAN_NAME)) {
- // getJBossMBeanServer().unregisterMBean(SchedulerServiceMBean.SCHEDULER_MBEAN_NAME);
- // }
- // } else {
- // releaseJBossMBeanServer();
- // }
- //
- // schedulerService = null;
- // }
- // }
- //
- // public PluginDeploymentScannerMBean getPluginScannerService() {
- // return pluginScannerService;
- // }
- //
- // protected void preparePluginScannerService() {
- // preparePluginScannerService(null);
- // }
- //
- // public void preparePluginScannerService(PluginDeploymentScannerMBean scannerService) {
- // try {
- // if (scannerService == null) {
- // scannerService = new PluginDeploymentScanner();
- // }
- // MBeanServer mbs = getJBossMBeanServer();
- // mbs.registerMBean(scannerService, PluginDeploymentScannerMBean.OBJECT_NAME);
- // pluginScannerService = scannerService;
- // return;
- // } catch (Exception e) {
- // e.printStackTrace();
- // throw new RuntimeException(e);
- // }
- // }
- //
- // public void unpreparePluginScannerService() throws Exception {
- // unpreparePluginScannerService(false);
- // }
- //
- // public void unpreparePluginScannerService(boolean beanOnly) throws Exception {
- // if (pluginScannerService != null) {
- // pluginScannerService.stop();
- // if (beanOnly) {
- // MBeanServer mbs = getJBossMBeanServer();
- // if (mbs.isRegistered(PluginDeploymentScannerMBean.OBJECT_NAME)) {
- // getJBossMBeanServer().unregisterMBean(PluginDeploymentScannerMBean.OBJECT_NAME);
- // }
- // } else {
- // releaseJBossMBeanServer();
- // }
- //
- // pluginScannerService = null;
- // }
- // }
- //
- // protected void executeInTransaction(TransactionCallback callback) {
- // executeInTransaction(callback);
- // }
-}
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/StandardServerPluginService.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/StandardServerPluginService.java
index 5f5692f..adcde42 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/StandardServerPluginService.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/StandardServerPluginService.java
@@ -84,7 +84,7 @@ public class StandardServerPluginService extends ServerPluginService implements
public List<Class<? extends AbstractTypeServerPluginContainer>> pluginContainerClasses;
public StandardServerPluginService() {
- File dir = new File(System.getProperty("java.io.tmpdir"), "test-server-plugins");
+ File dir = new File(System.getProperty("java.io.tmpdir") + "/rhq", this.getClass().getSimpleName());
this.masterConfig = new MasterServerPluginContainerConfiguration(dir, dir, dir, null);
pluginContainerClasses = new ArrayList<Class<? extends AbstractTypeServerPluginContainer>>();
pluginContainerClasses.add(AlertServerPluginContainer.class);
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/TestServerPluginService.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/TestServerPluginService.java
index c28256b..a8b134e 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/TestServerPluginService.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/TestServerPluginService.java
@@ -46,7 +46,7 @@ public class TestServerPluginService extends ServerPluginService implements Test
public TestServerPluginService() {
// build the config at constructor time so tests have it even before the PC is initialized
- File dir = new File(System.getProperty("java.io.tmpdir"), "test-server-plugins");
+ File dir = new File(System.getProperty("java.io.tmpdir") + "/rhq", this.getClass().getSimpleName());
this.masterConfig = new MasterServerPluginContainerConfiguration(dir, dir, dir, null);
}
11 years, 5 months
- 1
- 0
[rhq] etc/eclipse-tools modules/enterprise
by Jay Shaughnessy
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"
11 years, 5 months
- 1
- 0
[rhq] modules/enterprise
by John Sanda
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.java | 25 +++++++---
1 file changed, 19 insertions(+), 6 deletions(-)
New commits:
commit b12f68cf0ed1cd6f890d2b11b61a0ac818c1491e
Author: John Sanda <jsanda(a)redhat.com>
Date: Mon Dec 3 11:21:20 2012 -0500
fixing exception in JPQL query in set up/tear down code
Also removing references to LookUtil since we can directly inject managed
components into tests.
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.java
index 95a4dbe..a3ae638 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.java
@@ -38,6 +38,8 @@ import java.sql.Statement;
import java.util.Collections;
import java.util.List;
+import javax.ejb.EJB;
+
import org.joda.time.DateTime;
import org.joda.time.Hours;
import org.testng.annotations.Test;
@@ -58,13 +60,22 @@ import org.rhq.enterprise.server.auth.SubjectManagerLocal;
import org.rhq.enterprise.server.measurement.util.MeasurementDataManagerUtility;
import org.rhq.enterprise.server.test.AbstractEJB3Test;
import org.rhq.enterprise.server.test.TransactionCallback;
-import org.rhq.enterprise.server.util.LookupUtil;
/**
* @author John Sanda
*/
public class MeasurementDataManagerBeanTest extends AbstractEJB3Test {
+ // Tests in this class are failing currently do to a system initialization problem.
+ // MeasurementDataManagerUtility looks up config settings from SystemManagerBean.
+ // SystemManagerBean is however failing in its getDriftServerPluginManager method on
+ // the call to LookupUtil.getServerPluginService(). An InstanceNotFoundException is
+ // thrown,
+ //
+ // javax.management.InstanceNotFoundException: rhq:service=ServerPluginService
+ //
+ // Looks like the server plugin service is not getting deployed.
+
//private final Log log = LogFactory.getLog(MeasurementDataManagerBeanTest.class);
private static final boolean ENABLED = true;
@@ -99,9 +110,14 @@ public class MeasurementDataManagerBeanTest extends AbstractEJB3Test {
private Subject overlord;
+ @EJB
+ private SubjectManagerLocal subjectManager;
+
+ @EJB
+ private MeasurementDataManagerLocal dataManager;
+
@Override
protected void beforeMethod() throws Exception {
- SubjectManagerLocal subjectManager = LookupUtil.getSubjectManager();
overlord = subjectManager.getOverlord();
createInventory();
@@ -130,7 +146,6 @@ public class MeasurementDataManagerBeanTest extends AbstractEJB3Test {
report.addData(new MeasurementDataNumeric(buckets.get(59) + 20, request, 5.5));
report.addData(new MeasurementDataNumeric(buckets.get(59) + 30, request, 6.6));
- MeasurementDataManagerLocal dataManager = LookupUtil.getMeasurementDataManager();
dataManager.mergeMeasurementReport(report);
List<MeasurementDataNumericHighLowComposite> actualData = findDataForContext(overlord,
@@ -254,7 +269,7 @@ public class MeasurementDataManagerBeanTest extends AbstractEJB3Test {
em.createQuery("delete from MeasurementDefinition " +
"where dataType = :dataType and " +
"name = :name")
- .setParameter("dataType", DYNAMIC)
+ .setParameter("dataType", MEASUREMENT)
.setParameter("name", DYNAMIC_DEF_NAME)
.executeUpdate();
}
@@ -291,7 +306,6 @@ public class MeasurementDataManagerBeanTest extends AbstractEJB3Test {
MeasurementReport dummyReport = new MeasurementReport();
dummyReport.addData(new MeasurementDataNumeric(now.getMillis(), -1, 0.0));
- MeasurementDataManagerLocal dataManager = LookupUtil.getMeasurementDataManager();
dataManager.mergeMeasurementReport(dummyReport);
}
@@ -380,7 +394,6 @@ public class MeasurementDataManagerBeanTest extends AbstractEJB3Test {
private List<MeasurementDataNumericHighLowComposite> findDataForContext(Subject subject, EntityContext context,
MeasurementSchedule schedule, long beginTime, long endTime) {
- MeasurementDataManagerLocal dataManager = LookupUtil.getMeasurementDataManager();
List<List<MeasurementDataNumericHighLowComposite>> data = dataManager.findDataForContext(subject, context,
schedule.getDefinition().getId(), beginTime, endTime, 60);
11 years, 5 months
- 1
- 0
[rhq] Branch 'release/jon3.1.x' - modules/plugins
by Heiko W. Rupp
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DeploymentComponent.java | 71 +++++++++-
1 file changed, 67 insertions(+), 4 deletions(-)
New commits:
commit 85a91f48266d48531ebf0b4ca262169b40139a84
Author: Heiko W. Rupp <hwr(a)pilhuhn.de>
Date: Mon Dec 3 09:32:56 2012 +0100
BZ 855925 - better detect the location of backing files for deployed content.
(cherry-picked from e94ba25, BZ 880214)
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DeploymentComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DeploymentComponent.java
index 3d2f57e..c392ff0 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DeploymentComponent.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DeploymentComponent.java
@@ -43,6 +43,7 @@ import org.rhq.modules.plugins.jbossas7.json.Address;
import org.rhq.modules.plugins.jbossas7.json.Operation;
import org.rhq.modules.plugins.jbossas7.json.PROPERTY_VALUE;
import org.rhq.modules.plugins.jbossas7.json.ReadAttribute;
+import org.rhq.modules.plugins.jbossas7.json.ReadResource;
import org.rhq.modules.plugins.jbossas7.json.Result;
/**
@@ -51,6 +52,7 @@ import org.rhq.modules.plugins.jbossas7.json.Result;
*/
public class DeploymentComponent extends BaseComponent<ResourceComponent<?>> implements OperationFacet, ContentFacet {
+ private static final String DOMAIN_DATA_CONTENT_SUBDIR = "/data/content";
private boolean verbose = ASConnection.verbose;
private File deploymentFile;
@@ -233,6 +235,17 @@ public class DeploymentComponent extends BaseComponent<ResourceComponent<?>> imp
}
}
+ /**
+ * Determine the location of the physical content of a deployment.
+ * We need to check several cases here:
+ * <ul>
+ * <li>Standalone server</li>
+ * <li>Domain Deployment: here the content is under /deployment=xxx and in the filesystem at $AS/domain/data/content</li>
+ * <li>Server-group deployment: there is no real physical content, it is a logical link to a domain deployment</li>
+ * <li>Manages server: here the content exists below /host=xx/server=server-name/deployment=xxx</li>
+ * </ul>
+ * @return A file object pointing to the deployed file or null if there is no content
+ */
private File determineDeploymentFile() {
Operation op = new ReadAttribute(getAddress(), "content");
Result result = getASConnection().execute(op);
@@ -240,8 +253,35 @@ public class DeploymentComponent extends BaseComponent<ResourceComponent<?>> imp
@SuppressWarnings("unchecked")
List<Map<String, Object>> content = (List<Map<String, Object>>) result.getResult();
if (content == null || content.isEmpty()) {
- log.warn("Could not determine the location of the deployment - the content descriptor wasn't found for deployment" + getAddress() + ".");
- return null;
+ // No content -> check for server group
+ if (path.startsWith(("server-group="))) {
+ // Server group has no content of its own - use the domain deployment
+ String name = (String) path.substring(path.lastIndexOf("=")+1);
+ op = new ReadResource(new Address("deployment",name));
+ result = getASConnection().execute(op);
+ if (result.isSuccess()) {
+ @SuppressWarnings("unchecked")
+ Map<String,Object> contentMap = (Map<String, Object>) result.getResult();
+ content = (List<Map<String, Object>>) contentMap.get("content");
+ if (content.get(0).containsKey("path")) {
+ String path = (String) content.get(0).get("path");
+ String relativeTo = (String) content.get(0).get("relative-to");
+ deploymentFile = getDeploymentFileFromPath(relativeTo, path);
+ } else if (content.get(0).containsKey("hash")) {
+ @SuppressWarnings("unchecked")
+ String base64Hash = ((Map<String, String>)content.get(0).get("hash")).get("BYTES_VALUE");
+ byte[] hash = Base64.decode(base64Hash);
+ ServerGroupComponent sgc = (ServerGroupComponent) context.getParentResourceComponent();
+ String baseDir = ((HostControllerComponent) sgc.context.getParentResourceComponent()).pluginConfiguration.getSimpleValue("baseDir");
+ String contentPath = new File(baseDir , "/data/content").getAbsolutePath();
+ deploymentFile = getDeploymentFileFromHash(hash, contentPath);
+ }
+ return deploymentFile;
+ }
+ }
+ else {
+ log.warn("Could not determine the location of the deployment - the content descriptor wasn't found for deployment" + getAddress() + ".");
+ return null;}
}
Boolean archive = (Boolean) content.get(0).get("archive");
@@ -259,11 +299,34 @@ public class DeploymentComponent extends BaseComponent<ResourceComponent<?>> imp
@SuppressWarnings("unchecked")
String base64Hash = ((Map<String, String>)content.get(0).get("hash")).get("BYTES_VALUE");
byte[] hash = Base64.decode(base64Hash);
- Address contentPathAddress = new Address("core-service", "server-environment");
+ Address contentPathAddress;
+ if (context.getParentResourceComponent() instanceof ManagedASComponent) {
+ // -> managed server we need to check for host=x/server=y, but the path brings host=x,server-config=y
+ String p = ((ManagedASComponent) context.getParentResourceComponent()).getPath();
+ p = p.replaceAll("server-config=","server=");
+ contentPathAddress = new Address(p);
+ contentPathAddress.add("core-service", "server-environment");
+ }
+ else {
+ // standalone
+ contentPathAddress = new Address("core-service", "server-environment");
+ }
op = new ReadAttribute(contentPathAddress, "content-dir");
result = getASConnection().execute(op);
- String contentPath = (String) result.getResult();
+ String contentPath;
+ if (result.isSuccess()) {
+ contentPath = (String) result.getResult();
+ } else {
+ // No success above -> check if this is a domain deployment
+ if (this instanceof DomainDeploymentComponent) {
+ String baseDir = ((HostControllerComponent) context.getParentResourceComponent()).pluginConfiguration.getSimpleValue("baseDir");
+ contentPath = new File(baseDir , DOMAIN_DATA_CONTENT_SUBDIR).getAbsolutePath();
+ }
+ else {
+ contentPath = "-unknown-";
+ }
+ }
deploymentFile = getDeploymentFileFromHash(hash, contentPath);
} else {
log.warn("Failed to determine the deployment file of " + getAddress() + " deployment. Neither path nor hash attributes were available.");
11 years, 5 months
- 1
- 0
[rhq] modules/enterprise
by Jay Shaughnessy
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/TestServerPluginService.java | 2
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/bundle/TestBundleServerPluginService.java | 2
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/content/test/ContentUIManagerBeanTest.java | 11
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java | 2
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/core/plugin/DatabaseAndFilePluginDeploymentTest.java | 7
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java | 2
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/plugin/pc/content/TestContentServerPluginService.java | 2
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/plugin/pc/generic/TestGenericServerPluginService.java | 2
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MetadataBeanTest.java | 35
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest.java | 6
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginScanningExtensionMetadataTest.java | 12
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/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java | 46 -
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/OldAbstractEJB3Test.java | 445 ----------
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/StandardServerPluginService.java | 2
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/TestServerPluginService.java | 2
16 files changed, 68 insertions(+), 512 deletions(-)
New commits:
commit a8d94d9619c760f372499502be72db3384487154
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Sat Dec 1 19:29:10 2012 -0500
Server i-test work to address many test interaction issues ( ** There are still some test failures ** )
- thin rhq.ear by removing the services SAR. The standard services actually
just get in the way, tests are responsible for prepare/unprepare of any
services they need and should not depend on the production services, which
may perform undesired work anyway.
- Add AbstractEJB3Test.preparePluginScannerService(), which will prepare a default
test deployment scanner, and make use of it in more classes that
need that service deployed, and were previously depending on the production
deployment scanner.
- Apply more consistent temp directory usage by settling on
java.io.tmpdir/rhq/<class.simplename> as the convention. Add
AbstractEJB3Test.getTempDir() and use it ubiquitously. This consolidates
the test files under and "rhq" root dir and also identofies them by creating
class name.
- DatabaseAndFilePluginDeploymentTest
- make a non-test method private, not public so it doesn't execute as a test
- remove the obsolete OldAbstractEJB3Test class
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/TestServerPluginService.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/TestServerPluginService.java
index be9b752..796a562 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/TestServerPluginService.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/TestServerPluginService.java
@@ -53,7 +53,7 @@ public abstract class TestServerPluginService extends ServerPluginService implem
protected TestServerPluginService() {
// build the config at constructor time so tests have it even before the PC is initialized
- File dir = new File(System.getProperty("java.io.tmpdir"), "test-server-plugins");
+ File dir = new File(System.getProperty("java.io.tmpdir") + "/rhq", this.getClass().getSimpleName());
this.masterConfig = new MasterServerPluginContainerConfiguration(dir, dir, dir, null);
}
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/bundle/TestBundleServerPluginService.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/bundle/TestBundleServerPluginService.java
index 61c53d3..45f210c 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/bundle/TestBundleServerPluginService.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/bundle/TestBundleServerPluginService.java
@@ -68,7 +68,7 @@ public class TestBundleServerPluginService extends ServerPluginService implement
public TestBundleServerPluginService() {
// build the config at constructor time so tests have it even before the PC is initialized
- File dir = new File(System.getProperty("java.io.tmpdir"), "test-server-plugins");
+ File dir = new File(System.getProperty("java.io.tmpdir") + "/rhq", this.getClass().getSimpleName());
this.masterConfig = new MasterServerPluginContainerConfiguration(dir, dir, dir, null);
}
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/content/test/ContentUIManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/content/test/ContentUIManagerBeanTest.java
index 311d521..51bd984 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/content/test/ContentUIManagerBeanTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/content/test/ContentUIManagerBeanTest.java
@@ -268,12 +268,13 @@ public class ContentUIManagerBeanTest extends AbstractEJB3Test {
// contents into memory every time.
// destination once pulled from db
- String pulledFilename = System.getProperty("java.io.tmpdir") + "/"
- + this.getClass().getSimpleName()
- + "/pulled.jar";
- File retrieved = new File(pulledFilename);
+ File tempDir = getTempDir();
+ if (!tempDir.exists()) {
+ assertTrue("Unable to mkdirs " + tempDir + " for test.", tempDir.mkdirs());
+ }
+ File retrieved = new File(tempDir, "pulled.jar");
if (retrieved.exists()) {
- assertTrue("Unable to delete " + pulledFilename + " for test cleanup.", retrieved.delete());
+ assertTrue("Unable to delete " + retrieved.getPath() + " for test cleanup.", retrieved.delete());
}
//any jar should be fine. Use canned jar
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java
index 645e35c..02a2fbc 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java
@@ -531,7 +531,7 @@ public class CoreServerServiceImplTest extends AbstractEJB3Test {
@Override
public File getJBossServerHomeDir() {
- return new File(System.getProperty("java.io.tmpdir"), "CoreServerServiceImplTest");
+ return getTempDir();
}
@Override
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/core/plugin/DatabaseAndFilePluginDeploymentTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/core/plugin/DatabaseAndFilePluginDeploymentTest.java
index 6d649f5..d031926 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/core/plugin/DatabaseAndFilePluginDeploymentTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/core/plugin/DatabaseAndFilePluginDeploymentTest.java
@@ -48,13 +48,12 @@ import org.rhq.enterprise.server.util.LookupUtil;
//make sure we run this after the plugins.metadata tests are done so that
//the db contents don't interfere
-@Test
-//(dependsOnGroups = "plugin.metadata")
+//@Test(dependsOnGroups = "plugin.metadata")
public class DatabaseAndFilePluginDeploymentTest extends AbstractEJB3Test {
private static final String PLUGIN_NAME = "DeployTest"; // as defined in our test descriptors
private static final String DESCRIPTORS_LOCATION = "test/deployment/";
- private static final String TEST_DIR = System.getProperty("java.io.tmpdir") + "/"
+ private static final String TEST_DIR = System.getProperty("java.io.tmpdir") + "/rhq/"
+ DatabaseAndFilePluginDeploymentTest.class.getName() + "/";
private static final String JARS_LOCATION = TEST_DIR + "jars";
private static final String DEPLOY_LOCATION = TEST_DIR + "deploy";
@@ -116,7 +115,7 @@ public class DatabaseAndFilePluginDeploymentTest extends AbstractEJB3Test {
// is important that afterClassStandIn() have a dependency such that it runs in the last test-set.
//@BeforeClass
- public void beforeClass() throws Exception {
+ private void beforeClass() throws Exception {
Calendar cal = Calendar.getInstance();
cal.set(2009, Calendar.FEBRUARY, 1, 1, 0, 0);
cal.set(Calendar.MILLISECOND, 0);
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java
index 8389f17..03cffdc 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java
@@ -111,7 +111,7 @@ public class DriftManagerBeanTest extends AbstractEJB3Test {
@Test
public void testStoreChangeSet() throws Exception {
- File rootDir = new File(System.getProperty("java.io.tmpdir"));
+ File rootDir = getTempDir();
File changeSetsDir = new File(rootDir, "changesets");
deleteDirectory(changeSetsDir);
changeSetsDir.mkdirs();
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/plugin/pc/content/TestContentServerPluginService.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/plugin/pc/content/TestContentServerPluginService.java
index da94c58..5850985 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/plugin/pc/content/TestContentServerPluginService.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/plugin/pc/content/TestContentServerPluginService.java
@@ -86,7 +86,7 @@ public class TestContentServerPluginService extends ServerPluginService implemen
protected MasterServerPluginContainer createMasterPluginContainer() {
MasterServerPluginContainer master = new TestMasterServerPluginContainer();
- File dir = new File(System.getProperty("java.io.tmpdir"), "test-server-plugins");
+ File dir = new File(System.getProperty("java.io.tmpdir") + "/rhq", this.getClass().getSimpleName());
MasterServerPluginContainerConfiguration config = new MasterServerPluginContainerConfiguration(dir, dir, dir,
null);
master.initialize(config);
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/plugin/pc/generic/TestGenericServerPluginService.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/plugin/pc/generic/TestGenericServerPluginService.java
index e8cdb51..85f45d0 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/plugin/pc/generic/TestGenericServerPluginService.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/plugin/pc/generic/TestGenericServerPluginService.java
@@ -57,7 +57,7 @@ public class TestGenericServerPluginService extends ServerPluginService implemen
public TestGenericServerPluginService() {
// build the config at constructor time so tests have it even before the PC is initialized
- File dir = new File(System.getProperty("java.io.tmpdir"), "test-server-plugins");
+ File dir = new File(System.getProperty("java.io.tmpdir" + "/rhq"), this.getClass().getSimpleName());
this.masterConfig = new MasterServerPluginContainerConfiguration(dir, dir, dir, null);
}
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MetadataBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MetadataBeanTest.java
index dbdb765..38b1216 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MetadataBeanTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MetadataBeanTest.java
@@ -39,7 +39,6 @@ import org.rhq.core.util.MessageDigestGenerator;
import org.rhq.core.util.stream.StreamUtil;
import org.rhq.enterprise.server.auth.SubjectManagerLocal;
import org.rhq.enterprise.server.bundle.TestBundleServerPluginService;
-import org.rhq.enterprise.server.core.plugin.PluginDeploymentScanner;
import org.rhq.enterprise.server.resource.ResourceTypeManagerLocal;
import org.rhq.enterprise.server.scheduler.jobs.PurgePluginsJob;
import org.rhq.enterprise.server.scheduler.jobs.PurgeResourceTypesJob;
@@ -48,8 +47,6 @@ import org.rhq.enterprise.server.util.LookupUtil;
public class MetadataBeanTest extends AbstractEJB3Test {
- protected PluginDeploymentScanner pluginScanner;
-
private List<Integer> pluginIds = new ArrayList<Integer>();
/**
@@ -81,6 +78,7 @@ public class MetadataBeanTest extends AbstractEJB3Test {
prepareCustomServerPluginService(bundleService);
bundleService.startMasterPluginContainerWithoutSchedulingJobs();
prepareScheduler();
+ preparePluginScannerService();
}
/**
@@ -91,6 +89,7 @@ public class MetadataBeanTest extends AbstractEJB3Test {
@Override
protected void afterMethod() throws Exception {
+ unpreparePluginScannerService();
unprepareServerPluginService();
unprepareScheduler();
}
@@ -145,7 +144,7 @@ public class MetadataBeanTest extends AbstractEJB3Test {
protected void createPlugin(String pluginFileName, String version, String descriptorFileName) throws Exception {
URL descriptorURL = getDescriptorURL(descriptorFileName);
PluginDescriptor pluginDescriptor = loadPluginDescriptor(descriptorURL);
- String pluginFilePath = getPluginWorkDir() + "/" + pluginFileName + ".jar";
+ String pluginFilePath = getPluginScannerService().getAgentPluginDir() + "/" + pluginFileName + ".jar";
Plugin plugin = new Plugin(pluginDescriptor.getName(), pluginFilePath);
plugin.setDisplayName(pluginDescriptor.getName());
@@ -162,37 +161,11 @@ public class MetadataBeanTest extends AbstractEJB3Test {
pluginIds.add(plugin.getId());
}
- protected void preparePluginScannerService() {
- if (this.pluginScanner == null) {
- this.pluginScanner = new PluginDeploymentScanner();
-
- String pluginDirPath = null;
- try {
- pluginDirPath = getPluginWorkDir();
- } catch (Exception e) {
- throw new RuntimeException("Cannot determine where to put the plugin jar files", e);
- }
- this.pluginScanner.setAgentPluginDir(pluginDirPath); // we don't want to scan for these
- this.pluginScanner.setServerPluginDir(null); // we don't want to scan for these
- this.pluginScanner.setScanPeriod("9999999"); // we want to manually scan - don't allow for auto-scan to happen
- }
-
- preparePluginScannerService(this.pluginScanner);
- }
-
private URL getDescriptorURL(String descriptor) {
String dir = getClass().getSimpleName();
return getClass().getResource(dir + "/" + descriptor);
}
- protected String getPluginWorkDir() throws Exception {
- return getCurrentWorkingDir() + "/" + this.getClass().getSimpleName() + "/" + "plugins";
- }
-
- protected String getCurrentWorkingDir() throws Exception {
- return System.getProperty("java.io.tmpdir");
- }
-
String getAmpsVersion(PluginDescriptor pluginDescriptor) {
if (pluginDescriptor.getAmpsVersion() == null) {
return "2.0";
@@ -283,7 +256,7 @@ public class MetadataBeanTest extends AbstractEJB3Test {
InputStream in = null;
try {
- String pluginDirPath = getPluginWorkDir();
+ String pluginDirPath = getPluginScannerService().getAgentPluginDir();
File pluginDir = new File(pluginDirPath);
pluginDir.mkdirs();
File jarFile = new File(pluginDir, jarName);
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest.java
index 36b0821..befaa1a 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest.java
@@ -55,9 +55,7 @@ public class PluginManagerBeanTest extends MetadataBeanTest {
subjectMgr = LookupUtil.getSubjectManager();
pluginMgr = LookupUtil.getPluginManager();
- FileUtil.purge(new File(getPluginWorkDir()), true);
-
- preparePluginScannerService();
+ FileUtil.purge(new File(getPluginScannerService().getAgentPluginDir()), true);
}
@Override
@@ -88,7 +86,7 @@ public class PluginManagerBeanTest extends MetadataBeanTest {
createPluginJarFile("test-plugin3.jar", "plugin_3.xml");
createPluginJarFile("test-plugin3.1.jar", "plugin_3.1.xml");
- pluginScanner.startDeployment();
+ getPluginScannerService().startDeployment();
}
@Test(dependsOnMethods = { "registerPlugins" })
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginScanningExtensionMetadataTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginScanningExtensionMetadataTest.java
index 5417305..1667dee 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginScanningExtensionMetadataTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginScanningExtensionMetadataTest.java
@@ -56,8 +56,6 @@ public class PluginScanningExtensionMetadataTest extends MetadataBeanTest {
protected void beforeMethod() throws Exception {
super.beforeMethod();
- preparePluginScannerService();
-
subjectMgr = LookupUtil.getSubjectManager();
resourceTypeMgr = LookupUtil.getResourceTypeManager();
@@ -80,8 +78,6 @@ public class PluginScanningExtensionMetadataTest extends MetadataBeanTest {
}
createdJarFiles.clear();
- unpreparePluginScannerService();
-
super.afterMethod();
}
@@ -110,7 +106,7 @@ public class PluginScanningExtensionMetadataTest extends MetadataBeanTest {
private void registerParentPluginV1() throws Exception {
// register the plugin, load the new type and test to make sure its what we expect
createdJarFiles.add(createPluginJarFile("parent-plugin.jar", "parent_plugin_v1.xml"));
- this.pluginScanner.startDeployment(); // first time we need to scan so call startDeployment which will call scanAndRegister
+ getPluginScannerService().startDeployment(); // first time we need to scan so call startDeployment which will call scanAndRegister
ResourceType resourceType = loadResourceTypeFully(TYPE_NAME_PARENT, PLUGIN_NAME_PARENT);
assert resourceType.getName().equals(TYPE_NAME_PARENT);
assert resourceType.getPlugin().equals(PLUGIN_NAME_PARENT);
@@ -120,7 +116,7 @@ public class PluginScanningExtensionMetadataTest extends MetadataBeanTest {
private void registerChild1PluginV1() throws Exception {
// register the plugin, load the new type and test to make sure its what we expect
createdJarFiles.add(createPluginJarFile("child1-plugin.jar", "child1_plugin_v1.xml"));
- this.pluginScanner.scanAndRegister();
+ getPluginScannerService().scanAndRegister();
ResourceType resourceType = loadResourceTypeFully(TYPE_NAME_CHILD1, PLUGIN_NAME_CHILD1);
assert resourceType.getName().equals(TYPE_NAME_CHILD1);
assert resourceType.getPlugin().equals(PLUGIN_NAME_CHILD1);
@@ -137,7 +133,7 @@ public class PluginScanningExtensionMetadataTest extends MetadataBeanTest {
private void registerChild2PluginV1() throws Exception {
// register the plugin, load the new type and test to make sure its what we expect
createdJarFiles.add(createPluginJarFile("child2-plugin.jar", "child2_plugin_v1.xml"));
- this.pluginScanner.scanAndRegister();
+ getPluginScannerService().scanAndRegister();
ResourceType resourceType = loadResourceTypeFully(TYPE_NAME_CHILD2, PLUGIN_NAME_CHILD2);
assert resourceType.getName().equals(TYPE_NAME_CHILD2);
assert resourceType.getPlugin().equals(PLUGIN_NAME_CHILD2);
@@ -147,7 +143,7 @@ public class PluginScanningExtensionMetadataTest extends MetadataBeanTest {
private void registerParentPluginV2() throws Exception {
// register the plugin, load the new type and test to make sure its what we expect
createdJarFiles.add(createPluginJarFile("parent-plugin.jar", "parent_plugin_v2.xml"));
- this.pluginScanner.scanAndRegister();
+ getPluginScannerService().scanAndRegister();
ResourceType resourceType = loadResourceTypeFully(TYPE_NAME_PARENT, PLUGIN_NAME_PARENT);
assert resourceType.getName().equals(TYPE_NAME_PARENT);
assert resourceType.getPlugin().equals(PLUGIN_NAME_PARENT);
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java
index ddf59f0..7c4fa43 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java
@@ -75,6 +75,7 @@ public class UpdatePluginMetadataTestBase extends AbstractEJB3Test {
agentServiceContainer = prepareForTestAgents();
prepareMockAgentServiceContainer();
prepareScheduler();
+ preparePluginScannerService();
pluginMgr = LookupUtil.getPluginManager();
resourceTypeManager = LookupUtil.getResourceTypeManager();
@@ -85,6 +86,7 @@ public class UpdatePluginMetadataTestBase extends AbstractEJB3Test {
protected void afterMethod() throws Exception {
cleanupTest();
+ unpreparePluginScannerService();
unprepareScheduler();
unprepareForTestAgents();
}
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java
index 975efb8..d8db4b9 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java
@@ -58,6 +58,7 @@ import org.rhq.core.util.stream.StreamUtil;
import org.rhq.enterprise.server.RHQConstants;
import org.rhq.enterprise.server.auth.SessionManager;
import org.rhq.enterprise.server.core.comm.ServerCommunicationsServiceMBean;
+import org.rhq.enterprise.server.core.plugin.PluginDeploymentScanner;
import org.rhq.enterprise.server.core.plugin.PluginDeploymentScannerMBean;
import org.rhq.enterprise.server.plugin.pc.ServerPluginService;
import org.rhq.enterprise.server.plugin.pc.ServerPluginServiceMBean;
@@ -292,9 +293,10 @@ public abstract class AbstractEJB3Test extends Arquillian {
EnterpriseArchive testEar = ShrinkWrap.create(EnterpriseArchive.class, "rhq.ear");
EnterpriseArchive rhqEar = earResolver.artifact("org.rhq:rhq-enterprise-server-ear:ear:4.6.0-SNAPSHOT")
.resolveAs(EnterpriseArchive.class).iterator().next();
- // merge rhq.ear into testEar but include only the EJB jars, the SAR, and the supporting libraries
- testEar = testEar.merge(rhqEar,
- Filters.include("/lib.*|/rhq.*ejb3\\.jar.*|/rhq-enterprise-server-services-sar.*"));
+ // merge rhq.ear into testEar but include only the EJB jars and the supporting libraries. Note that we
+ // don't include the services sar because tests are responsible for prepare/unprepare of all required services,
+ // we don't want the production services performig any unexpected work.
+ testEar = testEar.merge(rhqEar, Filters.include("/lib.*|/rhq.*ejb3\\.jar.*"));
// remove startup beans and shutdown listeners, we don't want this to be a full server deployment. The tests
// start/stop what they need, typically with test services or mocks.
testEar.delete(ArchivePaths
@@ -932,12 +934,33 @@ public abstract class AbstractEJB3Test extends Arquillian {
}
/**
+ * Prepares a test deployment scanner with the following characteristics<br/>.
+ * - start() is called but startDeployment() is not called.<br/>
+ * - agentPluginDir is set to getTempDir() + "/plugins"<br/>
+ * - serverPluginDir is set to null (no scanning for server plugins)<br/>
+ * - scanPeriod is set to 9999999 (basically prevent autoscan)<br/>
+ */
+ protected PluginDeploymentScannerMBean preparePluginScannerService() {
+ if (null != pluginScannerService) {
+ return pluginScannerService;
+ }
+
+ PluginDeploymentScanner scanner = new PluginDeploymentScanner();
+ String pluginDirPath = getTempDir() + "/plugins";
+ scanner.setAgentPluginDir(pluginDirPath); // we don't want to scan for these
+ scanner.setServerPluginDir(null); // we don't want to scan for these
+ scanner.setScanPeriod("9999999"); // we want to manually scan - don't allow for auto-scan to happen
+
+ return preparePluginScannerService(scanner);
+ }
+
+ /**
* Note that the standard plugin scanner service is deployed automatically with the test rhq ear,
* this is only necessary if you want a custom service.
*
* @param scannerService
*/
- public void preparePluginScannerService(PluginDeploymentScannerMBean scannerService) {
+ public PluginDeploymentScannerMBean preparePluginScannerService(PluginDeploymentScannerMBean scannerService) {
try {
MBeanServer mbs = getPlatformMBeanServer();
if (mbs.isRegistered(PluginDeploymentScannerMBean.OBJECT_NAME)) {
@@ -949,6 +972,8 @@ public abstract class AbstractEJB3Test extends Arquillian {
pluginScannerService = scannerService;
pluginScannerService.start();
+ return pluginScannerService;
+
} catch (Exception e) {
e.printStackTrace();
throw new RuntimeException(e);
@@ -998,7 +1023,7 @@ public abstract class AbstractEJB3Test extends Arquillian {
* @throws Exception
*/
protected void writeObjects(String filename, Object... objects) throws Exception {
- File file = new File(System.getProperty("java.io.tmpdir"), this.getClass().getName() + "-" + filename);
+ File file = new File(getTempDir(), "-" + filename);
file.delete();
ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream(file));
for (Object o : objects) {
@@ -1021,7 +1046,7 @@ public abstract class AbstractEJB3Test extends Arquillian {
ObjectInputStream ois = null;
try {
- File file = new File(System.getProperty("java.io.tmpdir"), this.getClass().getName() + "-" + filename);
+ File file = new File(getTempDir(), "-" + filename);
ois = new ObjectInputStream(new FileInputStream(file));
for (int i = 0; i < numObjects; ++i) {
result.add(ois.readObject());
@@ -1040,8 +1065,15 @@ public abstract class AbstractEJB3Test extends Arquillian {
* @return true if deleted, false otherwise.
*/
protected boolean deleteObjects(String filename) {
- File file = new File(System.getProperty("java.io.tmpdir"), this.getClass().getName() + "-" + filename);
+ File file = new File(getTempDir(), "-" + filename);
return file.delete();
}
+ /**
+ * @return a temp directory for testing that is specific to this test class.
+ */
+ protected File getTempDir() {
+ return new File(System.getProperty("java.io.tmpdir") + "/rhq", this.getClass().getSimpleName());
+ }
+
}
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/OldAbstractEJB3Test.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/OldAbstractEJB3Test.java
deleted file mode 100644
index a8337b7..0000000
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/OldAbstractEJB3Test.java
+++ /dev/null
@@ -1,445 +0,0 @@
-///*
-// * RHQ Management Platform
-// * Copyright (C) 2005-2008 Red Hat, Inc.
-// * All rights reserved.
-// *
-// * This program is free software; you can redistribute it and/or modify
-// * it under the terms of the GNU General Public License as published by
-// * the Free Software Foundation version 2 of the License.
-// *
-// * This program is distributed in the hope that it will be useful,
-// * but WITHOUT ANY WARRANTY; without even the implied warranty of
-// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// * GNU General Public License for more details.
-// *
-// * You should have received a copy of the GNU General Public License
-// * along with this program; if not, write to the Free Software
-// * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-// */
-package org.rhq.enterprise.server.test;
-
-import org.testng.AssertJUnit;
-
-
-//import static org.rhq.test.JPAUtils.lookupEntityManager;
-//import static org.rhq.test.JPAUtils.lookupTransactionManager;
-//
-//import java.sql.Connection;
-//import java.sql.SQLException;
-//import java.util.Hashtable;
-//import java.util.Properties;
-//
-//import javax.management.MBeanServer;
-//import javax.management.MBeanServerFactory;
-//import javax.naming.InitialContext;
-//import javax.naming.NamingException;
-//import javax.persistence.EntityManager;
-//import javax.transaction.TransactionManager;
-//
-//import org.hibernate.SessionFactory;
-//import org.hibernate.stat.Statistics;
-//import org.testng.AssertJUnit;
-//import org.testng.annotations.AfterMethod;
-//import org.testng.annotations.AfterSuite;
-//import org.testng.annotations.BeforeMethod;
-//import org.testng.annotations.BeforeSuite;
-//
-//import org.jboss.ejb3.embedded.EJB3StandaloneBootstrap;
-//import org.jboss.ejb3.embedded.EJB3StandaloneDeployer;
-//import org.jboss.mx.util.MBeanServerLocator;
-//
-//import org.rhq.core.db.DatabaseTypeFactory;
-//import org.rhq.core.db.PostgresqlDatabaseType;
-//import org.rhq.core.domain.auth.Subject;
-//import org.rhq.core.domain.server.PersistenceUtility;
-//import org.rhq.enterprise.server.RHQConstants;
-//import org.rhq.enterprise.server.auth.SessionManager;
-//import org.rhq.enterprise.server.content.ContentSourceManagerBean;
-//import org.rhq.enterprise.server.core.comm.ServerCommunicationsServiceMBean;
-//import org.rhq.enterprise.server.core.plugin.PluginDeploymentScanner;
-//import org.rhq.enterprise.server.core.plugin.PluginDeploymentScannerMBean;
-//import org.rhq.enterprise.server.plugin.pc.ServerPluginService;
-//import org.rhq.enterprise.server.plugin.pc.ServerPluginServiceMBean;
-//import org.rhq.enterprise.server.scheduler.SchedulerService;
-//import org.rhq.enterprise.server.scheduler.SchedulerServiceMBean;
-//import org.rhq.enterprise.server.util.LookupUtil;
-//
-////
-/////**
-//// * This is the abstract test base for server jar tests.
-//// *
-//// * @author Greg Hinkle
-//// */
-public abstract class OldAbstractEJB3Test extends AssertJUnit {
- //
- // private static EJB3StandaloneDeployer deployer;
- // private static Statistics stats;
- // @SuppressWarnings("unused")
- // private static long start; // see endTest() if you want to output this
- // private SchedulerService schedulerService;
- // private ServerPluginService serverPluginService;
- // private MBeanServer dummyJBossMBeanServer;
- // private PluginDeploymentScannerMBean pluginScannerService;
- //
- //
- // //@BeforeSuite(groups = {"integration.ejb3","PERF"}) // TODO investigate again
- // @BeforeSuite(alwaysRun = true)
- // public static void startupEmbeddedJboss() throws Exception {
- // // The embeddedDeployment property needs to be set for running tests
- // // with the embedded container. It is set in the surefire configuration
- // // in pom.xml but setting here makes it easier to run tests directly
- // // from your IDE.
- // //
- // // jsanda
- // System.setProperty("embeddedDeployment", "true");
- //
- // // Setting content location to the tmp dir
- // System.setProperty(ContentSourceManagerBean.FILESYSTEM_PROPERTY, System.getProperty("java.io.tmpdir"));
- //
- // System.out.println("Starting JBoss EJB3 Embedded Container...");
- // String deployDir = System.getProperty("deploymentDirectory", "target/classes");
- // System.out.println("Loading EJB3 deployments from directory: " + deployDir);
- // try {
- // EJB3StandaloneBootstrap.boot(null);
- // // EJB3StandaloneBootstrap.scanClasspath();
- //
- // System.err.println("...... embedded container booted....");
- //
- // deployer = EJB3StandaloneBootstrap.createDeployer();
- //
- // deployer.setClassLoader(AbstractEJB3Test.class.getClassLoader());
- // System.err.println("...... embedded container classloader set....");
- //
- // deployer.getArchivesByResource().add("META-INF/persistence.xml");
- // System.err.println("...... embedded container persistence xml deployed....");
- //
- // deployer.getArchivesByResource().add("META-INF/ejb-jar.xml");
- // System.err.println("...... embedded container ejb-jar xml deployed....");
- //
- // EJB3StandaloneBootstrap.deployXmlResource("jboss-jms-beans.xml");
- // System.err.println("...... embedded container jboss-jms-beans xml deployed....");
- //
- // EJB3StandaloneBootstrap.deployXmlResource("rhq-mdb-beans.xml");
- // System.err.println("...... embedded container rhq-mdb-beans xml deployed....");
- //
- // /*
- // * File core = new File(deployDir, "on-core-domain-ejb.ejb3"); if (!core.exists())
- // * System.err.println("Deployment directory does not exist: " + core.getAbsolutePath());
- // * deployer.getArchives().add(core.toURI().toURL());
- // *
- // * File server = new File(deployDir, "on-enterprise-server-ejb.ejb3"); if (!server.exists())
- // * System.err.println("Deployment directory does not exist: " + server.getAbsolutePath());
- // * deployer.getArchives().add(server.toURI().toURL());
- // *
- // */
- //
- // //deployer.setKernel(EJB3StandaloneBootstrap.getKernel());
- // deployer.create();
- // System.err.println("...... deployer created....");
- //
- // deployer.start();
- // System.err.println("...... deployer started....");
- //
- // System.err.println("...... start statistics");
- // SessionFactory sessionFactory = PersistenceUtility.getHibernateSession(getEntityManager())
- // .getSessionFactory();
- // stats = sessionFactory.getStatistics();
- // stats.setStatisticsEnabled(true);
- //
- // System.err.println("...... embedded container initialized and ready for testing....");
- //
- // } catch (Throwable t) {
- // // Catch RuntimeExceptions and Errors and dump their stack trace, because Surefire will completely swallow them
- // // and throw a cryptic NPE (see http://jira.codehaus.org/browse/SUREFIRE-157)!
- // t.printStackTrace();
- // throw new RuntimeException(t);
- // }
- // }
- //
- // //@Configuration(groups = "integration.ejb3", afterSuite = true)
- // @AfterSuite(alwaysRun = true)
- // public static void shutdownEmbeddedJboss() {
- // System.out.println("Stopping JBoss EJB3 Embedded Container...");
- //
- // System.err.println("!!! Any errors occurring after this point !!!");
- // System.err.println("!!! occurred during embedded server shutdown !!!");
- // System.err.println("!!! and are probably not a real problem. !!!");
- // if (deployer != null) {
- // try {
- // deployer.stop();
- // deployer.destroy();
- // deployer = null;
- // } catch (Throwable t) {
- // System.err.println("Failed to stop embedded deployer");
- // t.printStackTrace(System.err);
- // }
- // }
- // EJB3StandaloneBootstrap.shutdown();
- // }
- //
- // @BeforeMethod
- // public static void startTest() {
- // if (DatabaseTypeFactory.getDefaultDatabaseType() == null) {
- // try {
- // Connection conn = getConnection();
- // DatabaseTypeFactory.setDefaultDatabaseType(DatabaseTypeFactory.getDatabaseType(conn));
- // } catch (Exception e) {
- // System.err.println("!!! WARNING !!! cannot set default database type, some tests may fail");
- // e.printStackTrace();
- // }
- // }
- //
- // if (stats != null)
- // start = stats.getQueryExecutionCount();
- // else
- // start = 0;
- // }
- //
- // public static Connection getConnection() throws SQLException {
- // return LookupUtil.getDataSource().getConnection();
- // }
- //
- // @AfterMethod
- // public static void endTest() {
- // //System.out.println("Connections used: " + (stats.getQueryExecutionCount() - start));
- // }
- //
- // public TransactionManager getTransactionManager() {
- // return lookupTransactionManager();
- // }
- //
- // public static EntityManager getEntityManager() {
- // return lookupEntityManager();
- // }
- //
- // public static InitialContext getInitialContext() {
- // Hashtable<String, String> env = new Hashtable<String, String>();
- // env.put("java.naming.factory.initial", "org.jnp.interfaces.LocalOnlyContextFactory");
- // env.put("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces");
- // try {
- // return new InitialContext(env);
- // } catch (NamingException e) {
- // e.printStackTrace();
- // throw new RuntimeException("Failed to load initial context", e);
- // }
- // }
- //
- // public boolean isPostgres() throws Exception {
- // return DatabaseTypeFactory.getDatabaseType(getInitialContext(), RHQConstants.DATASOURCE_JNDI_NAME) instanceof PostgresqlDatabaseType;
- // }
- //
- // /**
- // * This creates a session for the given user and associates that session with the subject. You can test the security
- // * annotations by creating sessions for different users with different permissions.
- // *
- // * @param subject a JON subject
- // * @return the session activated subject, a copy of the subject passed in.
- // */
- // public Subject createSession(Subject subject) {
- // return SessionManager.getInstance().put(subject);
- // }
- //
- // /**
- // * Returns an MBeanServer that simulates the JBossAS MBeanServer.
- // *
- // * @return MBeanServer instance
- // */
- // public MBeanServer getJBossMBeanServer() {
- // if (dummyJBossMBeanServer == null) {
- // dummyJBossMBeanServer = MBeanServerFactory.createMBeanServer("jboss");
- // MBeanServerLocator.setJBoss(dummyJBossMBeanServer);
- // }
- //
- // return dummyJBossMBeanServer;
- // }
- //
- // public void releaseJBossMBeanServer() {
- // if (dummyJBossMBeanServer != null) {
- // MBeanServerFactory.releaseMBeanServer(dummyJBossMBeanServer);
- // dummyJBossMBeanServer = null;
- // }
- // }
- //
- // /**
- // * If you need to test round trips from server to agent and back, you first must install the server communications
- // * service that houses all the agent clients. Call this method and add your test agent services to the public fields
- // * in the returned object.
- // *
- // * @return the object that will house your test agent service impls and the agent clients.
- // *
- // * @throws RuntimeException
- // */
- // public TestServerCommunicationsService prepareForTestAgents() {
- // try {
- // MBeanServer mbs = getJBossMBeanServer();
- // if (mbs.isRegistered(ServerCommunicationsServiceMBean.OBJECT_NAME)) {
- // mbs.unregisterMBean(ServerCommunicationsServiceMBean.OBJECT_NAME);
- // }
- // TestServerCommunicationsService testAgentContainer = new TestServerCommunicationsService();
- // mbs.registerMBean(testAgentContainer, ServerCommunicationsServiceMBean.OBJECT_NAME);
- // return testAgentContainer;
- // } catch (Exception e) {
- // throw new RuntimeException(e);
- // }
- // }
- //
- // /**
- // * Call this after your tests have finished. You only need to call this if your test previously called
- // * {@link #prepareForTestAgents()}.
- // */
- // public void unprepareForTestAgents() {
- // unprepareForTestAgents(false);
- // }
- //
- // public void unprepareForTestAgents(boolean beanOnly) {
- // try {
- // if (beanOnly) {
- // MBeanServer mbs = getJBossMBeanServer();
- // if (mbs.isRegistered(ServerCommunicationsServiceMBean.OBJECT_NAME)) {
- // mbs.unregisterMBean(ServerCommunicationsServiceMBean.OBJECT_NAME);
- // }
- // } else {
- // releaseJBossMBeanServer();
- // }
- // } catch (Exception e) {
- // throw new RuntimeException(e);
- // }
- // }
- //
- // /**
- // * If you need to test server plugins, you must first prepare the server plugin service.
- // * After this returns, the caller must explicitly start the PC by using the appropriate API
- // * on the given mbean; this method will only start the service, it will NOT start the master PC.
- // *
- // * @param testServiceMBean the object that will house your test server plugins
- // *
- // * @throws RuntimeException
- // */
- // public void prepareCustomServerPluginService(ServerPluginService testServiceMBean) {
- // try {
- // MBeanServer mbs = getJBossMBeanServer();
- // testServiceMBean.start();
- // mbs.registerMBean(testServiceMBean, ServerPluginServiceMBean.OBJECT_NAME);
- // serverPluginService = testServiceMBean;
- // return;
- // } catch (Exception e) {
- // throw new RuntimeException(e);
- // }
- // }
- //
- // public void unprepareServerPluginService() throws Exception {
- // unprepareServerPluginService(false);
- // }
- //
- // public void unprepareServerPluginService(boolean beanOnly) throws Exception {
- // if (serverPluginService != null) {
- // serverPluginService.stopMasterPluginContainer();
- // serverPluginService.stop();
- // if (beanOnly) {
- // MBeanServer mbs = getJBossMBeanServer();
- // if (mbs.isRegistered(ServerPluginService.OBJECT_NAME)) {
- // getJBossMBeanServer().unregisterMBean(ServerPluginService.OBJECT_NAME);
- // }
- // if (mbs.isRegistered(ServerPluginServiceMBean.OBJECT_NAME)) {
- // getJBossMBeanServer().unregisterMBean(ServerPluginServiceMBean.OBJECT_NAME);
- // }
- //
- // } else {
- // releaseJBossMBeanServer();
- // }
- // serverPluginService = null;
- // }
- // }
- //
- // public SchedulerService getSchedulerService() {
- // return schedulerService;
- // }
- //
- // public void prepareScheduler() {
- // try {
- // if (schedulerService != null) {
- // return;
- // }
- //
- // Properties quartzProps = new Properties();
- // quartzProps.load(this.getClass().getClassLoader().getResourceAsStream("test-scheduler.properties"));
- //
- // schedulerService = new SchedulerService();
- // schedulerService.setQuartzProperties(quartzProps);
- // schedulerService.start();
- // getJBossMBeanServer().registerMBean(schedulerService, SchedulerServiceMBean.SCHEDULER_MBEAN_NAME);
- // schedulerService.startQuartzScheduler();
- // return;
- // } catch (Exception e) {
- // e.printStackTrace();
- // throw new RuntimeException(e);
- // }
- // }
- //
- // public void unprepareScheduler() throws Exception {
- // unprepareScheduler(false);
- // }
- //
- // public void unprepareScheduler(boolean beanOnly) throws Exception {
- // if (schedulerService != null) {
- // schedulerService.stop();
- // if (beanOnly) {
- // MBeanServer mbs = getJBossMBeanServer();
- // if (mbs.isRegistered(SchedulerServiceMBean.SCHEDULER_MBEAN_NAME)) {
- // getJBossMBeanServer().unregisterMBean(SchedulerServiceMBean.SCHEDULER_MBEAN_NAME);
- // }
- // } else {
- // releaseJBossMBeanServer();
- // }
- //
- // schedulerService = null;
- // }
- // }
- //
- // public PluginDeploymentScannerMBean getPluginScannerService() {
- // return pluginScannerService;
- // }
- //
- // protected void preparePluginScannerService() {
- // preparePluginScannerService(null);
- // }
- //
- // public void preparePluginScannerService(PluginDeploymentScannerMBean scannerService) {
- // try {
- // if (scannerService == null) {
- // scannerService = new PluginDeploymentScanner();
- // }
- // MBeanServer mbs = getJBossMBeanServer();
- // mbs.registerMBean(scannerService, PluginDeploymentScannerMBean.OBJECT_NAME);
- // pluginScannerService = scannerService;
- // return;
- // } catch (Exception e) {
- // e.printStackTrace();
- // throw new RuntimeException(e);
- // }
- // }
- //
- // public void unpreparePluginScannerService() throws Exception {
- // unpreparePluginScannerService(false);
- // }
- //
- // public void unpreparePluginScannerService(boolean beanOnly) throws Exception {
- // if (pluginScannerService != null) {
- // pluginScannerService.stop();
- // if (beanOnly) {
- // MBeanServer mbs = getJBossMBeanServer();
- // if (mbs.isRegistered(PluginDeploymentScannerMBean.OBJECT_NAME)) {
- // getJBossMBeanServer().unregisterMBean(PluginDeploymentScannerMBean.OBJECT_NAME);
- // }
- // } else {
- // releaseJBossMBeanServer();
- // }
- //
- // pluginScannerService = null;
- // }
- // }
- //
- // protected void executeInTransaction(TransactionCallback callback) {
- // executeInTransaction(callback);
- // }
-}
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/StandardServerPluginService.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/StandardServerPluginService.java
index 5f5692f..adcde42 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/StandardServerPluginService.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/StandardServerPluginService.java
@@ -84,7 +84,7 @@ public class StandardServerPluginService extends ServerPluginService implements
public List<Class<? extends AbstractTypeServerPluginContainer>> pluginContainerClasses;
public StandardServerPluginService() {
- File dir = new File(System.getProperty("java.io.tmpdir"), "test-server-plugins");
+ File dir = new File(System.getProperty("java.io.tmpdir") + "/rhq", this.getClass().getSimpleName());
this.masterConfig = new MasterServerPluginContainerConfiguration(dir, dir, dir, null);
pluginContainerClasses = new ArrayList<Class<? extends AbstractTypeServerPluginContainer>>();
pluginContainerClasses.add(AlertServerPluginContainer.class);
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/TestServerPluginService.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/TestServerPluginService.java
index c28256b..a8b134e 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/TestServerPluginService.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/TestServerPluginService.java
@@ -46,7 +46,7 @@ public class TestServerPluginService extends ServerPluginService implements Test
public TestServerPluginService() {
// build the config at constructor time so tests have it even before the PC is initialized
- File dir = new File(System.getProperty("java.io.tmpdir"), "test-server-plugins");
+ File dir = new File(System.getProperty("java.io.tmpdir") + "/rhq", this.getClass().getSimpleName());
this.masterConfig = new MasterServerPluginContainerConfiguration(dir, dir, dir, null);
}
11 years, 5 months
- 1
- 0