Author: markt
Date: Sun Aug 22 20:16:56 2010
New Revision: 987945
URL: http://svn.apache.org/viewvc?rev=987945&view=rev
Log:
Extend the simple MapRealm use for testing to support roles.
Modified:
tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java
Modified: tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java?rev=987945&r1=987944&r2=987945&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java Sun Aug 22
20:16:56 2010
@@ -24,7 +24,9 @@ import java.io.Reader;
import java.net.URL;
import java.net.URLConnection;
import java.security.Principal;
+import java.util.ArrayList;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import javax.naming.Context;
@@ -135,11 +137,22 @@ public class TestTomcat extends TomcatBa
*/
public static final class MapRealm extends RealmBase {
private Map<String,String> users = new HashMap<String,String>();
+ private Map<String,List<String>> roles =
+ new HashMap<String,List<String>>();
public void addUser(String username, String password) {
users.put(username, password);
}
+ public void addUserRole(String username, String role) {
+ List<String> userRoles = roles.get(username);
+ if (userRoles == null) {
+ userRoles = new ArrayList<String>();
+ roles.put(username, userRoles);
+ }
+ userRoles.add(role);
+ }
+
@Override
protected String getName() {
return "MapRealm";
@@ -152,7 +165,8 @@ public class TestTomcat extends TomcatBa
@Override
protected Principal getPrincipal(String username) {
- return new GenericPrincipal(username, getPassword(username));
+ return new GenericPrincipal(username, getPassword(username),
+ roles.get(username));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
