Author: chathura
Date: Fri Jan 11 03:19:12 2008
New Revision: 12149
Log:
Adding support for friendly names for users.
Modified:
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/ControllerServlet.java
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/AddUserAction.java
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/UserManagementAction.java
trunk/registry/modules/webapps/src/main/webapp/admin/people.jsp
Modified:
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/ControllerServlet.java
==============================================================================
---
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/ControllerServlet.java
(original)
+++
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/ControllerServlet.java
Fri Jan 11 03:19:12 2008
@@ -129,6 +129,7 @@
addUserAction.setPassword(request.getParameter("password"));
addUserAction.setConfirmedPassword(request.getParameter("confirmedPassword"));
addUserAction.setRoleName(request.getParameter("roleName"));
+
addUserAction.setFriendlyName(request.getParameter("friendlyName"));
try {
addUserAction.execute(request);
Modified:
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/AddUserAction.java
==============================================================================
---
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/AddUserAction.java
(original)
+++
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/AddUserAction.java
Fri Jan 11 03:19:12 2008
@@ -20,6 +20,9 @@
import org.wso2.usermanager.Realm;
import javax.servlet.http.HttpServletRequest;
+import java.util.Properties;
+import java.util.Map;
+import java.util.HashMap;
public class AddUserAction extends AbstractRegistryAction {
@@ -27,6 +30,7 @@
private String password;
private String confirmedPassword;
private String roleName;
+ private String friendlyName;
public String execute(HttpServletRequest request) throws Exception {
@@ -45,6 +49,10 @@
userRealm.getUserStoreAdmin().addUser(newUserName, password);
+ Map currentProperties =
userRealm.getUserStoreAdmin().getUserProperties(newUserName);
+ currentProperties.put("friendlyName", friendlyName);
+ userRealm.getUserStoreAdmin().setUserProperties(newUserName,
currentProperties);
+
if (roleName != null && !roleName.equalsIgnoreCase("1")) {
userRealm.getUserStoreAdmin().addUserToRole(newUserName, roleName);
}
@@ -83,4 +91,8 @@
public void setRoleName(String roleName) {
this.roleName = roleName;
}
+
+ public void setFriendlyName(String friendlyName) {
+ this.friendlyName = friendlyName;
+ }
}
Modified:
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/UserManagementAction.java
==============================================================================
---
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/UserManagementAction.java
(original)
+++
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/UserManagementAction.java
Fri Jan 11 03:19:12 2008
@@ -24,10 +24,12 @@
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
public class UserManagementAction extends AbstractRegistryAction {
- private List userNames = new ArrayList();
+ private Map userNames = new HashMap();
private List roleNames = new ArrayList();
public String execute(HttpServletRequest request) throws RegistryException
{
@@ -40,7 +42,9 @@
try {
String[] userNamesArray =
userRealm.getUserStoreReader().getAllUserNames();
for (int i = 0; i < userNamesArray.length; i++) {
- userNames.add(userNamesArray[i]);
+ String friendlyName = (String) userRealm.getUserStoreAdmin().
+
getUserProperties(userNamesArray[i]).get("friendlyName");
+ userNames.put(userNamesArray[i], friendlyName);
}
} catch (UserManagerException e) {
String msg = "Could not read all user names. Caused by: " +
e.getMessage();
@@ -60,7 +64,7 @@
return SUCCESS;
}
- public List getUserNames() {
+ public Map getUserNames() {
return userNames;
}
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/people.jsp
==============================================================================
--- trunk/registry/modules/webapps/src/main/webapp/admin/people.jsp
(original)
+++ trunk/registry/modules/webapps/src/main/webapp/admin/people.jsp Fri Jan
11 03:19:12 2008
@@ -2,6 +2,7 @@
<%@ page import="org.wso2.registry.web.UIConstants" %>
<%@ page import="java.util.List" %>
<%@ page import="java.util.Iterator" %>
+<%@ page import="java.util.Map" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
"http://www.w3.org/TR/html4/strict.dtd";>
@@ -126,15 +127,16 @@
</tr>
<%
- List userNames =
userManagementAction.getUserNames();
- Iterator iUsers = userNames.iterator();
- while (iUsers.hasNext()) {
- String regUser = (String) iUsers.next();
- %>
+ Map userNames = userManagementAction.getUserNames();
+ Iterator iUsers = userNames.keySet().iterator();
+ while (iUsers.hasNext()) {
+ String regUser = (String) iUsers.next();
+ String friendlyName = (String) userNames.get(regUser);
+ %>
<tr>
<td><a
href="/wso2registry/system/people/<%=regUser%>"><%=regUser%></a></td>
- <td>Friendly name should appear here</td>
+ <td><%=friendlyName%></td>
<td align="left">
<a
href="/wso2registry/system/removeUser?user=<%=regUser%>" title="Delete"
style="margin-left:5px;"><img src="/wso2registry/admin/images/icon-trash.gif"
border="0" /></a>
_______________________________________________
Registry-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/registry-dev
