Index: lams_admin/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -r22e9389aaada5dc91833d762a79f8051bca172c4 -r36e114e125b1ce88588f7b9c03121ea56c491015
--- lams_admin/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 22e9389aaada5dc91833d762a79f8051bca172c4)
+++ lams_admin/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 36e114e125b1ce88588f7b9c03121ea56c491015)
@@ -14,6 +14,10 @@
   <form-beans>
 
     <form-bean
+      name="UserOrgRoleForm"
+      type="org.lamsfoundation.lams.admin.web.UserOrgRoleForm"
+    />
+    <form-bean
       name="CacheActionForm"
       type="org.lamsfoundation.lams.admin.web.CacheActionForm"
     />
@@ -33,6 +37,12 @@
 	<form-property name="courseAdminCanChangeStatusOfCourse" type="java.lang.Boolean" initial="false"/>
 </form-bean>
 
+<form-bean name="UserRolesForm" type="org.apache.struts.action.DynaActionForm">
+    <form-property name="orgId" type="java.lang.Integer" />
+	<form-property name="userId" type="java.lang.Integer" />
+    <form-property name="roles" type="java.lang.String[]" />
+</form-bean>
+
 <form-bean name="UserForm" type="org.apache.struts.action.DynaActionForm">
     <form-property name="orgId" type="java.lang.Integer" />
 	<form-property name="userId" type="java.lang.Integer" />
@@ -47,14 +57,14 @@
 	<form-property name="addressLine3" type="java.lang.String" />
 	<form-property name="city" type="java.lang.String" />
 	<form-property name="state" type="java.lang.String" />
+	<form-property name="postcode" type="java.lang.String" />
 	<form-property name="country" type="java.lang.String" />
 	<form-property name="dayPhone" type="java.lang.String" />
 	<form-property name="eveningPhone" type="java.lang.String" />
 	<form-property name="mobilePhone" type="java.lang.String" />
 	<form-property name="fax" type="java.lang.String" />
 	<form-property name="email" type="java.lang.String" />
 	<form-property name="localeId" type="java.lang.Byte" />
-    <form-property name="roles" type="java.lang.String[]" />
 </form-bean>
 
 <form-bean name="UserOrgForm" type="org.apache.struts.action.DynaActionForm">
@@ -63,14 +73,47 @@
     <form-property name="userIds" type="java.lang.String[]" />
 </form-bean>
 
+<form-bean name="UserSearchForm" type="org.apache.struts.action.DynaActionForm">
+	<form-property name="sUserId" type="java.lang.String" />
+    <form-property name="sLogin" type="java.lang.String" />
+    <form-property name="sFirstName" type="java.lang.String" />
+    <form-property name="sLastName" type="java.lang.String" />
+    <form-property name="searched" type="java.lang.Boolean" initial="false" />
+</form-bean>
+
+<form-bean name="LoginMaintainForm" type="org.apache.struts.action.DynaActionForm">
+	<form-property name="logo"  type="org.apache.struts.upload.FormFile" />
+	<form-property name="news" type="java.lang.String" />
+</form-bean>
+
+<form-bean name="ServerOrgMapForm" type="org.apache.struts.action.DynaActionForm">
+	<form-property name="sid" type="java.lang.Integer" initial="-1"/>
+	<form-property name="serverid" type="java.lang.String" />
+	<form-property name="serverkey" type="java.lang.String" />
+	<form-property name="servername" type="java.lang.String" />
+	<form-property name="serverdesc" type="java.lang.String" />
+	<form-property name="prefix" type="java.lang.String"/>
+	<form-property name="userinfoUrl" type="java.lang.String" />
+	<form-property name="timeoutUrl" type="java.lang.String" initial="http://dummy.url/not.implemented"/>
+	<form-property name="disabled" type="java.lang.Boolean" initial="false"/>
+	<form-property name="orgId" type="java.lang.Integer" initial="-1"/>
+	<form-property name="newOrg" type="java.lang.Boolean" initial="false"/>
+	<form-property name="orgName" type="java.lang.String" />
+</form-bean>
+
+<form-bean name="ConfigForm" type="org.apache.struts.action.DynaActionForm">
+	<form-property name="cKey" type="java.lang.String[]" />
+	<form-property name="cValue" type="java.lang.String[]" />
+	<form-property name="method" type="java.lang.String" />
+</form-bean>
   </form-beans>
 
   <!-- ========== Global Exceptions Definitions =================================== -->
   <global-exceptions>
   <exception
