modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMeasurementScheduleListView.java
| 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/UpdateCollectionIntervalWidget.java
| 2
modules/plugins/platform/src/main/java/org/rhq/plugins/platform/FileSystemDiscoveryComponent.java
| 36 ++++++----
3 files changed, 25 insertions(+), 15 deletions(-)
New commits:
commit 0807155b735ae33c21b69df4758d7f031d4a28a0
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Tue Sep 14 20:11:07 2010 -0400
fix potential cast exception when sp[ecified metric collection interval is larger than
Integer.MAX
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMeasurementScheduleListView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMeasurementScheduleListView.java
index 9b68f39..c00175a 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMeasurementScheduleListView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMeasurementScheduleListView.java
@@ -87,7 +87,7 @@ public abstract class AbstractMeasurementScheduleListView extends Table
{
return "";
}
- long milliseconds = (Integer) value;
+ long milliseconds = ((Number) value).longValue();
if (milliseconds == 0) {
return "0";
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/UpdateCollectionIntervalWidget.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/UpdateCollectionIntervalWidget.java
index 78fe1d3..bef5806 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/UpdateCollectionIntervalWidget.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/UpdateCollectionIntervalWidget.java
@@ -37,7 +37,7 @@ import
org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHLayout;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableIButton;
/**
- * Widget for updating the collection intervals on the selected metrics. It displays two
form fields for
+ * Widget for updating the collection intervals for the selected metrics. It displays two
form fields for
* entering the interval and the interval's units (seconds, minutes, or hours), as
well as a Set button
* for submitting the update.
*
commit 2a60df38568690f9b2b6a555e212c3a6934ea011
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Tue Sep 14 20:08:22 2010 -0400
add support for lofs and tmpfs filesystems on Solaris
(
https://bugzilla.redhat.com/show_bug.cgi?id=553034)
diff --git
a/modules/plugins/platform/src/main/java/org/rhq/plugins/platform/FileSystemDiscoveryComponent.java
b/modules/plugins/platform/src/main/java/org/rhq/plugins/platform/FileSystemDiscoveryComponent.java
index b7960c2..a12d556 100644
---
a/modules/plugins/platform/src/main/java/org/rhq/plugins/platform/FileSystemDiscoveryComponent.java
+++
b/modules/plugins/platform/src/main/java/org/rhq/plugins/platform/FileSystemDiscoveryComponent.java
@@ -1,6 +1,6 @@
/*
* RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
+ * Copyright (C) 2005-2010 Red Hat, Inc.
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
@@ -22,7 +22,7 @@
*/
package org.rhq.plugins.platform;
-import java.util.HashSet;
+import java.util.LinkedHashSet;
import java.util.Set;
import org.apache.commons.logging.Log;
@@ -38,14 +38,16 @@ import org.rhq.core.system.SystemInfo;
/**
* @author Greg Hinkle
+ * @author Ian Springer
*/
+@SuppressWarnings({"UnusedDeclaration"})
public class FileSystemDiscoveryComponent implements
ResourceDiscoveryComponent<PlatformComponent> {
private final Log log = LogFactory.getLog(this.getClass());
public Set<DiscoveredResourceDetails>
discoverResources(ResourceDiscoveryContext<PlatformComponent> discoveryContext)
throws Exception {
- Set<DiscoveredResourceDetails> results = new
HashSet<DiscoveredResourceDetails>();
+ Set<DiscoveredResourceDetails> results = new
LinkedHashSet<DiscoveredResourceDetails>();
SystemInfo sysInfo = discoveryContext.getSystemInformation();
if (!sysInfo.isNative()) {
@@ -54,22 +56,30 @@ public class FileSystemDiscoveryComponent implements
ResourceDiscoveryComponent<
return results;
}
- String hostname = discoveryContext.getSystemInformation().getHostname();
-
- for (FileSystemInfo fs : sysInfo.getFileSystems()) {
- int fsType = fs.getFileSystem().getType();
- if (fsType != FileSystem.TYPE_LOCAL_DISK && fsType !=
FileSystem.TYPE_NETWORK) {
- continue;
+ for (FileSystemInfo fsInfo : sysInfo.getFileSystems()) {
+ FileSystem fs = fsInfo.getFileSystem();
+ int fsType = fs.getType();
+ // We only support local, network (nfs), lofs, or tmpfs filesystems - skip
any other types.
+ switch (fsType) {
+ case FileSystem.TYPE_LOCAL_DISK:
+ case FileSystem.TYPE_NETWORK:
+ break;
+ default:
+ if (!(fs.getDevName().equals("lofs") ||
+ fs.getDevName().equals("tmpfs"))) {
+ continue;
+ }
}
+
Configuration pluginConfig =
discoveryContext.getDefaultPluginConfiguration();
try {
- String key = fs.getMountPoint();
+ String key = fsInfo.getMountPoint();
DiscoveredResourceDetails details = new
DiscoveredResourceDetails(discoveryContext.getResourceType(),
- key, key, null, fs.getFileSystem().getDevName() + ": "
- + fs.getFileSystem().getDirName(), pluginConfig, null);
+ key, key, null, fsInfo.getFileSystem().getDevName() + ": "
+ + fsInfo.getFileSystem().getDirName(), pluginConfig, null);
results.add(details);
} catch (Exception e) {
- log.error("File system discovery failed: " + e + ",
skipping.");
+ log.error("File system discovery failed for [" + fsInfo +
"]: " + e);
}
}
return results;