From c0aee4817399b0020241e1c77a9f36ce587fb3d2 Mon Sep 17 00:00:00 2001 From: felix Date: Mon, 23 Aug 2010 19:10:58 +0200 Subject: [PATCH] formatted with eclipse --- WebContent/index.jsp | 246 ++-- WebContent/main.jsp | 56 +- WebContent/menu.jsp | 1789 +++++++++++++++++---------- src/org/mcb/services/connectionmanager.java | 38 +- src/org/mcb/services/loginmanager.java | 170 +-- src/org/mcb/services/passwordservices.java | 79 +- src/org/mcb/services/udac.java | 163 +-- src/org/mcb/services/userbean.java | 92 +- 8 files changed, 1599 insertions(+), 1034 deletions(-) diff --git a/WebContent/index.jsp b/WebContent/index.jsp index 4c97960..1333f7b 100644 --- a/WebContent/index.jsp +++ b/WebContent/index.jsp @@ -1,20 +1,20 @@ - -<%@ page language="java" session="true" %> -<%@ page language="java" buffer="500kb" autoFlush="false"%> -<%@ page import = "java.io.*" %> -<%@ page import = "java.sql.*" %> -<%@ page import = "java.util.*" %> -<%@ page import = "java.util.Calendar" %> -<%@ page import = "org.mcb.services.*" %> -<%@ include file = "db/dbcon.jsp" %> -<%@ include file = "//procs/audit.jsp" %> - - -Smart Card Generation Application - - - - + +<%@ page language="java" session="true"%> +<%@ page language="java" buffer="500kb" autoFlush="false"%> +<%@ page import="java.io.*"%> +<%@ page import="java.sql.*"%> +<%@ page import="java.util.*"%> +<%@ page import="java.util.Calendar"%> +<%@ page import="org.mcb.services.*"%> +<%@ include file="db/dbcon.jsp"%> +<%@ include file="//procs/audit.jsp"%> + + +Smart Card Generation Application + + + + - - - - - - - - - - - - - - - - - - - - - <% //out.println(connection); %> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
         
    
 -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- <% if(request.getParameter("user")!=null){ %> - Login Unsuccessfull: Either Login credentials are in-valid or account has been locked. - <%} %> -
Login
User - Id  
- -
Password  
  
- -
-
 
         
         
- - + + + + + + + + + + + + + + + + + + + + + + <% + //out.println(connection); + %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
         
    
+
+ 		+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ <% + if (request.getParameter("user") != null) { + %> Login + Unsuccessfull: Either Login credentials are in-valid or account has + been locked. <% + } + %> +
Login
User + Id  
+
+
Password  
   +
+
+
+ 		 
         
+
+
         
