diff options
| author | Samu <samurey@gmail.com> | 2013-06-02 17:34:02 (GMT) |
|---|---|---|
| committer | Samu <samurey@gmail.com> | 2013-06-02 17:34:02 (GMT) |
| commit | 99605cb78f85fdc9a6d8ea30e2bcd542d4575205 (patch) | |
| tree | 9f4e30328b3b595c1ab5c0d9de0efb9dccf72015 | |
| parent | 764becd0b597880592437dda47854aad97c941cc (diff) | |
| parent | 8dae636fca8be47fb03003354e60f636ee57fcfc (diff) | |
Merge remote-tracking branch 'remotes/origin/Cecilia' into samu
| -rw-r--r-- | EjercitarJPA/src/model/Tarea.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/EjercitarJPA/src/model/Tarea.java b/EjercitarJPA/src/model/Tarea.java index 98f8262..94f98c0 100644 --- a/EjercitarJPA/src/model/Tarea.java +++ b/EjercitarJPA/src/model/Tarea.java @@ -7,7 +7,6 @@ package model; import java.io.Serializable; import java.util.List; import javax.persistence.Basic; -import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; @@ -44,7 +43,7 @@ public class Tarea implements Serializable { @Size(max = 2147483647) @Column(name = "descripcion") private String descripcion; - @ManyToMany(mappedBy = "tareaList", cascade = CascadeType.ALL) + @ManyToMany(mappedBy = "tareaList") private List<Concepto> conceptoList; @JoinColumn(name = "tema", referencedColumnName = "id_tema") @ManyToOne |