diff options
author | sreyes <sreyes@dataworks.com.py> | 2014-10-12 20:20:48 (GMT) |
---|---|---|
committer | sreyes <sreyes@dataworks.com.py> | 2014-10-12 20:20:48 (GMT) |
commit | cc483ec621db687ea3b5cbfffd1bbab954b38510 (patch) | |
tree | 036cb7faa30798de4ebe5b9ef2242ddfd700e6f7 /EjercitarJPA | |
parent | 7a0ff6c9f17d87daeeab45292cbf1cd89c74cb0c (diff) | |
parent | 4215a259c0bbecd9a135ce3a9fff674fab8757e0 (diff) |
Merge remote-tracking branch 'remotes/origin/Cecilia' into samurey
Conflicts:
EjercitarJPA/build/classes/model/Ejercicio.class
EjercitarJPA/build/classes/model/Sesion.class
Diffstat (limited to 'EjercitarJPA')
-rw-r--r-- | EjercitarJPA/build/classes/META-INF/MANIFEST.MF | 3 | ||||
-rw-r--r-- | EjercitarJPA/build/classes/META-INF/persistence.xml | 18 | ||||
-rw-r--r-- | EjercitarJPA/build/classes/model/Concepto.class | bin | 6087 -> 0 bytes | |||
-rw-r--r-- | EjercitarJPA/build/classes/model/Curso.class | bin | 5034 -> 0 bytes | |||
-rw-r--r-- | EjercitarJPA/build/classes/model/EjercicioResueltoAlumno.class | bin | 3599 -> 0 bytes | |||
-rw-r--r-- | EjercitarJPA/build/classes/model/Escuela.class | bin | 4373 -> 0 bytes | |||
-rw-r--r-- | EjercitarJPA/build/classes/model/Profesor.class | bin | 6954 -> 0 bytes | |||
-rw-r--r-- | EjercitarJPA/build/classes/model/Respuesta.class | bin | 3757 -> 0 bytes | |||
-rw-r--r-- | EjercitarJPA/build/classes/model/Tarea.class | bin | 4908 -> 0 bytes | |||
-rw-r--r-- | EjercitarJPA/build/classes/model/Tema.class | bin | 5090 -> 0 bytes |
10 files changed, 0 insertions, 21 deletions
diff --git a/EjercitarJPA/build/classes/META-INF/MANIFEST.MF b/EjercitarJPA/build/classes/META-INF/MANIFEST.MF deleted file mode 100644 index 254272e..0000000 --- a/EjercitarJPA/build/classes/META-INF/MANIFEST.MF +++ /dev/null @@ -1,3 +0,0 @@ -Manifest-Version: 1.0 -Class-Path: - diff --git a/EjercitarJPA/build/classes/META-INF/persistence.xml b/EjercitarJPA/build/classes/META-INF/persistence.xml deleted file mode 100644 index a5aee30..0000000 --- a/EjercitarJPA/build/classes/META-INF/persistence.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"> - <persistence-unit name="EjercitarJPA" transaction-type="JTA"> - <jta-data-source>java:/EjercitarDS</jta-data-source> - <class>model.Alumno</class> - <class>model.Concepto</class> - <class>model.Curso</class> - <class>model.Ejercicio</class> - <class>model.Escuela</class> - <class>model.Profesor</class> - <class>model.Respuesta</class> - <class>model.Sesion</class> - <class>model.Tarea</class> - <class>model.Tema</class> - <class>model.Asignatura</class> - <class>model.EjercicioResueltoAlumno</class> - </persistence-unit> -</persistence> diff --git a/EjercitarJPA/build/classes/model/Concepto.class b/EjercitarJPA/build/classes/model/Concepto.class Binary files differdeleted file mode 100644 index 2775171..0000000 --- a/EjercitarJPA/build/classes/model/Concepto.class +++ /dev/null diff --git a/EjercitarJPA/build/classes/model/Curso.class b/EjercitarJPA/build/classes/model/Curso.class Binary files differdeleted file mode 100644 index 6ae6052..0000000 --- a/EjercitarJPA/build/classes/model/Curso.class +++ /dev/null diff --git a/EjercitarJPA/build/classes/model/EjercicioResueltoAlumno.class b/EjercitarJPA/build/classes/model/EjercicioResueltoAlumno.class Binary files differdeleted file mode 100644 index 85e75c1..0000000 --- a/EjercitarJPA/build/classes/model/EjercicioResueltoAlumno.class +++ /dev/null diff --git a/EjercitarJPA/build/classes/model/Escuela.class b/EjercitarJPA/build/classes/model/Escuela.class Binary files differdeleted file mode 100644 index 7adf95a..0000000 --- a/EjercitarJPA/build/classes/model/Escuela.class +++ /dev/null diff --git a/EjercitarJPA/build/classes/model/Profesor.class b/EjercitarJPA/build/classes/model/Profesor.class Binary files differdeleted file mode 100644 index 138adc7..0000000 --- a/EjercitarJPA/build/classes/model/Profesor.class +++ /dev/null diff --git a/EjercitarJPA/build/classes/model/Respuesta.class b/EjercitarJPA/build/classes/model/Respuesta.class Binary files differdeleted file mode 100644 index 42b82a2..0000000 --- a/EjercitarJPA/build/classes/model/Respuesta.class +++ /dev/null diff --git a/EjercitarJPA/build/classes/model/Tarea.class b/EjercitarJPA/build/classes/model/Tarea.class Binary files differdeleted file mode 100644 index 2d5e2d5..0000000 --- a/EjercitarJPA/build/classes/model/Tarea.class +++ /dev/null diff --git a/EjercitarJPA/build/classes/model/Tema.class b/EjercitarJPA/build/classes/model/Tema.class Binary files differdeleted file mode 100644 index 2077d27..0000000 --- a/EjercitarJPA/build/classes/model/Tema.class +++ /dev/null |