Fixed initial commit (TODO: Registration functionality)

hyzor · hyzor · commit 57cc221f1908 · 2015-04-20T22:33:15.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -22,3 +22,5 @@ nbdist/
 nbactions.xml
 nb-configuration.xml
 .nb-gradle/
+/EnterpriseApplication1-war/nbproject/private/
+/EnterpriseApplication1-ejb/nbproject/private/
diff --git a/EnterpriseApplication1-war/src/java/com/MyPackage/MainServlet.java b/EnterpriseApplication1-war/src/java/com/MyPackage/MainServlet.java
@@ -1,54 +1,52 @@
-package com.MyPackage;
-
 /*
  * To change this license header, choose License Headers in Project Properties.
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
+package com.MyPackage;
 
+import static com.MyPackage.MainServlet.SQL_DRIVER;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.sql.Connection;
 import java.sql.DriverManager;
-import java.sql.PreparedStatement;
 import java.sql.ResultSet;
-import java.sql.SQLDataException;
 import java.sql.SQLException;
 import java.sql.Statement;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.HttpJspPage;
 import javax.sql.DataSource;
 
 /**
  *
- * @author Jesper
+ * @author hyzor
  */
-@WebServlet(urlPatterns = {"/NewServlet"})
-public abstract class NewServlet extends HttpServlet implements HttpJspPage {
-
+public class MainServlet extends HttpServlet {
+    
     InitialContext ctx = null;
     DataSource ds = null;
     protected Connection conn = null;
     Statement statement = null;
     ResultSet rs = null;
     SqlBean sqlBean = null;
-
-    //static final String JDBC_DRIVER="org.hsqldb.jdbc.JDBCDriver";
-    static final String DB_URL="jdbc:derby://localhost:1527/ourDatabase";
     
-    String sql = "SELECT * FROM APP.USERS";
+    static final String SQL_DB_URL="jdbc:derby://localhost:1527/MyDatabase";
+    static final String SQL_DRIVER="org.apache.derby.jdbc.ClientDriver";
+    static final String SQL_USERNAME = "test";
+    static final String SQL_PASSWORD = "test123";
+    
+    @Override
+    public final void init(ServletConfig config) throws ServletException {
+        super.init(config);
+    }
 
-    /*
+    /**
      * Processes requests for both HTTP <code>GET</code> and <code>POST</code>
      * methods.
      *
@@ -57,38 +55,33 @@ public abstract class NewServlet extends HttpServlet implements HttpJspPage {
      * @throws ServletException if a servlet-specific error occurs
      * @throws IOException if an I/O error occurs
      */
-    protected final void processRequest(HttpServletRequest request, HttpServletResponse response)
+    protected void processRequest(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
         response.setContentType("text/html;charset=UTF-8");
         try (PrintWriter out = response.getWriter()) {
             /* TODO output your page here. You may use following sample code. */
             out.println("<!DOCTYPE html>");
             out.println("<html>");
             out.println("<head>");
-            out.println("<title>Servlet NewServlet</title>");
+            out.println("<title>Servlet MainServlet2</title>");            
             out.println("</head>");
             out.println("<body>");
-            out.println("<h1>Servlet NewServlet at " + request.getContextPath() + "</h1>");
+            out.println("<h1>Servlet MainServlet2 at " + request.getContextPath() + "</h1>");
             out.println("</body>");
             out.println("</html>");
         }
     }
-
-    @Override
-    public final void init(ServletConfig config) throws ServletException {
-        super.init(config);
+    
+    protected void processRequest_Get(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+        response.setContentType("text/html;charset=UTF-8");
+        
         try {
             System.out.println("Connecting to database...");
             ctx = new InitialContext();
-            //ds = (DataSource) ctx.lookup("java:comp/env/jdbc/hsqldb");
-            //conn = ds.getConnection();
-            Class.forName("org.apache.derby.jdbc.ClientDriver").newInstance();
-            conn = DriverManager.getConnection(DB_URL, "test", "tgdas"); 
-            
+            Class.forName(SQL_DRIVER).newInstance();
+            conn = DriverManager.getConnection(SQL_DB_URL, SQL_USERNAME, SQL_PASSWORD); 
             System.out.println("Connected!");
-            //ps = conn.cr(sql);
-            //statement = conn.createStatement();
-            //rs = statement.executeQuery(sql);
             
             sqlBean = new SqlBean();
             sqlBean.setConnection(conn);
@@ -97,39 +90,27 @@ public final void init(ServletConfig config) throws ServletException {
         } catch (NamingException ne) {
             System.out.println("NamingException: " + ne.getMessage());
         } catch (ClassNotFoundException ex) {
-            Logger.getLogger(NewServlet.class.getName()).log(Level.SEVERE, null, ex);
+            //Logger.getLogger(MainServlet.class.getName()).log(Level.SEVERE, null, ex);
+            System.out.println("ClassNotFoundException: " + ex.getMessage());
         } catch (InstantiationException ex) {
-            Logger.getLogger(NewServlet.class.getName()).log(Level.SEVERE, null, ex);
+            //Logger.getLogger(MainServlet.class.getName()).log(Level.SEVERE, null, ex);
+            System.out.println("InstantiationException: " + ex.getMessage());
         } catch (IllegalAccessException ex) {
-            Logger.getLogger(NewServlet.class.getName()).log(Level.SEVERE, null, ex);
+            //Logger.getLogger(MainServlet.class.getName()).log(Level.SEVERE, null, ex);
+            System.out.println("IllegalAccessException: " + ex.getMessage());
         }
+               
+        RequestDispatcher rd = null;
         
-        jspInit();
-    }
-
-    @Override
-    public final void destroy() {
-        try {
-            if (rs != null) {
-                rs.close();
-            }
-            if (statement != null) {
-                statement.close();
-            }
-            if (conn != null) {
-                conn.close();
-            }
-            if (ctx != null) {
-                ctx.close();
-            }
-        } catch (SQLException se) {
-            System.out.println("SQLException: " + se.getMessage());
-        } catch (NamingException ne) {
-            System.out.println("NamingException: " + ne.getMessage());
+        if (request.getAttribute("username") == null) {
+            rd = request.getRequestDispatcher("loginPage.jsp");
+        } else {
+            rd = request.getRequestDispatcher("home.jsp");
         }
         
-        jspDestroy();
-        super.destroy();
+        request.setAttribute("sqlBean", sqlBean);
+        request.getSession().setAttribute("sqlBean", sqlBean);
+        rd.forward(request, response);
     }
 
     // <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
@@ -142,18 +123,9 @@ public final void destroy() {
      * @throws IOException if an I/O error occurs
      */
     @Override
-    protected final void doGet(HttpServletRequest request, HttpServletResponse response)
+    protected void doGet(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
-        //SqlBean sqlBean = new SqlBean();
-        //sqlBean.setConnection(conn);
-        
-
-
-        RequestDispatcher rd = request.getRequestDispatcher("loginPage.jsp");
-        request.setAttribute("sqlBean", sqlBean);
-        //request.setAttribute("conn", conn);
-        rd.forward(request, response);
-        //processRequest(request, response);
+        processRequest_Get(request, response);
     }
 
     /**
@@ -165,7 +137,7 @@ protected final void doGet(HttpServletRequest request, HttpServletResponse respo
      * @throws IOException if an I/O error occurs
      */
     @Override
-    protected final void doPost(HttpServletRequest request, HttpServletResponse response)
+    protected void doPost(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
         processRequest(request, response);
     }
@@ -176,43 +148,32 @@ protected final void doPost(HttpServletRequest request, HttpServletResponse resp
      * @return a String containing servlet description
      */
     @Override
-    public final String getServletInfo() {
+    public String getServletInfo() {
         return "Short description";
     }// </editor-fold>
-    
-       /**
-   * Called when the JSP is loaded.
-   * By default does nothing.
-   */
-    @Override
-   public void jspInit() {}
-
-   /**
-   * Called when the JSP is unloaded.
-   * By default does nothing.
-   */
-    @Override
-   public void jspDestroy() {}
-
-   /**
-   * Invokes the JSP's _jspService method.
-   */
-    @Override
-   public final void service(
-         HttpServletRequest request,
-         HttpServletResponse response)
-      throws ServletException, IOException
-   {
-      _jspService(request, response);
-   }
 
-   /**
-   * Handles a service request.
-   */
+    
     @Override
-   public abstract void _jspService(
-         HttpServletRequest request,
-         HttpServletResponse response)
-      throws ServletException, IOException;
-
+    public final void destroy() {
+        try {
+            if (rs != null) {
+                rs.close();
+            }
+            if (statement != null) {
+                statement.close();
+            }
+            if (conn != null) {
+                conn.close();
+            }
+            if (ctx != null) {
+                ctx.close();
+            }
+        } catch (SQLException se) {
+            System.out.println("SQLException: " + se.getMessage());
+        } catch (NamingException ne) {
+            System.out.println("NamingException: " + ne.getMessage());
+        }
+        
+        super.destroy();
+    }
 }
diff --git a/EnterpriseApplication1-war/web/WEB-INF/web.xml b/EnterpriseApplication1-war/web/WEB-INF/web.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="3.1" xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd">
+    <servlet>
+        <servlet-name>MainServlet2</servlet-name>
+        <servlet-class>com.MyPackage.MainServlet</servlet-class>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>MainServlet2</servlet-name>
+        <url-pattern>/MainServlet2</url-pattern>
+    </servlet-mapping>
+    <session-config>
+        <session-timeout>
+            30
+        </session-timeout>
+    </session-config>
+</web-app>
diff --git a/EnterpriseApplication1-war/web/index.html b/EnterpriseApplication1-war/web/index.html
diff --git a/EnterpriseApplication1-war/web/index.jsp b/EnterpriseApplication1-war/web/index.jsp
@@ -0,0 +1,28 @@
+<%-- 
+    Document   : index
+    Created on : Apr 20, 2015, 8:03:41 PM
+    Author     : hyzor
+--%>
+<jsp:forward page="/MainServlet2" />
+
+<%@page contentType="text/html" pageEncoding="UTF-8"%>
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <title>JSP Page</title>
+    </head>
+    <body>
+        <%
+            RequestDispatcher rd = null;
+            
+            if (session.getAttribute("username") == null) {
+                rd = request.getRequestDispatcher("loginPage.jsp");
+            } else {
+                rd = request.getRequestDispatcher("home.jsp");
+            }
+            
+            rd.forward(request, response);
+        %>
+    </body>
+</html>
diff --git a/EnterpriseApplication1-war/web/loginCheck.jsp b/EnterpriseApplication1-war/web/loginCheck.jsp
@@ -11,8 +11,6 @@
 <%@page import="java.sql.Connection"%>
 <%@page contentType="text/html" pageEncoding="UTF-8"%>
 
-<jsp:useBean id="sqlSessionBean" class="com.MyPackage.SqlBean" />
-
 <!DOCTYPE html>
 <html>
     <head>
@@ -23,19 +21,25 @@
         <%
         String username = request.getParameter("username");
         String password = request.getParameter("password");
-
-        Statement statement = sqlSessionBean.getConnection().createStatement();
-        String sql = "SELECT Password FROM APP.USERS WHERE Username="+username;
+        
+        SqlBean sqlBean = (SqlBean)session.getAttribute("sqlBean");
+        
+        Statement statement = sqlBean.getConnection().createStatement();
+        
+        String sql = "SELECT Password FROM TEST.USERS WHERE Username="+"'"+username+"'";
         ResultSet rs = statement.executeQuery(sql);
         
-        if (rs.next() == true) {
-            if (password == rs.getString("password")) {
+        boolean userFound = false;
+        
+        while (rs.next()) {
+            if (password.equals(rs.getString("password"))) {
                 session.setAttribute("username", username);
+                userFound = true;
                 response.sendRedirect("home.jsp");
-            } else {
-                response.sendRedirect("error.jsp");
             }
-        } else {
+        }
+        
+        if (!userFound) {
             response.sendRedirect("error.jsp");
         }
     %>
