You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2002/05/08 01:31:50 UTC
cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources ResourceUtils.java
manveen 02/05/07 16:31:50
Modified: webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources
ResourceUtils.java
Log:
Fix for displaying the appropriate resource list under jdbc datasource and userdb
Revision Changes Path
1.4 +32 -25 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceUtils.java
Index: ResourceUtils.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceUtils.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ResourceUtils.java 7 May 2002 07:27:28 -0000 1.3
+++ ResourceUtils.java 7 May 2002 23:31:50 -0000 1.4
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceUtils.java,v 1.3 2002/05/07 07:27:28 manveen Exp $
- * $Revision: 1.3 $
- * $Date: 2002/05/07 07:27:28 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceUtils.java,v 1.4 2002/05/07 23:31:50 manveen Exp $
+ * $Revision: 1.4 $
+ * $Date: 2002/05/07 23:31:50 $
*
* ====================================================================
*
@@ -64,15 +64,18 @@
import java.util.Arrays;
import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.Collections;
import javax.management.MBeanServer;
import javax.management.ObjectName;
+import javax.management.ObjectInstance;
/**
* <p>Shared utility methods for the resource administration module.</p>
*
* @author Manveen Kaur
- * @version $Revision: 1.3 $ $Date: 2002/05/07 07:27:28 $
+ * @version $Revision: 1.4 $ $Date: 2002/05/07 23:31:50 $
* @since 4.1
*/
@@ -83,8 +86,8 @@
public final static String NAMINGRESOURCES_TYPE = "Catalina:type=NamingResources";
// resource class names
- private final static String USERDB_CLASS = "org.apache.catalina.UserDatabase";
- private final static String DATASOURCE_CLASS = "javax.sql.DataSource";
+ public final static String USERDB_CLASS = "org.apache.catalina.UserDatabase";
+ public final static String DATASOURCE_CLASS = "javax.sql.DataSource";
// --------------------------------------------------------- Public Methods
@@ -128,18 +131,20 @@
throws Exception {
ObjectName rname = new ObjectName( RESOURCE_TYPE +
- ",class=" + "javax.sql.DataSource");
-
- // display only JDBC Resources for the DataSources screen
- String[] results = (String[]) (mserver.queryMBeans(rname, null).toArray());
+ ",class=" + DATASOURCE_CLASS + ",*");
+
+ Iterator iterator = (mserver.queryMBeans(rname, null).iterator());
- if (results == null) {
- results = new String[0];
- }
- Arrays.sort(results);
+ ArrayList results = new ArrayList();
+ while (iterator.hasNext()) {
+ ObjectInstance instance = (ObjectInstance) iterator.next();
+ results.add(instance.getObjectName().toString());
+ }
+ Collections.sort(results);
DataSourcesForm dataSourcesForm = new DataSourcesForm();
- dataSourcesForm.setDataSources(results);
+ dataSourcesForm.setDataSources((String[])
+ results.toArray(new String[results.size()]));
return (dataSourcesForm);
}
@@ -156,20 +161,22 @@
public static UserDatabasesForm getUserDatabasesForm(MBeanServer mserver)
throws Exception {
- ObjectName ename = new ObjectName( NAMINGRESOURCES_TYPE );
-
- String results[] =
- (String[]) mserver.getAttribute(ename, "resources");
+ ObjectName rname = new ObjectName( RESOURCE_TYPE +
+ ",class=" + USERDB_CLASS + ",*");
- // FIX ME -- need to add just the UserDatabase resources.
+ Iterator iterator = (mserver.queryMBeans(rname, null).iterator());
- if (results == null) {
- results = new String[0];
- }
- Arrays.sort(results);
+ ArrayList results = new ArrayList();
+ while (iterator.hasNext()) {
+ ObjectInstance instance = (ObjectInstance) iterator.next();
+ results.add(instance.getObjectName().toString());
+ }
+
+ Collections.sort(results);
UserDatabasesForm userDatabasesForm = new UserDatabasesForm();
- userDatabasesForm.setUserDatabases(results);
+ userDatabasesForm.setUserDatabases((String[])
+ results.toArray(new String[results.size()]));
return (userDatabasesForm);
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>