amyroh 2004/04/28 09:46:04
Modified: webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources
ResourceUtils.java
Log:
Display GlobalNamingResource config if web.xml has resource-ref definition
without Context Resource config.
Revision Changes Path
1.10 +16 -3
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceUtils.java
Index: ResourceUtils.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceUtils.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ResourceUtils.java 28 Apr 2004 02:02:46 -0000 1.9
+++ ResourceUtils.java 28 Apr 2004 16:46:03 -0000 1.10
@@ -203,9 +203,22 @@
try {
// only add resource mbean if definition exists
mserver.getAttribute(oname, "driverClassName");
- results.add(instance.getObjectName().toString());
+ results.add(oname.toString());
} catch (AttributeNotFoundException ex) {
- // full resource definition doesn't exist
+ // if context resource definition doesn't exist
+ // get the global resource definition
+ if (resourcetype.equals("Context")) {
+ rname = new ObjectName( domain + RESOURCE_TYPE +
+ GLOBAL_TYPE + ",class=" + DATASOURCE_CLASS + ",*");
+ Iterator globalIter = (mserver.queryMBeans(rname,
null).iterator());
+ while (globalIter.hasNext()) {
+ ObjectInstance globalInstance =
+ (ObjectInstance) globalIter.next();
+ ObjectName globalOname = globalInstance.getObjectName();
+ mserver.getAttribute(globalOname, "driverClassName");
+ results.add(globalOname.toString());
+ }
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
