HOLY FUCKING SHIT, IT WORKS

WOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO
591291-hvl · Apr 4, 2022 · c6eb681 · c6eb681
1 parent ff36707
commit c6eb681
Show file tree

Hide file tree

Showing 65 changed files with 377 additions and 52 deletions.
diff --git a/.idea/artifacts/Yatzy_ear.xml b/.idea/artifacts/Yatzy_ear.xml
diff --git a/.idea/artifacts/Yatzy_ear_exploded.xml b/.idea/artifacts/Yatzy_ear_exploded.xml
diff --git a/.idea/artifacts/Yatzy_war_exploded.xml b/.idea/artifacts/Yatzy_war_exploded.xml
diff --git a/.idea/libraries/JAX_WS_Glassfish___JAX_WS_2_2_RI___Metro_1_X___JWSDP_2_2.xml b/.idea/libraries/JAX_WS_Glassfish___JAX_WS_2_2_RI___Metro_1_X___JWSDP_2_2.xml
diff --git a/.idea/webContexts.xml b/.idea/webContexts.xml
diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+
diff --git a/META-INF/application.xml b/META-INF/application.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application xmlns="https://jakarta.ee/xml/ns/jakartaee"
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/application_9.xsd"
+             version="9">
+    <module id="JavaEEHelloWorld-Web">
+        <web>
+            <web-uri>JavaEEHelloWorld.war</web-uri>
+            <context-root>JavaEEHelloWorldWeb</context-root>
+        </web>
+    </module>
+
+</application>
diff --git a/lib/FastInoset.jar b/lib/FastInoset.jar
diff --git a/lib/gmbal-api-only.jar b/lib/gmbal-api-only.jar
diff --git a/lib/ha-api.jar b/lib/ha-api.jar
diff --git a/lib/javax.annotation_2.jar b/lib/javax.annotation_2.jar
diff --git a/lib/jaxb-api.jar b/lib/jaxb-api.jar
diff --git a/lib/jaxb-impl.jar b/lib/jaxb-impl.jar
diff --git a/lib/jaxb-xjc.jar b/lib/jaxb-xjc.jar
diff --git a/lib/jaxws-api.jar b/lib/jaxws-api.jar
diff --git a/lib/jaxws-rt.jar b/lib/jaxws-rt.jar
diff --git a/lib/jaxws-tools.jar b/lib/jaxws-tools.jar
diff --git a/lib/jsr181-api.jar b/lib/jsr181-api.jar
diff --git a/lib/mail.jar b/lib/mail.jar
diff --git a/lib/management-api.jar b/lib/management-api.jar
diff --git a/lib/mimepull.jar b/lib/mimepull.jar
diff --git a/lib/policy.jar b/lib/policy.jar
diff --git a/lib/saaj-api.jar b/lib/saaj-api.jar
diff --git a/lib/saaj-impl.jar b/lib/saaj-impl.jar
diff --git a/lib/stax-ex.jar b/lib/stax-ex.jar
diff --git a/lib/stax2-api.jar b/lib/stax2-api.jar
diff --git a/lib/streambuffer.jar b/lib/streambuffer.jar
diff --git a/lib/woodstox-core-asl.jar b/lib/woodstox-core-asl.jar
diff --git a/out/artifacts/Yatzy_war_exploded/META-INF/MANIFEST.MF b/out/artifacts/Yatzy_war_exploded/META-INF/MANIFEST.MF
@@ -0,0 +1,5 @@
+Manifest-Version: 1.0
+Created-By: IntelliJ IDEA
+Built-By: 47472
+Build-Jdk: Oracle OpenJDK version 14.0.2
+
diff --git a/out/artifacts/Yatzy_war_exploded/WEB-INF/classes/META-INF/MANIFEST.MF b/out/artifacts/Yatzy_war_exploded/WEB-INF/classes/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: jpaMain
+
diff --git a/out/artifacts/Yatzy_war_exploded/WEB-INF/classes/META-INF/persistence.xml b/out/artifacts/Yatzy_war_exploded/WEB-INF/classes/META-INF/persistence.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence"
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd"
+             version="3.0">
+    <persistence-unit name="personUnit"
+                      transaction-type="JTA">
+        <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
+        <jta-data-source>myDataSource</jta-data-source>
+        <class>entity.PersonEntity</class>
+        <properties>
+            <property name="eclipselink.weaving" value="false" />
+        </properties>
+    </persistence-unit>
+
+</persistence>
diff --git a/out/artifacts/Yatzy_war_exploded/WEB-INF/classes/META-INF/resources.xml b/out/artifacts/Yatzy_war_exploded/WEB-INF/classes/META-INF/resources.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<resources>
+    <Resource id="myDataSource" name="myDataSource" type="javax.sql.DataSource">
+	jdbcDriver = org.postgresql.Driver
+	jdbcUrl = jdbc:postgresql://ider-database.westeurope.cloudapp.azure.com:5432/h591291
+	userName = h591291
+	password = pass
+    </Resource>
+</resources>
+
diff --git a/out/artifacts/Yatzy_war_exploded/WEB-INF/classes/autoPlay/autoMain.class b/out/artifacts/Yatzy_war_exploded/WEB-INF/classes/autoPlay/autoMain.class
diff --git a/out/artifacts/Yatzy_war_exploded/WEB-INF/classes/autoPlay/autoPlayYatzy.class b/out/artifacts/Yatzy_war_exploded/WEB-INF/classes/autoPlay/autoPlayYatzy.class
diff --git a/out/artifacts/Yatzy_war_exploded/WEB-INF/classes/backend/Board.class b/out/artifacts/Yatzy_war_exploded/WEB-INF/classes/backend/Board.class
diff --git a/out/artifacts/Yatzy_war_exploded/WEB-INF/classes/backend/CUI.class b/out/artifacts/Yatzy_war_exploded/WEB-INF/classes/backend/CUI.class
diff --git a/out/artifacts/Yatzy_war_exploded/WEB-INF/classes/backend/Dice.class b/out/artifacts/Yatzy_war_exploded/WEB-INF/classes/backend/Dice.class
diff --git a/out/artifacts/Yatzy_war_exploded/WEB-INF/classes/backend/DiceShaker.class b/out/artifacts/Yatzy_war_exploded/WEB-INF/classes/backend/DiceShaker.class
diff --git a/out/artifacts/Yatzy_war_exploded/WEB-INF/classes/backend/Main.class b/out/artifacts/Yatzy_war_exploded/WEB-INF/classes/backend/Main.class
diff --git a/out/artifacts/Yatzy_war_exploded/WEB-INF/classes/backend/Player.class b/out/artifacts/Yatzy_war_exploded/WEB-INF/classes/backend/Player.class
diff --git a/out/artifacts/Yatzy_war_exploded/WEB-INF/classes/backend/RoundUtils.class b/out/artifacts/Yatzy_war_exploded/WEB-INF/classes/backend/RoundUtils.class
diff --git a/out/artifacts/Yatzy_war_exploded/WEB-INF/classes/backend/Yatzy.class b/out/artifacts/Yatzy_war_exploded/WEB-INF/classes/backend/Yatzy.class
diff --git a/out/artifacts/Yatzy_war_exploded/WEB-INF/classes/dao/PersonDAO.class b/out/artifacts/Yatzy_war_exploded/WEB-INF/classes/dao/PersonDAO.class
diff --git a/out/artifacts/Yatzy_war_exploded/WEB-INF/classes/entity/PersonEntity.class b/out/artifacts/Yatzy_war_exploded/WEB-INF/classes/entity/PersonEntity.class
diff --git a/out/artifacts/Yatzy_war_exploded/WEB-INF/classes/jpaMain.class b/out/artifacts/Yatzy_war_exploded/WEB-INF/classes/jpaMain.class
diff --git a/out/artifacts/Yatzy_war_exploded/WEB-INF/classes/servlet/PersonServlet.class b/out/artifacts/Yatzy_war_exploded/WEB-INF/classes/servlet/PersonServlet.class
diff --git a/out/artifacts/Yatzy_war_exploded/WEB-INF/personServlet.jsp b/out/artifacts/Yatzy_war_exploded/WEB-INF/personServlet.jsp
@@ -0,0 +1,31 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ page language="java" contentType="text/html; charset=utf-8"
+		 pageEncoding="utf-8"%>
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="ISO-8859-1">
+<!-- Fra https://purecss.io/ -->
+<link rel="stylesheet"
+	href="https://unpkg.com/purecss@1.0.0/build/pure-min.css">
+<title>SpillerListe</title>
+</head>
+<body>
+	<h2>Spillerliste</h2>
+	<table class="pure-table">
+		<tr bgcolor="#cccccc">
+			<th align="left">Id</th>
+			<th align="left">Navn</th>
+
+		</tr>
+
+		<c:forEach items="${spillere}" var="s">
+
+
+		<td>${s.id}</td>
+		<td>${s.name}</td>
+
+		</c:forEach>
+	</table>
+</body>
+</html>
diff --git a/out/artifacts/Yatzy_war_exploded/WEB-INF/web.xml b/out/artifacts/Yatzy_war_exploded/WEB-INF/web.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd"
+         version="5.0">
+    <welcome-file-list>
+        <welcome-file>index.html</welcome-file>
+    </welcome-file-list>
+</web-app>
diff --git a/out/artifacts/Yatzy_war_exploded/index.html b/out/artifacts/Yatzy_war_exploded/index.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+	<meta charset="ISO-8859-1">
+	<title>
+		Yatzy
+	</title>
+</head>
+
+<body>
+	<h1>
+		Yatzy
+	</h1>
+	<h2>
+		<a href="PersonServlet">Se personer</a>
+	</h2>
+
+</body>
+
+</html>
diff --git a/pom.xml b/pom.xml
@@ -11,9 +11,9 @@
 
         <!-- https://mvnrepository.com/artifact/junit/junit -->
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.13.2</version>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>5.8.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -33,6 +33,25 @@
             <artifactId>postgresql</artifactId>
             <version>42.3.3</version>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/org.actframework/act-eclipselink -->
