modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXDiscoveryComponent.java | 35 ++++++---- 1 file changed, 23 insertions(+), 12 deletions(-)
New commits: commit 1d4e0d12dc0d013659e3ebde3b18eb24b0083e84 Author: Simeon Pinder spinder@fulliautomatix.conchfritter.com Date: Tue Sep 11 17:59:29 2012 -0400
[BZ 839087] a few lines more of documentation.
diff --git a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXDiscoveryComponent.java b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXDiscoveryComponent.java index 25391e8..e8072ea 100644 --- a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXDiscoveryComponent.java +++ b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXDiscoveryComponent.java @@ -131,6 +131,7 @@ public class JMXDiscoveryComponent implements ResourceDiscoveryComponent, Manual ProcessInfo processInfo = process.getProcessInfo(); DiscoveredResourceDetails details = discoverResourceDetails(context, processInfo); if (details != null) { + //detect discovered jmx resources that are erroneously using the same key if (discoveredResources.contains(details)) { List<DiscoveredResourceDetails> duplicates = duplicatesByKey.get(details.getResourceKey()); if (duplicates == null) { @@ -151,6 +152,7 @@ public class JMXDiscoveryComponent implements ResourceDiscoveryComponent, Manual } }
+ //Log the erroneous collisions and take them out of the discoveredResource list. for (String duplicateKey : duplicatesByKey.keySet()) { List<DiscoveredResourceDetails> duplicates = duplicatesByKey.get(duplicateKey); log.error("Multiple Resources with the same key (" + duplicateKey @@ -511,6 +513,7 @@ public class JMXDiscoveryComponent implements ResourceDiscoveryComponent, Manual } }
+ //build the resource names from supported JvmResourceKey instances. See JvmResourceKey.Type for more details. switch (key.getType()) { case Legacy: // implies main classname was not found. Include earlier naming format as well. name.append("JMX Server (" + key.getJmxRemotingPort() + ")");
commit c431e51a08fbb6960c3c87090bef1c150c537c8c Author: Simeon Pinder spinder@fulliautomatix.conchfritter.com Date: Tue Sep 11 17:38:54 2012 -0400
[BZ 839087] add support for ConnectorAddress naming as well.
diff --git a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXDiscoveryComponent.java b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXDiscoveryComponent.java index 5914b9b..25391e8 100644 --- a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXDiscoveryComponent.java +++ b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXDiscoveryComponent.java @@ -513,14 +513,19 @@ public class JMXDiscoveryComponent implements ResourceDiscoveryComponent, Manual
switch (key.getType()) { case Legacy: // implies main classname was not found. Include earlier naming format as well. - name.append("JMX Server (" + key.getJmxRemotingPort() + ")");// + name.append("JMX Server (" + key.getJmxRemotingPort() + ")"); break; - case JmxRemotingPort: - name.append(':').append(key.getJmxRemotingPort()); break; - case Explicit: - name.append(' ').append(key.getExplicitValue()); break; - default: - throw new IllegalStateException("Unsupported key type: " + key.getType()); + case ConnectorAddress: + name.append(key.getConnectorAddress()); + break; + case JmxRemotingPort: + name.append(':').append(key.getJmxRemotingPort()); + break; + case Explicit: + name.append(' ').append(key.getExplicitValue()); + break; + default: + throw new IllegalStateException("Unsupported key type: " + key.getType()); }
return name.toString();
commit ad3c40c0812d74756eab640faabf83980ef8d891 Author: Elias Ross genman@noderunner.net Date: Mon Sep 10 17:34:27 2012 -0400
[BZ 839087] adding support for Legacy types when generating names for discovered types. - also applying original naming scheme for consistency.
diff --git a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXDiscoveryComponent.java b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXDiscoveryComponent.java index f0a4f98..5914b9b 100644 --- a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXDiscoveryComponent.java +++ b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXDiscoveryComponent.java @@ -46,6 +46,12 @@ import javax.management.remote.JMXServiceURL;
import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.mc4j.ems.connection.EmsConnection; +import org.mc4j.ems.connection.bean.EmsBean; +import org.mc4j.ems.connection.bean.attribute.EmsAttribute; +import org.mc4j.ems.connection.support.ConnectionProvider; +import org.mc4j.ems.connection.support.metadata.J2SE5ConnectionTypeDescriptor; + import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.domain.resource.ResourceUpgradeReport; @@ -63,12 +69,6 @@ import org.rhq.plugins.jmx.util.ConnectionProviderFactory; import org.rhq.plugins.jmx.util.JvmResourceKey; import org.rhq.plugins.jmx.util.JvmUtility;
-import org.mc4j.ems.connection.EmsConnection; -import org.mc4j.ems.connection.bean.EmsBean; -import org.mc4j.ems.connection.bean.attribute.EmsAttribute; -import org.mc4j.ems.connection.support.ConnectionProvider; -import org.mc4j.ems.connection.support.metadata.J2SE5ConnectionTypeDescriptor; - /** * This component will discover JVM processes that appear to be long-running (i.e. "servers"). Specifically, it will * discover java processes that: @@ -512,6 +512,9 @@ public class JMXDiscoveryComponent implements ResourceDiscoveryComponent, Manual }
switch (key.getType()) { + case Legacy: // implies main classname was not found. Include earlier naming format as well. + name.append("JMX Server (" + key.getJmxRemotingPort() + ")");// + break; case JmxRemotingPort: name.append(':').append(key.getJmxRemotingPort()); break; case Explicit:
rhq-commits@lists.fedorahosted.org