-    handler="org.lamsfoundation.lams.admin.web.StrutsExceptionHandler"
+    handler="org.lamsfoundation.lams.web.util.CustomStrutsExceptionHandler"
     key="error.system"
-    path=".error"
+    path="/error.jsp"
     scope="request"
     type="java.lang.Exception"/>
 </global-exceptions>
@@ -103,14 +146,17 @@
       />
     </action>
     <action
-      path="/joblist"
-      type="org.lamsfoundation.lams.admin.web.ScheduledJobListAction"
+      path="/usersearch"
+      type="org.lamsfoundation.lams.admin.web.UserSearchAction"
+      name="UserSearchForm"
+      scope="request"
+      input=".usersearchlist"
       unknown="false"
       validate="false"
     >
       <forward
-        name="list"
-        path=".joblist"
+        name="usersearchlist"
+        path=".usersearchlist"
         redirect="false"
       />
     </action>
@@ -127,6 +173,157 @@
       />
     </action>
     <action
+      path="/joblist"
+      type="org.lamsfoundation.lams.admin.web.ScheduledJobListAction"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="list"
+        path=".joblist"
+        redirect="false"
+      />
+    </action>
+    <action
+      path="/disabledmanage"
+      type="org.lamsfoundation.lams.admin.web.DisabledUserManageAction"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="disabledlist"
+        path=".disabledlist"
+        redirect="false"
+      />
+    </action>
+    <action
+      path="/serverlist"
+      type="org.lamsfoundation.lams.admin.web.ServerListAction"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="serverlist"
+        path=".serverlist"
+        redirect="false"
+      />
+    </action>
+    <action
+      path="/usersave"
+      type="org.lamsfoundation.lams.admin.web.UserSaveAction"
+      name="UserForm"
+      scope="request"
+      input=".user"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="user"
+        path="/user.do?method=edit"
+        redirect="false"
+      />
+      <forward
+        name="userlist"
+        path="/usermanage.do"
+        redirect="false"
+      />
+      <forward
+        name="userroles"
+        path="/userroles.do"
+        redirect="false"
+      />
+      <forward
+        name="usersearch"
+        path="/usersearch.do"
+        redirect="false"
+      />
+    </action>
+    <action
+      path="/userorgrolesave"
+      type="org.lamsfoundation.lams.admin.web.UserOrgRoleSaveAction"
+      name="UserOrgRoleForm"
+      scope="session"
+      input=".userorgrole"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="userlist"
+        path="/usermanage.do"
+        redirect="false"
+      />
+    </action>
+    <action
+      path="/cache"
+      type="org.lamsfoundation.lams.admin.web.CacheAction"
+      name="CacheActionForm"
+      scope="request"
+      parameter="method"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="cache"
+        path=".cache"
+        redirect="false"
+      />
+    </action>
+    <action
+      path="/serversave"
+      type="org.lamsfoundation.lams.admin.web.ServerSaveAction"
+      name="ServerOrgMapForm"
+      scope="request"
+      input=".servermaintain"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="success"
+        path="/serverlist.do"
+        redirect="false"
+      />
+    </action>
+    <action
+      path="/servermaintain"
+      type="org.lamsfoundation.lams.admin.web.ServerMaintainAction"
+      name="ServerOrgMapForm"
+      scope="request"
+      parameter="method"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="servermaintain"
+        path=".servermaintain"
+        redirect="false"
+      />
+      <forward
+        name="serverlist"
+        path="/serverlist.do"
+        redirect="false"
+      />
+    </action>
+    <action
+      path="/userroles"
+      type="org.lamsfoundation.lams.admin.web.UserRolesAction"
+      name="UserRolesForm"
+      scope="request"
+      parameter="method"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="userrole"
+        path=".userrole"
+        redirect="false"
+      />
+      <forward
+        name="userlist"
+        path="/usermanage.do"
+        redirect="false"
+      />
+    </action>
+    <action
       path="/usermanage"
       type="org.lamsfoundation.lams.admin.web.UserManageAction"
       unknown="false"
