Fixed linking issues and include problem. Changed persistence.xml file.

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(); 
 

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(); 
     }

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) {
+
+    }
+
+}

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(); 
     }

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

src/main/resources/META-INF/persistence.xml

@@ -15,7 +15,7 @@
       <property name="eclipselink.logging.level" value="FINE"/>
     </properties>
   </persistence-unit>
-  <persistence-unit name="MoodMapperTestPU--noDataSource" transaction-type="RESOURCE_LOCAL">
+  <persistence-unit name="MoodMapperDevPU--noDataSource" transaction-type="RESOURCE_LOCAL">
     <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
     <class>com.moodmapper.entity.EntityObject</class>
     <class>MoodMapperService.MoodMapperService</class>
@@ -26,11 +26,11 @@
     <exclude-unlisted-classes>false</exclude-unlisted-classes>
     <properties>
       <property name="eclipselink.canonicalmodel.subpackage" value="two"/>
-      <property name="javax.persistence.jdbc.url" value="jdbc:mysql://localhost:3306/mood_mappertestdb"/>
+      <property name="javax.persistence.jdbc.url" value="jdbc:mysql://localhost:3306/mood_mapper"/>
       <property name="javax.persistence.jdbc.user" value="root"/>
       <property name="javax.persistence.jdbc.driver" value="com.mysql.jdbc.Driver"/>
       <property name="javax.persistence.jdbc.password" value=""/>
-<!--      <property name="eclipselink.ddl-generation" value="create-tables"/>-->
+      <!--      <property name="eclipselink.ddl-generation" value="create-tables"/>-->
       <property name="eclipselink.create-ddl-jdbc-file-name" value="createDDL_ddlGeneration.jdbc"/>
       <property name="eclipselink.drop-ddl-jdbc-file-name" value="dropDDL_ddlGeneration.jdbc"/>
       <property name="eclipselink.ddl-generation.output-mode" value="both"/>

src/main/webapp/META-INF/context.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Context antiJARLocking="true" path="/app">
-  <Resource auth="Container" driverClassName="com.mysql.jdbc.Driver" factory="org.apache.tomcat.jdbc.pool.DataSourceFactory" maxActive="20" maxIdle="10" maxWait="-1" name="java:comp/env/jdbc/devdb" password="" type="javax.sql.DataSource" url="jdbc:mysql://localhost:3306/mood_mapper" username="root"/>
-  <Resource auth="Container" driverClassName="com.mysql.jdbc.Driver" factory="org.apache.tomcat.jdbc.pool.DataSourceFactory" maxActive="5" maxIdle="5" maxWait="-1" name="java:comp/env/jdbc/testdb" password="" type="javax.sql.DataSource" url="jdbc:mysql://localhost:3306/mood_mappertestdb" username="root"/>
+<Context antiJARLocking="true" path="">
+  <Resource auth="Container" driverClassName="com.mysql.jdbc.Driver" factory="org.apache.tomcat.jdbc.pool.DataSourceFactory" maxActive="20" maxIdle="10" maxWait="-1" name="jdbc/DevDB" password="" type="javax.sql.DataSource" url="jdbc:mysql://localhost:3306/mood_mapper" username="root"/>
+  <Resource auth="Container" driverClassName="com.mysql.jdbc.Driver" factory="org.apache.tomcat.jdbc.pool.DataSourceFactory" maxActive="5" maxIdle="5" maxWait="-1" name="jdbc/TestDB" password="" type="javax.sql.DataSource" url="jdbc:mysql://localhost:3306/mood_mappertestdb" username="root"/>
 </Context>

src/main/webapp/WEB-INF/inc/head.jsp

@@ -11,6 +11,7 @@
 	 <script src="https://storage.googleapis.com/code.getmdl.io/1.0.5/material.min.js"></script>
    <link rel="stylesheet" href="https://storage.googleapis.com/code.getmdl.io/1.0.5/material.blue_grey-blue.min.css" /> 
 
+
 	 <!-- Material Design icon font -->
    <link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
 

src/main/webapp/WEB-INF/inc/navbar.jsp

@@ -7,7 +7,7 @@
     <div class="mdl-layout-spacer"></div>
     <!-- Navigation -->
     <nav class="mdl-navigation">
-      <a href="/app/new-status/">
+      <a href="/app/new_status.jsp">
       <button class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored">
         <i class="material-icons">add</i>
       </button>

src/main/webapp/WEB-INF/inc/navdrawer.jsp

@@ -3,9 +3,9 @@
 	<span class="mdl-layout-title">Mood Mapper</span>
 	<nav class="mdl-navigation">
 		<a class="mdl-navigation__link" href="/app/index.jsp"><i class="mdl-color-text--blue-grey-400 material-icons" role="presentation">home</i>Home</a>
