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/07 09:27:29 UTC
cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources ResourceUtils.java ResourcesTreeBuilder.java
manveen 02/05/07 00:27:29
Modified: webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources
ResourceUtils.java ResourcesTreeBuilder.java
Log:
Added User Datasource to resource tree.
Revision Changes Path
1.3 +42 -11 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ResourceUtils.java 5 May 2002 22:44:21 -0000 1.2
+++ ResourceUtils.java 7 May 2002 07:27:28 -0000 1.3
@@ -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.2 2002/05/05 22:44:21 manveen Exp $
- * $Revision: 1.2 $
- * $Date: 2002/05/05 22:44:21 $
+ * $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 $
*
* ====================================================================
*
@@ -63,6 +63,8 @@
package org.apache.webapp.admin.resources;
import java.util.Arrays;
+import java.util.ArrayList;
+
import javax.management.MBeanServer;
import javax.management.ObjectName;
@@ -70,7 +72,7 @@
* <p>Shared utility methods for the resource administration module.</p>
*
* @author Manveen Kaur
- * @version $Revision: 1.2 $ $Date: 2002/05/05 22:44:21 $
+ * @version $Revision: 1.3 $ $Date: 2002/05/07 07:27:28 $
* @since 4.1
*/
@@ -79,6 +81,10 @@
public final static String ENVIRONMENT_TYPE = "Catalina:type=Environment";
public final static String RESOURCE_TYPE = "Catalina:type=Resource";
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 Methods
@@ -120,18 +126,12 @@
*/
public static DataSourcesForm getDataSourcesForm(MBeanServer mserver)
throws Exception {
-
- ObjectName rname = new ObjectName( NAMINGRESOURCES_TYPE );
- String results[] =
- (String[]) mserver.getAttribute(rname, "resources");
-
- /*
+
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());
- */
if (results == null) {
results = new String[0];
@@ -143,4 +143,35 @@
return (dataSourcesForm);
}
+
+ /**
+ * Construct and return a UserDatabaseForm identifying all currently defined
+ * user databases in the specified resource database.
+ *
+ * @param mserver MBeanServer to be consulted
+ * @param databaseName MBean Name of the resource database to be consulted
+ *
+ * @exception Exception if an error occurs
+ */
+ public static UserDatabasesForm getUserDatabasesForm(MBeanServer mserver)
+ throws Exception {
+
+ ObjectName ename = new ObjectName( NAMINGRESOURCES_TYPE );
+
+ String results[] =
+ (String[]) mserver.getAttribute(ename, "resources");
+
+ // FIX ME -- need to add just the UserDatabase resources.
+
+ if (results == null) {
+ results = new String[0];
+ }
+ Arrays.sort(results);
+
+ UserDatabasesForm userDatabasesForm = new UserDatabasesForm();
+ userDatabasesForm.setUserDatabases(results);
+ return (userDatabasesForm);
+
+ }
+
}
1.4 +15 -6 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourcesTreeBuilder.java
Index: ResourcesTreeBuilder.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourcesTreeBuilder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ResourcesTreeBuilder.java 5 May 2002 22:44:21 -0000 1.3
+++ ResourcesTreeBuilder.java 7 May 2002 07:27:29 -0000 1.4
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourcesTreeBuilder.java,v 1.3 2002/05/05 22:44:21 manveen Exp $
- * $Revision: 1.3 $
- * $Date: 2002/05/05 22:44:21 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourcesTreeBuilder.java,v 1.4 2002/05/07 07:27:29 manveen Exp $
+ * $Revision: 1.4 $
+ * $Date: 2002/05/07 07:27:29 $
*
* ====================================================================
*
@@ -76,7 +76,7 @@
* for administering the resources (data sources).
*
* @author Manveen Kaur
- * @version $Revision: 1.3 $ $Date: 2002/05/05 22:44:21 $
+ * @version $Revision: 1.4 $ $Date: 2002/05/07 07:27:29 $
* @since 4.1
*/
@@ -130,15 +130,23 @@
"content",
true);
TreeControlNode datasources = new TreeControlNode
- ("Global Administer Data Sources",
+ ("Globally Administer Data Sources",
"Datasource.gif",
resources.getMessage("resources.treeBuilder.datasources"),
"resources/listDataSources.do?forward=" +
URLEncoder.encode("DataSources List Setup"),
"content",
false);
+ TreeControlNode userdbs = new TreeControlNode
+ ("Globally Administer UserDatabase Entries",
+ "EnvironmentEntries.gif",
+ resources.getMessage("resources.treeBuilder.databases"),
+ "resources/listUserDatabases.do?forward=" +
+ URLEncoder.encode("UserDatabases List Setup"),
+ "content",
+ false);
TreeControlNode envs = new TreeControlNode
- ("Global Administer Environment Entries",
+ ("Globally Administer Environment Entries",
"EnvironmentEntries.gif",
resources.getMessage("resources.env.entries"),
"resources/listEnvEntries.do?forward=" +
@@ -146,6 +154,7 @@
"content",
false);
root.addChild(subtree);
+ subtree.addChild(userdbs);
subtree.addChild(datasources);
subtree.addChild(envs);
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>