@@ -159,41 +356,96 @@
       />
     </action>
     <action
-      path="/userorgsave"
-      type="org.lamsfoundation.lams.admin.web.UserOrgSaveAction"
-      name="UserOrgForm"
+      path="/config"
+      type="org.lamsfoundation.lams.admin.web.ConfigAction"
+      name="ConfigForm"
       scope="request"
-      input=".userorg"
+      input=".config"
+      parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="userlist"
-        path="/usermanage.do"
+        name="config"
+        path=".config"
         redirect="false"
       />
+      <forward
+        name="sysadmin"
+        path=".sysadmin"
+        redirect="false"
+      />
     </action>
     <action
-      path="/usersave"
-      type="org.lamsfoundation.lams.admin.web.UserSaveAction"
-      name="UserForm"
+      path="/loginmaintain"
+      type="org.lamsfoundation.lams.admin.web.LoginMaintainAction"
+      name="LoginMaintainForm"
       scope="request"
-      input=".user"
       unknown="false"
       validate="false"
     >
       <forward
-        name="user"
-        path=".user"
+        name="loginmaintain"
+        path=".loginmaintain"
         redirect="false"
       />
+    </action>
+    <action
+      path="/userrolessave"
+      type="org.lamsfoundation.lams.admin.web.UserRolesSaveAction"
+      name="UserRolesForm"
+      scope="request"
+      input=".userroles"
+      parameter="method"
+      unknown="false"
+      validate="false"
+    >
       <forward
+        name="userroles"
+        path="/userroles.do"
+        redirect="false"
+      />
+      <forward
         name="userlist"
         path="/usermanage.do"
         redirect="false"
       />
     </action>
     <action
+      path="/userorgsave"
+      type="org.lamsfoundation.lams.admin.web.UserOrgSaveAction"
+      name="UserOrgForm"
+      scope="request"
+      input=".userorg"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="userlist"
+        path="/usermanage.do"
+        redirect="false"
+      />
+      <forward
+        name="userorgrole"
+        path="/userorgrole.do"
+        redirect="false"
+      />
+    </action>
+    <action
+      path="/userorgrole"
+      type="org.lamsfoundation.lams.admin.web.UserOrgRoleAction"
+      name="UserOrgRoleForm"
+      scope="session"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="userorgrole"
+        path=".userorgrole"
+        redirect="false"
+      />
+    </action>
+    <action
       path="/user"
       type="org.lamsfoundation.lams.admin.web.UserAction"
       name="UserForm"
@@ -212,35 +464,56 @@
         path="/usermanage.do"
         redirect="false"
       />
+      <forward
+        name="remove"
+        path=".remove"
+        redirect="false"
+      />
+      <forward
+        name="disabledlist"
+        path="/disabledmanage.do"
+        redirect="false"
+      />
+      <forward
+        name="usersearch"
+        path="/usersearch.do"
+        redirect="false"
+      />
     </action>
     <action
-      path="/cache"
-      type="org.lamsfoundation.lams.admin.web.CacheAction"
-      name="CacheActionForm"
+      path="/userorg"
+      type="org.lamsfoundation.lams.admin.web.UserOrgAction"
+      name="UserOrgForm"
       scope="request"
-      parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="cache"
-        path=".cache"
+        name="userorg"
+        path=".userorg"
         redirect="false"
       />
     </action>
     <action
-      path="/userorg"
-      type="org.lamsfoundation.lams.admin.web.UserOrgAction"
-      name="UserOrgForm"
+      path="/loginsave"
+      type="org.lamsfoundation.lams.admin.web.LoginSaveAction"
+      name="LoginMaintainForm"
       scope="request"
+      input=".loginmaintian"
+      parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="userorg"
-        path=".userorg"
+        name="sysadmin"
+        path=".sysadmin"
         redirect="false"
       />
+      <forward
+        name="loginmaintain"
+        path=".loginmaintain"
+        redirect="false"
+      />
     </action>
 
        <action