From f7268d62b6af915213d6398fe166307dee30d6d0 Mon Sep 17 00:00:00 2001
From: Jean-Frederic Clere <jfclere@gmail.com>
Date: Sun, 9 Mar 2014 10:07:09 +0100
Subject: [PATCH] BZ 1069880 -  Discovery of Tomcat fails when started using
 daemon.sh or jsvc

---
 .../plugins/tomcat/src/main/resources/META-INF/rhq-plugin.xml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/plugins/tomcat/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/tomcat/src/main/resources/META-INF/rhq-plugin.xml
index ed1a2811145..d81c65a91fa 100644
--- a/modules/plugins/tomcat/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/tomcat/src/main/resources/META-INF/rhq-plugin.xml
@@ -160,7 +160,7 @@
       <!--  This will pick up Tomcat processes, whether standalone or embedded. We narrow it down further by examining the command line -->
       <process-scan
          name="Tomcat"
-         query="process|basename|match=^java.*,arg|org.apache.catalina.startup.Bootstrap|match=.*" />
+         query="process|basename|match=^(jsvc.exec|java).*,arg|org.apache.catalina.startup.Bootstrap|match=.*" />
 
       <!--
          On windows EWS uses the tomcat5.exe, tomcat6.exe and tomcat7.exe executables for starting tomcat. Unlike the normal