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()));