[rhq] 2 commits - modules/core modules/enterprise
by John Sanda
modules/core/dbutils/pom.xml | 2
modules/core/dbutils/src/main/scripts/dbsetup/content-schema.xml | 1
modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml | 10 ++
modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftComplianceStatus.java | 37 ++++++++++
modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftDefinition.java | 12 +++
modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionDataSource.java | 25 ++++++
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 3
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java | 37 +++++++++-
9 files changed, 126 insertions(+), 3 deletions(-)
New commits:
commit fa55e1b11afb478de2273ac0a9ff0f649abb4001
Author: John Sanda <jsanda(a)redhat.com>
Date: Fri Nov 4 17:41:17 2011 -0400
[BZ 7517474] Adding compliance field to drift definitions view
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftComplianceStatus.java b/modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftComplianceStatus.java
index bc12b24..8cf1d61 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftComplianceStatus.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftComplianceStatus.java
@@ -25,4 +25,13 @@ public enum DriftComplianceStatus {
OUT_OF_COMPLIANCE_NO_BASEDIR,
OUT_OF_COMPLIANCE_DRIFT;
+
+ public static DriftComplianceStatus fromCode(int code) {
+ switch (code) {
+ case 0: return IN_COMPLIANCE;
+ case 1: return OUT_OF_COMPLIANCE_NO_BASEDIR;
+ case 2: return OUT_OF_COMPLIANCE_DRIFT;
+ default: throw new IllegalArgumentException(code + " is not a DriftComplianceStatus code");
+ }
+ }
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionDataSource.java
index 3bb7161..e740da5 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionDataSource.java
@@ -39,6 +39,7 @@ import com.smartgwt.client.widgets.grid.events.RecordClickHandler;
import org.rhq.core.domain.common.EntityContext;
import org.rhq.core.domain.criteria.DriftDefinitionCriteria;
import org.rhq.core.domain.drift.DriftChangeSet;
+import org.rhq.core.domain.drift.DriftComplianceStatus;
import org.rhq.core.domain.drift.DriftDefinition;
import org.rhq.core.domain.drift.DriftDefinitionComposite;
import org.rhq.core.domain.drift.DriftConfigurationDefinition.DriftHandlingMode;
@@ -73,6 +74,8 @@ public class DriftDefinitionDataSource extends RPCDataSource<DriftDefinitionComp
public static final String ATTR_IS_PINNED = "isPinned";
public static final String ATTR_CHANGE_SET_CTIME = "changesetTime";
public static final String ATTR_CHANGE_SET_VERSION = "changesetVersion";
+ public static final String ATTR_COMPLIANCE = "compliance";
+ public static final String ATTR_COMPLIANCE_ICON = "complianceIcon";
public static final String DRIFT_HANDLING_MODE_NORMAL = MSG.view_drift_table_driftHandlingMode_normal();
public static final String DRIFT_HANDLING_MODE_PLANNED = MSG.view_drift_table_driftHandlingMode_plannedChanges();
@@ -144,6 +147,24 @@ public class DriftDefinitionDataSource extends RPCDataSource<DriftDefinitionComp
enabledField.setAlign(Alignment.CENTER);
fields.add(enabledField);
+ ListGridField inComplianceField = new ListGridField(ATTR_COMPLIANCE_ICON, MSG.common_title_in_compliance());
+ inComplianceField.setType(ListGridFieldType.IMAGE);
+ inComplianceField.setAlign(Alignment.CENTER);
+ inComplianceField.setShowHover(true);
+ inComplianceField.setHoverCustomizer(new HoverCustomizer() {
+ @Override
+ public String hoverHTML(Object o, ListGridRecord record, int row, int column) {
+ int complianceCode = record.getAttributeAsInt(ATTR_COMPLIANCE);
+ DriftComplianceStatus complianceStatus = DriftComplianceStatus.fromCode(complianceCode);
+ switch (complianceStatus) {
+ case OUT_OF_COMPLIANCE_NO_BASEDIR: return MSG.view_drift_table_out_of_compliance_no_basedir();
+ case OUT_OF_COMPLIANCE_DRIFT: return MSG.view_drift_table_out_of_compliance_drift();
+ default: return "";
+ }
+ }
+ });
+ fields.add(inComplianceField);
+
ListGridField driftHandlingModeField = new ListGridField(ATTR_DRIFT_HANDLING_MODE, MSG
.view_drift_table_driftHandlingMode());
fields.add(driftHandlingModeField);
@@ -218,6 +239,7 @@ public class DriftDefinitionDataSource extends RPCDataSource<DriftDefinitionComp
changeSetField.setWidth(70);
changeSetTimeField.setWidth(100);
enabledField.setWidth(60);
+ inComplianceField.setWidth(60);
driftHandlingModeField.setWidth("15%");
intervalField.setWidth(70);
baseDirField.setWidth("*");
@@ -336,6 +358,9 @@ public class DriftDefinitionDataSource extends RPCDataSource<DriftDefinitionComp
record.setAttribute(ATTR_BASE_DIR_STRING, getBaseDirString(def.getBasedir()));
record.setAttribute(ATTR_IS_ENABLED, String.valueOf(def.isEnabled()));
record.setAttribute(ATTR_IS_ENABLED_ICON, ImageManager.getAvailabilityIcon(def.isEnabled()));
+ record.setAttribute(ATTR_COMPLIANCE, def.getComplianceStatus().ordinal());
+ record.setAttribute(ATTR_COMPLIANCE_ICON, ImageManager.getAvailabilityIcon(
+ def.getComplianceStatus() == DriftComplianceStatus.IN_COMPLIANCE));
// fixed value, just the edit icon
record.setAttribute(ATTR_EDIT, ImageManager.getEditIcon());
record.setAttribute(ATTR_IS_PINNED, def.isPinned() ? ImageManager.getPinnedIcon() : ImageManager
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
index 32db3fc..da21776 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
@@ -138,6 +138,7 @@ common_title_duration = Duration
common_title_edit = Edit?
common_title_edit_mode = Edit Mode
common_title_enabled = Enabled?
+common_title_in_compliance = In Compliance?
common_title_end = End
common_title_generalProp = General Properties
common_title_group = Group
@@ -1202,6 +1203,8 @@ view_drift_table_baseDir = Base Directory
view_drift_table_driftHandlingMode = Drift Handling
view_drift_table_driftHandlingMode_normal = normal
view_drift_table_driftHandlingMode_plannedChanges = planned changes
+view_drift_table_out_of_compliance_drift = There is drift
+view_drift_table_out_of_compliance_no_basedir = The base directory does not exist
view_drift_table_hover_defNotPinned = The drift definition is not pinned Click to view the initial snapshot.
view_drift_table_hover_defPinned = The drift definition is pinned to its initial snapshot. Click to view the initial snapshot.
view_drift_table_hover_edit = Click to view or edit the drift definition or template properties.
commit 0d92f378cc33769b6da523b8293332c0890816ee
Author: John Sanda <jsanda(a)redhat.com>
Date: Fri Nov 4 16:36:02 2011 -0400
[BZ 7517474] Initial support for tracking compliance
This commit adds a complianceStatus field to DriftDefinition. There are
corresponding dbsetup and dbupgrade changes. DriftManagerBean has been
updated to set the complianceStatus field if the definition is pinned
when the agent reports a change set.
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
index dd75181..c974572 100644
--- a/modules/core/dbutils/pom.xml
+++ b/modules/core/dbutils/pom.xml
@@ -16,7 +16,7 @@
</scm>
<properties>
<scm.module.path>modules/core/dbutils/</scm.module.path>
- <db.schema.version>2.114</db.schema.version>
+ <db.schema.version>2.115</db.schema.version>
<rhq.ds.type-mapping>${rhq.test.ds.type-mapping}</rhq.ds.type-mapping>
<rhq.ds.db-name>${rhq.test.ds.db-name}</rhq.ds.db-name>
<rhq.ds.connection-url>${rhq.test.ds.connection-url}</rhq.ds.connection-url>
diff --git a/modules/core/dbutils/src/main/scripts/dbsetup/content-schema.xml b/modules/core/dbutils/src/main/scripts/dbsetup/content-schema.xml
index d6975d5..7986a51 100644
--- a/modules/core/dbutils/src/main/scripts/dbsetup/content-schema.xml
+++ b/modules/core/dbutils/src/main/scripts/dbsetup/content-schema.xml
@@ -702,6 +702,7 @@
<column name="DRIFT_HANDLING_MODE" type="VARCHAR2" size="20" required="true"/>
<column name="IS_PINNED" type="BOOLEAN" required="true"/>
<column name="IS_ATTACHED" type="BOOLEAN" required="true"/>
+ <column name="COMPLIANCE_STATUS" type="INTEGER" required="true"/>
</table>
<table name="RHQ_DRIFT_SET">
diff --git a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
index 9221532..c7edf53 100644
--- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
+++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
@@ -3684,6 +3684,16 @@
</schema-directSQL>
</schemaSpec>
+ <schemaSpec version="2.115">
+ <schema-addColumn table="RHQ_DRIFT_DEFINITION" column="COMPLIANCE_STATUS" columnType="INTEGER"/>
+ <schema-directSQL>
+ <statement desc="RHQ_DRIFT_DEFINITION: set compliance_status column for existing definitions">
+ UPDATE RHQ_DRIFT_DEFINITION SET COMPLIANCE_STATUS = 0
+ </statement>
+ </schema-directSQL>
+ <schema-alterColumn table="RHQ_DRIFT_DEFINITION" column="COMPLIANCE_STATUS" nullable="FALSE"/>
+ </schemaSpec>
+
</dbupgrade>
</target>
</project>
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftComplianceStatus.java b/modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftComplianceStatus.java
new file mode 100644
index 0000000..bc12b24
--- /dev/null
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftComplianceStatus.java
@@ -0,0 +1,28 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2011 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.core.domain.drift;
+
+public enum DriftComplianceStatus {
+ IN_COMPLIANCE,
+
+ OUT_OF_COMPLIANCE_NO_BASEDIR,
+
+ OUT_OF_COMPLIANCE_DRIFT;
+}
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftDefinition.java b/modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftDefinition.java
index efb9ac2..08f2f3f 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftDefinition.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftDefinition.java
@@ -111,6 +111,10 @@ public class DriftDefinition implements Serializable {
@Column(name = "IS_ATTACHED", nullable = false)
private boolean attached = true;
+ @Column(name = "COMPLIANCE_STATUS", nullable = false)
+ @Enumerated(EnumType.ORDINAL)
+ private DriftComplianceStatus complianceStatus = DriftComplianceStatus.IN_COMPLIANCE;
+
// required for jaxb/web services stuff
protected DriftDefinition() {
}
@@ -259,6 +263,14 @@ public class DriftDefinition implements Serializable {
this.template = template;
}
+ public DriftComplianceStatus getComplianceStatus() {
+ return complianceStatus;
+ }
+
+ public void setComplianceStatus(DriftComplianceStatus complianceStatus) {
+ this.complianceStatus = complianceStatus;
+ }
+
@Override
public String toString() {
StringBuilder builder = new StringBuilder();
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java
index 09bedef..95f0090 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java
@@ -268,7 +268,7 @@ public class DriftDetector implements Runnable {
// the current snapshot to match the pinned snapshot. Note though
// that we increment the snapshot version in order to let the server
// know about the state change.
- if (schedule.getDriftDefinition().isPinned()) {
+ if (schedule.getDriftDefinition().isPinned() && newVersion > 1) {
currentSnapshot.delete();
File newSnapshot = updateCurrentSnapshot(schedule, snapshotEntries, newVersion);
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java
index 2fb8d51..bb67fa8 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java
@@ -22,6 +22,8 @@ import static java.util.Arrays.asList;
import static javax.ejb.TransactionAttributeType.NOT_SUPPORTED;
import static javax.ejb.TransactionAttributeType.REQUIRES_NEW;
import static org.rhq.core.domain.drift.DriftChangeSetCategory.COVERAGE;
+import static org.rhq.core.domain.drift.DriftComplianceStatus.OUT_OF_COMPLIANCE_DRIFT;
+import static org.rhq.core.domain.drift.DriftComplianceStatus.IN_COMPLIANCE;
import java.io.File;
import java.io.InputStream;
@@ -516,16 +518,49 @@ public class DriftManagerBean implements DriftManagerLocal, DriftManagerRemote {
}
@Override
- @TransactionAttribute(NOT_SUPPORTED)
+ @TransactionAttribute(REQUIRES_NEW)
public DriftChangeSetSummary saveChangeSet(Subject subject, int resourceId, File changeSetZip) throws Exception {
DriftServerPluginFacet driftServerPlugin = getServerPlugin();
DriftChangeSetSummary summary = driftServerPlugin.saveChangeSet(subject, resourceId, changeSetZip);
+
if (DriftHandlingMode.plannedChanges != summary.getDriftHandlingMode()) {
notifyAlertConditionCacheManager("saveChangeSet", summary);
}
+
+ DriftDefinitionCriteria criteria = new DriftDefinitionCriteria();
+ criteria.addFilterName(summary.getDriftDefinitionName());
+ criteria.addFilterResourceIds(resourceId);
+ PageList<DriftDefinition> definitions = findDriftDefinitionsByCriteria(subject, criteria);
+
+ if (definitions.isEmpty()) {
+ log.warn("Could not find drift definition for [resourceId: " + resourceId + ", driftDefinitionName: " +
+ summary.getDriftDefinitionName() + "]. Will not be able check compliance for thiis drift definition");
+ } else {
+ updateCompliance(definitions.get(0), summary);
+ }
+
return summary;
}
+ private void updateCompliance(DriftDefinition definition, DriftChangeSetSummary changeSetSummary) {
+ if (!definition.isPinned()) {
+ return;
+ }
+
+ boolean updateNeeded = false;
+ if (changeSetSummary.getDriftPathnames().isEmpty()) {
+ updateNeeded = definition.getComplianceStatus() != IN_COMPLIANCE;
+ definition.setComplianceStatus(IN_COMPLIANCE);
+ } else {
+ updateNeeded = definition.getComplianceStatus() == IN_COMPLIANCE;
+ definition.setComplianceStatus(OUT_OF_COMPLIANCE_DRIFT);
+ }
+
+ if (updateNeeded) {
+ updateDriftDefinition(definition);
+ }
+ }
+
@Override
@TransactionAttribute(NOT_SUPPORTED)
public void saveChangeSetFiles(Subject subject, File changeSetFilesZip) throws Exception {
12 years, 7 months
[rhq] modules/plugins
by snegrea
modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 7d6daf24fd744c8c3e513efaaa03a35c9f554c61
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Fri Nov 4 15:52:34 2011 -0500
[BZ 743437] Add default type mappings to the property description to make it easier for users to select a predefined type mapping.
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 6f68607..b6ce5ec 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
@@ -216,7 +216,8 @@
<c:map-property name="metadata" required="false" description="Metadata properties.">
<c:simple-property required="false" name="typeMapping">
<c:description>
- The name of the corresponding type-mapping in conf/standardjbosscmp-jdbc.xml.
+ The name of the corresponding type-mapping in conf/standardjbosscmp-jdbc.xml. The type mappings provided by default: DB2, InformixDB, MaxDB, mySQL, Oracle9i, PointBase, InterBase, Mimer SQL, McKoi, SapDB, DB2/400, SOLID, Hypersonic SQL, FirstSQL/J, MS SQLSERVER2000, MS SQLSERVER, Cloudscape, Derby, Firebird, PostgreSQL 8.0, PostgreSQL, Sybase, Ingres.
+ Note, there may be custom type mappings defined in addition to these predefined mappings.
</c:description>
</c:simple-property>
</c:map-property>
@@ -278,7 +279,8 @@
<c:simple-property name="type-mapping" displayName="Type Mapping" required="false">
<c:description>
- The name of the corresponding type-mapping in conf/standardjbosscmp-jdbc.xml.
+ The name of the corresponding type-mapping in conf/standardjbosscmp-jdbc.xml. The type mappings provided by default: DB2, InformixDB, MaxDB, mySQL, Oracle9i, PointBase, InterBase, Mimer SQL, McKoi, SapDB, DB2/400, SOLID, Hypersonic SQL, FirstSQL/J, MS SQLSERVER2000, MS SQLSERVER, Cloudscape, Derby, Firebird, PostgreSQL 8.0, PostgreSQL, Sybase, Ingres.
+ Note, there may be custom type mappings defined in addition to these predefined mappings.
</c:description>
</c:simple-property>
12 years, 7 months
[rhq] Branch 'release_jon3.x' - modules/plugins
by snegrea
modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 1a8507f7efb36e4b6d018b18b4785e570a3e9a1f
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Fri Nov 4 15:52:34 2011 -0500
[BZ 743437] Add default type mappings to the property description to make it easier for users to select a predefined type mapping.
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 6f68607..b6ce5ec 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
@@ -216,7 +216,8 @@
<c:map-property name="metadata" required="false" description="Metadata properties.">
<c:simple-property required="false" name="typeMapping">
<c:description>
- The name of the corresponding type-mapping in conf/standardjbosscmp-jdbc.xml.
+ The name of the corresponding type-mapping in conf/standardjbosscmp-jdbc.xml. The type mappings provided by default: DB2, InformixDB, MaxDB, mySQL, Oracle9i, PointBase, InterBase, Mimer SQL, McKoi, SapDB, DB2/400, SOLID, Hypersonic SQL, FirstSQL/J, MS SQLSERVER2000, MS SQLSERVER, Cloudscape, Derby, Firebird, PostgreSQL 8.0, PostgreSQL, Sybase, Ingres.
+ Note, there may be custom type mappings defined in addition to these predefined mappings.
</c:description>
</c:simple-property>
</c:map-property>
@@ -278,7 +279,8 @@
<c:simple-property name="type-mapping" displayName="Type Mapping" required="false">
<c:description>
- The name of the corresponding type-mapping in conf/standardjbosscmp-jdbc.xml.
+ The name of the corresponding type-mapping in conf/standardjbosscmp-jdbc.xml. The type mappings provided by default: DB2, InformixDB, MaxDB, mySQL, Oracle9i, PointBase, InterBase, Mimer SQL, McKoi, SapDB, DB2/400, SOLID, Hypersonic SQL, FirstSQL/J, MS SQLSERVER2000, MS SQLSERVER, Cloudscape, Derby, Firebird, PostgreSQL 8.0, PostgreSQL, Sybase, Ingres.
+ Note, there may be custom type mappings defined in addition to these predefined mappings.
</c:description>
</c:simple-property>
12 years, 7 months
[rhq] Branch 'release_jon3.x' - modules/enterprise
by Jay Shaughnessy
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java | 68 +++-------
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java | 6
2 files changed, 24 insertions(+), 50 deletions(-)
New commits:
commit 2932513b74ff180d201c1691745b8cffdbb4eb3f
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Fri Nov 4 15:39:40 2011 -0400
[Bug 734592 - in summary header for autogroups, Name, Description, and Recursive fields are editable and for some autogroups, the Name field contains the string "null (...)]
Again fixing the Null naming aspect of this bug.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java
index 8938062..a1544fa 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java
@@ -36,6 +36,7 @@ import com.smartgwt.client.data.fields.DataSourceTextField;
import com.smartgwt.client.rpc.RPCResponse;
import com.smartgwt.client.types.DSDataFormat;
import com.smartgwt.client.types.DSProtocol;
+import com.smartgwt.client.widgets.tree.TreeGrid;
import com.smartgwt.client.widgets.tree.TreeNode;
import org.rhq.core.domain.criteria.ResourceCriteria;
@@ -64,16 +65,20 @@ public class ResourceTreeDatasource extends DataSource {
private List<Resource> initialData;
private List<Resource> lockedData;
+ // the encompassing grid. It's unfortunate to have the DS know about the encompassing TreeGrid
+ // but we have a situation in which a new AG node needs to be able to access its parent TreeNode by ID.
+ private TreeGrid treeGrid;
private ResourceGWTServiceAsync resourceService = GWTServiceLookup.getResourceService();
- public ResourceTreeDatasource(List<Resource> initialData, List<Resource> lockedData) {
+ public ResourceTreeDatasource(List<Resource> initialData, List<Resource> lockedData, TreeGrid treeGrid) {
this.setClientOnly(false);
this.setDataProtocol(DSProtocol.CLIENTCUSTOM);
this.setDataFormat(DSDataFormat.CUSTOM);
this.initialData = initialData;
this.lockedData = (null != lockedData) ? lockedData : new ArrayList<Resource>();
+ this.treeGrid = treeGrid;
DataSourceField idDataField = new DataSourceTextField("id", MSG.common_title_id());
idDataField.setPrimaryKey(true);
@@ -169,7 +174,7 @@ public class ResourceTreeDatasource extends DataSource {
new ResourceTypeRepository.ResourceTypeLoadedCallback() {
public void onResourceTypeLoaded(List<Resource> result) {
- TreeNode[] treeNodes = buildNodes(result, lockedData);
+ TreeNode[] treeNodes = buildNodes(result, lockedData, treeGrid);
response.setData(treeNodes);
processResponse(requestId, response);
}
@@ -182,49 +187,14 @@ public class ResourceTreeDatasource extends DataSource {
* @param resources
* @return
*/
- public static TreeNode[] buildNodes(List<Resource> resources, List<Resource> lockedData) {
+ public static TreeNode[] buildNodes(List<Resource> resources, List<Resource> lockedData, TreeGrid treeGrid) {
List<ResourceTreeNode> resourceNodes = new ArrayList<ResourceTreeNode>(resources.size());
- // boolean nullFound = false;
for (Resource resource : resources) {
- // if (null != resource.getParentResource() && null == resource.getParentResource().getName()) {
- // CoreGUI.getMessageCenter().notify(
- // new Message(" *** Null parent name for " + resource + " parent " + resource.getParentResource(),
- // Severity.Info));
- // nullFound = true;
- // }
ResourceTreeNode node = new ResourceTreeNode(resource, lockedData.contains(resource));
resourceNodes.add(node);
}
- // if (!nullFound) {
- // CoreGUI.getMessageCenter().notify(new Message(" *** No Null parent names found", Severity.Info));
- // }
-
- List<TreeNode> result = introduceTypeAndCategoryNodes(resourceNodes);
-
- // nullFound = false;
- // for (TreeNode node : result) {
- // if (node instanceof ResourceTreeNode) {
- // ResourceTreeNode rtNode = (ResourceTreeNode) node;
- // if (null != rtNode.getResource().getParentResource()
- // && null == rtNode.getResource().getParentResource().getName()) {
- // CoreGUI.getMessageCenter().notify(
- // new Message(" *** Null parent name for resource tree node " + rtNode.getResource() + " parent "
- // + rtNode.getResource(), Severity.Info));
- // nullFound = true;
- // }
- // } else if (node instanceof AutoGroupTreeNode) {
- // AutoGroupTreeNode rtNode = (AutoGroupTreeNode) node;
- // if (null == rtNode.getParentResource().getName()) {
- // CoreGUI.getMessageCenter().notify(
- // new Message(" *** Null parent name for autogroup tree node " + rtNode.getParentResource(),
- // Severity.Info));
- // nullFound = true;
- // }
- // }
- // }
- // if (!nullFound) {
- // CoreGUI.getMessageCenter().notify(new Message(" *** No Null tree node parent names found", Severity.Info));
- // }
+
+ List<TreeNode> result = introduceTypeAndCategoryNodes(resourceNodes, treeGrid);
return result.toArray(new TreeNode[result.size()]);
}
@@ -233,7 +203,8 @@ public class ResourceTreeDatasource extends DataSource {
* @param resourceNodes ordered such that referenced parent nodes have lower indexes than the referencing child.
* @return a new List, properly ordered and including AG and Subcategory nodes.
*/
- private static List<TreeNode> introduceTypeAndCategoryNodes(final List<ResourceTreeNode> resourceNodes) {
+ private static List<TreeNode> introduceTypeAndCategoryNodes(final List<ResourceTreeNode> resourceNodes,
+ TreeGrid treeGrid) {
// The resulting list of nodes, including AG and SC nodes. The list is ordered to ensure all
// referenced parent nodes have lower indexes than the referencing child.
List<TreeNode> allNodes = new ArrayList<TreeNode>(resourceNodes.size());
@@ -268,12 +239,15 @@ public class ResourceTreeDatasource extends DataSource {
// First we need to ensure we have a properly populated parentResource (id and name, minimally),
// get this from the parent ResourceTreeNode as resource.parentResource may not be set with
// anything more than the id.
-
- String parentResourceNodeId = ResourceTreeNode.idOf(resource.getParentResource());
- for (ResourceTreeNode node : resourceNodes) {
- if (node.getID().equals(parentResourceNodeId)) {
- resource.setParentResource(node.getResource());
- }
+ Resource parentResource = resource.getParentResource();
+ String parentResourceNodeId = ResourceTreeNode.idOf(parentResource);
+ TreeNode parentResourceNode = treeGrid.getTree().findById(parentResourceNodeId);
+ if (null != parentResourceNode) {
+ parentResource = ((ResourceTreeNode) parentResourceNode).getResource();
+ resource.setParentResource(parentResource);
+ }
+ if (null == parentResource.getName()) {
+ Log.error("AutoGroup node creation using invalid parent resource: " + parentResource);
}
String autoGroupNodeID = resourceNode.getParentID();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java
index 5d175c7..c82d234 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java
@@ -790,7 +790,7 @@ public class ResourceTreeView extends LocatableVLayout {
setRootResource(root);
// seed datasource with initial resource list and which ancestor resources are locked
- ResourceTreeDatasource dataSource = new ResourceTreeDatasource(lineage, lockedData);
+ ResourceTreeDatasource dataSource = new ResourceTreeDatasource(lineage, lockedData, treeGrid);
treeGrid.setDataSource(dataSource);
addMember(treeGrid);
@@ -828,8 +828,8 @@ public class ResourceTreeView extends LocatableVLayout {
new ResourceTypeRepository.ResourceTypeLoadedCallback() {
public void onResourceTypeLoaded(List<Resource> result) {
- treeGrid.getTree()
- .linkNodes(ResourceTreeDatasource.buildNodes(lineage, lockedData));
+ treeGrid.getTree().linkNodes(
+ ResourceTreeDatasource.buildNodes(lineage, lockedData, treeGrid));
TreeNode selectedNode = treeGrid.getTree().findById(selectedNodeId);
if (selectedNode != null && updateSelection) {
12 years, 7 months
[rhq] modules/enterprise
by Jay Shaughnessy
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java | 68 +++-------
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java | 6
2 files changed, 24 insertions(+), 50 deletions(-)
New commits:
commit f7523d5757af1d0955dc75358e0a9f4e54be43fe
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Fri Nov 4 15:39:40 2011 -0400
[Bug 734592 - in summary header for autogroups, Name, Description, and Recursive fields are editable and for some autogroups, the Name field contains the string "null (...)]
Again fixing the Null naming aspect of this bug.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java
index 8938062..a1544fa 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java
@@ -36,6 +36,7 @@ import com.smartgwt.client.data.fields.DataSourceTextField;
import com.smartgwt.client.rpc.RPCResponse;
import com.smartgwt.client.types.DSDataFormat;
import com.smartgwt.client.types.DSProtocol;
+import com.smartgwt.client.widgets.tree.TreeGrid;
import com.smartgwt.client.widgets.tree.TreeNode;
import org.rhq.core.domain.criteria.ResourceCriteria;
@@ -64,16 +65,20 @@ public class ResourceTreeDatasource extends DataSource {
private List<Resource> initialData;
private List<Resource> lockedData;
+ // the encompassing grid. It's unfortunate to have the DS know about the encompassing TreeGrid
+ // but we have a situation in which a new AG node needs to be able to access its parent TreeNode by ID.
+ private TreeGrid treeGrid;
private ResourceGWTServiceAsync resourceService = GWTServiceLookup.getResourceService();
- public ResourceTreeDatasource(List<Resource> initialData, List<Resource> lockedData) {
+ public ResourceTreeDatasource(List<Resource> initialData, List<Resource> lockedData, TreeGrid treeGrid) {
this.setClientOnly(false);
this.setDataProtocol(DSProtocol.CLIENTCUSTOM);
this.setDataFormat(DSDataFormat.CUSTOM);
this.initialData = initialData;
this.lockedData = (null != lockedData) ? lockedData : new ArrayList<Resource>();
+ this.treeGrid = treeGrid;
DataSourceField idDataField = new DataSourceTextField("id", MSG.common_title_id());
idDataField.setPrimaryKey(true);
@@ -169,7 +174,7 @@ public class ResourceTreeDatasource extends DataSource {
new ResourceTypeRepository.ResourceTypeLoadedCallback() {
public void onResourceTypeLoaded(List<Resource> result) {
- TreeNode[] treeNodes = buildNodes(result, lockedData);
+ TreeNode[] treeNodes = buildNodes(result, lockedData, treeGrid);
response.setData(treeNodes);
processResponse(requestId, response);
}
@@ -182,49 +187,14 @@ public class ResourceTreeDatasource extends DataSource {
* @param resources
* @return
*/
- public static TreeNode[] buildNodes(List<Resource> resources, List<Resource> lockedData) {
+ public static TreeNode[] buildNodes(List<Resource> resources, List<Resource> lockedData, TreeGrid treeGrid) {
List<ResourceTreeNode> resourceNodes = new ArrayList<ResourceTreeNode>(resources.size());
- // boolean nullFound = false;
for (Resource resource : resources) {
- // if (null != resource.getParentResource() && null == resource.getParentResource().getName()) {
- // CoreGUI.getMessageCenter().notify(
- // new Message(" *** Null parent name for " + resource + " parent " + resource.getParentResource(),
- // Severity.Info));
- // nullFound = true;
- // }
ResourceTreeNode node = new ResourceTreeNode(resource, lockedData.contains(resource));
resourceNodes.add(node);
}
- // if (!nullFound) {
- // CoreGUI.getMessageCenter().notify(new Message(" *** No Null parent names found", Severity.Info));
- // }
-
- List<TreeNode> result = introduceTypeAndCategoryNodes(resourceNodes);
-
- // nullFound = false;
- // for (TreeNode node : result) {
- // if (node instanceof ResourceTreeNode) {
- // ResourceTreeNode rtNode = (ResourceTreeNode) node;
- // if (null != rtNode.getResource().getParentResource()
- // && null == rtNode.getResource().getParentResource().getName()) {
- // CoreGUI.getMessageCenter().notify(
- // new Message(" *** Null parent name for resource tree node " + rtNode.getResource() + " parent "
- // + rtNode.getResource(), Severity.Info));
- // nullFound = true;
- // }
- // } else if (node instanceof AutoGroupTreeNode) {
- // AutoGroupTreeNode rtNode = (AutoGroupTreeNode) node;
- // if (null == rtNode.getParentResource().getName()) {
- // CoreGUI.getMessageCenter().notify(
- // new Message(" *** Null parent name for autogroup tree node " + rtNode.getParentResource(),
- // Severity.Info));
- // nullFound = true;
- // }
- // }
- // }
- // if (!nullFound) {
- // CoreGUI.getMessageCenter().notify(new Message(" *** No Null tree node parent names found", Severity.Info));
- // }
+
+ List<TreeNode> result = introduceTypeAndCategoryNodes(resourceNodes, treeGrid);
return result.toArray(new TreeNode[result.size()]);
}
@@ -233,7 +203,8 @@ public class ResourceTreeDatasource extends DataSource {
* @param resourceNodes ordered such that referenced parent nodes have lower indexes than the referencing child.
* @return a new List, properly ordered and including AG and Subcategory nodes.
*/
- private static List<TreeNode> introduceTypeAndCategoryNodes(final List<ResourceTreeNode> resourceNodes) {
+ private static List<TreeNode> introduceTypeAndCategoryNodes(final List<ResourceTreeNode> resourceNodes,
+ TreeGrid treeGrid) {
// The resulting list of nodes, including AG and SC nodes. The list is ordered to ensure all
// referenced parent nodes have lower indexes than the referencing child.
List<TreeNode> allNodes = new ArrayList<TreeNode>(resourceNodes.size());
@@ -268,12 +239,15 @@ public class ResourceTreeDatasource extends DataSource {
// First we need to ensure we have a properly populated parentResource (id and name, minimally),
// get this from the parent ResourceTreeNode as resource.parentResource may not be set with
// anything more than the id.
-
- String parentResourceNodeId = ResourceTreeNode.idOf(resource.getParentResource());
- for (ResourceTreeNode node : resourceNodes) {
- if (node.getID().equals(parentResourceNodeId)) {
- resource.setParentResource(node.getResource());
- }
+ Resource parentResource = resource.getParentResource();
+ String parentResourceNodeId = ResourceTreeNode.idOf(parentResource);
+ TreeNode parentResourceNode = treeGrid.getTree().findById(parentResourceNodeId);
+ if (null != parentResourceNode) {
+ parentResource = ((ResourceTreeNode) parentResourceNode).getResource();
+ resource.setParentResource(parentResource);
+ }
+ if (null == parentResource.getName()) {
+ Log.error("AutoGroup node creation using invalid parent resource: " + parentResource);
}
String autoGroupNodeID = resourceNode.getParentID();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java
index 5d175c7..c82d234 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java
@@ -790,7 +790,7 @@ public class ResourceTreeView extends LocatableVLayout {
setRootResource(root);
// seed datasource with initial resource list and which ancestor resources are locked
- ResourceTreeDatasource dataSource = new ResourceTreeDatasource(lineage, lockedData);
+ ResourceTreeDatasource dataSource = new ResourceTreeDatasource(lineage, lockedData, treeGrid);
treeGrid.setDataSource(dataSource);
addMember(treeGrid);
@@ -828,8 +828,8 @@ public class ResourceTreeView extends LocatableVLayout {
new ResourceTypeRepository.ResourceTypeLoadedCallback() {
public void onResourceTypeLoaded(List<Resource> result) {
- treeGrid.getTree()
- .linkNodes(ResourceTreeDatasource.buildNodes(lineage, lockedData));
+ treeGrid.getTree().linkNodes(
+ ResourceTreeDatasource.buildNodes(lineage, lockedData, treeGrid));
TreeNode selectedNode = treeGrid.getTree().findById(selectedNodeId);
if (selectedNode != null && updateSelection) {
12 years, 7 months
[rhq] Branch 'release_jon3.x' - modules/enterprise
by mazz
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/MembersView.java | 3 +++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMembersHealthView.java | 3 +--
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit d76e1564c3f598c96d1554e820c1df2f342215b2
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Fri Nov 4 14:10:16 2011 -0400
[BZ 751424] make sure to re-enable footer buttons
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/MembersView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/MembersView.java
index e4eb551..46ed186 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/MembersView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/MembersView.java
@@ -77,6 +77,7 @@ public class MembersView extends ResourceSearchView {
@Override
public void onCloseClick(CloseClientEvent event) {
winModal.markForDestroy();
+ MembersView.this.refreshTableInfo();
}
});
@@ -87,6 +88,7 @@ public class MembersView extends ResourceSearchView {
public void onClick(ClickEvent event) {
winModal.markForDestroy();
+ MembersView.this.refreshTableInfo();
CoreGUI.refresh();
}
});
@@ -95,6 +97,7 @@ public class MembersView extends ResourceSearchView {
public void onClick(ClickEvent event) {
winModal.destroy();
+ MembersView.this.refreshTableInfo();
}
});
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMembersHealthView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMembersHealthView.java
index ac98035..c8e6ee7 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMembersHealthView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMembersHealthView.java
@@ -19,7 +19,6 @@
*/
package org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table;
-import java.util.HashMap;
import java.util.List;
import com.smartgwt.client.widgets.grid.ListGridField;
@@ -71,7 +70,6 @@ public class GroupMembersHealthView extends MembersView {
return;
}
// keyed on metric name - string[0] is the metric label, [1] is the units
- final HashMap<String, String[]> scheduleNamesAndUnits = new HashMap<String, String[]>();
int[] resourceIds = new int[selection.length];
int i = 0;
for (ListGridRecord record : selection) {
@@ -90,6 +88,7 @@ public class GroupMembersHealthView extends MembersView {
FullHTMLPane iframe = new FullHTMLPane(extendLocatorId("View"), destination);
window.addItem(iframe);
window.show();
+ GroupMembersHealthView.this.refreshTableInfo();
}
});
}
12 years, 7 months
[rhq] modules/enterprise
by mazz
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/MembersView.java | 3 +++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMembersHealthView.java | 3 +--
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit df7e7e155c9c1d59b69d583e243509a157be3dc0
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Fri Nov 4 14:10:16 2011 -0400
[BZ 751424] make sure to re-enable footer buttons
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/MembersView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/MembersView.java
index e4eb551..46ed186 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/MembersView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/MembersView.java
@@ -77,6 +77,7 @@ public class MembersView extends ResourceSearchView {
@Override
public void onCloseClick(CloseClientEvent event) {
winModal.markForDestroy();
+ MembersView.this.refreshTableInfo();
}
});
@@ -87,6 +88,7 @@ public class MembersView extends ResourceSearchView {
public void onClick(ClickEvent event) {
winModal.markForDestroy();
+ MembersView.this.refreshTableInfo();
CoreGUI.refresh();
}
});
@@ -95,6 +97,7 @@ public class MembersView extends ResourceSearchView {
public void onClick(ClickEvent event) {
winModal.destroy();
+ MembersView.this.refreshTableInfo();
}
});
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMembersHealthView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMembersHealthView.java
index ac98035..c8e6ee7 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMembersHealthView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMembersHealthView.java
@@ -19,7 +19,6 @@
*/
package org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table;
-import java.util.HashMap;
import java.util.List;
import com.smartgwt.client.widgets.grid.ListGridField;
@@ -71,7 +70,6 @@ public class GroupMembersHealthView extends MembersView {
return;
}
// keyed on metric name - string[0] is the metric label, [1] is the units
- final HashMap<String, String[]> scheduleNamesAndUnits = new HashMap<String, String[]>();
int[] resourceIds = new int[selection.length];
int i = 0;
for (ListGridRecord record : selection) {
@@ -90,6 +88,7 @@ public class GroupMembersHealthView extends MembersView {
FullHTMLPane iframe = new FullHTMLPane(extendLocatorId("View"), destination);
window.addItem(iframe);
window.show();
+ GroupMembersHealthView.this.refreshTableInfo();
}
});
}
12 years, 7 months
[rhq] Branch 'release_jon3.x' - modules/plugins
by snegrea
modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml | 54 ----------
1 file changed, 54 deletions(-)
New commits:
commit 9939b5e91e46a78542b25b1650d898e042eee4fe
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Fri Nov 4 11:33:07 2011 -0500
[BZ 743437] Transformed Type Mapping into a simple text box. All the other implementations considered are currently not supported by the underlying structure.
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 dfbd728..6f68607 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
@@ -218,33 +218,6 @@
<c:description>
The name of the corresponding type-mapping in conf/standardjbosscmp-jdbc.xml.
</c:description>
- <c:property-options>
- <c:option name="Cloudscape" value="Cloudscape"/>
- <c:option name="DB2" value="DB2"/>
- <c:option name="DB2/400" value="DB2/400"/>
- <c:option name="Derby" value="Derby"/>
- <c:option name="Firebird" value="Firebird"/>
- <c:option name="FirstSQL/J" value="FirstSQL/J"/>
- <c:option name="Hypersonic SQL" value="Hypersonic SQL"/>
- <c:option name="InformixDB" value="InformixDB"/>
- <c:option name="Ingres" value="Ingres"/>
- <c:option name="InterBase" value="InterBase"/>
- <c:option name="MaxDB" value="MaxDB"/>
- <c:option name="McKoi" value="McKoi"/>
- <c:option name="Mimer SQL" value="Mimer SQL"/>
- <c:option name="MS SQLSERVER" value="MS SQLSERVER"/>
- <c:option name="MS SQLSERVER2000" value="MS SQLSERVER2000"/>
- <c:option name="Oracle7" value="Oracle7"/>
- <c:option name="Oracle8" value="Oracle8"/>
- <c:option name="Oracle9i" value="Oracle9i"/>
- <c:option name="PointBase" value="PointBase"/>
- <c:option name="PostgreSQL" value="PostgreSQL"/>
- <c:option name="PostgreSQL 7.2" value="PostgreSQL 7.2"/>
- <c:option name="PostgreSQL 8.0" value="PostgreSQL 8.0"/>
- <c:option name="SapDB" value="SapDB"/>
- <c:option name="SOLID" value="SOLID"/>
- <c:option name="Sybase" value="Sybase"/>
- </c:property-options>
</c:simple-property>
</c:map-property>
@@ -307,33 +280,6 @@
<c:description>
The name of the corresponding type-mapping in conf/standardjbosscmp-jdbc.xml.
</c:description>
- <c:property-options>
- <c:option name="Cloudscape" value="Cloudscape"/>
- <c:option name="DB2" value="DB2"/>
- <c:option name="DB2/400" value="DB2/400"/>
- <c:option name="Derby" value="Derby"/>
- <c:option name="Firebird" value="Firebird"/>
- <c:option name="FirstSQL/J" value="FirstSQL/J"/>
- <c:option name="Hypersonic SQL" value="Hypersonic SQL"/>
- <c:option name="InformixDB" value="InformixDB"/>
- <c:option name="Ingres" value="Ingres"/>
- <c:option name="InterBase" value="InterBase"/>
- <c:option name="MaxDB" value="MaxDB"/>
- <c:option name="McKoi" value="McKoi"/>
- <c:option name="Mimer SQL" value="Mimer SQL"/>
- <c:option name="MS SQLSERVER" value="MS SQLSERVER"/>
- <c:option name="MS SQLSERVER2000" value="MS SQLSERVER2000"/>
- <c:option name="Oracle7" value="Oracle7"/>
- <c:option name="Oracle8" value="Oracle8"/>
- <c:option name="Oracle9i" value="Oracle9i"/>
- <c:option name="PointBase" value="PointBase"/>
- <c:option name="PostgreSQL" value="PostgreSQL"/>
- <c:option name="PostgreSQL 7.2" value="PostgreSQL 7.2"/>
- <c:option name="PostgreSQL 8.0" value="PostgreSQL 8.0"/>
- <c:option name="SapDB" value="SapDB"/>
- <c:option name="SOLID" value="SOLID"/>
- <c:option name="Sybase" value="Sybase"/>
- </c:property-options>
</c:simple-property>
<c:simple-property name="use-java-context"
12 years, 7 months
[rhq] modules/plugins
by snegrea
modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml | 54 ----------
1 file changed, 54 deletions(-)
New commits:
commit 43566de98d044de20f96107c54d881e9144cfd2f
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Fri Nov 4 11:33:07 2011 -0500
[BZ 743437] Transformed Type Mapping into a simple text box. All the other implementations considered are currently not supported by the underlying structure.
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 dfbd728..6f68607 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
@@ -218,33 +218,6 @@
<c:description>
The name of the corresponding type-mapping in conf/standardjbosscmp-jdbc.xml.
</c:description>
- <c:property-options>
- <c:option name="Cloudscape" value="Cloudscape"/>
- <c:option name="DB2" value="DB2"/>
- <c:option name="DB2/400" value="DB2/400"/>
- <c:option name="Derby" value="Derby"/>
- <c:option name="Firebird" value="Firebird"/>
- <c:option name="FirstSQL/J" value="FirstSQL/J"/>
- <c:option name="Hypersonic SQL" value="Hypersonic SQL"/>
- <c:option name="InformixDB" value="InformixDB"/>
- <c:option name="Ingres" value="Ingres"/>
- <c:option name="InterBase" value="InterBase"/>
- <c:option name="MaxDB" value="MaxDB"/>
- <c:option name="McKoi" value="McKoi"/>
- <c:option name="Mimer SQL" value="Mimer SQL"/>
- <c:option name="MS SQLSERVER" value="MS SQLSERVER"/>
- <c:option name="MS SQLSERVER2000" value="MS SQLSERVER2000"/>
- <c:option name="Oracle7" value="Oracle7"/>
- <c:option name="Oracle8" value="Oracle8"/>
- <c:option name="Oracle9i" value="Oracle9i"/>
- <c:option name="PointBase" value="PointBase"/>
- <c:option name="PostgreSQL" value="PostgreSQL"/>
- <c:option name="PostgreSQL 7.2" value="PostgreSQL 7.2"/>
- <c:option name="PostgreSQL 8.0" value="PostgreSQL 8.0"/>
- <c:option name="SapDB" value="SapDB"/>
- <c:option name="SOLID" value="SOLID"/>
- <c:option name="Sybase" value="Sybase"/>
- </c:property-options>
</c:simple-property>
</c:map-property>
@@ -307,33 +280,6 @@
<c:description>
The name of the corresponding type-mapping in conf/standardjbosscmp-jdbc.xml.
</c:description>
- <c:property-options>
- <c:option name="Cloudscape" value="Cloudscape"/>
- <c:option name="DB2" value="DB2"/>
- <c:option name="DB2/400" value="DB2/400"/>
- <c:option name="Derby" value="Derby"/>
- <c:option name="Firebird" value="Firebird"/>
- <c:option name="FirstSQL/J" value="FirstSQL/J"/>
- <c:option name="Hypersonic SQL" value="Hypersonic SQL"/>
- <c:option name="InformixDB" value="InformixDB"/>
- <c:option name="Ingres" value="Ingres"/>
- <c:option name="InterBase" value="InterBase"/>
- <c:option name="MaxDB" value="MaxDB"/>
- <c:option name="McKoi" value="McKoi"/>
- <c:option name="Mimer SQL" value="Mimer SQL"/>
- <c:option name="MS SQLSERVER" value="MS SQLSERVER"/>
- <c:option name="MS SQLSERVER2000" value="MS SQLSERVER2000"/>
- <c:option name="Oracle7" value="Oracle7"/>
- <c:option name="Oracle8" value="Oracle8"/>
- <c:option name="Oracle9i" value="Oracle9i"/>
- <c:option name="PointBase" value="PointBase"/>
- <c:option name="PostgreSQL" value="PostgreSQL"/>
- <c:option name="PostgreSQL 7.2" value="PostgreSQL 7.2"/>
- <c:option name="PostgreSQL 8.0" value="PostgreSQL 8.0"/>
- <c:option name="SapDB" value="SapDB"/>
- <c:option name="SOLID" value="SOLID"/>
- <c:option name="Sybase" value="Sybase"/>
- </c:property-options>
</c:simple-property>
<c:simple-property name="use-java-context"
12 years, 7 months
[rhq] Branch 'release_jon3.x' - pom.xml
by ips
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit dc4a80e62c358dff231622778366e62adbde3502
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Fri Nov 4 12:14:21 2011 -0400
[BZ 701375] upgrade EMS from 1.2.16 to 1.3 in order to prevent exceptions in
EMS/jmx-based plugins after a restart of the underlying MBeanServer process
(https://bugzilla.redhat.com/show_bug.cgi?id=701375)
(cherry picked from commit 9c437b02eec7243f8fc712121371795ca6230907)
diff --git a/pom.xml b/pom.xml
index 047d2f6..681b96e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,7 +86,7 @@
<jsf-api.version>1.2_14</jsf-api.version>
<jsf-impl.version>1.2_14</jsf-impl.version>
<ojdbc5.version>11.2.0.2.0</ojdbc5.version>
- <ems.version>1.2.16</ems.version>
+ <ems.version>1.3</ems.version>
<postgresql.version>9.0-801.jdbc4</postgresql.version>
<h2.version>1.2.139</h2.version>
<jtds.version>1.2.2</jtds.version>
12 years, 7 months