From 1a9700426d9fe8af60efe219ac6df658973d2e75 Mon Sep 17 00:00:00 2001 From: "Uchenna F. Okoye" Date: Sun, 18 Oct 2015 23:02:09 -0500 Subject: [PATCH] Fixed linking issues and include problem. Changed persistence.xml file. --- .../moodmapper/entity/MMEntityService.java | 1 + .../com/moodmapper/servlet/LoginServlet.java | 2 +- .../servlet/ServletInitialization.java | 64 +++++++++ .../com/moodmapper/servlet/SignUpServlet.java | 2 +- .../servlet/UsernameAvailabilityServlet.java | 2 +- src/main/resources/META-INF/persistence.xml | 6 +- src/main/webapp/META-INF/context.xml | 6 +- src/main/webapp/WEB-INF/inc/head.jsp | 1 + src/main/webapp/WEB-INF/inc/navbar.jsp | 2 +- src/main/webapp/WEB-INF/inc/navdrawer.jsp | 6 +- src/main/webapp/WEB-INF/web.xml | 4 + src/main/webapp/app/advisory.jsp | 8 +- src/main/webapp/app/create_group.jsp | 8 +- src/main/webapp/app/home.jsp | 6 +- src/main/webapp/app/index.jsp | 51 +++++++ src/main/webapp/app/join_group.jsp | 6 +- src/main/webapp/app/mood_maps.jsp | 6 +- src/main/webapp/app/my_groups.jsp | 6 +- src/main/webapp/app/new_status.jsp | 8 +- src/main/webapp/{ => app}/signup.jsp | 10 +- src/main/webapp/css/signup.css | 127 ++++++++++++++++++ src/main/webapp/css/styles.css | 126 ----------------- src/main/webapp/js/{app.js => signup.js} | 24 +--- 23 files changed, 292 insertions(+), 190 deletions(-) create mode 100644 src/main/java/com/moodmapper/servlet/ServletInitialization.java create mode 100644 src/main/webapp/app/index.jsp rename src/main/webapp/{ => app}/signup.jsp (97%) create mode 100644 src/main/webapp/css/signup.css delete mode 100644 src/main/webapp/css/styles.css rename src/main/webapp/js/{app.js => signup.js} (77%) diff --git a/src/main/java/com/moodmapper/entity/MMEntityService.java b/src/main/java/com/moodmapper/entity/MMEntityService.java index 97c6b33..c65845d 100644 --- a/src/main/java/com/moodmapper/entity/MMEntityService.java +++ b/src/main/java/com/moodmapper/entity/MMEntityService.java @@ -20,6 +20,7 @@ public class MMEntityService implements Serializable { //Use when you want to make sure it doesn't already exist in the database public void create(EntityManagerFactory emf) { EntityManager em; + em = emf.createEntityManager(); EntityTransaction tx = em.getTransaction(); diff --git a/src/main/java/com/moodmapper/servlet/LoginServlet.java b/src/main/java/com/moodmapper/servlet/LoginServlet.java index 7face49..4a2f56a 100644 --- a/src/main/java/com/moodmapper/servlet/LoginServlet.java +++ b/src/main/java/com/moodmapper/servlet/LoginServlet.java @@ -41,7 +41,7 @@ public LoginServlet() { public void init() { - emf = Persistence.createEntityManagerFactory("MoodMapperTestPU--noDataSource"); + emf = Persistence.createEntityManagerFactory("MoodMapperDevPU--noDataSource"); em = emf.createEntityManager(); user = new UserEntity(); } diff --git a/src/main/java/com/moodmapper/servlet/ServletInitialization.java b/src/main/java/com/moodmapper/servlet/ServletInitialization.java new file mode 100644 index 0000000..0e8322d --- /dev/null +++ b/src/main/java/com/moodmapper/servlet/ServletInitialization.java @@ -0,0 +1,64 @@ +/* + * 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.moodmapper.servlet; + +import java.util.logging.Logger; +import javax.naming.Context; +import javax.naming.InitialContext; +import javax.servlet.ServletContext; +import javax.servlet.ServletContextEvent; +import javax.servlet.ServletContextListener; +import javax.servlet.annotation.WebListener; +import javax.sql.DataSource; + +/** + * + * @author faithfulokoye + */ +@WebListener + +public class ServletInitialization implements ServletContextListener { + + /** + * Default constructor. + */ + public ServletInitialization() { + } + + + @Override + public void contextInitialized(ServletContextEvent event) { + + try { +// ServletContext sc = event.getServletContext(); +// String datasourceString = sc.getInitParameter("datasource"); +// Context initContext = new InitialContext(); +// Context envContext = (Context) initContext.lookup("java:/comp/env"); +// DataSource ds = (DataSource) envContext.lookup("datasourceString"); +// +// +// sc.setAttribute("datasourceObject", ds); + + Logger.getLogger("Creating Data Source /Initial Context"); + + + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + Logger.getLogger("Error occured"); + + + } + Logger.getLogger("Made it outside the try/catch for data source/servlet initialization"); + } + + + @Override + public void contextDestroyed(ServletContextEvent event) { + + } + +} diff --git a/src/main/java/com/moodmapper/servlet/SignUpServlet.java b/src/main/java/com/moodmapper/servlet/SignUpServlet.java index 7ddf1a9..12394d3 100644 --- a/src/main/java/com/moodmapper/servlet/SignUpServlet.java +++ b/src/main/java/com/moodmapper/servlet/SignUpServlet.java @@ -36,7 +36,7 @@ public SignUpServlet(){ @Override public void init() { - emf = Persistence.createEntityManagerFactory("MoodMapperTestPU--noDataSource"); + emf = Persistence.createEntityManagerFactory("MoodMapperDevPU--noDataSource"); em = emf.createEntityManager(); user = new UserEntity(); } diff --git a/src/main/java/com/moodmapper/servlet/UsernameAvailabilityServlet.java b/src/main/java/com/moodmapper/servlet/UsernameAvailabilityServlet.java index 56a2251..0a49bf8 100644 --- a/src/main/java/com/moodmapper/servlet/UsernameAvailabilityServlet.java +++ b/src/main/java/com/moodmapper/servlet/UsernameAvailabilityServlet.java @@ -30,7 +30,7 @@ public class UsernameAvailabilityServlet extends HttpServlet { @Override public void init() { - emf = Persistence.createEntityManagerFactory("MoodMapperTestPU--noDataSource"); + emf = Persistence.createEntityManagerFactory("MoodMapperDevPU--noDataSource"); } @Override diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml index d6dddbf..2714460 100644 --- a/src/main/resources/META-INF/persistence.xml +++ b/src/main/resources/META-INF/persistence.xml @@ -15,7 +15,7 @@ - + org.eclipse.persistence.jpa.PersistenceProvider com.moodmapper.entity.EntityObject MoodMapperService.MoodMapperService @@ -26,11 +26,11 @@ false - + - + diff --git a/src/main/webapp/META-INF/context.xml b/src/main/webapp/META-INF/context.xml index 0a98a6f..f9b0fcc 100644 --- a/src/main/webapp/META-INF/context.xml +++ b/src/main/webapp/META-INF/context.xml @@ -1,5 +1,5 @@ - - - + + + diff --git a/src/main/webapp/WEB-INF/inc/head.jsp b/src/main/webapp/WEB-INF/inc/head.jsp index bcf82df..fb54b1e 100644 --- a/src/main/webapp/WEB-INF/inc/head.jsp +++ b/src/main/webapp/WEB-INF/inc/head.jsp @@ -11,6 +11,7 @@ + diff --git a/src/main/webapp/WEB-INF/inc/navbar.jsp b/src/main/webapp/WEB-INF/inc/navbar.jsp index 5123de4..3cc766f 100644 --- a/src/main/webapp/WEB-INF/inc/navbar.jsp +++ b/src/main/webapp/WEB-INF/inc/navbar.jsp @@ -7,7 +7,7 @@