craigmcc 02/02/18 18:15:28
Modified: catalina/src/share/org/apache/catalina/mbeans
MBeanUtils.java mbeans-descriptors.xml
Log:
Support future implementation of a JDBCUserDatabase and associated dependent
components.
Revision Changes Path
1.26 +10 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
Index: MBeanUtils.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- MBeanUtils.java 14 Feb 2002 07:47:14 -0000 1.25
+++ MBeanUtils.java 19 Feb 2002 02:15:27 -0000 1.26
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.25 2002/02/14 07:47:14 amyroh Exp $
- * $Revision: 1.25 $
- * $Date: 2002/02/14 07:47:14 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.26 2002/02/19 02:15:27 craigmcc Exp $
+ * $Revision: 1.26 $
+ * $Date: 2002/02/19 02:15:27 $
*
* ====================================================================
*
@@ -109,7 +109,7 @@
*
* @author Craig R. McClanahan
* @author Amy Roh
- * @version $Revision: 1.25 $ $Date: 2002/02/14 07:47:14 $
+ * @version $Revision: 1.26 $ $Date: 2002/02/19 02:15:27 $
*/
public class MBeanUtils {
@@ -132,6 +132,12 @@
"Http10Connector" },
{ "org.apache.catalina.connector.http.HttpConnector",
"Http11Connector" },
+ { "org.apache.catalina.users.JDBCGroup",
+ "Group" },
+ { "org.apache.catalina.users.JDBCRole",
+ "Role" },
+ { "org.apache.catalina.users.JDBCUser",
+ "User" },
{ "org.apache.catalina.users.MemoryGroup",
"Group" },
{ "org.apache.catalina.users.MemoryRole",
1.32 +125 -1
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/mbeans-descriptors.xml
Index: mbeans-descriptors.xml
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/mbeans-descriptors.xml,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- mbeans-descriptors.xml 15 Feb 2002 00:19:27 -0000 1.31
+++ mbeans-descriptors.xml 19 Feb 2002 02:15:27 -0000 1.32
@@ -6,7 +6,7 @@
<!--
Descriptions of JMX MBeans for Catalina
- $Id: mbeans-descriptors.xml,v 1.31 2002/02/15 00:19:27 craigmcc Exp $
+ $Id: mbeans-descriptors.xml,v 1.32 2002/02/19 02:15:27 craigmcc Exp $
-->
<mbeans-descriptors>
@@ -736,6 +736,130 @@
<attribute name="userTable"
description="The table that holds user data"
type="java.lang.String"/>
+
+ </mbean>
+
+
+ <mbean name="JDBCUserDatabase"
+ className="org.apache.catalina.mbeans.JDBCUserDatabaseMBean"
+ description="JDBC based user and group database"
+ domain="Users"
+ group="UserDatabase"
+ type="org.apache.catalina.users.JDBCUserDatabase">
+
+ <attribute name="groups"
+ description="MBean Names of all defined groups"
+ type="java.lang.String[]"
+ writeable="false"/>
+
+ <attribute name="roles"
+ description="MBean Names of all defined roles"
+ type="java.lang.String[]"
+ writeable="false"/>
+
+ <attribute name="users"
+ description="MBean Names of all defined users"
+ type="java.lang.String[]"
+ writeable="false"/>
+
+ <operation name="createGroup"
+ description="Create new group and return MBean name"
+ impact="ACTION"
+ returnType="java.lang.String">
+ <parameter name="groupname"
+ description="Group name of the new group"
+ type="java.lang.String"/>
+ <parameter name="description"
+ description="Description of the new group"
+ type="java.lang.String"/>
+ </operation>
+
+ <operation name="createRole"
+ description="Create new role and return MBean name"
+ impact="ACTION"
+ returnType="java.lang.String">
+ <parameter name="rolename"
+ description="Role name of the new role"
+ type="java.lang.String"/>
+ <parameter name="description"
+ description="Description of the new role"
+ type="java.lang.String"/>
+ </operation>
+
+ <operation name="createUser"
+ description="Create new user and return MBean name"
+ impact="ACTION"
+ returnType="java.lang.String">
+ <parameter name="username"
+ description="User name of the new user"
+ type="java.lang.String"/>
+ <parameter name="password"
+ description="Password of the new user"
+ type="java.lang.String"/>
+ <parameter name="fullName"
+ description="Full name of the new user"
+ type="java.lang.String"/>
+ </operation>
+
+ <operation name="findGroup"
+ description="Return MBean Name of the specified group (if any)"
+ impact="INFO"
+ returnType="java.lang.String">
+ <parameter name="groupname"
+ description="Group name of the requested group"
+ type="java.lang.String"/>
+ </operation>
+
+ <operation name="findRole"
+ description="Return MBean Name of the specified role (if any)"
+ impact="INFO"
+ returnType="java.lang.String">
+ <parameter name="rolename"
+ description="Role name of the requested role"
+ type="java.lang.String"/>
+ </operation>
+
+ <operation name="findUser"
+ description="Return MBean Name of the specified user (if any)"
+ impact="INFO"
+ returnType="java.lang.String">
+ <parameter name="username"
+ description="User name of the requested user"
+ type="java.lang.String"/>
+ </operation>
+
+ <operation name="removeGroup"
+ description="Remove existing group (and all user memberships)"
+ impact="ACTION"
+ returnType="void">
+ <parameter name="groupname"
+ description="Group name of the group to remove"
+ type="java.lang.String"/>
+ </operation>
+
+ <operation name="removeRole"
+ description="Remove existing role"
+ impact="ACTION"
+ returnType="void">
+ <parameter name="rolename"
+ description="Role name of the role to remove"
+ type="java.lang.String"/>
+ </operation>
+
+ <operation name="removeUser"
+ description="Remove existing user (and all group memberships)"
+ impact="ACTION"
+ returnType="void">
+ <parameter name="username"
+ description="User name of the user to remove"
+ type="java.lang.String"/>
+ </operation>
+
+ <operation name="save"
+ description="Save current users and groups to persistent storage"
+ impact="ACTION"
+ returnType="void">
+ </operation>
</mbean>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