+ + diff --git a/WebContent/main.jsp b/WebContent/main.jsp index f361bc9..b09c176 100644 --- a/WebContent/main.jsp +++ b/WebContent/main.jsp @@ -4,12 +4,12 @@ Author : yawar.saeed --%> -<%@ page language="java" %> -<%@ page import = "java.io.*" %> -<%@ page import="java.sql.*" %> -<%@ page import = "org.mcb.services.*" %> -<%@ page language="java" session="true" %> -<%@ page buffer="32kb" %> +<%@ page language="java"%> +<%@ page import="java.io.*"%> +<%@ page import="java.sql.*"%> +<%@ page import="org.mcb.services.*"%> +<%@ page language="java" session="true"%> +<%@ page buffer="32kb"%> Smart Card Generation Application @@ -18,31 +18,31 @@ <% -userbean usr = (userbean) session.getAttribute("user"); -String login_path = request.getContextPath()+"/index.jsp"; -if( usr == null ){ - session.invalidate(); - response.sendRedirect(response.encodeRedirectURL(login_path)); -} -else{%> + userbean usr = (userbean) session.getAttribute("user"); + String login_path = request.getContextPath() + "/index.jsp"; + if (usr == null) { + session.invalidate(); + response.sendRedirect(response.encodeRedirectURL(login_path)); + } else { +%> - - - + + +
- - - - - - -
- -
- -
+ + + + + + + +
+
-<% } %> +<% + } +%> \ No newline at end of file diff --git a/WebContent/menu.jsp b/WebContent/menu.jsp index f94f08f..ea01ca0 100644 --- a/WebContent/menu.jsp +++ b/WebContent/menu.jsp @@ -2,636 +2,1159 @@ Document : menu Created on : Jul 28, 2010, 2:42:16 PM Author : yawar.saeed ---%> - -<%@ page import = "org.mcb.services.*" %> - - - - - -MCB Smart Card Generation Application -<% -String script_path = request.getContextPath()+"/scripts/stuhover.js"; -String css_path = request.getContextPath()+"/css/pro_dropdown_2.css"; -String login_path = request.getContextPath()+"/index.jsp"; -%> - - - -<% userbean usr = (userbean) session.getAttribute("user"); -//if( (session.getAttribute("user_id") == null) | (session.getAttribute("user_id") == "" ) ){ -if( usr == null ){ - session.invalidate(); //request.getContextPath()+"/Index.jsp" -// response.sendRedirect(login_path); - response.sendRedirect(response.encodeRedirectURL(login_path)); -}else{ -/* String user_id = (String) session.getAttribute("user_id"); - String user_name = (String) session.getAttribute("user_name"); - //String user_pass = (String) session.getAttribute("user_pass"); - String role_id = (String) session.getAttribute("role_id"); - String role_name = (String) session.getAttribute("role_desc"); - String last_login = (String) session.getAttribute("last_login"); - // userbean usr = (userbean) session.getAttribute("user"); - //out.println("object value: "+usr.getName()); - */ -%> - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Welcome - <%= usr.getName() %> -
Logged - in as - <%= usr.getRoleDesc() %> -
Last Login Date: - <%= usr.getLastLogin() %> -
Current - Date: - <%= new java.util.Date() %> -
-
- -<% -if( usr.getRole().equals("0")) { // ROOT USER -//if( role_id.equals("0")) { // ROOT USER %> - -<% } -if( usr.getRole().equals("1")) { // IDC USER -//if( role_id.equals("1")) { // IDC USER %> - -<% } -if( usr.getRole().equals("11")) { // BRANCH PROCESSOR -//if( role_id.equals("11")) { // BRANCH PROCESSOR %> - -<% } -if( usr.getRole().equals("12")) { // BRANCH APPROVER -//if( role_id.equals("12")) { // BRANCH APPROVER %> - -<% } -if( usr.getRole().equals("21")) { // OPS PROCESSOR -//if( role_id.equals("21")) { // OPS PROCESSOR %> - -<% } -if( usr.getRole().equals("22")) { // OPS APPROVER -//if( role_id.equals("22")) { // OPS APPROVER %> - -<% } -if( usr.getRole().equals("23")) { // OPS ADMIN -//if( role_id.equals("23")) { // OPS ADMIN %> - -<% } -if( usr.getRole().equals("31")) { // CPDU PROCESSOR -//if( role_id.equals("31")) { // CPDU PROCESSOR %> - -<% } -if( usr.getRole().equals("41")) { // CALL-CENTER AGENT -//if( role_id.equals("41")) { // CALL-CENTER AGENT %> - -<% } %> - -
- -<% } %> - +--%> + +<%@ page import="org.mcb.services.*"%> + + + + + +MCB Smart Card Generation Application +<% + String script_path = request.getContextPath() + + "/scripts/stuhover.js"; + String css_path = request.getContextPath() + + "/css/pro_dropdown_2.css"; + String login_path = request.getContextPath() + "/index.jsp"; +%> + + + +<% + userbean usr = (userbean) session.getAttribute("user"); + //if( (session.getAttribute("user_id") == null) | (session.getAttribute("user_id") == "" ) ){ + if (usr == null) { + session.invalidate(); //request.getContextPath()+"/Index.jsp" + // response.sendRedirect(login_path); + response.sendRedirect(response.encodeRedirectURL(login_path)); + } else { + /* String user_id = (String) session.getAttribute("user_id"); + String user_name = (String) session.getAttribute("user_name"); + //String user_pass = (String) session.getAttribute("user_pass"); + String role_id = (String) session.getAttribute("role_id"); + String role_name = (String) session.getAttribute("role_desc"); + String last_login = (String) session.getAttribute("last_login"); + // userbean usr = (userbean) session.getAttribute("user"); + //out.println("object value: "+usr.getName()); + */ +%> + + + + + + + + + + + + + +
+ + + + + + + + + + + + + +
+
+
Welcome + <%=usr.getName()%> +
Logged in as <%=usr.getRoleDesc()%> +
+
Last + Login Date: <%=usr.getLastLogin()%> +
Current Date: <%=new java.util.Date()%> +
+
+
<% + if (usr.getRole().equals("0")) { // ROOT USER + //if( role_id.equals("0")) { // ROOT USER + %> + + <% + } + if (usr.getRole().equals("1")) { // IDC USER + //if( role_id.equals("1")) { // IDC USER + %> + + <% + } + if (usr.getRole().equals("11")) { // BRANCH PROCESSOR + //if( role_id.equals("11")) { // BRANCH PROCESSOR + %> + + <% + } + if (usr.getRole().equals("12")) { // BRANCH APPROVER + //if( role_id.equals("12")) { // BRANCH APPROVER + %> + + <% + } + if (usr.getRole().equals("21")) { // OPS PROCESSOR + //if( role_id.equals("21")) { // OPS PROCESSOR + %> + + <% + } + if (usr.getRole().equals("22")) { // OPS APPROVER + //if( role_id.equals("22")) { // OPS APPROVER + %> + + <% + } + if (usr.getRole().equals("23")) { // OPS ADMIN + //if( role_id.equals("23")) { // OPS ADMIN + %> + + <% + } + if (usr.getRole().equals("31")) { // CPDU PROCESSOR + //if( role_id.equals("31")) { // CPDU PROCESSOR + %> + + <% + } + if (usr.getRole().equals("41")) { // CALL-CENTER AGENT + //if( role_id.equals("41")) { // CALL-CENTER AGENT + %> + + <% + } + %>
+ +<% + } +%> + diff --git a/src/org/mcb/services/connectionmanager.java b/src/org/mcb/services/connectionmanager.java index 689d6d2..64ea79a 100644 --- a/src/org/mcb/services/connectionmanager.java +++ b/src/org/mcb/services/connectionmanager.java @@ -8,23 +8,25 @@ import java.sql.*; import java.util.*; import oracle.jdbc.driver.*; - public class connectionmanager { - static Connection scgmcon ; +public class connectionmanager { + static Connection scgmcon; - public static Connection scgm_conn() throws Exception{ - String host = "10.20.0.115"; - String service = "scdb"; - String usr = "scuser"; - String pass = "scuser"; - String driverName = "oracle.jdbc.driver.OracleDriver"; - String connstr = "jdbc:oracle:thin:@(DESCRIPTION =(ADDRESS_LIST = (ADDRESS = (PROTOCOL = TCP)(HOST = " + - host +")(PORT = 1521)))(CONNECT_DATA =(SERVICE_NAME = " + service + ")))"; - try{ - Class.forName(driverName).newInstance(); - scgmcon = DriverManager.getConnection(connstr, usr, pass); - }catch(Exception e){ - System.out.println(e); - } - return(scgmcon); - } + public static Connection scgm_conn() throws Exception { + String host = "10.20.0.115"; + String service = "scdb"; + String usr = "scuser"; + String pass = "scuser"; + String driverName = "oracle.jdbc.driver.OracleDriver"; + String connstr = "jdbc:oracle:thin:@(DESCRIPTION =(ADDRESS_LIST = (ADDRESS = (PROTOCOL = TCP)(HOST = " + + host + + ")(PORT = 1521)))(CONNECT_DATA =(SERVICE_NAME = " + + service + ")))"; + try { + Class.forName(driverName).newInstance(); + scgmcon = DriverManager.getConnection(connstr, usr, pass); + } catch (Exception e) { + System.out.println(e); + } + return (scgmcon); + } } diff --git a/src/org/mcb/services/loginmanager.java b/src/org/mcb/services/loginmanager.java index eb147ac..4142e47 100644 --- a/src/org/mcb/services/loginmanager.java +++ b/src/org/mcb/services/loginmanager.java @@ -8,88 +8,110 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; + /** - * + * * @author yawar.saeed */ public class loginmanager extends HttpServlet { - - /** - * Processes requests for both HTTP GET and POST methods. - * @param request servlet request - * @param response servlet response - * @throws ServletException if a servlet-specific error occurs - * @throws IOException if an I/O error occurs - */ - protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - response.setContentType("text/html;charset=UTF-8"); - PrintWriter out = response.getWriter(); - try { - userbean user = new userbean(); - user.setUserId(request.getParameter("txt_userid")); - user.setPassword(request.getParameter("txt_pass")); - user = udac.login(user); - if (user.isValid()){ - HttpSession session = request.getSession(true); - session.setAttribute("user", user); - session.setAttribute("user_id",user.getUserId()); - session.setAttribute("user_name",user.getName()); - session.setAttribute("role_id",user.getRole()); - session.setAttribute("role_desc", user.getRoleDesc()); - session.setAttribute("last_login", user.getLastLogin()); - //response.sendRedirect("main.jsp"); //logged-in page - //response.sendRedirect(response.encodeRedirectURL("main.jsp")); - response.sendRedirect(request.getContextPath() + response.encodeRedirectURL("/main.jsp")); - }else{ - // response.sendRedirect("index.jsp?user="+user.isValid()); //revert back to login page - // response.sendRedirect(response.encodeRedirectURL("index.jsp?user="+user.isValid())); //revert back to login page - response.sendRedirect(request.getContextPath() - + response.encodeRedirectURL("/index.jsp") - + "?user="+ user.isValid()); - // + java.net.URLEncoder.encode()); + /** + * Processes requests for both HTTP GET and POST + * methods. + * + * @param request + * servlet request + * @param response + * servlet response + * @throws ServletException + * if a servlet-specific error occurs + * @throws IOException + * if an I/O error occurs + */ + protected void processRequest(HttpServletRequest request, + HttpServletResponse response) throws ServletException, IOException { + response.setContentType("text/html;charset=UTF-8"); + PrintWriter out = response.getWriter(); + try { + userbean user = new userbean(); + user.setUserId(request.getParameter("txt_userid")); + user.setPassword(request.getParameter("txt_pass")); + user = udac.login(user); + if (user.isValid()) { + HttpSession session = request.getSession(true); + session.setAttribute("user", user); + session.setAttribute("user_id", user.getUserId()); + session.setAttribute("user_name", user.getName()); + session.setAttribute("role_id", user.getRole()); + session.setAttribute("role_desc", user.getRoleDesc()); + session.setAttribute("last_login", user.getLastLogin()); + // response.sendRedirect("main.jsp"); //logged-in page + // response.sendRedirect(response.encodeRedirectURL("main.jsp")); + response.sendRedirect(request.getContextPath() + + response.encodeRedirectURL("/main.jsp")); + + } else { + // response.sendRedirect("index.jsp?user="+user.isValid()); + // //revert back to login page + // response.sendRedirect(response.encodeRedirectURL("index.jsp?user="+user.isValid())); + // //revert back to login page + response.sendRedirect(request.getContextPath() + + response.encodeRedirectURL("/index.jsp") + "?user=" + + user.isValid()); + // + java.net.URLEncoder.encode()); - } - } finally { - out.close(); - } - } + } + } finally { + out.close(); + } + } - // - /** - * Handles the HTTP GET method. - * @param request servlet request - * @param response servlet response - * @throws ServletException if a servlet-specific error occurs - * @throws IOException if an I/O error occurs - */ - @Override - protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - processRequest(request, response); - } + // + /** + * Handles the HTTP GET method. + * + * @param request + * servlet request + * @param response + * servlet response + * @throws ServletException + * if a servlet-specific error occurs + * @throws IOException + * if an I/O error occurs + */ + @Override + protected void doGet(HttpServletRequest request, + HttpServletResponse response) throws ServletException, IOException { + processRequest(request, response); + } - /** - * Handles the HTTP POST method. - * @param request servlet request - * @param response servlet response - * @throws ServletException if a servlet-specific error occurs - * @throws IOException if an I/O error occurs - */ - @Override - protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - processRequest(request, response); - } + /** + * Handles the HTTP POST method. + * + * @param request + * servlet request + * @param response + * servlet response + * @throws ServletException + * if a servlet-specific error occurs + * @throws IOException + * if an I/O error occurs + */ + @Override + protected void doPost(HttpServletRequest request, + HttpServletResponse response) throws ServletException, IOException { + processRequest(request, response); + } - /** - * Returns a short description of the servlet. - * @return a String containing servlet description - */ - @Override - public String getServletInfo() { - return "Short description"; - }// + /** + * Returns a short description of the servlet. + * + * @return a String containing servlet description + */ + @Override + public String getServletInfo() { + return "Short description"; + }// } diff --git a/src/org/mcb/services/passwordservices.java b/src/org/mcb/services/passwordservices.java index c3314a5..79d0f5b 100644 --- a/src/org/mcb/services/passwordservices.java +++ b/src/org/mcb/services/passwordservices.java @@ -6,55 +6,46 @@ package org.mcb.services; /** - * + * * @author yawar.saeed */ import java.io.UnsupportedEncodingException; import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -//import org.mcb.SystemUnavailableException; +import java.security.NoSuchAlgorithmException; // import + // org.mcb.SystemUnavailableException; import sun.misc.BASE64Encoder; import sun.misc.CharacterEncoder; -public final class passwordservices -{ - private static passwordservices instance; - private passwordservices() - { - } - public synchronized String encrypt(String plaintext) throws Exception - { - MessageDigest md = null; - try - { - md = MessageDigest.getInstance("SHA"); //step 2 - } - catch(NoSuchAlgorithmException e) - { - throw new Exception(e.getMessage()); - } - try - { - md.update(plaintext.getBytes("UTF-8")); //step 3 - } - catch(UnsupportedEncodingException e) - { - throw new Exception(e.getMessage()); - } - byte raw[] = md.digest(); //step 4 - String hash = (new BASE64Encoder()).encode(raw); //step 5 - return hash; //step 6 - } - public static synchronized passwordservices getInstance() //step 1 - { - if(instance == null) - { - return new passwordservices(); - } - else - { - return instance; - } - } -} +public final class passwordservices { + private static passwordservices instance; + + private passwordservices() { + } + + public synchronized String encrypt(String plaintext) throws Exception { + MessageDigest md = null; + try { + md = MessageDigest.getInstance("SHA"); // step 2 + } catch (NoSuchAlgorithmException e) { + throw new Exception(e.getMessage()); + } + try { + md.update(plaintext.getBytes("UTF-8")); // step 3 + } catch (UnsupportedEncodingException e) { + throw new Exception(e.getMessage()); + } + byte raw[] = md.digest(); // step 4 + String hash = (new BASE64Encoder()).encode(raw); // step 5 + return hash; // step 6 + } + + public static synchronized passwordservices getInstance() // step 1 + { + if (instance == null) { + return new passwordservices(); + } else { + return instance; + } + } +} diff --git a/src/org/mcb/services/udac.java b/src/org/mcb/services/udac.java index 4dbc3a6..9f6ed8d 100644 --- a/src/org/mcb/services/udac.java +++ b/src/org/mcb/services/udac.java @@ -9,87 +9,92 @@ import java.util.*; import java.sql.*; import javax.servlet.http.HttpSession; - public class udac - { -// static Connection currentCon = null; -// static ResultSet rs = null; - - public static userbean login(userbean bean) { - //preparing some objects for connection - Connection currentCon = null; - ResultSet rs = null; - Statement stmt = null; - String userid = bean.getUserId(); - String password = bean.getPassword(); - String epass = null; - String name = null; - String user_id = null; - String role_id = null; - String branch_code = null; - String last_login = null; - String role_desc = null; - try{ - epass = passwordservices.getInstance().encrypt(password); - }catch(Exception e){ - System.out.println(e); - } - String searchQuery = "SELECT a.USER_ID,a.NAME, a.BRANCH_CODE, a.PASSWORD, a.LAST_LOGIN_DATE, a.ROLE_ID, b.ROLE_DESC FROM LOGIN_INFORMATION a, ROLES b WHERE a.ACTIVE = 'A' AND a.ROLE_ID = b.ROLE_ID "; - searchQuery = searchQuery + "AND LOWER(a.USER_ID) = LOWER('"+ userid + "') AND a.PASSWORD = '"+epass+"'"; - try{ - //connect to DB - currentCon = connectionmanager.scgm_conn(); - stmt=currentCon.createStatement(); - rs = stmt.executeQuery(searchQuery); - boolean hasdata=false; - while(rs.next()) { - hasdata=true; - name = rs.getString("NAME"); - user_id = rs.getString("USER_ID"); - branch_code = rs.getString("BRANCH_CODE"); - role_id = rs.getString("ROLE_ID"); - last_login = rs.getString("LAST_LOGIN_DATE"); - role_desc = rs.getString("ROLE_DESC"); - bean.setName(name); - bean.setUserId(user_id); - bean.setBranch(branch_code); - bean.setRole(role_id); - bean.setLastLogin(last_login); - bean.setRoleDesc(role_desc); - bean.setValid(true); - } - if(!hasdata) { - System.out.println("Sorry, you are not a registered user! Please sign up first "+ searchQuery); - bean.setValid(false); - } - }catch (Exception ex){ - System.out.println("Log In failed: An Exception has occurred! " + ex); - } - //some exception handling - finally{ - if (rs != null) { - try { - rs.close(); - } catch (Exception e) {} - rs = null; - } +public class udac { + // static Connection currentCon = null; + // static ResultSet rs = null; - if (stmt != null) { - try { - stmt.close(); - } catch (Exception e) {} - stmt = null; - } + public static userbean login(userbean bean) { + // preparing some objects for connection + Connection currentCon = null; + ResultSet rs = null; + Statement stmt = null; + String userid = bean.getUserId(); + String password = bean.getPassword(); + String epass = null; + String name = null; + String user_id = null; + String role_id = null; + String branch_code = null; + String last_login = null; + String role_desc = null; + try { + epass = passwordservices.getInstance().encrypt(password); + } catch (Exception e) { + System.out.println(e); + } + String searchQuery = "SELECT a.USER_ID,a.NAME, a.BRANCH_CODE, a.PASSWORD, a.LAST_LOGIN_DATE, a.ROLE_ID, b.ROLE_DESC FROM LOGIN_INFORMATION a, ROLES b WHERE a.ACTIVE = 'A' AND a.ROLE_ID = b.ROLE_ID "; + searchQuery = searchQuery + "AND LOWER(a.USER_ID) = LOWER('" + userid + + "') AND a.PASSWORD = '" + epass + "'"; + try { + // connect to DB + currentCon = connectionmanager.scgm_conn(); + stmt = currentCon.createStatement(); + rs = stmt.executeQuery(searchQuery); + boolean hasdata = false; + while (rs.next()) { + hasdata = true; + name = rs.getString("NAME"); + user_id = rs.getString("USER_ID"); + branch_code = rs.getString("BRANCH_CODE"); + role_id = rs.getString("ROLE_ID"); + last_login = rs.getString("LAST_LOGIN_DATE"); + role_desc = rs.getString("ROLE_DESC"); + bean.setName(name); + bean.setUserId(user_id); + bean.setBranch(branch_code); + bean.setRole(role_id); + bean.setLastLogin(last_login); + bean.setRoleDesc(role_desc); + bean.setValid(true); + } + if (!hasdata) { + System.out + .println("Sorry, you are not a registered user! Please sign up first " + + searchQuery); + bean.setValid(false); + } + } catch (Exception ex) { + System.out.println("Log In failed: An Exception has occurred! " + + ex); + } + // some exception handling + finally { + if (rs != null) { + try { + rs.close(); + } catch (Exception e) { + } + rs = null; + } - if (currentCon != null) { - try { - currentCon.close(); - } catch (Exception e) { - } + if (stmt != null) { + try { + stmt.close(); + } catch (Exception e) { + } + stmt = null; + } - currentCon = null; - } - } -return bean; + if (currentCon != null) { + try { + currentCon.close(); + } catch (Exception e) { + } - } + currentCon = null; + } + } + return bean; + + } } diff --git a/src/org/mcb/services/userbean.java b/src/org/mcb/services/userbean.java index 0fd4db5..d692a66 100644 --- a/src/org/mcb/services/userbean.java +++ b/src/org/mcb/services/userbean.java @@ -6,80 +6,80 @@ package org.mcb.services; /** - * + * * @author yawar.saeed */ public class userbean { - private String userid; - private String password; - private String RoleDesc; - private String LastLogin; - private String Name; - private String Branch; - private String RoleId; - public boolean valid; - - public String getName() { - return Name; - } - - public void setName(String newName) { - Name = newName; + private String userid; + private String password; + private String RoleDesc; + private String LastLogin; + private String Name; + private String Branch; + private String RoleId; + public boolean valid; + + public String getName() { + return Name; } - public String getBranch() { - return Branch; - } - public void setBranch(String newBranch) { - Branch = newBranch; + public void setName(String newName) { + Name = newName; } - public String getRole() { - return RoleId; - } - public void setRole(String newRole) { - RoleId = newRole; + public String getBranch() { + return Branch; } - public String getRoleDesc() { - return RoleDesc; + + public void setBranch(String newBranch) { + Branch = newBranch; } - public void setRoleDesc(String newRoleDesc) { - RoleDesc = newRoleDesc; + public String getRole() { + return RoleId; } - public String getLastLogin() { - return LastLogin; + public void setRole(String newRole) { + RoleId = newRole; } - public void setLastLogin(String newLastLogin) { - LastLogin = newLastLogin; + public String getRoleDesc() { + return RoleDesc; } + public void setRoleDesc(String newRoleDesc) { + RoleDesc = newRoleDesc; + } - public String getPassword() { - return password; + public String getLastLogin() { + return LastLogin; } - public void setPassword(String newPassword) { - password = newPassword; + public void setLastLogin(String newLastLogin) { + LastLogin = newLastLogin; } + public String getPassword() { + return password; + } - public String getUserId() { - return userid; + public void setPassword(String newPassword) { + password = newPassword; } - public void setUserId(String newUserId) { - userid = newUserId; + public String getUserId() { + return userid; } + public void setUserId(String newUserId) { + userid = newUserId; + } - public boolean isValid() { - return valid; + public boolean isValid() { + return valid; } - public void setValid(boolean newValid) { - valid = newValid; + public void setValid(boolean newValid) { + valid = newValid; } } -- 2.11.0