[Hyperic-hq-discuss] hq r3831 - trunk/plugins/websphere/src/org/hyperic/hq/plugin/websphere

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

Author: dougm
Date: 2007-03-22 19:27:20 -0800 (Thu, 22 Mar 2007)
New Revision: 3831
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=3831

Modified:
   trunk/plugins/websphere/src/org/hyperic/hq/plugin/websphere/WebsphereProductPlugin.java
   trunk/plugins/websphere/src/org/hyperic/hq/plugin/websphere/WebsphereUtil.java
Log:
[HHQ-763] Fix 6.0 classpath

Modified: trunk/plugins/websphere/src/org/hyperic/hq/plugin/websphere/WebsphereProductPlugin.java
===================================================================
--- trunk/plugins/websphere/src/org/hyperic/hq/plugin/websphere/WebsphereProductPlugin.java	2007-03-23 03:26:22 UTC (rev 3830)
+++ trunk/plugins/websphere/src/org/hyperic/hq/plugin/websphere/WebsphereProductPlugin.java	2007-03-23 03:27:20 UTC (rev 3831)
@@ -423,7 +423,7 @@
         }
 
         isOSGi =
-            new File(installDir, "/runtimes").isDirectory();
+            new File(installDir, "/plugins").isDirectory();
 
         //required for 6.1
         File sslConfigFile =
@@ -504,6 +504,7 @@
             installDir + "/lib/classloader.jar",
             installDir + "/lib/security.jar",
             installDir + "/lib/wasproduct.jar",
+            installDir + "/lib/pmij2ee.jar",
             installDir + "/java/jre/lib/ibmcertpathprovider.jar",
             installDir + "/java/jre/lib/ext/ibmjceprovider.jar",
             installDir + "/java/jre/lib/ext/ibmjcefips.jar",

Modified: trunk/plugins/websphere/src/org/hyperic/hq/plugin/websphere/WebsphereUtil.java
===================================================================
--- trunk/plugins/websphere/src/org/hyperic/hq/plugin/websphere/WebsphereUtil.java	2007-03-23 03:26:22 UTC (rev 3830)
+++ trunk/plugins/websphere/src/org/hyperic/hq/plugin/websphere/WebsphereUtil.java	2007-03-23 03:27:20 UTC (rev 3831)
@@ -162,7 +162,7 @@
                 } catch (Exception e) {
                     //e.g. unauthorized
                     throw new MetricUnreachableException(metric.getObjectName() +
-                                                         ": " + e.getMessage());
+                                                         ": " + e.getMessage(), e);
                 }
             }
         } catch (ConnectorException e) {