Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamu <samurey@gmail.com>2013-03-24 15:28:42 (GMT)
committer Samu <samurey@gmail.com>2013-03-24 15:28:42 (GMT)
commit4ba55bd9b118a50f0ac1626d31b1b2dc64c69730 (patch)
treeb75680776026e2766243e9d4c8f2027b691ae044
parent914ae3c7bc78f5f519213518bad3083ab45dfb21 (diff)
se agrego tema x concepto
-rw-r--r--EjercitarJPA/.classpath7
-rw-r--r--EjercitarJPA/.project2
-rw-r--r--EjercitarJPA/.settings/org.eclipse.jpt.entitygen.ejercitarconnection.publicbin1726 -> 2642 bytes
-rw-r--r--EjercitarJPA/.settings/org.eclipse.wst.common.component6
-rw-r--r--EjercitarJPA/.settings/org.eclipse.wst.common.project.facet.core.xml4
-rw-r--r--EjercitarJPA/.settings/org.jboss.ide.eclipse.as.core.prefs2
-rw-r--r--EjercitarJPA/build/classes/META-INF/MANIFEST.MF3
-rw-r--r--EjercitarJPA/build/classes/model/Alumno.classbin0 -> 5734 bytes
-rw-r--r--EjercitarJPA/build/classes/model/Asignatura.classbin0 -> 3940 bytes
-rw-r--r--EjercitarJPA/build/classes/model/Concepto.classbin4371 -> 4398 bytes
-rw-r--r--EjercitarJPA/build/classes/model/Curso.classbin0 -> 4773 bytes
-rw-r--r--EjercitarJPA/build/classes/model/EjercicioResueltoAlumno.classbin0 -> 3611 bytes
-rw-r--r--EjercitarJPA/build/classes/model/Profesor.classbin0 -> 4482 bytes
-rw-r--r--EjercitarJPA/build/classes/model/Sesion.classbin0 -> 5306 bytes
-rw-r--r--EjercitarJPA/build/classes/model/Tarea.classbin0 -> 3468 bytes
-rw-r--r--EjercitarJPA/build/classes/model/Tema.classbin4000 -> 4040 bytes
-rw-r--r--EjercitarJPA/src/META-INF/MANIFEST.MF3
-rw-r--r--EjercitarJPA/src/model/Concepto.java10
-rw-r--r--EjercitarJPA/src/model/Tema.java27
19 files changed, 43 insertions, 21 deletions
diff --git a/EjercitarJPA/.classpath b/EjercitarJPA/.classpath
index 70d889b..ab68b3e 100644
--- a/EjercitarJPA/.classpath
+++ b/EjercitarJPA/.classpath
@@ -1,11 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre6">
<attributes>
<attribute name="owner.project.facets" value="java"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.datatools.connectivity.jdt.DRIVERLIBRARY/PostgreSQL JDBC Driver"/>
+ <classpathentry kind="con" path="org.jboss.ide.eclipse.as.classpath.core.ejb3.classpathContainer/JBoss 6.x Runtime Server"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Hibernate"/>
+ <classpathentry kind="lib" path="C:/Users/Samu/Downloads/hibernate-distribution-3.6.4.Final/lib/jpa/hibernate-jpa-2.0-api-1.0.0.Final.jar"/>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+ <classpathentry kind="lib" path="C:/Users/Samu/Downloads/jboss-as-distribution-6.0.0.Final/jboss-6.0.0.Final/client/validation-api.jar"/>
<classpathentry kind="output" path="build/classes"/>
</classpath>
diff --git a/EjercitarJPA/.project b/EjercitarJPA/.project
index c34eca0..d35577d 100644
--- a/EjercitarJPA/.project
+++ b/EjercitarJPA/.project
@@ -27,6 +27,8 @@
</buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.hibernate.eclipse.console.hibernateNature</nature>
diff --git a/EjercitarJPA/.settings/org.eclipse.jpt.entitygen.ejercitarconnection.public b/EjercitarJPA/.settings/org.eclipse.jpt.entitygen.ejercitarconnection.public
index af47432..3206def 100644
--- a/EjercitarJPA/.settings/org.eclipse.jpt.entitygen.ejercitarconnection.public
+++ b/EjercitarJPA/.settings/org.eclipse.jpt.entitygen.ejercitarconnection.public
Binary files differ
diff --git a/EjercitarJPA/.settings/org.eclipse.wst.common.component b/EjercitarJPA/.settings/org.eclipse.wst.common.component
new file mode 100644
index 0000000..f7051ee
--- /dev/null
+++ b/EjercitarJPA/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+ <wb-module deploy-name="EjercitarJPA">
+ <wb-resource deploy-path="/" source-path="/src"/>
+ </wb-module>
+</project-modules>
diff --git a/EjercitarJPA/.settings/org.eclipse.wst.common.project.facet.core.xml b/EjercitarJPA/.settings/org.eclipse.wst.common.project.facet.core.xml
index 1e0e715..86b1c94 100644
--- a/EjercitarJPA/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/EjercitarJPA/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
- <fixed facet="java"/>
- <fixed facet="jpt.jpa"/>
+ <fixed facet="jst.utility"/>
<installed facet="java" version="1.6"/>
<installed facet="jpt.jpa" version="2.0"/>
+ <installed facet="jst.utility" version="1.0"/>
</faceted-project>
diff --git a/EjercitarJPA/.settings/org.jboss.ide.eclipse.as.core.prefs b/EjercitarJPA/.settings/org.jboss.ide.eclipse.as.core.prefs
new file mode 100644
index 0000000..c6c028c
--- /dev/null
+++ b/EjercitarJPA/.settings/org.jboss.ide.eclipse.as.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.jboss.ide.eclipse.as.core.singledeployable.deployableList=\n
diff --git a/EjercitarJPA/build/classes/META-INF/MANIFEST.MF b/EjercitarJPA/build/classes/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..5e94951
--- /dev/null
+++ b/EjercitarJPA/build/classes/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path:
+
diff --git a/EjercitarJPA/build/classes/model/Alumno.class b/EjercitarJPA/build/classes/model/Alumno.class
new file mode 100644
index 0000000..83ecdd9
--- /dev/null
+++ b/EjercitarJPA/build/classes/model/Alumno.class
Binary files differ
diff --git a/EjercitarJPA/build/classes/model/Asignatura.class b/EjercitarJPA/build/classes/model/Asignatura.class
new file mode 100644
index 0000000..e6e7f33
--- /dev/null
+++ b/EjercitarJPA/build/classes/model/Asignatura.class
Binary files differ
diff --git a/EjercitarJPA/build/classes/model/Concepto.class b/EjercitarJPA/build/classes/model/Concepto.class
index 1740ce0..8d0c4da 100644
--- a/EjercitarJPA/build/classes/model/Concepto.class
+++ b/EjercitarJPA/build/classes/model/Concepto.class
Binary files differ
diff --git a/EjercitarJPA/build/classes/model/Curso.class b/EjercitarJPA/build/classes/model/Curso.class
new file mode 100644
index 0000000..8d1c36a
--- /dev/null
+++ b/EjercitarJPA/build/classes/model/Curso.class
Binary files differ
diff --git a/EjercitarJPA/build/classes/model/EjercicioResueltoAlumno.class b/EjercitarJPA/build/classes/model/EjercicioResueltoAlumno.class
new file mode 100644
index 0000000..7bb5e09
--- /dev/null
+++ b/EjercitarJPA/build/classes/model/EjercicioResueltoAlumno.class
Binary files differ
diff --git a/EjercitarJPA/build/classes/model/Profesor.class b/EjercitarJPA/build/classes/model/Profesor.class
new file mode 100644
index 0000000..dc94039
--- /dev/null
+++ b/EjercitarJPA/build/classes/model/Profesor.class
Binary files differ
diff --git a/EjercitarJPA/build/classes/model/Sesion.class b/EjercitarJPA/build/classes/model/Sesion.class
new file mode 100644
index 0000000..dc6352d
--- /dev/null
+++ b/EjercitarJPA/build/classes/model/Sesion.class
Binary files differ
diff --git a/EjercitarJPA/build/classes/model/Tarea.class b/EjercitarJPA/build/classes/model/Tarea.class
new file mode 100644
index 0000000..67c2feb
--- /dev/null
+++ b/EjercitarJPA/build/classes/model/Tarea.class
Binary files differ
diff --git a/EjercitarJPA/build/classes/model/Tema.class b/EjercitarJPA/build/classes/model/Tema.class
index b0a7a5d..67a3dca 100644
--- a/EjercitarJPA/build/classes/model/Tema.class
+++ b/EjercitarJPA/build/classes/model/Tema.class
Binary files differ
diff --git a/EjercitarJPA/src/META-INF/MANIFEST.MF b/EjercitarJPA/src/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..5e94951
--- /dev/null
+++ b/EjercitarJPA/src/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path:
+
diff --git a/EjercitarJPA/src/model/Concepto.java b/EjercitarJPA/src/model/Concepto.java
index af2e8b9..a8cb860 100644
--- a/EjercitarJPA/src/model/Concepto.java
+++ b/EjercitarJPA/src/model/Concepto.java
@@ -17,7 +17,6 @@ import javax.persistence.JoinTable;
import javax.persistence.ManyToMany;
import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
-import javax.persistence.OneToMany;
import javax.persistence.Table;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
@@ -29,7 +28,7 @@ import javax.xml.bind.annotation.XmlTransient;
* @author Ceci
*/
@Entity
-@Table(name = "CONCEPTO")
+@Table(name = "concepto")
@XmlRootElement
@NamedQueries({
@NamedQuery(name = "Concepto.findAll", query = "SELECT c FROM Concepto c"),
@@ -53,12 +52,15 @@ public class Concepto implements Serializable {
@Size(min = 1, max = 2147483647)
@Column(name = "descripcion")
private String descripcion;
- @JoinTable(name = "EJERCICIO_CONCEPTO", joinColumns = {
+ @JoinTable(name = "ejercicio_concepto", joinColumns = {
@JoinColumn(name = "id_concepto", referencedColumnName = "id_concepto")}, inverseJoinColumns = {
@JoinColumn(name = "id_ejercicio", referencedColumnName = "id_ejercicio")})
@ManyToMany
private List<Ejercicio> ejercicioList;
- @OneToMany(mappedBy = "idConcepto")
+ @JoinTable(name = "tema_concepto", joinColumns = {
+ @JoinColumn(name = "id_concepto", referencedColumnName = "id_concepto")}, inverseJoinColumns = {
+ @JoinColumn(name = "id_tema", referencedColumnName = "id_tema")})
+ @ManyToMany
private List<Tema> temaList;
public Concepto() {
diff --git a/EjercitarJPA/src/model/Tema.java b/EjercitarJPA/src/model/Tema.java
index 1c6eb36..97b500b 100644
--- a/EjercitarJPA/src/model/Tema.java
+++ b/EjercitarJPA/src/model/Tema.java
@@ -12,8 +12,7 @@ import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
+import javax.persistence.ManyToMany;
import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.OneToMany;
@@ -28,7 +27,7 @@ import javax.xml.bind.annotation.XmlTransient;
* @author Ceci
*/
@Entity
-@Table(name = "TEMA")
+@Table(name = "tema")
@XmlRootElement
@NamedQueries({
@NamedQuery(name = "Tema.findAll", query = "SELECT t FROM Tema t"),
@@ -50,11 +49,10 @@ public class Tema implements Serializable {
@Size(max = 2147483647)
@Column(name = "descripcion")
private String descripcion;
+ @ManyToMany(mappedBy = "temaList")
+ private List<Concepto> conceptoList;
@OneToMany(mappedBy = "tema")
private List<Tarea> tareaList;
- @JoinColumn(name = "id_concepto", referencedColumnName = "id_concepto")
- @ManyToOne
- private Concepto idConcepto;
public Tema() {
}
@@ -93,20 +91,21 @@ public class Tema implements Serializable {
}
@XmlTransient
- public List<Tarea> getTareaList() {
- return tareaList;
+ public List<Concepto> getConceptoList() {
+ return conceptoList;
}
- public void setTareaList(List<Tarea> tareaList) {
- this.tareaList = tareaList;
+ public void setConceptoList(List<Concepto> conceptoList) {
+ this.conceptoList = conceptoList;
}
- public Concepto getIdConcepto() {
- return idConcepto;
+ @XmlTransient
+ public List<Tarea> getTareaList() {
+ return tareaList;
}
- public void setIdConcepto(Concepto idConcepto) {
- this.idConcepto = idConcepto;
+ public void setTareaList(List<Tarea> tareaList) {
+ this.tareaList = tareaList;
}
@Override