[Hyperic-hq-discuss] hq r14568 - in trunk/plugins: mysql/etc mysql_stats/etc

[<tr...@hy...>]

Author: trader
Date: 2010-05-04 13:51:16 -0700 (Tue, 04 May 2010)
New Revision: 14568
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14568

Modified:
   trunk/plugins/mysql/etc/hq-plugin.xml
   trunk/plugins/mysql_stats/etc/hq-plugin.xml
Log:
HQ-2121: mysql_stats plugin fails on EE with commercial driver: the plugin XML used the exact filename in the classpath, the fix was to use a wildcard instead.

Modified: trunk/plugins/mysql/etc/hq-plugin.xml
===================================================================
--- trunk/plugins/mysql/etc/hq-plugin.xml	2010-05-04 20:31:30 UTC (rev 14567)
+++ trunk/plugins/mysql/etc/hq-plugin.xml	2010-05-04 20:51:16 UTC (rev 14568)
@@ -27,7 +27,7 @@
 
 <plugin package="org.hyperic.hq.plugin.mysql">
   <classpath>
-    <include name="pdk/lib/jdbc/mysql-connector-java-5.1.10-bin.jar"/>
+    <include name="pdk/lib/jdbc/mysql-connector-java*5.1.10-bin.jar"/>
   </classpath>
 
   <!-- we use a dummy jmx object name -->

Modified: trunk/plugins/mysql_stats/etc/hq-plugin.xml
===================================================================
--- trunk/plugins/mysql_stats/etc/hq-plugin.xml	2010-05-04 20:31:30 UTC (rev 14567)
+++ trunk/plugins/mysql_stats/etc/hq-plugin.xml	2010-05-04 20:51:16 UTC (rev 14568)
@@ -31,7 +31,7 @@
 
 <plugin package="org.hyperic.hq.plugin.mysql_stats">
     <classpath>
-      <include name="pdk/lib/jdbc/mysql-connector-java-5.1.10-bin.jar"/>
+      <include name="pdk/lib/jdbc/mysql-connector-java*5.1.10-bin.jar"/>
     </classpath>
     <property name="template-config"
               value="jdbcUrl=%jdbcUrl%,jdbcUser=%jdbcUser%,jdbcPassword=%jdbcPassword%"/>