Merge remote-tracking branch 'remotes/origin/Cecilia' into samurey

Conflicts:
	EjercitarServer/build/classes/beans/AdministracionBean.class
	EjercitarServer/build/classes/beans/AdministracionBeanRemote.class
	EjercitarServer/build/classes/beans/EjercitarWSBean.class
	EjercitarWeb/build/classes/src/NuevoEjercicioServlet.class
	EjercitarWeb/build/classes/src/NuevoTemaServlet.class

3 files changed, 14 insertions, 6 deletions

diff --git a/EjercitarJPA/src/model/Alumno.java b/EjercitarJPA/src/model/Alumno.java
index 45d1fbb..b878a19 100644
--- a/EjercitarJPA/src/model/Alumno.java
+++ b/EjercitarJPA/src/model/Alumno.java
@@ -73,13 +73,13 @@ public class Alumno implements Serializable {
     @ManyToOne
     private Curso curso;
     @Transient
-    private String tipoAlumno;
+    private Double tipoAlumno;
 
-    public String getTipoAlumno() {
+    public Double getTipoAlumno() {
 		return tipoAlumno;
 	}
 
-	public void setTipoAlumno(String tipoAlumno) {
+	public void setTipoAlumno(Double tipoAlumno) {
 		this.tipoAlumno = tipoAlumno;
 	}
 
diff --git a/EjercitarJPA/src/model/Curso.java b/EjercitarJPA/src/model/Curso.java
index cf34ae6..dea2e82 100644
--- a/EjercitarJPA/src/model/Curso.java
+++ b/EjercitarJPA/src/model/Curso.java
@@ -9,6 +9,7 @@ import java.util.List;
 import javax.persistence.Basic;
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
@@ -49,10 +50,11 @@ public class Curso implements Serializable {
     @Size(max = 1)
     @Column(name = "turno")
     private String turno;
-    @JoinTable(name = "curso_profesor", joinColumns = {
+    /*@JoinTable(name = "curso_profesor", joinColumns = {
         @JoinColumn(name = "id_curso", referencedColumnName = "id_curso")}, inverseJoinColumns = {
         @JoinColumn(name = "id_profesor", referencedColumnName = "id_profesor")})
-    @ManyToMany
+    @ManyToMany*/
+    @ManyToMany(mappedBy = "cursoList", fetch=FetchType.EAGER)
     private List<Profesor> profesorList;
     @JoinColumn(name = "escuela", referencedColumnName = "id_escuela")
     @ManyToOne
diff --git a/EjercitarJPA/src/model/Profesor.java b/EjercitarJPA/src/model/Profesor.java
index 1aca780..76a14d4 100644
--- a/EjercitarJPA/src/model/Profesor.java
+++ b/EjercitarJPA/src/model/Profesor.java
@@ -14,6 +14,8 @@ import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
 import javax.persistence.ManyToMany;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQuery;
@@ -72,7 +74,11 @@ public class Profesor implements Serializable {
     @Size(max = 10)
     @Column(name = "password")
     private String password;
-    @ManyToMany(mappedBy = "profesorList", fetch=FetchType.EAGER)
+    //@ManyToMany(mappedBy = "profesorList", fetch=FetchType.EAGER)
+    @JoinTable(name = "curso_profesor", joinColumns = {
+            @JoinColumn(name = "id_profesor", referencedColumnName = "id_profesor")}, inverseJoinColumns = {
+            @JoinColumn(name = "id_curso", referencedColumnName = "id_curso")})
+    @ManyToMany
     private List<Curso> cursoList;
     @OneToMany(mappedBy = "profesor")
     private List<Ejercicio> ejercicioList;