-		<a class="mdl-navigation__link" href="/app/my-groups/index.jsp"><i class="material-icons">people</i>My Groups</a>
-		<a class="mdl-navigation__link" href="/app/mood-maps/index.jsp"><i class="material-icons">insert_chart</i>Mood Maps</a>
-		<a class="mdl-navigation__link" href="/app/new-status/index.jsp"><i class="material-icons">add_circle</i>New Status</a>
+		<a class="mdl-navigation__link" href="/app/my_groups.jsp"><i class="material-icons">people</i>My Groups</a>
+		<a class="mdl-navigation__link" href="/app/mood_maps.jsp"><i class="material-icons">insert_chart</i>Mood Maps</a>
+		<a class="mdl-navigation__link" href="/app/new_status.jsp"><i class="material-icons">add_circle</i>New Status</a>
 		<a class="mdl-navigation__link" href=""><i class="material-icons">exit_to_app</i>Sign out</a>
 	</nav>
 </div>

src/main/webapp/WEB-INF/web.xml

@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <web-app id="WebApp_ID" version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+    <context-param>
+        <param-name>persistent-unit-name</param-name>
+        <param-value>MoodMapperDevPU--noDataSource</param-value>
+    </context-param>
     <servlet>
         <servlet-name>UsernameAvailabilityServlet</servlet-name>
         <servlet-class>com.moodmapper.servlet.UsernameAvailabilityServlet</servlet-class>

src/main/webapp/app/advisory.jsp

@@ -10,13 +10,13 @@ String pageTitle = "Advisory";
 %>
 <!DOCTYPE html>
 <html>
-<jsp:include page="../../WEB-INF/inc/head.jsp" flush="true">
+<jsp:include page="/WEB-INF/inc/head.jsp" flush="true">
     <jsp:param name="pageTitle" value="<%=pageTitle%>" />
 </jsp:include>
 <body>
-    <jsp:include page="../../WEB-INF/inc/background.jsp"/>
-    <jsp:include page="../../WEB-INF/inc/navbar.jsp"/>
-    <jsp:include page="../../WEB-INF/inc/navdrawer.jsp"/>
+    <jsp:include page="/WEB-INF/inc/background.jsp"/>
+    <jsp:include page="/WEB-INF/inc/navbar.jsp"/>
+    <jsp:include page="/WEB-INF/inc/navdrawer.jsp"/>
 
       <main class="mdl-layout__content">
         <div class="page-content">

src/main/webapp/app/create_group.jsp

@@ -11,12 +11,12 @@ String pageTitle = "Create Group";
 <!DOCTYPE html>
 <html>
 <jsp:include page="/WEB-INF/inc/head.jsp" flush="true">
-    <jsp:param name="pageTitle" value="<%=pageTitle%>" />
+    <jsp:param name="pageTitle" value="" />
 </jsp:include>
 <body>
-    <jsp:include page="WEB-INF/inc/background.jsp"/>
-    <jsp:include page="WEB-INF/inc/navbar.jsp"/>
-    <jsp:include page="WEB-INF/inc/navdrawer.jsp"/>
+    <jsp:include page="/WEB-INF/inc/background.jsp"/>
+    <jsp:include page="/WEB-INF/inc/navbar.jsp"/>
+    <jsp:include page="/WEB-INF/inc/navdrawer.jsp"/>
 
       <main class="mdl-layout__content">
         <div class="page-content">

src/main/webapp/app/home.jsp

@@ -14,9 +14,9 @@ String pageTitle = "New Status";
     <jsp:param name="pageTitle" value="<%=pageTitle%>" />
 </jsp:include>
 <body>
-    <jsp:include page="WEB-INF/inc/background.jsp"/>
-    <jsp:include page="WEB-INF/inc/navbar.jsp"/>
-    <jsp:include page="WEB-INF/inc/navdrawer.jsp"/>
+    <jsp:include page="/WEB-INF/inc/background.jsp"/>
+    <jsp:include page="/WEB-INF/inc/navbar.jsp"/>
+    <jsp:include page="/WEB-INF/inc/navdrawer.jsp"/>
 
       <main class="mdl-layout__content">
         <div class="page-content">

src/main/webapp/app/index.jsp

@@ -0,0 +1,51 @@
+<%-- 
+    Document   : index
+    Created on : Oct 13, 2015, 8:15:08 PM
+    Author     : Dave Messer
+--%>
+
+<%@page language="java" contentType="text/html" pageEncoding="UTF-8"%>
+<%
+String pageTitle = "Home";
+%>
+<!DOCTYPE html>
+<html>
+<jsp:include page="/WEB-INF/inc/head.jsp" flush="true">
+    <jsp:param name="pageTitle" value="<%=pageTitle%>" />
+</jsp:include>
+<body>
+    <jsp:include page="/WEB-INF/inc/background.jsp"/>
+    <jsp:include page="/WEB-INF/inc/navbarhome.jsp"/>
+      <main class="mdl-layout__content">
+        <div class="page-content">
+            <div class="mdl-button mdl-js-button mdl-button--accent g-signin2" data-onsuccess="onSignIn"
+                 style="
+                    position: fixed;
+                    top: 50%;
+                    left: 50%;
+                    transform: translate(-50%, -50%);
+                    ">
+            </div>
+            <a class="mdl-button mdl-js-button mdl-button--accent" href="signup.jsp"
+               style="
+                    position: fixed;
+                    background-color: #fff;
+                    top: 60%;
+                    left: 50%;
+                    transform: translate(-50%, -50%);
+                    ">Signup/Login</a>
+        </div>
+      </main>
+
+      <script>function onSignIn(googleUser) {
+        var profile = googleUser.getBasicProfile();
+        console.log('ID: ' + profile.getId()); // Do not send to your backend! Use an ID token instead.
+        console.log('Name: ' + profile.getName());
+        console.log('Image URL: ' + profile.getImageUrl());
+        console.log('Email: ' + profile.getEmail());
+      }</script>
+
+    </div>
+  </body>
+</body>
+</html>

