[Hyperic-hq-discuss] hq r7721 - branches/HQ_3_2/plugins/weblogic/src/org/hyperic/hq/plugin/weblogic/jmx

[<do...@hy...>]

Author: dougm
Date: 2008-02-08 10:32:25 -0800 (Fri, 08 Feb 2008)
New Revision: 7721
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=7721

Modified:
   branches/HQ_3_2/plugins/weblogic/src/org/hyperic/hq/plugin/weblogic/jmx/ServerQuery.java
   branches/HQ_3_2/plugins/weblogic/src/org/hyperic/hq/plugin/weblogic/jmx/WeblogicDiscover.java
   branches/HQ_3_2/plugins/weblogic/src/org/hyperic/hq/plugin/weblogic/jmx/WeblogicRuntimeDiscoverer.java
Log:
[HHQ-1619] Use Admin type version for the node version (merged from trunk)

Modified: branches/HQ_3_2/plugins/weblogic/src/org/hyperic/hq/plugin/weblogic/jmx/ServerQuery.java
===================================================================
--- branches/HQ_3_2/plugins/weblogic/src/org/hyperic/hq/plugin/weblogic/jmx/ServerQuery.java	2008-02-08 18:31:40 UTC (rev 7720)
+++ branches/HQ_3_2/plugins/weblogic/src/org/hyperic/hq/plugin/weblogic/jmx/ServerQuery.java	2008-02-08 18:32:25 UTC (rev 7721)
@@ -408,8 +408,8 @@
         else {
             type = WeblogicProductPlugin.SERVER_NAME;
         }
-
-        return TypeBuilder.composeServerTypeName(type, this.version);
+        String version = getDiscover().getVersion();
+        return TypeBuilder.composeServerTypeName(type, version);
     }
 
     public String getIdentifier() {

Modified: branches/HQ_3_2/plugins/weblogic/src/org/hyperic/hq/plugin/weblogic/jmx/WeblogicDiscover.java
===================================================================
--- branches/HQ_3_2/plugins/weblogic/src/org/hyperic/hq/plugin/weblogic/jmx/WeblogicDiscover.java	2008-02-08 18:31:40 UTC (rev 7720)
+++ branches/HQ_3_2/plugins/weblogic/src/org/hyperic/hq/plugin/weblogic/jmx/WeblogicDiscover.java	2008-02-08 18:32:25 UTC (rev 7721)
@@ -47,6 +47,7 @@
     private String adminName = null;
     private String domain = null;
     private Properties props;
+    private String version;
 
     private HashMap mbeanServers = new HashMap();
     private HashMap internalApps = new HashMap();
@@ -59,15 +60,13 @@
         new JTAResourceQuery(),
     };
 
-    public WeblogicDiscover(Properties props) {
+    public WeblogicDiscover(String version, Properties props) {
+        this.version = version;
         this.props = props;
     }
 
-    public WeblogicDiscover(String adminURL,
-                            String username,
-                            String password) {
-
-        this.props = getProperties(adminURL, username, password);
+    public String getVersion() {
+        return this.version;
     }
 
     public static Log getLog() {

Modified: branches/HQ_3_2/plugins/weblogic/src/org/hyperic/hq/plugin/weblogic/jmx/WeblogicRuntimeDiscoverer.java
===================================================================
--- branches/HQ_3_2/plugins/weblogic/src/org/hyperic/hq/plugin/weblogic/jmx/WeblogicRuntimeDiscoverer.java	2008-02-08 18:31:40 UTC (rev 7720)
+++ branches/HQ_3_2/plugins/weblogic/src/org/hyperic/hq/plugin/weblogic/jmx/WeblogicRuntimeDiscoverer.java	2008-02-08 18:32:25 UTC (rev 7721)
@@ -172,7 +172,7 @@
 
         Properties props = config.toProperties();
 
-        WeblogicDiscover discover = new WeblogicDiscover(props);
+        WeblogicDiscover discover = new WeblogicDiscover(this.version, props);
 
         try {
             MBeanServer mServer = discover.getMBeanServer();