modules/core/domain/src/main/java/org/rhq/core/domain/configuration/composite/ResourceConfigurationComposite.java
| 4 ++++
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/SubjectCriteria.java
| 1 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/AggregateConfigurationBuilder.java
| 6 +++---
modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
| 10 +++++-----
4 files changed, 12 insertions(+), 9 deletions(-)
New commits:
commit f7e8e4c7cbd4bb0080fbc9fc9921316f5738448b
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Thu Oct 7 17:55:56 2010 -0400
add no-arg ctor to ResourceConfigurationComposite to make GWT happy; remove a few
remaining uses of the no-longer-valid c:option 'default' attribute in as5 plugin
descriptor
diff --git
a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/composite/ResourceConfigurationComposite.java
b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/composite/ResourceConfigurationComposite.java
index 3ce48ee..e00e29d 100644
---
a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/composite/ResourceConfigurationComposite.java
+++
b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/composite/ResourceConfigurationComposite.java
@@ -35,6 +35,10 @@ public class ResourceConfigurationComposite implements Serializable{
*/
private Configuration configuration;
+ // No-arg constructor required by GWT
+ protected ResourceConfigurationComposite() {
+ }
+
public ResourceConfigurationComposite(int resourceId, Configuration configuration) {
this.resourceId = resourceId;
this.configuration = configuration;
diff --git
a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/SubjectCriteria.java
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/SubjectCriteria.java
index af0882f..e4df2b8 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/SubjectCriteria.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/SubjectCriteria.java
@@ -163,5 +163,4 @@ public class SubjectCriteria extends Criteria {
addSortField("department");
this.sortDepartment = sortDepartment;
}
-
}
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 f363993..545a6af 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
@@ -77,7 +77,7 @@ public class AggregateConfigurationBuilder {
}
// If the property is a Map, recurse into it and group together its child
properties.
else if (propertyDefinition instanceof PropertyDefinitionMap) {
- List<AbstractPropertyMap> nestedSourceParentPropertyMaps = new
ArrayList();
+ List<AbstractPropertyMap> nestedSourceParentPropertyMaps = new
ArrayList<AbstractPropertyMap>();
for (AbstractPropertyMap sourceParentPropertyMap : sourceParentPropertyMaps)
{
PropertyMap nestedSourceParentPropertyMap = sourceParentPropertyMap
.getMap(propertyDefinition.getName());
@@ -139,14 +139,14 @@ public class AggregateConfigurationBuilder {
private static Map<String, Map<String, Integer>>
createMemberNameValueFrequenciesMap(
List<AbstractPropertyMap> sourceParentPropertyMaps) {
- Map<String, Map<String, Integer>> nameValueFrequenciesMap = new
HashMap();
+ Map<String, Map<String, Integer>> nameValueFrequenciesMap = new
HashMap<String, Map<String, Integer>>();
for (AbstractPropertyMap map : sourceParentPropertyMaps) {
for (String propertyName : map.getMap().keySet()) {
PropertySimple propertySimple = map.getSimple(propertyName);
String propertyValue = (propertySimple != null) ?
propertySimple.getStringValue() : null;
Map<String, Integer> valueFrequencies =
nameValueFrequenciesMap.get(propertyName);
if (valueFrequencies == null) {
- valueFrequencies = new HashMap();
+ valueFrequencies = new HashMap<String, Integer>();
nameValueFrequenciesMap.put(propertyName, valueFrequencies);
}
Integer valueFrequency = (valueFrequencies.containsKey(propertyValue)) ?
(valueFrequencies
diff --git a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
index 473daf1..bab4121 100644
--- a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
@@ -447,7 +447,7 @@
</c:description>
</c:simple-property>
- <c:simple-property name="track-statements" type="string"
+ <c:simple-property name="track-statements" type="string"
default="yes-no-warnings"
displayName="Track Statements"
required="false">
<c:description>
Whether to check for unclosed Statements and ResultSets when connections are
returned to the pool. The
@@ -456,15 +456,15 @@
<c:property-options>
<c:option name="No" value="no"/>
<c:option name="Yes" value="yes"/>
- <c:option name="Yes, but no warnings"
value="yes-no-warnings" default="true"/>
+ <c:option name="Yes, but no warnings"
value="yes-no-warnings"/>
</c:property-options>
</c:simple-property>
- <c:simple-property name="transaction-isolation"
required="false"
+ <c:simple-property name="transaction-isolation"
required="false" default="TRANSACTION_READ_COMMITTED"
description="The Transaction Isolation level. The default
setting is to use whichever isolation level is provided by default by the
database.">
<c:property-options>
<c:option value="TRANSACTION_READ_UNCOMMITTED" name="Read
Uncommitted"/>
- <c:option value="TRANSACTION_READ_COMMITTED"
default="true" name="Read Committed"/>
+ <c:option value="TRANSACTION_READ_COMMITTED" name="Read
Committed"/>
<c:option value="TRANSACTION_REPEATABLE_READ"
name="Repeatable Read"/>
<c:option value="TRANSACTION_SERIALIZABLE"
name="Serializable"/>
<c:option value="TRANSACTION_NONE" name="None"/>
@@ -1003,7 +1003,7 @@
description="The method used to execute the Shut Down
operation;
defaults to 'JMX MBean'.">
<c:property-options>
- <c:option value="JMX" name="JMX MBean"
default="true"/>
+ <c:option value="JMX" name="JMX
MBean"/>
<c:option value="SCRIPT" name="shutdown
script"/>
</c:property-options>
</c:simple-property>
Show replies by date