+        <dependency>
+            <groupId>org.eclipse.persistence</groupId>
+            <artifactId>eclipselink</artifactId>
+            <version>2.6.3</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/javax.servlet/jstl -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jstl</artifactId>
+            <version>1.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>tomcat-catalina</artifactId>
+            <version>9.0.52</version>
+            <scope>provided</scope>
+        </dependency>
+
 
 
     </dependencies>

diff --git a/src/main/java/dao/PersonDAO.java b/src/main/java/dao/PersonDAO.java
@@ -1,31 +1,25 @@
 package dao;
 
 import entity.PersonEntity;
-import jakarta.persistence.EntityManager;
-import jakarta.persistence.EntityManagerFactory;
-import jakarta.persistence.Persistence;
-import jakarta.persistence.TypedQuery;
 
+import java.beans.JavaBean;
 import java.util.List;
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
 
+@Stateless
+@JavaBean
 public class PersonDAO {
-    private EntityManagerFactory emf;
 
-    public PersonDAO() {
-        emf = Persistence.createEntityManagerFactory("PersonUnit");
-    }
+    @PersistenceContext(name = "personUnit")
+    private EntityManager em;
 
+    public synchronized List<PersonEntity> getAllPersons() {
+        return em.createQuery("SELECT p FROM PersonEntity p", PersonEntity.class).getResultList();
+    }
 
-    public List<PersonEntity> getAllPersons() {
-        EntityManager em = emf.createEntityManager();
-        List<PersonEntity> persons = null;
-        try {
-            TypedQuery<PersonEntity> query = em.createQuery("Select p from PersonEntity p", PersonEntity.class);
-            persons = query.getResultList();
-        } finally {
-            em.close();
-        }
-        return persons;
+    public void savePerson(PersonEntity person) {
+        em.persist(person);
     }
 }
-
diff --git a/src/main/java/entity/PersonEntity.java b/src/main/java/entity/PersonEntity.java
@@ -3,7 +3,7 @@
 import jakarta.persistence.*;
 
 @Entity
-@Table(name = "Person", schema = "public", catalog = "h591291")
+@Table(name = "person", schema = "public")
 public class PersonEntity {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Id
@@ -13,6 +13,18 @@ public class PersonEntity {
     @Column(name = "name")
     private String name;
 
+    public PersonEntity(){
+
+    }
+
+    public PersonEntity(String id, String name){
+        this.id = id;
+        this.name = name;
+    }
+
+
+
+
     public String getId() {
         return id;
     }
@@ -29,6 +41,14 @@ public void setName(String name) {
         this.name = name;
     }
 
+    @Override
+    public String toString() {
+        return "PersonEntity{" +
+                "id='" + id + '\'' +
+                ", name='" + name + '\'' +
+                '}';
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;

diff --git a/src/main/java/jpaMain.java b/src/main/java/jpaMain.java
@@ -18,6 +18,9 @@ public static void main(String[] args){
 
         PersonDAO pDAO = new PersonDAO();
 
+        PersonEntity p1 = new PersonEntity("003", "Petter");
+        pDAO.savePerson(p1);
+
         List<PersonEntity> persons = pDAO.getAllPersons();
 
         for(PersonEntity p : persons){

diff --git a/src/main/java/servlet/PersonServlet.java b/src/main/java/servlet/PersonServlet.java
@@ -0,0 +1,48 @@
+package servlet;
+
+import dao.PersonDAO;
+import entity.PersonEntity;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
+import jakarta.servlet.annotation.*;
+
+import javax.ejb.EJB;
+import java.io.IOException;
+import java.util.List;
+
+@WebServlet(name = "PersonServlet", value = "/PersonServlet")
+public class PersonServlet extends HttpServlet {
+    private static final long serialVersionUID = 1L;
+
+
+    @EJB
+    private PersonDAO pDAO;
+
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+
+
+        // Henter alle deltagerene sortert etter navn
+        List<PersonEntity> spillere = pDAO.getAllPersons();
+
+        // Setter deltagerene som atributt i requesten, hentes ut i jsp siden...
+        request.setAttribute("spillere", spillere);
+
+        // G� til deltagerlisten
+        request.getRequestDispatcher("WEB-INF/personServlet.jsp").forward(request, response);
+
+
+    }
+
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+
+
+        // Henter alle deltagerene sortert etter navn
+        List<PersonEntity> spillere = pDAO.getAllPersons();
+
+        // Setter deltagerene som atributt i requesten, hentes ut i jsp siden...
+        request.setAttribute("spillere", spillere);
+
+        // G� til deltagerlisten
+        request.getRequestDispatcher("WEB-INF/personServlet.jsp").forward(request, response);
+    }
+}