remm 2005/08/04 06:12:16
Modified: catalina/src/share/org/apache/catalina/users
MemoryUserDatabase.java mbeans-descriptors.xml
Log:
- I don't quite like "persistable".
Revision Changes Path
1.9 +4 -4
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/users/MemoryUserDatabase.java
Index: MemoryUserDatabase.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/users/MemoryUserDatabase.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- MemoryUserDatabase.java 4 Aug 2005 13:06:56 -0000 1.8
+++ MemoryUserDatabase.java 4 Aug 2005 13:12:16 -0000 1.9
@@ -477,7 +477,7 @@
* to persistent storage location
*
*/
- public boolean isPersistable() {
+ public boolean isWriteable() {
File file = new File(pathname);
if (!file.isAbsolute()) {
@@ -498,11 +498,11 @@
*/
public void save() throws Exception {
- if ( getReadonly() ) {
+ if (getReadonly()) {
return;
}
- if ( ! isPersistable() ) {
+ if (!isWriteable()) {
log.warn(sm.getString("memoryUserDatabase.notPersistable"));
return;
}
1.3 +11 -11
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/users/mbeans-descriptors.xml
Index: mbeans-descriptors.xml
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/users/mbeans-descriptors.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mbeans-descriptors.xml 4 Aug 2005 13:06:56 -0000 1.2
+++ mbeans-descriptors.xml 4 Aug 2005 13:12:16 -0000 1.3
@@ -159,6 +159,17 @@
type="[Ljava.lang.String;"
writeable="false"/>
+ <attribute name="readonly"
+ description="No persistant save of the user database"
+ type="boolean"
+ writeable="false"/>
+
+ <attribute name="writeable"
+ description="Check if user database is writeable"
+ impact="INFO"
+ is="true"
+ writeable="false"/>
+
<operation name="createGroup"
description="Create new group and return MBean name"
impact="ACTION"
@@ -252,17 +263,6 @@
type="java.lang.String"/>
</operation>
- <attribute name="readonly"
- description="No persistant save of the user database"
- type="boolean"
- writeable="false"/>
-
- <operation name="isPersistable"
- description="Check if user database is writable"
- impact="INFO"
- returnType="boolean">
- </operation>
-
<operation name="save"
description="Save current users and groups to persistent storage"
impact="ACTION"
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
