Added:
trunk/openiam-selfservice/src/main/java/org/openiam/selfsrvc/delegate/
trunk/openiam-selfservice/src/main/java/org/openiam/selfsrvc/delegate/OutOfOfficeDelegateCommand.java
trunk/openiam-selfservice/src/main/java/org/openiam/selfsrvc/delegate/OutOfOfficeDelegateController.java
trunk/openiam-selfservice/src/main/webapp/priv/outofoffice.jsp
Modified:
trunk/openiam-selfservice/src/main/java/org/openiam/selfsrvc/prov/ChangeAccessValidator.java
trunk/openiam-selfservice/src/main/java/org/openiam/selfsrvc/prov/ChangeAccessWizardController.java
trunk/openiam-selfservice/src/main/java/org/openiam/selfsrvc/prov/NewRequestValidator.java
trunk/openiam-selfservice/src/main/java/org/openiam/selfsrvc/reg/SelfRegistrationValidator.java
trunk/openiam-selfservice/src/main/webapp/WEB-INF/selfserve-servlet.xml
trunk/openiam-selfservice/src/main/webapp/WEB-INF/struts-config.xml
trunk/openiam-selfservice/src/main/webapp/WEB-INF/web.xml
trunk/openiam-selfservice/src/main/webapp/WEB-INF/ws-beans.xml
trunk/openiam-selfservice/src/main/webapp/prov/createrequest.jsp
trunk/openiam-selfservice/src/main/webapp/prov/selectapps.jsp
Log:
Added: trunk/openiam-selfservice/src/main/java/org/openiam/selfsrvc/delegate/OutOfOfficeDelegateCommand.java
==============================================================================
--- (empty file)
+++ trunk/openiam-selfservice/src/main/java/org/openiam/selfsrvc/delegate/OutOfOfficeDelegateCommand.java Mon Jun 7 07:30:50 2010
@@ -0,0 +1,53 @@
+package org.openiam.selfsrvc.delegate;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import org.openiam.idm.srvc.menu.dto.Menu;
+
+/**
+ * Command object for the ContactAdmin
+ * @author suneet
+ *
+ */
+public class OutOfOfficeDelegateCommand implements Serializable {
+
+
+
+
+ private String userId;
+ private String userName;
+ private Date startDate;
+ private Date endDate;
+ public String getUserId() {
+ return userId;
+ }
+ public void setUserId(String userId) {
+ this.userId = userId;
+ }
+ public String getUserName() {
+ return userName;
+ }
+ public void setUserName(String userName) {
+ this.userName = userName;
+ }
+ public Date getStartDate() {
+ return startDate;
+ }
+ public void setStartDate(Date startDate) {
+ this.startDate = startDate;
+ }
+ public Date getEndDate() {
+ return endDate;
+ }
+ public void setEndDate(Date endDate) {
+ this.endDate = endDate;
+ }
+
+
+
+
+
+
+
+}
Added: trunk/openiam-selfservice/src/main/java/org/openiam/selfsrvc/delegate/OutOfOfficeDelegateController.java
==============================================================================
--- (empty file)
+++ trunk/openiam-selfservice/src/main/java/org/openiam/selfsrvc/delegate/OutOfOfficeDelegateController.java Mon Jun 7 07:30:50 2010
@@ -0,0 +1,84 @@
+package org.openiam.selfsrvc.delegate;
+
+
+import java.util.Date;
+import java.text.SimpleDateFormat;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
+import org.springframework.web.bind.ServletRequestDataBinder;
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.mvc.SimpleFormController;
+import org.springframework.beans.propertyeditors.CustomDateEditor;
+
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.openiam.idm.srvc.msg.service.MailService;
+
+public class OutOfOfficeDelegateController extends SimpleFormController {
+
+ MailService mailService;
+ protected String emailAddress;
+
+ private static final Log log = LogFactory.getLog(OutOfOfficeDelegateController.class);
+
+
+ public OutOfOfficeDelegateController() {
+ super();
+ }
+
+
+ @Override
+ protected void initBinder(HttpServletRequest request,
+ ServletRequestDataBinder binder) throws Exception {
+
+ binder.registerCustomEditor(Date.class, new CustomDateEditor(new SimpleDateFormat("MM/dd/yyyy"),true) );
+ }
+
+
+
+
+ @Override
+ protected ModelAndView onSubmit(Object command) throws Exception {
+ // TODO Auto-generated method stub
+
+
+ OutOfOfficeDelegateCommand cmd =(OutOfOfficeDelegateCommand)command;
+
+
+
+
+
+ ModelAndView mav = new ModelAndView(getSuccessView());
+ mav.addObject("outOfOfficeCmd",cmd);
+
+
+ return mav;
+ }
+
+
+
+
+ public MailService getMailService() {
+ return mailService;
+ }
+
+
+ public void setMailService(MailService mailService) {
+ this.mailService = mailService;
+ }
+
+
+ public String getEmailAddress() {
+ return emailAddress;
+ }
+
+
+ public void setEmailAddress(String emailAddress) {
+ this.emailAddress = emailAddress;
+ }
+
+
+}
Modified: trunk/openiam-selfservice/src/main/java/org/openiam/selfsrvc/prov/ChangeAccessValidator.java
==============================================================================
--- trunk/openiam-selfservice/src/main/java/org/openiam/selfsrvc/prov/ChangeAccessValidator.java (original)
+++ trunk/openiam-selfservice/src/main/java/org/openiam/selfsrvc/prov/ChangeAccessValidator.java Mon Jun 7 07:30:50 2010
@@ -4,14 +4,10 @@
import org.openiam.idm.srvc.auth.ws.LoginDataWebService;
import org.openiam.idm.srvc.user.dto.UserSearch;
-import org.openiam.idm.srvc.user.dto.UserSearchField;
import org.openiam.idm.srvc.user.ws.UserDataWebService;
import org.springframework.validation.Validator;
import org.springframework.validation.Errors;
-import org.openiam.idm.srvc.auth.dto.Login;
-import org.openiam.util.db.QueryCriteria;
-import org.openiam.util.db.Search;
-import org.openiam.util.db.SearchImpl;
+
public class ChangeAccessValidator implements Validator {
protected UserDataWebService userMgr;
Modified: trunk/openiam-selfservice/src/main/java/org/openiam/selfsrvc/prov/ChangeAccessWizardController.java
==============================================================================
--- trunk/openiam-selfservice/src/main/java/org/openiam/selfsrvc/prov/ChangeAccessWizardController.java (original)
+++ trunk/openiam-selfservice/src/main/java/org/openiam/selfsrvc/prov/ChangeAccessWizardController.java Mon Jun 7 07:30:50 2010
@@ -81,6 +81,7 @@
private RoleDataWebService roleDataService;
private GroupDataWebService groupManager;
protected ProvisionService provisionService;
+ protected OrganizationDataService orgManager;
String defaultDomainId;
@@ -198,6 +199,9 @@
List<Group> groupList = groupManager.getAllGroups().getGroupList();
model.put("groupList", groupList);
+ List<Organization> deptList = orgManager.allDepartments(null);
+ model.put("deptList",deptList);
+
return model;
}
@@ -271,6 +275,16 @@
public void setProvisionService(ProvisionService provisionService) {
this.provisionService = provisionService;
}
+
+
+ public OrganizationDataService getOrgManager() {
+ return orgManager;
+ }
+
+
+ public void setOrgManager(OrganizationDataService orgManager) {
+ this.orgManager = orgManager;
+ }
Modified: trunk/openiam-selfservice/src/main/java/org/openiam/selfsrvc/prov/NewRequestValidator.java
==============================================================================
--- trunk/openiam-selfservice/src/main/java/org/openiam/selfsrvc/prov/NewRequestValidator.java (original)
+++ trunk/openiam-selfservice/src/main/java/org/openiam/selfsrvc/prov/NewRequestValidator.java Mon Jun 7 07:30:50 2010
@@ -2,16 +2,10 @@
import java.util.List;
-import org.openiam.idm.srvc.auth.login.LoginDataService;
-import org.openiam.idm.srvc.user.dto.UserSearch;
-import org.openiam.idm.srvc.user.dto.UserSearchField;
-import org.openiam.idm.srvc.user.service.UserDataService;
+
import org.springframework.validation.Validator;
import org.springframework.validation.Errors;
-import org.openiam.idm.srvc.auth.dto.Login;
-import org.openiam.util.db.QueryCriteria;
-import org.openiam.util.db.Search;
-import org.openiam.util.db.SearchImpl;
+
public class NewRequestValidator implements Validator {
Modified: trunk/openiam-selfservice/src/main/java/org/openiam/selfsrvc/reg/SelfRegistrationValidator.java
==============================================================================
--- trunk/openiam-selfservice/src/main/java/org/openiam/selfsrvc/reg/SelfRegistrationValidator.java (original)
+++ trunk/openiam-selfservice/src/main/java/org/openiam/selfsrvc/reg/SelfRegistrationValidator.java Mon Jun 7 07:30:50 2010
@@ -4,14 +4,10 @@
import org.openiam.idm.srvc.auth.login.LoginDataService;
import org.openiam.idm.srvc.user.dto.UserSearch;
-import org.openiam.idm.srvc.user.dto.UserSearchField;
import org.openiam.idm.srvc.user.service.UserDataService;
import org.springframework.validation.Validator;
import org.springframework.validation.Errors;
-import org.openiam.idm.srvc.auth.dto.Login;
-import org.openiam.util.db.QueryCriteria;
-import org.openiam.util.db.Search;
-import org.openiam.util.db.SearchImpl;
+
public class SelfRegistrationValidator implements Validator {
UserDataService userMgr;
Modified: trunk/openiam-selfservice/src/main/webapp/WEB-INF/selfserve-servlet.xml
==============================================================================
--- trunk/openiam-selfservice/src/main/webapp/WEB-INF/selfserve-servlet.xml (original)
+++ trunk/openiam-selfservice/src/main/webapp/WEB-INF/selfserve-servlet.xml Mon Jun 7 07:30:50 2010
@@ -27,7 +27,7 @@
<property name="successView" value="/welcome" />
<property name="validator" ref="loginValidator" />
<property name="navigationDataService" ref="navServiceClient" />
- <property name="secDomainService" ref="secDomainService" />
+ <property name="secDomainService" ref="secDomainServiceClient" />
<property name="appConfiguration" ref="appConfiguration" />
<property name="rootMenu" value="SELFSERVICE" />
@@ -47,7 +47,7 @@
</bean>
<bean id="loginValidator" class="org.openiam.selfsrvc.login.LoginValidator" >
- <property name="authenticate" ref="authenticate" />
+ <property name="authenticate" ref="authServiceClient" />
<property name="configuration" ref="passwordConfiguration" />
</bean>
@@ -65,7 +65,7 @@
<property name="formView" value="/prov/requestlist" />
<property name="successView" value="/prov/requestlist" />
- <property name="provRequestService" ref="provRequestService" />
+ <property name="provRequestService" ref="provRequestServiceClient" />
<property name="userMgr" ref="userServiceClient" />
</bean>
@@ -75,7 +75,7 @@
<property name="formView" value="/prov/requestdetail" />
<property name="successView" value="/prov/confirm" />
- <property name="provRequestService" ref="provRequestService" />
+ <property name="provRequestService" ref="provRequestServiceClient" />
<property name="userManager" ref="userServiceClient" />
<property name="roleDataService" ref="roleServiceClient" />
@@ -105,7 +105,7 @@
<property name="roleDataService" ref="roleServiceClient" />
<property name="managedSysService" ref="managedSysService" />
- <property name="provRequestService" ref="provRequestService" />
+ <property name="provRequestService" ref="provRequestServiceClient" />
<property name="menuGroup" value="ENT_APPS" />
<property name="parentOrgId" value="100" />
<property name="validator" ref="profileValidator" />
@@ -132,7 +132,7 @@
<bean id="pswdChangeValidator" class="org.openiam.selfsrvc.pswd.PasswordChangeValidator">
- <property name="passwordService" ref="passwordWS" />
+ <property name="passwordService" ref="passwordServiceClient" />
<property name="configuration" ref="passwordConfiguration" />
</bean>
@@ -144,8 +144,8 @@
<property name="successView" value="/priv/confirm" />
<property name="validator" ref="identityQuestionValidator" />
<property name="configuration" ref="passwordConfiguration" />
- <property name="policyDataService" ref="policyDataService" />
- <property name="secDomainService" ref="secDomainService" />
+ <property name="policyDataService" ref="policyServiceClient" />
+ <property name="secDomainService" ref="secDomainServiceClient" />
<property name="challengeResponse" ref="challengeServiceClient" />
</bean>
@@ -169,10 +169,10 @@
<property name="mailService" ref="mailServiceClient" />
<property name="roleDataService" ref="roleServiceClient" />
<property name="navigatorDataService" ref="navServiceClient" />
- <property name="provRequestService" ref="provRequestService" />
+ <property name="provRequestService" ref="provRequestServiceClient" />
<property name="configuration" ref="passwordConfiguration" />
<property name="refDataService" ref="refDataService" />
- <property name="secDomainService" ref="secDomainService" />
+ <property name="secDomainService" ref="secDomainServiceClient" />
<property name="orgManager" ref="orgServiceClient" />
<property name="locationService" ref="locationDataService" />
@@ -221,7 +221,7 @@
<property name="configuration" ref="passwordConfiguration" />
<property name="loginManager" ref="loginServiceClient" />
<property name="userMgr" ref="userServiceClient" />
- <property name="mailService" ref="mailService" />
+ <property name="mailService" ref="mailServiceClient" />
<property name="fromEmailAddress" value="sup...@openiam.com" />
<property name="emailSubject" value="Login ID Request" />
</bean>
@@ -257,7 +257,7 @@
<property name="managedSysService" ref="managedSysService" />
<property name="userMgr" ref="userServiceClient" />
- <property name="provRequestService" ref="provRequestService" />
+ <property name="provRequestService" ref="provRequestServiceClient" />
<property name="refDataService" ref="refDataService" />
</bean>
@@ -284,6 +284,7 @@
<property name="roleDataService" ref="roleServiceClient" />
<property name="groupManager" ref="groupServiceClient" />
<property name="provisionService" ref="provisionServiceClient" />
+ <property name="orgManager" ref="orgServiceClient" />
</bean>
<bean id="changeAccessValidator" class="org.openiam.selfsrvc.prov.ChangeAccessValidator">
@@ -303,7 +304,7 @@
<property name="commandClass" value="org.openiam.selfsrvc.email.ReportIncidentCommand" />
<property name="formView" value="/pub/securityincident" />
<property name="successView" value="/pub/confirm" />
- <property name="mailService" ref="mailService" />
+ <property name="mailService" ref="mailServiceClient" />
<property name="emailAddress" value="sup...@openiam.com" />
</bean>
@@ -313,10 +314,17 @@
<property name="commandClass" value="org.openiam.selfsrvc.email.ContactAdminCommand" />
<property name="formView" value="/pub/contactadmin" />
<property name="successView" value="/pub/confirm" />
- <property name="mailService" ref="mailService" />
+ <property name="mailService" ref="mailServiceClient" />
<property name="emailAddress" value="sup...@openiam.com" />
</bean>
-
+
+ <bean id="outOfOffice" class="org.openiam.selfsrvc.delegate.OutOfOfficeDelegateController">
+ <property name="commandName" value="outOfOfficeCmd" />
+ <property name="commandClass" value="org.openiam.selfsrvc.delegate.OutOfOfficeDelegateCommand" />
+ <property name="formView" value="/priv/outofoffice" />
+ <property name="successView" value="/priv/confirm" />
+ </bean>
+
<!-- <bean id="createRequest" class="org.openiam.selfsrvc.prov.NewRequestController">
<property name="sessionForm"><value>true</value></property>
<property name="commandName" value="newRequestCmd" />
@@ -351,11 +359,11 @@
<prop key="/welcomePage.selfserve">welcomePage</prop>
<prop key="/selectUser.selfserve">selectUser</prop>
<prop key="pub/forgotLogin.selfserve">forgotLogin</prop>
+ <prop key="outofoffice.selfserve">outOfOffice</prop>
</props>
</property>
</bean>
-
</beans>
Modified: trunk/openiam-selfservice/src/main/webapp/WEB-INF/struts-config.xml
==============================================================================
--- trunk/openiam-selfservice/src/main/webapp/WEB-INF/struts-config.xml (original)
+++ trunk/openiam-selfservice/src/main/webapp/WEB-INF/struts-config.xml Mon Jun 7 07:30:50 2010
@@ -209,8 +209,7 @@
<set-property property="contextConfigLocation"
value="/WEB-INF/applicationContext.xml
/WEB-INF/action-servlet.xml
- /WEB-INF/selfServeBeans.xml
- classpath:applicationContext.xml" />
+ /WEB-INF/selfServeBeans.xml" />
</plug-in>
<plug-in className="org.apache.struts.validator.ValidatorPlugIn">
Modified: trunk/openiam-selfservice/src/main/webapp/WEB-INF/web.xml
==============================================================================
--- trunk/openiam-selfservice/src/main/webapp/WEB-INF/web.xml (original)
+++ trunk/openiam-selfservice/src/main/webapp/WEB-INF/web.xml Mon Jun 7 07:30:50 2010
@@ -102,7 +102,7 @@
<context-param>
<param-name>contextConfigLocation</param-name>
- <param-value>/WEB-INF/applicationContext*.xml /WEB-INF/selfServeBeans.xml /WEB-INF/ws-beans.xml classpath:applicationContext.xml
+ <param-value>/WEB-INF/applicationContext*.xml /WEB-INF/selfServeBeans.xml /WEB-INF/ws-beans.xml
</param-value>
</context-param>
Modified: trunk/openiam-selfservice/src/main/webapp/WEB-INF/ws-beans.xml
==============================================================================
--- trunk/openiam-selfservice/src/main/webapp/WEB-INF/ws-beans.xml (original)
+++ trunk/openiam-selfservice/src/main/webapp/WEB-INF/ws-beans.xml Mon Jun 7 07:30:50 2010
@@ -54,6 +54,16 @@
<property name="address" value="${openiam.service_host}/idm-connector-ws/ProvisionControllerService"/>
</bean>
+ <bean id="provRequestServiceClient" class="org.openiam.idm.srvc.prov.request.ws.RequestWebService"
+ factory-bean="provRequestServiceFactory" factory-method="create"/>
+
+
+ <bean id="provRequestServiceFactory" class="org.apache.cxf.jaxws.JaxWsProxyFactoryBean">
+ <property name="serviceClass" value="org.openiam.idm.srvc.prov.request.ws.RequestWebService"/>
+ <property name="address" value="${openiam.service_host}/idmsrvc/RequestWebService"/>
+ </bean>
+
+
<!-- User Service -->
<bean id="userServiceClient" class="org.openiam.idm.srvc.user.ws.UserDataWebService"
factory-bean="userServiceFactory" factory-method="create"/>
@@ -187,12 +197,12 @@
</bean>
<!-- Password Service -->
- <bean id="passwordServiceClient" class="org.openiam.idm.srvc.pswd.service.PasswordService"
+ <bean id="passwordServiceClient" class="org.openiam.idm.srvc.pswd.ws.PasswordWebService"
factory-bean="passwordServiceFactory" factory-method="create"/>
<bean id="passwordServiceFactory" class="org.apache.cxf.jaxws.JaxWsProxyFactoryBean">
- <property name="serviceClass" value="org.openiam.idm.srvc.pswd.service.PasswordService"/>
+ <property name="serviceClass" value="org.openiam.idm.srvc.pswd.ws.PasswordWebService"/>
<property name="address" value="${openiam.service_host}/idm-ws/idmsrvc/PasswordWebService"/>
</bean>
Added: trunk/openiam-selfservice/src/main/webapp/priv/outofoffice.jsp
==============================================================================
--- (empty file)
+++ trunk/openiam-selfservice/src/main/webapp/priv/outofoffice.jsp Mon Jun 7 07:30:50 2010
@@ -0,0 +1,102 @@
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+
+<script type="text/javascript">
+<!--
+
+function showUserDialog(idfield, namefield) {
+ var ua = window.navigator.userAgent;
+ var msie = ua.indexOf ( "MSIE " );
+
+ if ( msie > 0 ) {
+ dialogReturnValue = window.showModalDialog("user/dialogshell.jsp",null,"dialogWidth:670px;dialogHeight:600px;");
+ document.getElementById (idfield).value = dialogReturnValue.id;
+ document.getElementById (nameField).value = dialogReturnValue.name;
+ }else {
+ dialogReturnValue = window.showModalDialog("user/seluser.jsp",null,"dialogWidth:670px;dialogHeight:600px;");
+ document.getElementById (idfield).value = dialogReturnValue.id;
+ document.getElementById (namefield).value = dialogReturnValue.name;
+ }
+}
+
+
+String.prototype.toProperCase = function()
+{
+ return this.charAt(0).toUpperCase() + this.substring(1,this.length).toLowerCase();
+}
+
+
+function validateInt(fld) {
+ if (isNaN(fld.value)) {
+ alert(fld.name + " is not a number");
+ return false;
+ }
+ return true;
+}
+
+
+
+
+//-->
+</script>
+
+
+<form:form commandName="outOfOfficeCmd">
+<table width="620" border="0" cellspacing="2" cellpadding="1" align="center">
+ <tr>
+ <td colspan="3" class="title">
+ <strong>Out of Office Delegate</strong>
+ </td>
+ <td colspan="1" class="text" align="right">
+ <font size="1" color="red">*</font> Required
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="4" align="center" bgcolor="8397B4" >
+ <font></font>
+ </td>
+ </tr>
+
+ <tr>
+ <td class="tdlight">User to delegate requests to: </td>
+ <td class="tdlight" colspan="3">
+ <form:hidden path="userId" />
+ <form:input path="userName" size="40" readonly="true" /> <a href="javascript:showUserDialog('userId', 'userName' );">Select User</a>
+
+ <font color="red"></font>
+ </td>
+ </tr>
+ <tr>
+ <td class="tdlight">Date Range:<font color="red"></font>
+ </td>
+ <td class="tdlight" colspan="3">
+ <form:input path="startDate" size="20" /> - <form:input path="endDate" size="20" />
+ </td>
+ </tr>
+
+
+
+
+ <tr>
+ <td colspan="6"> </td>
+ </tr>
+
+ <tr>
+ <td colspan="6" align="center" bgcolor="8397B4" >
+ <font></font>
+ </td>
+ </tr>
+
+
+
+ <tr>
+ <td colspan="6" align="right"> <input type="submit" value="Submit"> </td>
+ </tr>
+</table>
+
+</form:form>
+
Modified: trunk/openiam-selfservice/src/main/webapp/prov/createrequest.jsp
==============================================================================
--- trunk/openiam-selfservice/src/main/webapp/prov/createrequest.jsp (original)
+++ trunk/openiam-selfservice/src/main/webapp/prov/createrequest.jsp Mon Jun 7 07:30:50 2010
@@ -107,6 +107,7 @@
<form:select path="requestType">
<form:option value="-" label="-Please Select-" />
<form:option value="CHANGE" label="Change Access" />
+ <form:option value="CHANGE_DEPT" label="Change Department" />
<form:option value="TERMINATE" label="Terminate" />
</form:select>
</td>
Modified: trunk/openiam-selfservice/src/main/webapp/prov/selectapps.jsp
==============================================================================
--- trunk/openiam-selfservice/src/main/webapp/prov/selectapps.jsp (original)
+++ trunk/openiam-selfservice/src/main/webapp/prov/selectapps.jsp Mon Jun 7 07:30:50 2010
@@ -85,6 +85,22 @@
</td>
</tr>
+ <tr>
+ <td class="tddark">Change Department:</td>
+ <td colspan="3">
+ <table cellpadding="2">
+ <tr>
+ <td>
+ <form:select path="role" multiple="false">
+ <form:option value="-" label="-Please Select-"/>
+ <form:options items="${deptList}" itemValue="orgId" itemLabel="organizationName"/>
+ </form:select>
+ </td>
+ </tr>
+
+ </table>
+ </td>
+ </tr>
<tr>
<td colspan="6" class="help">
@@ -95,15 +111,19 @@
<tr>
<td class="tddarknormal" align="right">APPLICATION</td>
- <td class="tddarknormal" colspan="3">PRIVLEGE LEVEL </td>
+ <td class="tddarknormal" colspan="3">ENTITLEMENTS </td>
</tr>
<c:forEach items="${resourceList}" var="res" varStatus="resource">
<tr>
<td> <form:checkbox path="resourceList[${resource.index}].resourceId" value="false" /> ${res.name} </td>
<td>
+ <form:select path="role" multiple="false">
+ <form:option value="-" label="-Please Select-"/>
+ <form:options items="${roleList}" itemValue="id.roleId" itemLabel="roleName"/>
+ </form:select>
</td>
<TD COLSPAN="2">
- </TD>
+ <INPUT TYPE="CHECKBOX">C <INPUT TYPE="CHECKBOX">R <INPUT TYPE="CHECKBOX">U <INPUT TYPE="CHECKBOX">D <INPUT TYPE="CHECKBOX">EXEC </TD>
</tr>
</c:forEach>