src/main/webapp/app/join_group.jsp

@@ -14,9 +14,9 @@ String pageTitle = "Join Group";
     <jsp:param name="pageTitle" value="<%=pageTitle%>" />
 </jsp:include>
 <body>
-    <jsp:include page="WEB-INF/inc/background.jsp"/>
-    <jsp:include page="WEB-INF/inc/navbar.jsp"/>
-    <jsp:include page="WEB-INF/inc/navdrawer.jsp"/>
+    <jsp:include page="/WEB-INF/inc/background.jsp"/>
+    <jsp:include page="/WEB-INF/inc/navbar.jsp"/>
+    <jsp:include page="/WEB-INF/inc/navdrawer.jsp"/>
 
       <main class="mdl-layout__content">
         <div class="page-content">

src/main/webapp/app/mood_maps.jsp

@@ -14,9 +14,9 @@ String pageTitle = "Mood Maps";
     <jsp:param name="pageTitle" value="<%=pageTitle%>" />
 </jsp:include>
 <body>
-    <jsp:include page="WEB-INF/inc/background.jsp"/>
-    <jsp:include page="WEB-INF/inc/navbar.jsp"/>
-    <jsp:include page="WEB-INF/inc/navdrawer.jsp"/>
+    <jsp:include page="/WEB-INF/inc/background.jsp"/>
+    <jsp:include page="/WEB-INF/inc/navbar.jsp"/>
+    <jsp:include page="/WEB-INF/inc/navdrawer.jsp"/>
 
       <main class="mdl-layout__content">
         <div class="page-content">

src/main/webapp/app/my_groups.jsp

@@ -14,9 +14,9 @@ String pageTitle = "My Groups";
     <jsp:param name="pageTitle" value="<%=pageTitle%>" />
 </jsp:include>
 <body>
-    <jsp:include page="WEB-INF/inc/background.jsp"/>
-    <jsp:include page="WEB-INF/inc/navbar.jsp"/>
-    <jsp:include page="WEB-INF/inc/navdrawer.jsp"/>
+    <jsp:include page="/WEB-INF/inc/background.jsp"/>
+    <jsp:include page="/WEB-INF/inc/navbar.jsp"/>
+    <jsp:include page="/WEB-INF/inc/navdrawer.jsp"/>
 
       <main class="mdl-layout__content">
         <div class="page-content">

src/main/webapp/app/new_status.jsp

@@ -10,13 +10,13 @@ String pageTitle = "App";
 %>
 <!DOCTYPE html>
 <html>
-<jsp:include page="../WEB-INF/inc/head.jsp" flush="true">
+<jsp:include page="/WEB-INF/inc/head.jsp" flush="true">
     <jsp:param name="pageTitle" value="<%=pageTitle%>" />
 </jsp:include>
 <body>
-    <jsp:include page="../WEB-INF/inc/background.jsp"/>
-    <jsp:include page="../WEB-INF/inc/navbar.jsp"/>
-    <jsp:include page="../WEB-INF/inc/navdrawer.jsp"/>
+    <jsp:include page="/WEB-INF/inc/background.jsp"/>
+    <jsp:include page="/WEB-INF/inc/navbar.jsp"/>
+    <jsp:include page="/WEB-INF/inc/navdrawer.jsp"/>
 
       <main class="mdl-layout__content">
         <div class="page-content">

src/main/webapp/signup.jsp → src/main/webapp/app/signup.jsp

@@ -9,19 +9,19 @@
 <html>
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <link rel="stylesheet" href="css/styles.css" media="screen" charset="utf-8" />
+        <link rel="stylesheet" href="/css/signup.css" media="screen" charset="utf-8" />
         <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
         <script src="https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.14/angular.min.js"></script>
-        <script src="js/app.js"></script>
+        <script src="/js/signup.js"></script>
         <title>Sign-Up Form</title>
     </head>
     <!-- Google Login -->
-
+<!--
     <div class="google-login">
         <a href="#" ><img src="http://app.dynamiccreative.com/assets/google-plus-sign-in-connect-1d4043fc5b3dc76beb2663e8e70cc1b1.jpg" width="100%"/></a>
-    </div>
+    </div>-->
     <!--Google Login-->
-    <div class="form-wrap" ng-app="loginOrSignUpForm">
+    <div id="registration" class="form-wrap" ng-app="loginOrSignUpForm">
 
         <div class="tabs">