Description of problem:
Tomcat 7 datasources are not discovered if defined in server.xml file. At the same time, datasources will be properly discovered when defined in the context.xml file.

It seems that the problem is in the name of the MBean that tomcat plugin expects to see:

- if datasource is defined using server.xml file, the MBean name will be: Catalina:type=DataSource,class=javax.sql.DataSource,name="jdbc/mysql";

- if datasource is defined using context.xml file, the MBean name is: Catalina:type=DataSource,context=/examples,host=localhost,class=javax.sql.DataSource,name="jdbc/mysql"

Version-Release number of selected component (if applicable):
- RHQ 4.9
- Tomcat 7
- RHQ plugins for tomcat

How reproducible:
Always

Steps to Reproduce:
1. Install and start RHQ
2. Download, install  and configure Tomcat server; 
3. Install RHQ plugin for tomcat;
3. Define datasource in the context.xml file - for instance add the following Resource inside Context:

***********************
...
<Context>
...
    <Resource auth="Container"
              name="jdbc/mysql"
              type="javax.sql.DataSource"
              driverClassName="com.mysql.jdbc.Driver"
              url="jdbc:mysql://localhost:3306/test"
              username="userName" password="password" />
</Context>
***********************
4. Save the file, restart the Tomcat;
5. Navigate to the RHQ UI -> Tomcat Servers -> Tomcat instance -> Tomcat Virtual Hosts -> localhost -> Tomcat Web Application (WAR)s -> example and there should be Tomcat Datasoruces with the "jdbc/mysql" discovered;
6. Shutdown Tomcat instance and uninventory it from the JBoss ON UI;
7. Delete Resource configuration (given in the step 3 above) from context.xml and instead add the following in the context.xml file:
***********************
<Context>
...
<ResourceLink name="jdbc/mysql" 
              global="jdbc/mysql"
              auth="Container"
              type="javax.sql.DataSource" />
</Context>
***********************
   
Above Resource configuration add to the Tomcat's server.xml file:

***********************
<GlobalNamingResources>
...
    <Resource auth="Container"
              name="jdbc/mysql"
              type="javax.sql.DataSource"
              driverClassName="com.mysql.jdbc.Driver"
              url="jdbc:mysql://localhost:3306/test"
              username="userName" password="password" />
</GlobalNamingResources>
***********************
and save the file.
8. Start Tomcat server again and let RHQ Agent discover it;

Actual results:
No datasource is discovered

Expected results:
Globally defined datasources should be discovered.


Additional info: