[Hyperic-hq-discuss] hq r14359 - in trunk: plugins/xml src/org/hyperic/hq/product/jmx

[<gla...@hy...>]

Author: glaullon
Date: 2010-03-09 09:43:44 -0800 (Tue, 09 Mar 2010)
New Revision: 14359
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14359

Modified:
   trunk/plugins/xml/activemq-plugin.xml
   trunk/src/org/hyperic/hq/product/jmx/MxServerDetector.java
Log:
[HQ-2007] Embedded ActiveMQ server is not being Autodiscovered when embedded in spring app running on tcserver (6.0.20.C)
[HPD-50]

Modified: trunk/plugins/xml/activemq-plugin.xml
===================================================================
--- trunk/plugins/xml/activemq-plugin.xml	2010-03-09 09:17:03 UTC (rev 14358)
+++ trunk/plugins/xml/activemq-plugin.xml	2010-03-09 17:43:44 UTC (rev 14359)
@@ -247,9 +247,9 @@
               value="var/activemq.log"/>
 
     <property name="VERSION_FILE"
-              value="lib/activemq-core-4.*.jar"/>
+              value="**/lib/.*activemq-core-4.\d*.*.jar"/>
 
-    <config include="jmx">
+    <config>
       <option name="process.query"
               description="Process Query"/>
     </config>
@@ -362,24 +362,44 @@
   <server name="ActiveMQ"
           version="5.0"
           include="4.0">
+      <property name="VERSION_FILE"
+              value="**/.*activemq-core-(5.\d*).*.jar"/>
+</server>
 
-    <property name="VERSION_FILE"
-              value="lib/activemq-core-5.0.*.jar"/>
-  </server>
-
   <server name="ActiveMQ"
           version="5.1"
           include="5.0">
+  </server>
 
-    <property name="VERSION_FILE"
-              value="lib/activemq-core-5.1.*.jar"/>
+  <server name="ActiveMQ"
+          version="5.2"
+          include="5.1">
   </server>
 
   <server name="ActiveMQ"
+          version="5.3"
+          include="5.2">
+  </server>
+
+  <server name="ActiveMQ Embeeded"
+          version="5.0"
+          include="ActiveMQ 5.0">
+    <property name="PROC_HOME_PROPERTY"
+              value="catalina.base"/>
+  </server>
+  <server name="ActiveMQ Embeeded"
+          version="5.1"
+          include="ActiveMQ 5.1">
+    <property name="PROC_HOME_PROPERTY"
+              value="catalina.base"/>
+  </server>
+  <server name="ActiveMQ Embeeded"
           version="5.2"
           include="5.1">
+  </server>
+  <server name="ActiveMQ Embeeded"
+          version="5.3"
+          include="5.2">
+  </server>
 
-    <property name="VERSION_FILE"
-              value="lib/activemq-core-5.2.*.jar"/>
-  </server>
 </plugin>

Modified: trunk/src/org/hyperic/hq/product/jmx/MxServerDetector.java
===================================================================
--- trunk/src/org/hyperic/hq/product/jmx/MxServerDetector.java	2010-03-09 09:17:03 UTC (rev 14358)
+++ trunk/src/org/hyperic/hq/product/jmx/MxServerDetector.java	2010-03-09 17:43:44 UTC (rev 14359)
@@ -254,7 +254,7 @@
         List procs = new ArrayList();
         long[] pids = getPids(getProcQuery());
         log.debug(getProcQuery() + " matched " + pids.length + " processes");
-
+ 
         String homeProp = getProcHomeProperty();
         final boolean isMatch = isMatch(homeProp);
         if (isMatch) {