From 2e36d80fbf7a0f0a6a1e6740a2ea6bef13ddd1c9 Mon Sep 17 00:00:00 2001
From: Felipe <felipe.parodi@fing.edu.uy>
Date: Thu, 12 Mar 2020 20:50:46 -0300
Subject: [PATCH] Fix para deploy
---
.../src/main/java/edu/proygrado/ejb/LoginEJB.java | 8 +++++++-
.../main/java/edu/proygrado/servicios/login/LoginRS.java | 2 +-
Servidor JEE/src/main/resources/META-INF/persistence.xml | 3 ++-
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/Servidor JEE/src/main/java/edu/proygrado/ejb/LoginEJB.java b/Servidor JEE/src/main/java/edu/proygrado/ejb/LoginEJB.java
index 16e8ea9..c556237 100644
--- a/Servidor JEE/src/main/java/edu/proygrado/ejb/LoginEJB.java
+++ b/Servidor JEE/src/main/java/edu/proygrado/ejb/LoginEJB.java
@@ -22,6 +22,7 @@ import javax.ejb.TransactionManagement;
import javax.ejb.TransactionManagementType;
import javax.inject.Inject;
import javax.persistence.EntityManager;
+import javax.persistence.EntityTransaction;
import javax.persistence.PersistenceContext;
import javax.persistence.TypedQuery;
import javax.servlet.ServletContext;
@@ -402,6 +403,8 @@ public class LoginEJB {
}
public String cargarDatosDePrueba() {
+ try {
+ userTransaction.begin();
Liceo varela = new Liceo("Colegio Varela");
em.persist(varela);
@@ -456,7 +459,10 @@ public class LoginEJB {
em.persist(mate);
segundoAnio.addAlumno(invitado);
-
+ userTransaction.commit();
+ } catch(Exception e) {
+ return "error";
+ }
return "ok";
}
diff --git a/Servidor JEE/src/main/java/edu/proygrado/servicios/login/LoginRS.java b/Servidor JEE/src/main/java/edu/proygrado/servicios/login/LoginRS.java
index 1a713b4..5e66eed 100644
--- a/Servidor JEE/src/main/java/edu/proygrado/servicios/login/LoginRS.java
+++ b/Servidor JEE/src/main/java/edu/proygrado/servicios/login/LoginRS.java
@@ -34,7 +34,7 @@ public class LoginRS{
@GET
@Path("/datosDePrueba")
- public String cargarDatosDePrueba(){
+ public String cargarDatosDePrueba() {
return loginEJB.cargarDatosDePrueba();
}
diff --git a/Servidor JEE/src/main/resources/META-INF/persistence.xml b/Servidor JEE/src/main/resources/META-INF/persistence.xml
index a4db38c..a6fef8a 100644
--- a/Servidor JEE/src/main/resources/META-INF/persistence.xml
+++ b/Servidor JEE/src/main/resources/META-INF/persistence.xml
@@ -32,12 +32,13 @@
<class>edu.proygrado.modelo.Evaluacion</class>
<class>edu.proygrado.modelo.Grupo</class>
<class>edu.proygrado.modelo.GrupoPK</class>
- <class>edu.proygrado.modelo.Liceo</class>
+ <class>edu.proygrado.modelo.Licseo</class>
<class>edu.proygrado.modelo.LiceoPK</class>
<class>edu.proygrado.modelo.Usuario</class>
<class>edu.proygrado.modelo.Sesion</class>
<properties>
<property name="javax.persistence.schema-generation.database.action" value="none" />
+ <property name="hibernate.hbm2ddl.auto" value="update"/>
</properties>
</persistence-unit>
--
GitLab