[Carbon-dev] svn commit r22731 - in trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt.ui/src/main: java/org/wso2/carbon/user/ui/client resources/web/role
dimuthul at wso2.com
dimuthul at wso2.com
Thu Oct 23 05:38:11 PDT 2008
Author: dimuthul
Date: Thu Oct 23 05:38:11 2008
New Revision: 22731
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=22731
Log:
Role addition works without any issue in this revision.
Modified:
trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt.ui/src/main/java/org/wso2/carbon/user/ui/client/RoleBean.java
trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt.ui/src/main/java/org/wso2/carbon/user/ui/client/UserMgtClient.java
trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt.ui/src/main/resources/web/role/add-finish.jsp
trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt.ui/src/main/resources/web/role/add-step1.jsp
trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt.ui/src/main/resources/web/role/add-step2.jsp
trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt.ui/src/main/resources/web/role/edit-permissions-finish.jsp
trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt.ui/src/main/resources/web/role/edit-permissions.jsp
trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt.ui/src/main/resources/web/role/edit-users-finish.jsp
trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt.ui/src/main/resources/web/role/edit-users.jsp
trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt.ui/src/main/resources/web/role/role-mgt.jsp
Modified: trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt.ui/src/main/java/org/wso2/carbon/user/ui/client/RoleBean.java
URL: http://wso2.org/svn/browse/wso2/trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt.ui/src/main/java/org/wso2/carbon/user/ui/client/RoleBean.java?rev=22731&r1=22730&r2=22731&view=diff
==============================================================================
--- trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt.ui/src/main/java/org/wso2/carbon/user/ui/client/RoleBean.java (original)
+++ trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt.ui/src/main/java/org/wso2/carbon/user/ui/client/RoleBean.java Thu Oct 23 05:38:11 2008
@@ -24,7 +24,11 @@
public void setSelectedPermissions(String[] selectedPermissions) {
this.selectedPermissions = selectedPermissions;
}
-
+ public void cleanup(){
+ roleName = null;
+ selectedUsers = null;
+ selectedPermissions = null;
+ }
Modified: trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt.ui/src/main/java/org/wso2/carbon/user/ui/client/UserMgtClient.java
URL: http://wso2.org/svn/browse/wso2/trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt.ui/src/main/java/org/wso2/carbon/user/ui/client/UserMgtClient.java?rev=22731&r1=22730&r2=22731&view=diff
==============================================================================
--- trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt.ui/src/main/java/org/wso2/carbon/user/ui/client/UserMgtClient.java (original)
+++ trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt.ui/src/main/java/org/wso2/carbon/user/ui/client/UserMgtClient.java Thu Oct 23 05:38:11 2008
@@ -64,7 +64,7 @@
request.setUserNames(roleBean.getSelectedUsers());
request.setPermissions(roleBean.getSelectedPermissions());
stub.addRoleToInternalStore(request);
-
+ // roleBean.cleanup();
}
public void deleteRoleFromInternalStore(String roleName) throws java.lang.Exception{
@@ -86,7 +86,14 @@
public void updateRolesofResource(String[] roleNames, String resource, String action){
}
-
+
+ public String[] getUsersInRole(String roleName) throws java.lang.Exception{
+ GetUsersInRole request = new GetUsersInRole();
+ request.setRoleName(roleName);
+ GetUsersInRoleResponse response = stub.getUsersInRole(request);
+ return response.get_return();
+ }
+
public String[] getSystemPermissions() throws java.lang.Exception{
GetSystemPermissionsResponse response = stub.getSystemPermissions();
return response.get_return();
@@ -108,10 +115,10 @@
- public void updateSystemPermissionsOfRole(String roleName, String[] actions) throws java.lang.Exception{
+ public void updateSystemPermissionsOfRole(RoleBean bean) throws java.lang.Exception{
UpdateSystemPermissionsOfRole request = new UpdateSystemPermissionsOfRole();
- request.setRoleName(roleName);
- request.setActions(actions);
+ request.setRoleName(bean.getRoleName());
+ request.setActions(bean.getSelectedPermissions());
stub.updateSystemPermissionsOfRole(request);
}
Modified: trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt.ui/src/main/resources/web/role/add-finish.jsp
URL: http://wso2.org/svn/browse/wso2/trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt.ui/src/main/resources/web/role/add-finish.jsp?rev=22731&r1=22730&r2=22731&view=diff
==============================================================================
--- trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt.ui/src/main/resources/web/role/add-finish.jsp (original)
+++ trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt.ui/src/main/resources/web/role/add-finish.jsp Thu Oct 23 05:38:11 2008
@@ -1,15 +1,13 @@
<%@page import="org.wso2.carbon.utils.ServerConstants"%>
<%@ page import="org.wso2.carbon.user.ui.client.UserMgtClient" %>
-<jsp:useBean id="roleBean" class="org.wso2.carbon.user.ui.client.RoleBean" scope="session">
+<jsp:useBean id="roleBean" type="org.wso2.carbon.user.ui.client.RoleBean" scope="session"/>
<jsp:setProperty name="roleBean" property="*" />
-</jsp:useBean>
<%
try {
//System.out.println(""+selectAll);
String cookie = (String)session.getAttribute(ServerConstants.ADMIN_SERVICE_COOKIE);
UserMgtClient client = new UserMgtClient(cookie);
client.addRoleToInternalStore(roleBean);
-
response.sendRedirect("role-mgt.jsp?msgId=MSG" + (System.currentTimeMillis() + Math.random()) +
"&message=User group " + roleBean.getRoleName() + " successfully added");
session.setAttribute("usergroup-added", "true");
Modified: trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt.ui/src/main/resources/web/role/add-step1.jsp
URL: http://wso2.org/svn/browse/wso2/trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt.ui/src/main/resources/web/role/add-step1.jsp?rev=22731&r1=22730&r2=22731&view=diff
==============================================================================
--- trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt.ui/src/main/resources/web/role/add-step1.jsp (original)
+++ trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt.ui/src/main/resources/web/role/add-step1.jsp Thu Oct 23 05:38:11 2008
@@ -1,7 +1,8 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<%@ page import="org.wso2.carbon.user.ui.client.UserMgtClient" %>
<%@page import="org.wso2.carbon.utils.ServerConstants"%>
-<html xmlns="http://www.w3.org/1999/xhtml">
+<%@page import="org.wso2.carbon.user.ui.client.RoleBean"%>
+<jsp:useBean id="roleBean" scope="session" class="org.wso2.carbon.user.ui.client.RoleBean"/>
+<html>
<head>
<link href="../../styles/main.css" rel="stylesheet" type="text/css" media="all"/>
<script language="javascript" src="../extensions/core/js/vui.js" type="text/javascript"></script>
@@ -66,7 +67,7 @@
}
%>
<div id="formset">
- <form method="post" action="add-step2.jsp" name="dataForm" onsubmit="return doValidation();">
+ <form method="get" action="add-step2.jsp" name="dataForm" onsubmit="return doValidation();">
<fieldset>
<p>
<legend>Step 1: Add Role : Add users to Role</legend>
Modified: trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt.ui/src/main/resources/web/role/add-step2.jsp
URL: http://wso2.org/svn/browse/wso2/trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt.ui/src/main/resources/web/role/add-step2.jsp?rev=22731&r1=22730&r2=22731&view=diff
==============================================================================
--- trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt.ui/src/main/resources/web/role/add-step2.jsp (original)
+++ trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt.ui/src/main/resources/web/role/add-step2.jsp Thu Oct 23 05:38:11 2008
@@ -1,11 +1,8 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<%@ page import="org.wso2.carbon.user.ui.client.UserMgtClient" %>
<%@page import="org.wso2.carbon.utils.ServerConstants"%>
-<jsp:useBean id="roleBean" class="org.wso2.carbon.user.ui.client.RoleBean" scope="session">
-<jsp:setProperty name="roleBean" property="*" />
-</jsp:useBean>
-<%@page import="org.wso2.carbon.user.ui.client.xsd.PermissionData"%>
-<html xmlns="http://www.w3.org/1999/xhtml">
+<jsp:useBean id="roleBean" scope="session" type="org.wso2.carbon.user.ui.client.RoleBean"/>
+<jsp:setProperty name="roleBean" property="*" />
+<html>
<head>
<link href="../../styles/main.css" rel="stylesheet" type="text/css" media="all"/>
<script language="javascript" src="../extensions/core/js/vui.js" type="text/javascript"></script>
@@ -58,9 +55,11 @@
<jsp:include page="../display-messages.jsp"/>
<div id="breadcrumbDiv" style="display:none;"></div>
<h2>Add User Group</h2>
- <%!PermissionData[] datas =null; %>
+ <%!String[] datas =null; %>
<%
- String storeType = request.getParameter("selectedUsers");
+ System.out.println("Users **********" + roleBean.getRoleName());
+ System.out.println("Request is ******" + request.getParameter("roleName"));
+ System.out.println("Users **********" + roleBean.getSelectedUsers());
try {
String cookie = (String)session.getAttribute(ServerConstants.ADMIN_SERVICE_COOKIE);
UserMgtClient client = new UserMgtClient(cookie);
@@ -70,7 +69,7 @@
}
%>
<div id="formset">
- <form method="post" action="add-finish.jsp" name="dataForm" onsubmit="return doValidation();">
+ <form method="get" action="add-finish.jsp" name="dataForm" onsubmit="return doValidation();">
<fieldset>
<p>
<legend>Step 2: Add Role : Add permissions to Role</legend>
@@ -83,16 +82,13 @@
<tbody>
<%
if (datas != null) {
- for (PermissionData data : datas) {
+ for (String data : datas) {
if (data != null) {
- String permission = data.getAction();
- if(data.getResource()!=null){
- permission = permission+"-"+data.getResource();
- }
+
%>
<tr>
<td>
- <input type="checkbox" name="selectedUsers" value="<%=permission%>"/><%=permission%>
+ <input type="checkbox" name="selectedPermissions" value="<%=data%>"/><%=data%>
</td>
</tr>
<%
Modified: trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt.ui/src/main/resources/web/role/edit-permissions-finish.jsp
URL: http://wso2.org/svn/browse/wso2/trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt.ui/src/main/resources/web/role/edit-permissions-finish.jsp?rev=22731&r1=22730&r2=22731&view=diff
==============================================================================
--- trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt.ui/src/main/resources/web/role/edit-permissions-finish.jsp (original)
+++ trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt.ui/src/main/resources/web/role/edit-permissions-finish.jsp Thu Oct 23 05:38:11 2008
@@ -1,20 +1,20 @@
<%@page import="org.wso2.carbon.utils.ServerConstants"%>
<%@page import="org.wso2.carbon.user.ui.client.UserMgtClient" %>
-<jsp:useBean id="roleBean" class="org.wso2.carbon.user.ui.client.RoleBean" scope="session">
-<jsp:setProperty name="roleBean" property="*" />
+<jsp:useBean id="roleBeanEditPermission" class="org.wso2.carbon.user.ui.client.RoleBean" scope="session">
+<jsp:setProperty name="roleBeanEditPermission" property="*" />
</jsp:useBean>
<%
try {
String cookie = (String)session.getAttribute(ServerConstants.ADMIN_SERVICE_COOKIE);
UserMgtClient client = new UserMgtClient(cookie);
- client.updatePermissionsOfRole(roleBean);
+ client.updateSystemPermissionsOfRole(roleBeanEditPermission);
session.setAttribute("usergroup-added", "true");
response.sendRedirect("role-mgt.jsp?msgId=MSG" + (System.currentTimeMillis() + Math.random()) +
- "&message=User group " + roleBean.getRoleName() + " updated successfully");
+ "&message=User group " + roleBeanEditPermission.getRoleName() + " updated successfully");
return;
} catch (Exception e) {
response.sendRedirect("edit-users.jsp?msgId=MSG" + (System.currentTimeMillis() + Math.random()) +
- "&userGroup=" + roleBean.getRoleName() +
- "&errorMessage=Cannot add user group " + roleBean.getRoleName() + ". " + e.getMessage());
+ "&userGroup=" + roleBeanEditPermission.getRoleName() +
+ "&errorMessage=Cannot add user group " + roleBeanEditPermission.getRoleName() + ". " + e.getMessage());
}
%>
\ No newline at end of file
Modified: trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt.ui/src/main/resources/web/role/edit-permissions.jsp
URL: http://wso2.org/svn/browse/wso2/trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt.ui/src/main/resources/web/role/edit-permissions.jsp?rev=22731&r1=22730&r2=22731&view=diff
==============================================================================
--- trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt.ui/src/main/resources/web/role/edit-permissions.jsp (original)
+++ trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt.ui/src/main/resources/web/role/edit-permissions.jsp Thu Oct 23 05:38:11 2008
@@ -4,7 +4,9 @@
<%@page import="java.util.List" %>
<%@page import="java.util.Arrays" %>
<%@page import="org.wso2.carbon.utils.ServerConstants"%>
-<%@page import="org.wso2.carbon.user.ui.client.xsd.PermissionData"%>
+<jsp:useBean id="roleBeanEditPermission" class="org.wso2.carbon.user.ui.client.RoleBean" scope="session">
+<jsp:setProperty name="roleBeanEditPermission" property="roleName" />
+</jsp:useBean>
<html>
<head>
<link href="../../styles/main.css" rel="stylesheet" type="text/css" media="all"/>
@@ -41,35 +43,16 @@
<%!String[] permissions =null; %>
<%!String[] data = null; %>
<%
- String roleName = request.getParameter("role");
+ String roleName = roleBeanEdit.getRoleName();
try {
String cookie = (String)session.getAttribute(ServerConstants.ADMIN_SERVICE_COOKIE);
UserMgtClient client = new UserMgtClient(cookie);
- PermissionData[] tempdata = client.getPermissionsOfRole(roleName);
- data = new String[tempdata.length];
- int i=0;
- for(PermissionData temp : tempdata){
- String permission = temp.getAction();
- if(temp.getResource() != null){
- permission = temp+temp.getResource();
- }
- data[i] = permission;
- i++;
- }
+ String[] data = client.getSystemPermissionsOfRole(roleName);
- PermissionData[] temppermissions = client.getSystemPermissions();
- permissions = new String[temppermissions.length];
- int i=0;
- for(PermissionData temp : tempdata){
- String permission = temp.getAction();
- if(temp.getResource() != null){
- permission = temp+temp.getResource();
- }
- permissions[i] = permission;
- i++;
- }
- }catch(Exception e){
+
+ permissions = client.getSystemPermissions();
+ }catch(Exception e){
e.printStackTrace();
}
%>
@@ -107,7 +90,7 @@
%>
<tr>
<td>
- <p><input type="checkbox" name="selectedPermissions" value="<%=name%>" <%=docheck%>/><%=name%>
+ <p><input type="checkbox" name="selectedPermissions" value="<%=value%>" <%=docheck%>/><%=value%>
</td>
</tr>
<%
Modified: trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt.ui/src/main/resources/web/role/edit-users-finish.jsp
URL: http://wso2.org/svn/browse/wso2/trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt.ui/src/main/resources/web/role/edit-users-finish.jsp?rev=22731&r1=22730&r2=22731&view=diff
==============================================================================
--- trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt.ui/src/main/resources/web/role/edit-users-finish.jsp (original)
+++ trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt.ui/src/main/resources/web/role/edit-users-finish.jsp Thu Oct 23 05:38:11 2008
@@ -1,20 +1,20 @@
<%@page import="org.wso2.carbon.utils.ServerConstants"%>
<%@page import="org.wso2.carbon.user.ui.client.UserMgtClient" %>
-<jsp:useBean id="roleBean" class="org.wso2.carbon.user.ui.client.RoleBean" scope="session">
-<jsp:setProperty name="roleBean" property="*" />
+<jsp:useBean id="roleBeanEditUsers" class="org.wso2.carbon.user.ui.client.RoleBean" scope="session">
+<jsp:setProperty name="roleBeanEditUsers" property="*" />
</jsp:useBean>
<%
try {
String cookie = (String)session.getAttribute(ServerConstants.ADMIN_SERVICE_COOKIE);
UserMgtClient client = new UserMgtClient(cookie);
- client.updateUsersOfRole(roleBean);
+ client.updateUsersOfRole(roleBeanEditUsers);
session.setAttribute("usergroup-added", "true");
response.sendRedirect("role-mgt.jsp?msgId=MSG" + (System.currentTimeMillis() + Math.random()) +
- "&message=User group " + roleBean.getRoleName() + " updated successfully");
+ "&message=User group " + roleBeanEditUsers.getRoleName() + " updated successfully");
return;
} catch (Exception e) {
response.sendRedirect("edit-users.jsp?msgId=MSG" + (System.currentTimeMillis() + Math.random()) +
- "&userGroup=" + roleBean.getRoleName() +
- "&errorMessage=Cannot add user group " + roleBean.getRoleName() + ". " + e.getMessage());
+ "&userGroup=" + roleBeanEditUsers.getRoleName() +
+ "&errorMessage=Cannot add user group " + roleBeanEditUsers.getRoleName() + ". " + e.getMessage());
}
%>
\ No newline at end of file
Modified: trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt.ui/src/main/resources/web/role/edit-users.jsp
URL: http://wso2.org/svn/browse/wso2/trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt.ui/src/main/resources/web/role/edit-users.jsp?rev=22731&r1=22730&r2=22731&view=diff
==============================================================================
--- trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt.ui/src/main/resources/web/role/edit-users.jsp (original)
+++ trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt.ui/src/main/resources/web/role/edit-users.jsp Thu Oct 23 05:38:11 2008
@@ -4,6 +4,9 @@
<%@page import="java.util.List" %>
<%@page import="java.util.Arrays" %>
<%@page import="org.wso2.carbon.utils.ServerConstants"%>
+<jsp:useBean id="roleBeanEditUsers" class="org.wso2.carbon.user.ui.client.RoleBean" scope="session">
+<jsp:setProperty name="roleBeanEditUsers" property="roleName" />
+</jsp:useBean>
<html>
<head>
<link href="../../styles/main.css" rel="stylesheet" type="text/css" media="all"/>
@@ -40,7 +43,7 @@
<%!String[] names =null; %>
<%!String[] data = null; %>
<%
- String roleName = request.getParameter("role");
+ String roleName = roleBeanEditUsers.getRoleName();
try {
String cookie = (String)session.getAttribute(ServerConstants.ADMIN_SERVICE_COOKIE);
UserMgtClient client = new UserMgtClient(cookie);
Modified: trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt.ui/src/main/resources/web/role/role-mgt.jsp
URL: http://wso2.org/svn/browse/wso2/trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt.ui/src/main/resources/web/role/role-mgt.jsp?rev=22731&r1=22730&r2=22731&view=diff
==============================================================================
--- trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt.ui/src/main/resources/web/role/role-mgt.jsp (original)
+++ trunk/carbon-components/user-mgt/org.wso2.carbon.user.mgt.ui/src/main/resources/web/role/role-mgt.jsp Thu Oct 23 05:38:11 2008
@@ -1,14 +1,13 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<%@ page import="org.wso2.carbon.user.ui.client.UserMgtClient" %>
<%@page import="org.wso2.carbon.utils.ServerConstants"%>
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html>
<head>
<link href="../../styles/main.css" rel="stylesheet" type="text/css" media="all"/>
<script language="javascript" src="../../main/admin/js/breadcrumbs.js"></script>
<script language="javascript" src="../../main/admin/js/cookies.js"></script>
<script language="javascript" src="../../main/admin/js/main.js"></script>
- <title>WSO2 Carbon - Security Configuration</title></head>
-
+ <title>WSO2 Carbon - Security Configuration</title>
+</head>
<%
String haveToDelete = "false";
Object o = session.getAttribute("usergroup-added");
@@ -87,7 +86,8 @@
}
}
}
- } catch (Exception e) {
+ } catch (Exception e) {
+ e.printStackTrace();
%>
<strong>An error occurred!</strong>
More information about the Carbon-dev
mailing list