modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXDiscoveryComponent.java | 32
++++++----
1 file changed, 20 insertions(+), 12 deletions(-)
New commits:
commit 10b02ff05c15e2cdf368ff617f0cdf48a6bf03eb
Author: Simeon Pinder <spinder(a)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 c6bd5e7..1619b67 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
@@ -518,14 +518,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 fbb56423a291d67900f3221901afa50e410d2052
Author: Elias Ross <genman(a)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 4ce9bc2..c6bd5e7 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:
@@ -517,6 +517,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:
Show replies by date