You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by cr...@hyperreal.org on 1999/11/10 06:04:39 UTC
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/security/file FileRealmDatabase.java FileRealmGroup.java FileRealmTool.java FileRealmUser.java
craigmcc 99/11/09 21:04:38
Modified: src/share/org/apache/tomcat/security/file
FileRealmDatabase.java FileRealmGroup.java
FileRealmTool.java FileRealmUser.java
Log:
De-overload (I hereby declare this to be a word :-) the add() method in
the implementation of the XML file security database implementation.
Submitted by: Preston Bannister <pr...@home.com>
Revision Changes Path
1.5 +10 -10 jakarta-tomcat/src/share/org/apache/tomcat/security/file/FileRealmDatabase.java
Index: FileRealmDatabase.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/security/file/FileRealmDatabase.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FileRealmDatabase.java 1999/10/24 00:08:02 1.4
+++ FileRealmDatabase.java 1999/11/10 05:04:36 1.5
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/security/file/FileRealmDatabase.java,v 1.4 1999/10/24 00:08:02 craigmcc Exp $
- * $Revision: 1.4 $
- * $Date: 1999/10/24 00:08:02 $
+ * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/security/file/FileRealmDatabase.java,v 1.5 1999/11/10 05:04:36 craigmcc Exp $
+ * $Revision: 1.5 $
+ * $Date: 1999/11/10 05:04:36 $
*
* ====================================================================
*
@@ -85,7 +85,7 @@
* <code>tomcat-users.dtd</code> file in this directory.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.4 $ $Date: 1999/10/24 00:08:02 $
+ * @version $Revision: 1.5 $ $Date: 1999/11/10 05:04:36 $
*/
public final class FileRealmDatabase {
@@ -148,7 +148,7 @@
/**
* [Package Private] Add this group to the set of defined groups.
*/
- void add(FileRealmGroup group) {
+ void addGroup(FileRealmGroup group) {
groups.put(group.getName(), group);
@@ -158,7 +158,7 @@
/**
* [Package Private] Add this role to the set of defined roles.
*/
- void add(String role) {
+ void addRole(String role) {
roles.put(role, role);
@@ -168,7 +168,7 @@
/**
* [Package Private] Add this user to the set of defined users.
*/
- void add(FileRealmUser user) {
+ void addUser(FileRealmUser user) {
users.put(user.getName(), user);
@@ -360,7 +360,7 @@
(String) um.getAttribute(Constants.Attribute.NAME);
FileRealmUser user = getUser(username);
if (user != null)
- user.add(group);
+ user.addGroup(group);
}
// XXX: Does not support the "anyone" sub-element
@@ -388,7 +388,7 @@
(String) gm.getAttribute(Constants.Attribute.NAME);
FileRealmGroup group = getGroup(groupname);
if (group != null)
- group.add(role);
+ group.addRole(role);
}
// Process the associated user memberships
@@ -399,7 +399,7 @@
(String) um.getAttribute(Constants.Attribute.NAME);
FileRealmUser user = getUser(username);
if (user != null)
- user.add(role);
+ user.addRole(role);
}
// XXX: Does not support the "anyone" sub-element
1.2 +7 -7 jakarta-tomcat/src/share/org/apache/tomcat/security/file/FileRealmGroup.java
Index: FileRealmGroup.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/security/file/FileRealmGroup.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FileRealmGroup.java 1999/10/18 03:34:05 1.1
+++ FileRealmGroup.java 1999/11/10 05:04:37 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/security/file/FileRealmGroup.java,v 1.1 1999/10/18 03:34:05 craigmcc Exp $
- * $Revision: 1.1 $
- * $Date: 1999/10/18 03:34:05 $
+ * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/security/file/FileRealmGroup.java,v 1.2 1999/11/10 05:04:37 craigmcc Exp $
+ * $Revision: 1.2 $
+ * $Date: 1999/11/10 05:04:37 $
*
* ====================================================================
*
@@ -81,7 +81,7 @@
* </ul>
*
* @author Craig R. McClanahan
- * @version $Revision: 1.1 $ $Date: 1999/10/18 03:34:05 $
+ * @version $Revision: 1.2 $ $Date: 1999/11/10 05:04:37 $
*/
final class FileRealmGroup {
@@ -125,7 +125,7 @@
super();
this.database = database;
this.name = name;
- database.add(this);
+ database.addGroup(this);
}
@@ -135,9 +135,9 @@
*
* @param role The role being assigned to this group
*/
- public void add(String role) {
+ public void addRole(String role) {
- database.add(role);
+ database.addRole(role);
roles.put(role, role);
}
@@ -149,7 +149,7 @@
*
* @param user User to be added
*/
- void add(FileRealmUser user) {
+ void addUser(FileRealmUser user) {
users.put(user.getName(), user);
1.3 +7 -7 jakarta-tomcat/src/share/org/apache/tomcat/security/file/FileRealmTool.java
Index: FileRealmTool.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/security/file/FileRealmTool.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FileRealmTool.java 1999/10/24 00:08:02 1.2
+++ FileRealmTool.java 1999/11/10 05:04:37 1.3
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/security/file/FileRealmTool.java,v 1.2 1999/10/24 00:08:02 craigmcc Exp $
- * $Revision: 1.2 $
- * $Date: 1999/10/24 00:08:02 $
+ * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/security/file/FileRealmTool.java,v 1.3 1999/11/10 05:04:37 craigmcc Exp $
+ * $Revision: 1.3 $
+ * $Date: 1999/11/10 05:04:37 $
*
* ====================================================================
*
@@ -115,7 +115,7 @@
* </pre>
*
* @author Craig R. McClanahan
- * @version $Revision: 1.2 $ $Date: 1999/10/24 00:08:02 $
+ * @version $Revision: 1.3 $ $Date: 1999/11/10 05:04:37 $
*/
public final class FileRealmTool {
@@ -219,7 +219,7 @@
}
if (!user.hasGroup(group)) {
- user.add(group);
+ user.addGroup(group);
modified = true;
}
@@ -252,14 +252,14 @@
if (group != null) {
if (!group.hasRole(role)) {
- group.add(role);
+ group.addRole(role);
modified = true;
}
}
if (user != null) {
if (!user.hasRole(role)) {
- user.add(role);
+ user.addRole(role);
modified = true;
}
}
1.3 +10 -10 jakarta-tomcat/src/share/org/apache/tomcat/security/file/FileRealmUser.java
Index: FileRealmUser.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/security/file/FileRealmUser.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FileRealmUser.java 1999/10/23 22:30:19 1.2
+++ FileRealmUser.java 1999/11/10 05:04:37 1.3
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/security/file/FileRealmUser.java,v 1.2 1999/10/23 22:30:19 craigmcc Exp $
- * $Revision: 1.2 $
- * $Date: 1999/10/23 22:30:19 $
+ * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/security/file/FileRealmUser.java,v 1.3 1999/11/10 05:04:37 craigmcc Exp $
+ * $Revision: 1.3 $
+ * $Date: 1999/11/10 05:04:37 $
*
* ====================================================================
*
@@ -87,7 +87,7 @@
* </ul>
*
* @author Craig R. McClanahan
- * @version $Revision: 1.2 $ $Date: 1999/10/23 22:30:19 $
+ * @version $Revision: 1.3 $ $Date: 1999/11/10 05:04:37 $
*/
final class FileRealmUser
@@ -141,7 +141,7 @@
this.database = database;
this.name = name;
setPassword(password);
- database.add(this);
+ database.addUser(this);
}
@@ -161,7 +161,7 @@
this.database = database;
this.name = name;
setPassword(password);
- database.add(this);
+ database.addUser(this);
}
@@ -171,9 +171,9 @@
*
* @param group Group this user is now a member of
*/
- public void add(FileRealmGroup group) {
+ public void addGroup(FileRealmGroup group) {
- group.add(this);
+ group.addUser(this);
groups.put(group.getName(), group);
}
@@ -184,9 +184,9 @@
*
* @param role The role being assigned to this group
*/
- public void add(String role) {
+ public void addRole(String role) {
- database.add(role);
+ database.addRole(role);
roles.put(role, role);
}