[Hyperic-hq-discuss] hq r13689 - in trunk: plugins/servlet/src/org/hyperic/hq/plugin/servlet src/org/hyperic/hq/product/servlet/client

[<jh...@hy...>]

Author: jhickey
Date: 2009-09-02 09:33:13 -0700 (Wed, 02 Sep 2009)
New Revision: 13689
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=13689

Modified:
   trunk/plugins/servlet/src/org/hyperic/hq/plugin/servlet/ServletDiscoveryPlugin.java
   trunk/plugins/servlet/src/org/hyperic/hq/plugin/servlet/Tomcat40ServerDetector.java
   trunk/src/org/hyperic/hq/product/servlet/client/JMXProtocolHttp.java
Log:
HHQ-3360

Modified: trunk/plugins/servlet/src/org/hyperic/hq/plugin/servlet/ServletDiscoveryPlugin.java
===================================================================
--- trunk/plugins/servlet/src/org/hyperic/hq/plugin/servlet/ServletDiscoveryPlugin.java	2009-09-02 08:44:41 UTC (rev 13688)
+++ trunk/plugins/servlet/src/org/hyperic/hq/plugin/servlet/ServletDiscoveryPlugin.java	2009-09-02 16:33:13 UTC (rev 13689)
@@ -97,9 +97,8 @@
         String host;
 
         jmxRemote.setJmxUrl(jmxUrl);
-        // XXX: need to add authentication supprt
-        // jmxRemote.setUser(user);
-        // jmxRemote.setPass(password);
+        jmxRemote.setUser(user);
+        jmxRemote.setPassword(password);
  
         Manifest mBeanInfo;
         try {

Modified: trunk/plugins/servlet/src/org/hyperic/hq/plugin/servlet/Tomcat40ServerDetector.java
===================================================================
--- trunk/plugins/servlet/src/org/hyperic/hq/plugin/servlet/Tomcat40ServerDetector.java	2009-09-02 08:44:41 UTC (rev 13688)
+++ trunk/plugins/servlet/src/org/hyperic/hq/plugin/servlet/Tomcat40ServerDetector.java	2009-09-02 16:33:13 UTC (rev 13689)
@@ -153,7 +153,8 @@
             String url = "http://" + address + ":" + port;
             productConfig.setValue(JMXRemote.PROP_JMX_URL, url);
 
-            server.setProductConfig(productConfig);
+            //jmxUser and jmxPass can be configured in agent.properties
+            setProductConfig(server, productConfig);
             server.setConnectProperties(new String[] {
                JMXRemote.PROP_JMX_URL,
             });

Modified: trunk/src/org/hyperic/hq/product/servlet/client/JMXProtocolHttp.java
===================================================================
--- trunk/src/org/hyperic/hq/product/servlet/client/JMXProtocolHttp.java	2009-09-02 08:44:41 UTC (rev 13688)
+++ trunk/src/org/hyperic/hq/product/servlet/client/JMXProtocolHttp.java	2009-09-02 16:33:13 UTC (rev 13689)
@@ -68,9 +68,9 @@
             UsernamePasswordCredentials credentials =
                 new UsernamePasswordCredentials(user, pass);
 
-            client.getState().setCredentials(host,
-                                             host,
-                                             credentials);
+            //pass the same credentials in for any realm on the host
+            //TODO could add support for a specific realm config prop if necessary
+            client.getState().setCredentials(null, host, credentials);
                     
             get.setDoAuthentication(true);
         }