Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/EjercitarServer
diff options
context:
space:
mode:
Diffstat (limited to 'EjercitarServer')
-rw-r--r--EjercitarServer/.classpath38
-rw-r--r--EjercitarServer/.project60
-rw-r--r--EjercitarServer/.settings/org.eclipse.jdt.core.prefs14
-rw-r--r--EjercitarServer/.settings/org.eclipse.wst.common.component16
-rw-r--r--EjercitarServer/.settings/org.eclipse.wst.common.project.facet.core.xml14
-rw-r--r--EjercitarServer/.settings/org.hibernate.eclipse.console.prefs6
-rw-r--r--EjercitarServer/.settings/org.jboss.ide.eclipse.as.core.prefs4
-rw-r--r--EjercitarServer/build/classes/META-INF/MANIFEST.MF4
-rw-r--r--EjercitarServer/build/classes/beans/AdministracionBean.classbin1219 -> 8903 bytes
-rw-r--r--EjercitarServer/build/classes/beans/AdministracionBeanLocal.classbin241 -> 0 bytes
-rw-r--r--EjercitarServer/build/classes/beans/AdministracionBeanRemote.classbin244 -> 555 bytes
-rw-r--r--EjercitarServer/build/classes/beans/AdministrationBean.classbin1144 -> 0 bytes
-rw-r--r--EjercitarServer/build/classes/beans/EjercitarWSBean.classbin6160 -> 6159 bytes
-rw-r--r--EjercitarServer/build/classes/beans/EjercitarWSRemote.classbin401 -> 0 bytes
-rw-r--r--EjercitarServer/build/classes/beans/Test.classbin769 -> 0 bytes
-rw-r--r--EjercitarServer/build/classes/beans/red_alumno_1.xdsl120
-rw-r--r--EjercitarServer/build/classes/red_alumno_1.xdsl120
-rw-r--r--EjercitarServer/build/classes/red_base_curso_1.xdsl120
-rw-r--r--EjercitarServer/ejbModule/META-INF/MANIFEST.MF4
-rw-r--r--EjercitarServer/ejbModule/beans/AdministracionBean.java621
-rw-r--r--EjercitarServer/ejbModule/beans/AdministracionBeanLocal.java20
-rw-r--r--EjercitarServer/ejbModule/beans/AdministracionBeanRemote.java46
-rw-r--r--EjercitarServer/ejbModule/beans/AdministrationBean.java76
-rw-r--r--EjercitarServer/ejbModule/beans/EjercitarWSRemote.java42
-rw-r--r--EjercitarServer/ejbModule/beans/Test.java40
-rw-r--r--EjercitarServer/ejbModule/beans/red_alumno_1.xdsl120
-rw-r--r--EjercitarServer/redes/red_alumno_1.xdsl120
-rw-r--r--EjercitarServer/redes/red_base_curso_1.xdsl120
28 files changed, 867 insertions, 858 deletions
diff --git a/EjercitarServer/.classpath b/EjercitarServer/.classpath
index 1657368..92c6209 100644
--- a/EjercitarServer/.classpath
+++ b/EjercitarServer/.classpath
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="ejbModule"/>
- <classpathentry kind="src" path="redes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
- <attributes>
- <attribute name="owner.project.facets" value="java"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
- <classpathentry kind="con" path="org.jboss.ide.eclipse.as.classpath.core.ejb3.classpathContainer/JBoss 6.x Runtime Server"/>
- <classpathentry kind="con" path="org.jboss.ide.eclipse.as.classpath.core.javaee-5.0"/>
- <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
- <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.jboss.ide.eclipse.as.core.server.runtime.runtimeTarget/JBoss 6.x Runtime"/>
- <classpathentry kind="lib" path="lib/postgresql-9.0-801.jdbc4.jar"/>
- <classpathentry kind="lib" path="lib/smile.jar"/>
- <classpathentry kind="lib" path="/EjercitarJPA/lib/hibernate-jpa-2.0-api-1.0.0.Final.jar"/>
- <classpathentry kind="output" path="build/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="ejbModule"/>
+ <classpathentry kind="src" path="redes"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
+ <attributes>
+ <attribute name="owner.project.facets" value="java"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+ <classpathentry kind="con" path="org.jboss.ide.eclipse.as.classpath.core.ejb3.classpathContainer/JBoss 6.x Runtime Server"/>
+ <classpathentry kind="con" path="org.jboss.ide.eclipse.as.classpath.core.javaee-5.0"/>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+ <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.jboss.ide.eclipse.as.core.server.runtime.runtimeTarget/JBoss 6.x Runtime"/>
+ <classpathentry kind="lib" path="lib/postgresql-9.0-801.jdbc4.jar"/>
+ <classpathentry kind="lib" path="lib/smile.jar"/>
+ <classpathentry kind="lib" path="/EjercitarJPA/lib/hibernate-jpa-2.0-api-1.0.0.Final.jar"/>
+ <classpathentry kind="output" path="build/classes"/>
+</classpath>
diff --git a/EjercitarServer/.project b/EjercitarServer/.project
index 3371025..2c32823 100644
--- a/EjercitarServer/.project
+++ b/EjercitarServer/.project
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>EjercitarServer</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.common.project.facet.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
- <arguments>
- </arguments>
- </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>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>EjercitarServer</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </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>
+ </natures>
+</projectDescription>
diff --git a/EjercitarServer/.settings/org.eclipse.jdt.core.prefs b/EjercitarServer/.settings/org.eclipse.jdt.core.prefs
index f287d53..c537b63 100644
--- a/EjercitarServer/.settings/org.eclipse.jdt.core.prefs
+++ b/EjercitarServer/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/EjercitarServer/.settings/org.eclipse.wst.common.component b/EjercitarServer/.settings/org.eclipse.wst.common.component
index 092b8d5..f276ed3 100644
--- a/EjercitarServer/.settings/org.eclipse.wst.common.component
+++ b/EjercitarServer/.settings/org.eclipse.wst.common.component
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
- <wb-module deploy-name="EjercitarServer">
- <wb-resource deploy-path="/" source-path="/ejbModule" tag="defaultRootSource"/>
- <wb-resource deploy-path="/" source-path="/redes"/>
- <property name="java-output-path" value="/EjercitarServer/build/classes"/>
- </wb-module>
-</project-modules>
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+ <wb-module deploy-name="EjercitarServer">
+ <wb-resource deploy-path="/" source-path="/ejbModule" tag="defaultRootSource"/>
+ <wb-resource deploy-path="/" source-path="/redes"/>
+ <property name="java-output-path" value="/EjercitarServer/build/classes"/>
+ </wb-module>
+</project-modules>
diff --git a/EjercitarServer/.settings/org.eclipse.wst.common.project.facet.core.xml b/EjercitarServer/.settings/org.eclipse.wst.common.project.facet.core.xml
index bde0059..e529cba 100644
--- a/EjercitarServer/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/EjercitarServer/.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="jst.ejb"/>
- <installed facet="java" version="1.6"/>
- <installed facet="jst.ejb" version="3.1"/>
-</faceted-project>
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+ <fixed facet="java"/>
+ <fixed facet="jst.ejb"/>
+ <installed facet="java" version="1.6"/>
+ <installed facet="jst.ejb" version="3.1"/>
+</faceted-project>
diff --git a/EjercitarServer/.settings/org.hibernate.eclipse.console.prefs b/EjercitarServer/.settings/org.hibernate.eclipse.console.prefs
index 8fdae10..21fefff 100644
--- a/EjercitarServer/.settings/org.hibernate.eclipse.console.prefs
+++ b/EjercitarServer/.settings/org.hibernate.eclipse.console.prefs
@@ -1,3 +1,3 @@
-default.configuration=
-eclipse.preferences.version=1
-hibernate3.enabled=false
+default.configuration=
+eclipse.preferences.version=1
+hibernate3.enabled=false
diff --git a/EjercitarServer/.settings/org.jboss.ide.eclipse.as.core.prefs b/EjercitarServer/.settings/org.jboss.ide.eclipse.as.core.prefs
index 1b1209b..94c3128 100644
--- a/EjercitarServer/.settings/org.jboss.ide.eclipse.as.core.prefs
+++ b/EjercitarServer/.settings/org.jboss.ide.eclipse.as.core.prefs
@@ -1,2 +1,2 @@
-eclipse.preferences.version=1
-org.jboss.ide.eclipse.as.core.singledeployable.deployableList=\n\n
+eclipse.preferences.version=1
+org.jboss.ide.eclipse.as.core.singledeployable.deployableList=\n\n
diff --git a/EjercitarServer/build/classes/META-INF/MANIFEST.MF b/EjercitarServer/build/classes/META-INF/MANIFEST.MF
index 58630c0..59499bc 100644
--- a/EjercitarServer/build/classes/META-INF/MANIFEST.MF
+++ b/EjercitarServer/build/classes/META-INF/MANIFEST.MF
@@ -1,2 +1,2 @@
-Manifest-Version: 1.0
-
+Manifest-Version: 1.0
+
diff --git a/EjercitarServer/build/classes/beans/AdministracionBean.class b/EjercitarServer/build/classes/beans/AdministracionBean.class
index 8d96b97..56e1fab 100644
--- a/EjercitarServer/build/classes/beans/AdministracionBean.class
+++ b/EjercitarServer/build/classes/beans/AdministracionBean.class
Binary files differ
diff --git a/EjercitarServer/build/classes/beans/AdministracionBeanLocal.class b/EjercitarServer/build/classes/beans/AdministracionBeanLocal.class
deleted file mode 100644
index d63f3dc..0000000
--- a/EjercitarServer/build/classes/beans/AdministracionBeanLocal.class
+++ /dev/null
Binary files differ
diff --git a/EjercitarServer/build/classes/beans/AdministracionBeanRemote.class b/EjercitarServer/build/classes/beans/AdministracionBeanRemote.class
index a011d44..e614916 100644
--- a/EjercitarServer/build/classes/beans/AdministracionBeanRemote.class
+++ b/EjercitarServer/build/classes/beans/AdministracionBeanRemote.class
Binary files differ
diff --git a/EjercitarServer/build/classes/beans/AdministrationBean.class b/EjercitarServer/build/classes/beans/AdministrationBean.class
deleted file mode 100644
index 22ea586..0000000
--- a/EjercitarServer/build/classes/beans/AdministrationBean.class
+++ /dev/null
Binary files differ
diff --git a/EjercitarServer/build/classes/beans/EjercitarWSBean.class b/EjercitarServer/build/classes/beans/EjercitarWSBean.class
index dda2095..82f4570 100644
--- a/EjercitarServer/build/classes/beans/EjercitarWSBean.class
+++ b/EjercitarServer/build/classes/beans/EjercitarWSBean.class
Binary files differ
diff --git a/EjercitarServer/build/classes/beans/EjercitarWSRemote.class b/EjercitarServer/build/classes/beans/EjercitarWSRemote.class
deleted file mode 100644
index aa70d7c..0000000
--- a/EjercitarServer/build/classes/beans/EjercitarWSRemote.class
+++ /dev/null
Binary files differ
diff --git a/EjercitarServer/build/classes/beans/Test.class b/EjercitarServer/build/classes/beans/Test.class
deleted file mode 100644
index c6ac9df..0000000
--- a/EjercitarServer/build/classes/beans/Test.class
+++ /dev/null
Binary files differ
diff --git a/EjercitarServer/build/classes/beans/red_alumno_1.xdsl b/EjercitarServer/build/classes/beans/red_alumno_1.xdsl
index 76e2209..9e30f46 100644
--- a/EjercitarServer/build/classes/beans/red_alumno_1.xdsl
+++ b/EjercitarServer/build/classes/beans/red_alumno_1.xdsl
@@ -1,60 +1,60 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<smile version="1.0" id="Network1" numsamples="1000" discsamples="10000">
- <nodes>
- <cpt id="C1">
- <state id="State0" />
- <state id="State1" />
- <probabilities>0.5 0.5</probabilities>
- </cpt>
- <cpt id="E1">
- <state id="State0" />
- <state id="State1" />
- <parents>C1</parents>
- <probabilities>0.5 0.5 0.5 0.5</probabilities>
- </cpt>
- <cpt id="E2">
- <state id="State0" />
- <state id="State1" />
- <parents>C1</parents>
- <probabilities>0.5 0.5 0.5 0.5</probabilities>
- </cpt>
- <cpt id="E3">
- <state id="State0" />
- <state id="State1" />
- <parents>C1</parents>
- <probabilities>0.5 0.5 0.5 0.5</probabilities>
- </cpt>
- </nodes>
- <extensions>
- <genie version="1.0" app="GeNIe 2.0.4779.0" name="Network1" faultnameformat="nodestate">
- <node id="E1">
- <name>E1</name>
- <interior color="e5f6f7" />
- <outline color="000080" />
- <font color="000000" name="Arial" size="8" />
- <position>203 276 251 306</position>
- </node>
- <node id="E2">
- <name>E2</name>
- <interior color="e5f6f7" />
- <outline color="000080" />
- <font color="000000" name="Arial" size="8" />
- <position>365 272 413 302</position>
- </node>
- <node id="E3">
- <name>E3</name>
- <interior color="e5f6f7" />
- <outline color="000080" />
- <font color="000000" name="Arial" size="8" />
- <position>508 290 556 320</position>
- </node>
- <node id="C1">
- <name>C1</name>
- <interior color="e5f6f7" />
- <outline color="000080" />
- <font color="000000" name="Arial" size="8" />
- <position>354 101 390 123</position>
- </node>
- </genie>
- </extensions>
-</smile>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<smile version="1.0" id="Network1" numsamples="1000" discsamples="10000">
+ <nodes>
+ <cpt id="C1">
+ <state id="State0" />
+ <state id="State1" />
+ <probabilities>0.5 0.5</probabilities>
+ </cpt>
+ <cpt id="E1">
+ <state id="State0" />
+ <state id="State1" />
+ <parents>C1</parents>
+ <probabilities>0.5 0.5 0.5 0.5</probabilities>
+ </cpt>
+ <cpt id="E2">
+ <state id="State0" />
+ <state id="State1" />
+ <parents>C1</parents>
+ <probabilities>0.5 0.5 0.5 0.5</probabilities>
+ </cpt>
+ <cpt id="E3">
+ <state id="State0" />
+ <state id="State1" />
+ <parents>C1</parents>
+ <probabilities>0.5 0.5 0.5 0.5</probabilities>
+ </cpt>
+ </nodes>
+ <extensions>
+ <genie version="1.0" app="GeNIe 2.0.4779.0" name="Network1" faultnameformat="nodestate">
+ <node id="E1">
+ <name>E1</name>
+ <interior color="e5f6f7" />
+ <outline color="000080" />
+ <font color="000000" name="Arial" size="8" />
+ <position>203 276 251 306</position>
+ </node>
+ <node id="E2">
+ <name>E2</name>
+ <interior color="e5f6f7" />
+ <outline color="000080" />
+ <font color="000000" name="Arial" size="8" />
+ <position>365 272 413 302</position>
+ </node>
+ <node id="E3">
+ <name>E3</name>
+ <interior color="e5f6f7" />
+ <outline color="000080" />
+ <font color="000000" name="Arial" size="8" />
+ <position>508 290 556 320</position>
+ </node>
+ <node id="C1">
+ <name>C1</name>
+ <interior color="e5f6f7" />
+ <outline color="000080" />
+ <font color="000000" name="Arial" size="8" />
+ <position>354 101 390 123</position>
+ </node>
+ </genie>
+ </extensions>
+</smile>
diff --git a/EjercitarServer/build/classes/red_alumno_1.xdsl b/EjercitarServer/build/classes/red_alumno_1.xdsl
index 76e2209..9e30f46 100644
--- a/EjercitarServer/build/classes/red_alumno_1.xdsl
+++ b/EjercitarServer/build/classes/red_alumno_1.xdsl
@@ -1,60 +1,60 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<smile version="1.0" id="Network1" numsamples="1000" discsamples="10000">
- <nodes>
- <cpt id="C1">
- <state id="State0" />
- <state id="State1" />
- <probabilities>0.5 0.5</probabilities>
- </cpt>
- <cpt id="E1">
- <state id="State0" />
- <state id="State1" />
- <parents>C1</parents>
- <probabilities>0.5 0.5 0.5 0.5</probabilities>
- </cpt>
- <cpt id="E2">
- <state id="State0" />
- <state id="State1" />
- <parents>C1</parents>
- <probabilities>0.5 0.5 0.5 0.5</probabilities>
- </cpt>
- <cpt id="E3">
- <state id="State0" />
- <state id="State1" />
- <parents>C1</parents>
- <probabilities>0.5 0.5 0.5 0.5</probabilities>
- </cpt>
- </nodes>
- <extensions>
- <genie version="1.0" app="GeNIe 2.0.4779.0" name="Network1" faultnameformat="nodestate">
- <node id="E1">
- <name>E1</name>
- <interior color="e5f6f7" />
- <outline color="000080" />
- <font color="000000" name="Arial" size="8" />
- <position>203 276 251 306</position>
- </node>
- <node id="E2">
- <name>E2</name>
- <interior color="e5f6f7" />
- <outline color="000080" />
- <font color="000000" name="Arial" size="8" />
- <position>365 272 413 302</position>
- </node>
- <node id="E3">
- <name>E3</name>
- <interior color="e5f6f7" />
- <outline color="000080" />
- <font color="000000" name="Arial" size="8" />
- <position>508 290 556 320</position>
- </node>
- <node id="C1">
- <name>C1</name>
- <interior color="e5f6f7" />
- <outline color="000080" />
- <font color="000000" name="Arial" size="8" />
- <position>354 101 390 123</position>
- </node>
- </genie>
- </extensions>
-</smile>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<smile version="1.0" id="Network1" numsamples="1000" discsamples="10000">
+ <nodes>
+ <cpt id="C1">
+ <state id="State0" />
+ <state id="State1" />
+ <probabilities>0.5 0.5</probabilities>
+ </cpt>
+ <cpt id="E1">
+ <state id="State0" />
+ <state id="State1" />
+ <parents>C1</parents>
+ <probabilities>0.5 0.5 0.5 0.5</probabilities>
+ </cpt>
+ <cpt id="E2">
+ <state id="State0" />
+ <state id="State1" />
+ <parents>C1</parents>
+ <probabilities>0.5 0.5 0.5 0.5</probabilities>
+ </cpt>
+ <cpt id="E3">
+ <state id="State0" />
+ <state id="State1" />
+ <parents>C1</parents>
+ <probabilities>0.5 0.5 0.5 0.5</probabilities>
+ </cpt>
+ </nodes>
+ <extensions>
+ <genie version="1.0" app="GeNIe 2.0.4779.0" name="Network1" faultnameformat="nodestate">
+ <node id="E1">
+ <name>E1</name>
+ <interior color="e5f6f7" />
+ <outline color="000080" />
+ <font color="000000" name="Arial" size="8" />
+ <position>203 276 251 306</position>
+ </node>
+ <node id="E2">
+ <name>E2</name>
+ <interior color="e5f6f7" />
+ <outline color="000080" />
+ <font color="000000" name="Arial" size="8" />
+ <position>365 272 413 302</position>
+ </node>
+ <node id="E3">
+ <name>E3</name>
+ <interior color="e5f6f7" />
+ <outline color="000080" />
+ <font color="000000" name="Arial" size="8" />
+ <position>508 290 556 320</position>
+ </node>
+ <node id="C1">
+ <name>C1</name>
+ <interior color="e5f6f7" />
+ <outline color="000080" />
+ <font color="000000" name="Arial" size="8" />
+ <position>354 101 390 123</position>
+ </node>
+ </genie>
+ </extensions>
+</smile>
diff --git a/EjercitarServer/build/classes/red_base_curso_1.xdsl b/EjercitarServer/build/classes/red_base_curso_1.xdsl
index 76e2209..9e30f46 100644
--- a/EjercitarServer/build/classes/red_base_curso_1.xdsl
+++ b/EjercitarServer/build/classes/red_base_curso_1.xdsl
@@ -1,60 +1,60 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<smile version="1.0" id="Network1" numsamples="1000" discsamples="10000">
- <nodes>
- <cpt id="C1">
- <state id="State0" />
- <state id="State1" />
- <probabilities>0.5 0.5</probabilities>
- </cpt>
- <cpt id="E1">
- <state id="State0" />
- <state id="State1" />
- <parents>C1</parents>
- <probabilities>0.5 0.5 0.5 0.5</probabilities>
- </cpt>
- <cpt id="E2">
- <state id="State0" />
- <state id="State1" />
- <parents>C1</parents>
- <probabilities>0.5 0.5 0.5 0.5</probabilities>
- </cpt>
- <cpt id="E3">
- <state id="State0" />
- <state id="State1" />
- <parents>C1</parents>
- <probabilities>0.5 0.5 0.5 0.5</probabilities>
- </cpt>
- </nodes>
- <extensions>
- <genie version="1.0" app="GeNIe 2.0.4779.0" name="Network1" faultnameformat="nodestate">
- <node id="E1">
- <name>E1</name>
- <interior color="e5f6f7" />
- <outline color="000080" />
- <font color="000000" name="Arial" size="8" />
- <position>203 276 251 306</position>
- </node>
- <node id="E2">
- <name>E2</name>
- <interior color="e5f6f7" />
- <outline color="000080" />
- <font color="000000" name="Arial" size="8" />
- <position>365 272 413 302</position>
- </node>
- <node id="E3">
- <name>E3</name>
- <interior color="e5f6f7" />
- <outline color="000080" />
- <font color="000000" name="Arial" size="8" />
- <position>508 290 556 320</position>
- </node>
- <node id="C1">
- <name>C1</name>
- <interior color="e5f6f7" />
- <outline color="000080" />
- <font color="000000" name="Arial" size="8" />
- <position>354 101 390 123</position>
- </node>
- </genie>
- </extensions>
-</smile>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<smile version="1.0" id="Network1" numsamples="1000" discsamples="10000">
+ <nodes>
+ <cpt id="C1">
+ <state id="State0" />
+ <state id="State1" />
+ <probabilities>0.5 0.5</probabilities>
+ </cpt>
+ <cpt id="E1">
+ <state id="State0" />
+ <state id="State1" />
+ <parents>C1</parents>
+ <probabilities>0.5 0.5 0.5 0.5</probabilities>
+ </cpt>
+ <cpt id="E2">
+ <state id="State0" />
+ <state id="State1" />
+ <parents>C1</parents>
+ <probabilities>0.5 0.5 0.5 0.5</probabilities>
+ </cpt>
+ <cpt id="E3">
+ <state id="State0" />
+ <state id="State1" />
+ <parents>C1</parents>
+ <probabilities>0.5 0.5 0.5 0.5</probabilities>
+ </cpt>
+ </nodes>
+ <extensions>
+ <genie version="1.0" app="GeNIe 2.0.4779.0" name="Network1" faultnameformat="nodestate">
+ <node id="E1">
+ <name>E1</name>
+ <interior color="e5f6f7" />
+ <outline color="000080" />
+ <font color="000000" name="Arial" size="8" />
+ <position>203 276 251 306</position>
+ </node>
+ <node id="E2">
+ <name>E2</name>
+ <interior color="e5f6f7" />
+ <outline color="000080" />
+ <font color="000000" name="Arial" size="8" />
+ <position>365 272 413 302</position>
+ </node>
+ <node id="E3">
+ <name>E3</name>
+ <interior color="e5f6f7" />
+ <outline color="000080" />
+ <font color="000000" name="Arial" size="8" />
+ <position>508 290 556 320</position>
+ </node>
+ <node id="C1">
+ <name>C1</name>
+ <interior color="e5f6f7" />
+ <outline color="000080" />
+ <font color="000000" name="Arial" size="8" />
+ <position>354 101 390 123</position>
+ </node>
+ </genie>
+ </extensions>
+</smile>
diff --git a/EjercitarServer/ejbModule/META-INF/MANIFEST.MF b/EjercitarServer/ejbModule/META-INF/MANIFEST.MF
index 58630c0..59499bc 100644
--- a/EjercitarServer/ejbModule/META-INF/MANIFEST.MF
+++ b/EjercitarServer/ejbModule/META-INF/MANIFEST.MF
@@ -1,2 +1,2 @@
-Manifest-Version: 1.0
-
+Manifest-Version: 1.0
+
diff --git a/EjercitarServer/ejbModule/beans/AdministracionBean.java b/EjercitarServer/ejbModule/beans/AdministracionBean.java
index 1729329..67ff358 100644
--- a/EjercitarServer/ejbModule/beans/AdministracionBean.java
+++ b/EjercitarServer/ejbModule/beans/AdministracionBean.java
@@ -1,307 +1,314 @@
-package beans;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.ejb.LocalBean;
-import javax.ejb.Stateless;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-
-import smile.Network;
-
-import model.Asignatura;
-import model.Concepto;
-import model.Ejercicio;
-import model.Profesor;
-import model.Tema;
-
-/**
- * Session Bean implementation class AdministracionBean
- */
-@Stateless
-@LocalBean
-public class AdministracionBean implements AdministracionBeanRemote, AdministracionBeanLocal {
-
- @PersistenceContext
- EntityManager em;
-
- /**
- * Default constructor.
- */
- public AdministracionBean() {
- // TODO Auto-generated constructor stub
- }
-
- public List getConceptoList(int idTema) {
- Tema tema = em.find(Tema.class, idTema);
- List conceptoList = tema.getConceptoList();
- System.out.println(conceptoList.toString());
- return conceptoList;
- }
-
- public void agregarEjercicio(Ejercicio ejercicio) {
- //Poner en una transaccion
- // em.getTransaction().begin();
- em.persist(ejercicio);
- agregarEjercicioRed(ejercicio);
- //em.getTransaction().commit();
- }
-
- public void agregarTema(Tema tema) {
- //Poner en una transaccion
- System.out.println("################################################################################");
- System.out.println(tema.getIdTema());
- System.out.println(tema.getDescripcion());
- System.out.println(tema.getNombre());
- System.out.println(tema.getAsignatura().getIdAsignatura());
- System.out.println(tema.getPeso());
- System.out.println(tema.getProfesor().getIdProfesor());
-
- System.out.println("################################################################################");
-
-
-
-
-
- em.persist(tema);
- // agregarTemaRed(tema);
-
- }
-
- public void agregarConcepto(Concepto concepto) {
- //Poner en una transaccion
- em.persist(concepto);
- agregarConceptoRed(concepto);
-
- }
-
- public void agregarProfesor(Profesor profesor) {
- em.persist(profesor);
- }
-
- public void calcularProbabilidades(Profesor profesor) {
- // Calculo de las probabilidades condicionales de las relaciones de agregacion
-
- String nombreRed = "red_base_curso_1.xdsl";
- System.out.println("redes/" + nombreRed);
- Network net = new Network();
- net.readFile("redes/" + nombreRed);
-
- //agregar where
- List<Tema> temaList = (List<Tema>) em.createQuery("Select e from Tema e").getResultList();
- for(Tema tema : temaList) {
- double[] temaDef = calcularProbabilidadesTema(tema);
- net.setNodeDefinition(tema.getNombre(), temaDef);
- }
-
- //agregar where
- List<Asignatura> asignaturaList = (List<Asignatura>) em.createQuery("Select e from Asignatura e").getResultList();
- for(Asignatura asignatura : asignaturaList) {
- double[] asignaturaDef = calcularProbabilidadesAsignatura(asignatura);
- net.setNodeDefinition(asignatura.getNombre(), asignaturaDef);
- }
-
- net.writeFile("redes/" + nombreRed);
- }
-
- private double[] calcularProbabilidadesAsignatura(Asignatura asignatura) {
- int dimension = (int) Math.pow(2, asignatura.getTemaList().size());
- double [] asignaturaDef = new double[dimension * 2];
-
- int j = 0;
- for(int i = 0; i < dimension; i++) {
- asignaturaDef[j] = cpAsignatura(asignatura, i);
- j++;
- asignaturaDef[j] = 1 - asignaturaDef[j-1];
- j++;
-
- }
-
- return asignaturaDef;
- }
-
- private double cpAsignatura(Asignatura asignatura, int i) {
- String comb = Integer.toBinaryString(i);
- int dimension = asignatura.getTemaList().size();
- while(comb.length() != dimension){
- comb = "0" + comb;
- }
- int k = dimension - 1;
- double valTemp = 0;
- for (int j = 0; j < dimension; j++) {
- if(comb.charAt(k) == '1') {
- valTemp = valTemp + asignatura.getTemaList().get(j).getPeso();
- }
- k--;
- }
-
- return valTemp;
- }
-
- private double [] calcularProbabilidadesEval(Ejercicio ejercicio) {
- //Calculo de las probabilidades condicionales
- int dimension = (int) Math.pow(2, ejercicio.getConceptoList().size());
- double [] ejercicioDef = new double[dimension * 2];
-
- int j = 0;
- for(int i = 0; i < dimension; i++) {
- ejercicioDef[j] = cp(ejercicio, i);
- j++;
- ejercicioDef[j] = 1 - ejercicioDef[j-1];
- j++;
-
- }
-
- return ejercicioDef;
- }
-
- private double cp(Ejercicio ejercicio, int i) {
-
- String comb = Integer.toBinaryString(i);
- while(comb.length() < ejercicio.getConceptoList().size()){
- comb = "0" + comb;
- System.out.println(comb);
- }
- int k = ejercicio.getConceptoList().size() - 1;
- double valTemp = 1;
- for (int j = 0; j < ejercicio.getConceptoList().size(); j++) {
- if(comb.charAt(k) == '0') {
- valTemp = valTemp * ejercicio.getConceptoList().get(j).getAdivinanza();
- } else {
- valTemp = valTemp * (1 -
- ejercicio.getConceptoList().get(j).getDescuido());
- }
-
- k--;
- }
-
- return valTemp;
-
- }
-
- private double [] calcularProbabilidadesTema(Tema tema) {
- //Calculo de las probabilidades condicionales
- int dimension = (int) Math.pow(2, tema.getConceptoList().size());
- double [] temaDef = new double[dimension * 2];
-
- int j = 0;
- for(int i = 0; i < dimension; i++) {
- temaDef[j] = cpTema(tema, i);
- j++;
- temaDef[j] = 1 - temaDef[j-1];
- j++;
-
- }
-
- return temaDef;
- }
-
- private double cpTema(Tema tema, int i) {
-
- String comb = Integer.toBinaryString(i);
- while(comb.length() < tema.getConceptoList().size()){
- comb = "0" + comb;
- }
- int k = tema.getConceptoList().size() - 1;
- double valTemp = 0;
- for (int j = 0; j < tema.getConceptoList().size(); j++) {
- if(comb.charAt(k) == '1') {
- valTemp = valTemp + tema.getConceptoList().get(j).getPeso();
- }
- k--;
- }
-
- return valTemp;
-
- }
-
- private void agregarEjercicioRed(Ejercicio ejercicio) {
- //operaciones sobre la red bayesiana con smile
- String nombreRed = "red_base_curso_1.xdsl";
- System.out.println("redes/" + nombreRed);
- Network net = new Network();
- net.readFile("redes/" + nombreRed);
-
- //agregar nodo ejercicio
- String titulo = "E" + Integer.toString(ejercicio.getIdEjercicio());
- net.addNode(Network.NodeType.Cpt, titulo);
- net.setOutcomeId(titulo, 0, "Incorrecto");
- net.setOutcomeId(titulo, 1, "Correcto");
-
- //agregar los arcos
- List<Concepto> conceptoList = ejercicio.getConceptoList();
- for(Concepto concepto : conceptoList) {
- net.addArc(concepto.getNombre(), titulo);
- }
-
- //definir probabilidades condicionales
- double[] ejercicioDef = calcularProbabilidadesEval(ejercicio);
- net.setNodeDefinition(titulo, ejercicioDef);
-
- net.writeFile("redes/" + nombreRed);
- }
-
- private void agregarTemaRed(Tema tema) {
- //operaciones sobre la red bayesiana con smile
- String nombreRed = "red_base_curso_1.xdsl";
- System.out.println("redes/" + nombreRed);
- Network net = new Network();
- net.readFile("redes/" + nombreRed);
-
- //agregar nodo ejercicio
- String titulo = tema.getNombre();
- net.addNode(Network.NodeType.Cpt, titulo);
- net.setOutcomeId(titulo, 0, "No_conoce");
- net.setOutcomeId(titulo, 1, "Conoce");
-
- //agregar los arcos
- List<Concepto> conceptoList = tema.getConceptoList();
- for(Concepto concepto : conceptoList) {
- net.addArc(concepto.getNombre(), titulo);
- }
-
- //definir probabilidades
- //net.setNodeDefinition(titulo, ejercicioDef);
- net.writeFile("redes/" + nombreRed);
- }
-
- private void agregarConceptoRed(Concepto concepto) {
- //operaciones sobre la red bayesiana con smile
- String nombreRed = "red_base_curso_1.xdsl";
- System.out.println("redes/" + nombreRed);
- Network net = new Network();
- net.readFile("redes/" + nombreRed);
-
- //agregar nodo concepto
- String titulo = concepto.getNombre();
- net.addNode(Network.NodeType.Cpt, titulo);
- net.setOutcomeId(titulo, 0, "No_conoce");
- net.setOutcomeId(titulo, 1, "Conoce");
-
- //agregar los arcos
-
- net.addArc(titulo, concepto.getTema().getNombre());
-
- //definir probabilidades
- double [] conceptoDef = new double [2];
- conceptoDef[1] = concepto.getApriori();
- conceptoDef[0] = 1 - conceptoDef[1];
- net.setNodeDefinition(titulo, conceptoDef);
- net.writeFile("redes/" + nombreRed);
- }
-
- @Override
- public Profesor logIn(String usuario, String password) {
- // TODO Auto-generated method stub
- Profesor profesor = (Profesor) em.createNamedQuery("Profesor.findByUsuario")
- .setParameter("usuario", usuario).getSingleResult();
-
- if(password.trim().equals(profesor.getUsuario().trim())){
- System.out.println(profesor.getAsignaturaList().toString());//No Borrar, sirve para la inicializacion
- return profesor;
- }
-
- return null;
- }
-}
+package beans;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.ejb.LocalBean;
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+import smile.Network;
+
+import model.Asignatura;
+import model.Concepto;
+import model.Ejercicio;
+import model.Profesor;
+import model.Tema;
+
+/**
+ * Session Bean implementation class AdministracionBean
+ */
+@Stateless
+@LocalBean
+public class AdministracionBean implements AdministracionBeanRemote, AdministracionBeanLocal {
+
+ @PersistenceContext
+ EntityManager em;
+
+ /**
+ * Default constructor.
+ */
+ public AdministracionBean() {
+ // TODO Auto-generated constructor stub
+ }
+
+ public List getConceptoList(int idTema) {
+ Tema tema = em.find(Tema.class, idTema);
+ List conceptoList = tema.getConceptoList();
+ System.out.println(conceptoList.toString());
+ return conceptoList;
+ }
+
+ public void agregarEjercicio(Ejercicio ejercicio) {
+ //Poner en una transaccion
+ // em.getTransaction().begin();
+ em.persist(ejercicio);
+ agregarEjercicioRed(ejercicio);
+ //em.getTransaction().commit();
+ }
+
+ public void agregarTema(Tema tema) {
+ //Poner en una transaccion
+ System.out.println("################################################################################");
+ System.out.println(tema.getIdTema());
+ System.out.println(tema.getDescripcion());
+ System.out.println(tema.getNombre());
+ System.out.println(tema.getAsignatura().getIdAsignatura());
+ System.out.println(tema.getPeso());
+ System.out.println(tema.getProfesor().getIdProfesor());
+
+ System.out.println("################################################################################");
+
+
+
+
+
+ em.persist(tema);
+ // agregarTemaRed(tema);
+
+ }
+
+ public void agregarConcepto(Concepto concepto) {
+ //Poner en una transaccion
+ em.persist(concepto);
+ agregarConceptoRed(concepto);
+
+ }
+
+ public void agregarProfesor(Profesor profesor) {
+ em.persist(profesor);
+ }
+ public void agregarAsignatura(Asignatura asignatura) {
+ System.out.print("#############" + asignatura.getDescripcion());
+ System.out.print("#############" +asignatura.getNombre());
+ System.out.print("#############" +asignatura.getCurso().getTurno());
+ System.out.print("#############" +asignatura.getProfesor().getNombre());
+ em.persist(asignatura);
+ }
+
+ public void calcularProbabilidades(Profesor profesor) {
+ // Calculo de las probabilidades condicionales de las relaciones de agregacion
+
+ String nombreRed = "red_base_curso_1.xdsl";
+ System.out.println("redes/" + nombreRed);
+ Network net = new Network();
+ net.readFile("redes/" + nombreRed);
+
+ //agregar where
+ List<Tema> temaList = (List<Tema>) em.createQuery("Select e from Tema e").getResultList();
+ for(Tema tema : temaList) {
+ double[] temaDef = calcularProbabilidadesTema(tema);
+ net.setNodeDefinition(tema.getNombre(), temaDef);
+ }
+
+ //agregar where
+ List<Asignatura> asignaturaList = (List<Asignatura>) em.createQuery("Select e from Asignatura e").getResultList();
+ for(Asignatura asignatura : asignaturaList) {
+ double[] asignaturaDef = calcularProbabilidadesAsignatura(asignatura);
+ net.setNodeDefinition(asignatura.getNombre(), asignaturaDef);
+ }
+
+ net.writeFile("redes/" + nombreRed);
+ }
+
+ private double[] calcularProbabilidadesAsignatura(Asignatura asignatura) {
+ int dimension = (int) Math.pow(2, asignatura.getTemaList().size());
+ double [] asignaturaDef = new double[dimension * 2];
+
+ int j = 0;
+ for(int i = 0; i < dimension; i++) {
+ asignaturaDef[j] = cpAsignatura(asignatura, i);
+ j++;
+ asignaturaDef[j] = 1 - asignaturaDef[j-1];
+ j++;
+
+ }
+
+ return asignaturaDef;
+ }
+
+ private double cpAsignatura(Asignatura asignatura, int i) {
+ String comb = Integer.toBinaryString(i);
+ int dimension = asignatura.getTemaList().size();
+ while(comb.length() != dimension){
+ comb = "0" + comb;
+ }
+ int k = dimension - 1;
+ double valTemp = 0;
+ for (int j = 0; j < dimension; j++) {
+ if(comb.charAt(k) == '1') {
+ valTemp = valTemp + asignatura.getTemaList().get(j).getPeso();
+ }
+ k--;
+ }
+
+ return valTemp;
+ }
+
+ private double [] calcularProbabilidadesEval(Ejercicio ejercicio) {
+ //Calculo de las probabilidades condicionales
+ int dimension = (int) Math.pow(2, ejercicio.getConceptoList().size());
+ double [] ejercicioDef = new double[dimension * 2];
+
+ int j = 0;
+ for(int i = 0; i < dimension; i++) {
+ ejercicioDef[j] = cp(ejercicio, i);
+ j++;
+ ejercicioDef[j] = 1 - ejercicioDef[j-1];
+ j++;
+
+ }
+
+ return ejercicioDef;
+ }
+
+ private double cp(Ejercicio ejercicio, int i) {
+
+ String comb = Integer.toBinaryString(i);
+ while(comb.length() < ejercicio.getConceptoList().size()){
+ comb = "0" + comb;
+ System.out.println(comb);
+ }
+ int k = ejercicio.getConceptoList().size() - 1;
+ double valTemp = 1;
+ for (int j = 0; j < ejercicio.getConceptoList().size(); j++) {
+ if(comb.charAt(k) == '0') {
+ valTemp = valTemp * ejercicio.getConceptoList().get(j).getAdivinanza();
+ } else {
+ valTemp = valTemp * (1 -
+ ejercicio.getConceptoList().get(j).getDescuido());
+ }
+
+ k--;
+ }
+
+ return valTemp;
+
+ }
+
+ private double [] calcularProbabilidadesTema(Tema tema) {
+ //Calculo de las probabilidades condicionales
+ int dimension = (int) Math.pow(2, tema.getConceptoList().size());
+ double [] temaDef = new double[dimension * 2];
+
+ int j = 0;
+ for(int i = 0; i < dimension; i++) {
+ temaDef[j] = cpTema(tema, i);
+ j++;
+ temaDef[j] = 1 - temaDef[j-1];
+ j++;
+
+ }
+
+ return temaDef;
+ }
+
+ private double cpTema(Tema tema, int i) {
+
+ String comb = Integer.toBinaryString(i);
+ while(comb.length() < tema.getConceptoList().size()){
+ comb = "0" + comb;
+ }
+ int k = tema.getConceptoList().size() - 1;
+ double valTemp = 0;
+ for (int j = 0; j < tema.getConceptoList().size(); j++) {
+ if(comb.charAt(k) == '1') {
+ valTemp = valTemp + tema.getConceptoList().get(j).getPeso();
+ }
+ k--;
+ }
+
+ return valTemp;
+
+ }
+
+ private void agregarEjercicioRed(Ejercicio ejercicio) {
+ //operaciones sobre la red bayesiana con smile
+ String nombreRed = "red_base_curso_1.xdsl";
+ System.out.println("redes/" + nombreRed);
+ Network net = new Network();
+ net.readFile("redes/" + nombreRed);
+
+ //agregar nodo ejercicio
+ String titulo = "E" + Integer.toString(ejercicio.getIdEjercicio());
+ net.addNode(Network.NodeType.Cpt, titulo);
+ net.setOutcomeId(titulo, 0, "Incorrecto");
+ net.setOutcomeId(titulo, 1, "Correcto");
+
+ //agregar los arcos
+ List<Concepto> conceptoList = ejercicio.getConceptoList();
+ for(Concepto concepto : conceptoList) {
+ net.addArc(concepto.getNombre(), titulo);
+ }
+
+ //definir probabilidades condicionales
+ double[] ejercicioDef = calcularProbabilidadesEval(ejercicio);
+ net.setNodeDefinition(titulo, ejercicioDef);
+
+ net.writeFile("redes/" + nombreRed);
+ }
+
+ private void agregarTemaRed(Tema tema) {
+ //operaciones sobre la red bayesiana con smile
+ String nombreRed = "red_base_curso_1.xdsl";
+ System.out.println("redes/" + nombreRed);
+ Network net = new Network();
+ net.readFile("redes/" + nombreRed);
+
+ //agregar nodo ejercicio
+ String titulo = tema.getNombre();
+ net.addNode(Network.NodeType.Cpt, titulo);
+ net.setOutcomeId(titulo, 0, "No_conoce");
+ net.setOutcomeId(titulo, 1, "Conoce");
+
+ //agregar los arcos
+ List<Concepto> conceptoList = tema.getConceptoList();
+ for(Concepto concepto : conceptoList) {
+ net.addArc(concepto.getNombre(), titulo);
+ }
+
+ //definir probabilidades
+ //net.setNodeDefinition(titulo, ejercicioDef);
+ net.writeFile("redes/" + nombreRed);
+ }
+
+ private void agregarConceptoRed(Concepto concepto) {
+ //operaciones sobre la red bayesiana con smile
+ String nombreRed = "red_base_curso_1.xdsl";
+ System.out.println("redes/" + nombreRed);
+ Network net = new Network();
+ net.readFile("redes/" + nombreRed);
+
+ //agregar nodo concepto
+ String titulo = concepto.getNombre();
+ net.addNode(Network.NodeType.Cpt, titulo);
+ net.setOutcomeId(titulo, 0, "No_conoce");
+ net.setOutcomeId(titulo, 1, "Conoce");
+
+ //agregar los arcos
+
+ net.addArc(titulo, concepto.getTema().getNombre());
+
+ //definir probabilidades
+ double [] conceptoDef = new double [2];
+ conceptoDef[1] = concepto.getApriori();
+ conceptoDef[0] = 1 - conceptoDef[1];
+ net.setNodeDefinition(titulo, conceptoDef);
+ net.writeFile("redes/" + nombreRed);
+ }
+
+ @Override
+ public Profesor logIn(String usuario, String password) {
+ // TODO Auto-generated method stub
+ Profesor profesor = (Profesor) em.createNamedQuery("Profesor.findByUsuario")
+ .setParameter("usuario", usuario).getSingleResult();
+
+ if(password.trim().equals(profesor.getUsuario().trim())){
+ System.out.println(profesor.getAsignaturaList().toString());//No Borrar, sirve para la inicializacion
+ return profesor;
+ }
+
+ return null;
+ }
+}
diff --git a/EjercitarServer/ejbModule/beans/AdministracionBeanLocal.java b/EjercitarServer/ejbModule/beans/AdministracionBeanLocal.java
index c0de343..65b5869 100644
--- a/EjercitarServer/ejbModule/beans/AdministracionBeanLocal.java
+++ b/EjercitarServer/ejbModule/beans/AdministracionBeanLocal.java
@@ -1,10 +1,10 @@
-package beans;
-
-import java.util.List;
-
-import javax.ejb.Local;
-
-@Local
-public interface AdministracionBeanLocal {
- public List getConceptoList(int idTema);
-}
+package beans;
+
+import java.util.List;
+
+import javax.ejb.Local;
+
+@Local
+public interface AdministracionBeanLocal {
+ public List getConceptoList(int idTema);
+}
diff --git a/EjercitarServer/ejbModule/beans/AdministracionBeanRemote.java b/EjercitarServer/ejbModule/beans/AdministracionBeanRemote.java
index e656377..36e58dc 100644
--- a/EjercitarServer/ejbModule/beans/AdministracionBeanRemote.java
+++ b/EjercitarServer/ejbModule/beans/AdministracionBeanRemote.java
@@ -1,22 +1,24 @@
-package beans;
-
-import java.util.List;
-
-import javax.ejb.Remote;
-
-import model.Concepto;
-import model.Ejercicio;
-import model.Profesor;
-import model.Tema;
-
-@Remote
-public interface AdministracionBeanRemote {
- public List getConceptoList(int idTema);
-
- public void agregarEjercicio(Ejercicio ejercicio);
- public void agregarConcepto(Concepto concepto);
- public void agregarTema(Tema tema);
- public void agregarProfesor(Profesor profesor);
- public Profesor logIn(String usuario, String password);
-
-}
+package beans;
+
+import java.util.List;
+
+import javax.ejb.Remote;
+
+import model.Asignatura;
+import model.Concepto;
+import model.Ejercicio;
+import model.Profesor;
+import model.Tema;
+
+@Remote
+public interface AdministracionBeanRemote {
+ public List getConceptoList(int idTema);
+
+ public void agregarEjercicio(Ejercicio ejercicio);
+ public void agregarConcepto(Concepto concepto);
+ public void agregarTema(Tema tema);
+ public void agregarProfesor(Profesor profesor);
+ public Profesor logIn(String usuario, String password);
+ public void agregarAsignatura(Asignatura asignatura);
+
+}
diff --git a/EjercitarServer/ejbModule/beans/AdministrationBean.java b/EjercitarServer/ejbModule/beans/AdministrationBean.java
index 4f2b8cc..53a6b60 100644
--- a/EjercitarServer/ejbModule/beans/AdministrationBean.java
+++ b/EjercitarServer/ejbModule/beans/AdministrationBean.java
@@ -1,38 +1,38 @@
-package beans;
-
-import java.util.List;
-
-import javax.ejb.LocalBean;
-import javax.ejb.Stateless;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-
-import model.Tema;
-
-
-
-/**
- * Session Bean implementation class getConceptoList
- */
-@Stateless
-@LocalBean
-public class AdministrationBean {
-
- @PersistenceContext
- EntityManager em;
-
- /**
- * Default constructor.
- */
- public AdministrationBean() {
- // TODO Auto-generated constructor stub
- }
-
- public List getConceptoList(int idTema) {
- Tema tema = em.find(Tema.class, idTema);
- List conceptoList = tema.getConceptoList();
- System.out.println(conceptoList.toString());
- return conceptoList;
- }
-
-}
+package beans;
+
+import java.util.List;
+
+import javax.ejb.LocalBean;
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+import model.Tema;
+
+
+
+/**
+ * Session Bean implementation class getConceptoList
+ */
+@Stateless
+@LocalBean
+public class AdministrationBean {
+
+ @PersistenceContext
+ EntityManager em;
+
+ /**
+ * Default constructor.
+ */
+ public AdministrationBean() {
+ // TODO Auto-generated constructor stub
+ }
+
+ public List getConceptoList(int idTema) {
+ Tema tema = em.find(Tema.class, idTema);
+ List conceptoList = tema.getConceptoList();
+ System.out.println(conceptoList.toString());
+ return conceptoList;
+ }
+
+}
diff --git a/EjercitarServer/ejbModule/beans/EjercitarWSRemote.java b/EjercitarServer/ejbModule/beans/EjercitarWSRemote.java
index e92d4c0..a4137e3 100644
--- a/EjercitarServer/ejbModule/beans/EjercitarWSRemote.java
+++ b/EjercitarServer/ejbModule/beans/EjercitarWSRemote.java
@@ -1,22 +1,22 @@
-package beans;
-
-import java.util.Collection;
-import java.util.List;
-
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-
-import model.Ejercicio;
-import model.Tarea;
-import model.Tema;
-
-@WebService
-public interface EjercitarWSRemote {
-
- public List<Tarea> getTareas(int idAlumno);
-
- public Ejercicio getSiguienteEjercicio(int idTarea, int idAlumno, int idEjercicio, String respuesta);
-
- public String getText();
-
+package beans;
+
+import java.util.Collection;
+import java.util.List;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+
+import model.Ejercicio;
+import model.Tarea;
+import model.Tema;
+
+@WebService
+public interface EjercitarWSRemote {
+
+ public List<Tarea> getTareas(int idAlumno);
+
+ public Ejercicio getSiguienteEjercicio(int idTarea, int idAlumno, int idEjercicio, String respuesta);
+
+ public String getText();
+
} \ No newline at end of file
diff --git a/EjercitarServer/ejbModule/beans/Test.java b/EjercitarServer/ejbModule/beans/Test.java
index 298955e..1960a0f 100644
--- a/EjercitarServer/ejbModule/beans/Test.java
+++ b/EjercitarServer/ejbModule/beans/Test.java
@@ -1,20 +1,20 @@
-package beans;
-
-import smile.Network;
-
-public class Test {
-
- /**
- * @param args
- */
- public static void main(String[] args) {
- // TODO Auto-generated method stub
- String path = System.getProperty("java.library.path");
- System.out.println(path);
-
- Network net = new Network();
- net.readFile("red_alumno_1.xdsl");
-
- }
-
-}
+package beans;
+
+import smile.Network;
+
+public class Test {
+
+ /**
+ * @param args
+ */
+ public static void main(String[] args) {
+ // TODO Auto-generated method stub
+ String path = System.getProperty("java.library.path");
+ System.out.println(path);
+
+ Network net = new Network();
+ net.readFile("red_alumno_1.xdsl");
+
+ }
+
+}
diff --git a/EjercitarServer/ejbModule/beans/red_alumno_1.xdsl b/EjercitarServer/ejbModule/beans/red_alumno_1.xdsl
index 76e2209..9e30f46 100644
--- a/EjercitarServer/ejbModule/beans/red_alumno_1.xdsl
+++ b/EjercitarServer/ejbModule/beans/red_alumno_1.xdsl
@@ -1,60 +1,60 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<smile version="1.0" id="Network1" numsamples="1000" discsamples="10000">
- <nodes>
- <cpt id="C1">
- <state id="State0" />
- <state id="State1" />
- <probabilities>0.5 0.5</probabilities>
- </cpt>
- <cpt id="E1">
- <state id="State0" />
- <state id="State1" />
- <parents>C1</parents>
- <probabilities>0.5 0.5 0.5 0.5</probabilities>
- </cpt>
- <cpt id="E2">
- <state id="State0" />
- <state id="State1" />
- <parents>C1</parents>
- <probabilities>0.5 0.5 0.5 0.5</probabilities>
- </cpt>
- <cpt id="E3">
- <state id="State0" />
- <state id="State1" />
- <parents>C1</parents>
- <probabilities>0.5 0.5 0.5 0.5</probabilities>
- </cpt>
- </nodes>
- <extensions>
- <genie version="1.0" app="GeNIe 2.0.4779.0" name="Network1" faultnameformat="nodestate">
- <node id="E1">
- <name>E1</name>
- <interior color="e5f6f7" />
- <outline color="000080" />
- <font color="000000" name="Arial" size="8" />
- <position>203 276 251 306</position>
- </node>
- <node id="E2">
- <name>E2</name>
- <interior color="e5f6f7" />
- <outline color="000080" />
- <font color="000000" name="Arial" size="8" />
- <position>365 272 413 302</position>
- </node>
- <node id="E3">
- <name>E3</name>
- <interior color="e5f6f7" />
- <outline color="000080" />
- <font color="000000" name="Arial" size="8" />
- <position>508 290 556 320</position>
- </node>
- <node id="C1">
- <name>C1</name>
- <interior color="e5f6f7" />
- <outline color="000080" />
- <font color="000000" name="Arial" size="8" />
- <position>354 101 390 123</position>
- </node>
- </genie>
- </extensions>
-</smile>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<smile version="1.0" id="Network1" numsamples="1000" discsamples="10000">
+ <nodes>
+ <cpt id="C1">
+ <state id="State0" />
+ <state id="State1" />
+ <probabilities>0.5 0.5</probabilities>
+ </cpt>
+ <cpt id="E1">
+ <state id="State0" />
+ <state id="State1" />
+ <parents>C1</parents>
+ <probabilities>0.5 0.5 0.5 0.5</probabilities>
+ </cpt>
+ <cpt id="E2">
+ <state id="State0" />
+ <state id="State1" />
+ <parents>C1</parents>
+ <probabilities>0.5 0.5 0.5 0.5</probabilities>
+ </cpt>
+ <cpt id="E3">
+ <state id="State0" />
+ <state id="State1" />
+ <parents>C1</parents>
+ <probabilities>0.5 0.5 0.5 0.5</probabilities>
+ </cpt>
+ </nodes>
+ <extensions>
+ <genie version="1.0" app="GeNIe 2.0.4779.0" name="Network1" faultnameformat="nodestate">
+ <node id="E1">
+ <name>E1</name>
+ <interior color="e5f6f7" />
+ <outline color="000080" />
+ <font color="000000" name="Arial" size="8" />
+ <position>203 276 251 306</position>
+ </node>
+ <node id="E2">
+ <name>E2</name>
+ <interior color="e5f6f7" />
+ <outline color="000080" />
+ <font color="000000" name="Arial" size="8" />
+ <position>365 272 413 302</position>
+ </node>
+ <node id="E3">
+ <name>E3</name>
+ <interior color="e5f6f7" />
+ <outline color="000080" />
+ <font color="000000" name="Arial" size="8" />
+ <position>508 290 556 320</position>
+ </node>
+ <node id="C1">
+ <name>C1</name>
+ <interior color="e5f6f7" />
+ <outline color="000080" />
+ <font color="000000" name="Arial" size="8" />
+ <position>354 101 390 123</position>
+ </node>
+ </genie>
+ </extensions>
+</smile>
diff --git a/EjercitarServer/redes/red_alumno_1.xdsl b/EjercitarServer/redes/red_alumno_1.xdsl
index 76e2209..9e30f46 100644
--- a/EjercitarServer/redes/red_alumno_1.xdsl
+++ b/EjercitarServer/redes/red_alumno_1.xdsl
@@ -1,60 +1,60 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<smile version="1.0" id="Network1" numsamples="1000" discsamples="10000">
- <nodes>
- <cpt id="C1">
- <state id="State0" />
- <state id="State1" />
- <probabilities>0.5 0.5</probabilities>
- </cpt>
- <cpt id="E1">
- <state id="State0" />
- <state id="State1" />
- <parents>C1</parents>
- <probabilities>0.5 0.5 0.5 0.5</probabilities>
- </cpt>
- <cpt id="E2">
- <state id="State0" />
- <state id="State1" />
- <parents>C1</parents>
- <probabilities>0.5 0.5 0.5 0.5</probabilities>
- </cpt>
- <cpt id="E3">
- <state id="State0" />
- <state id="State1" />
- <parents>C1</parents>
- <probabilities>0.5 0.5 0.5 0.5</probabilities>
- </cpt>
- </nodes>
- <extensions>
- <genie version="1.0" app="GeNIe 2.0.4779.0" name="Network1" faultnameformat="nodestate">
- <node id="E1">
- <name>E1</name>
- <interior color="e5f6f7" />
- <outline color="000080" />
- <font color="000000" name="Arial" size="8" />
- <position>203 276 251 306</position>
- </node>
- <node id="E2">
- <name>E2</name>
- <interior color="e5f6f7" />
- <outline color="000080" />
- <font color="000000" name="Arial" size="8" />
- <position>365 272 413 302</position>
- </node>
- <node id="E3">
- <name>E3</name>
- <interior color="e5f6f7" />
- <outline color="000080" />
- <font color="000000" name="Arial" size="8" />
- <position>508 290 556 320</position>
- </node>
- <node id="C1">
- <name>C1</name>
- <interior color="e5f6f7" />
- <outline color="000080" />
- <font color="000000" name="Arial" size="8" />
- <position>354 101 390 123</position>
- </node>
- </genie>
- </extensions>
-</smile>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<smile version="1.0" id="Network1" numsamples="1000" discsamples="10000">
+ <nodes>
+ <cpt id="C1">
+ <state id="State0" />
+ <state id="State1" />
+ <probabilities>0.5 0.5</probabilities>
+ </cpt>
+ <cpt id="E1">
+ <state id="State0" />
+ <state id="State1" />
+ <parents>C1</parents>
+ <probabilities>0.5 0.5 0.5 0.5</probabilities>
+ </cpt>
+ <cpt id="E2">
+ <state id="State0" />
+ <state id="State1" />
+ <parents>C1</parents>
+ <probabilities>0.5 0.5 0.5 0.5</probabilities>
+ </cpt>
+ <cpt id="E3">
+ <state id="State0" />
+ <state id="State1" />
+ <parents>C1</parents>
+ <probabilities>0.5 0.5 0.5 0.5</probabilities>
+ </cpt>
+ </nodes>
+ <extensions>
+ <genie version="1.0" app="GeNIe 2.0.4779.0" name="Network1" faultnameformat="nodestate">
+ <node id="E1">
+ <name>E1</name>
+ <interior color="e5f6f7" />
+ <outline color="000080" />
+ <font color="000000" name="Arial" size="8" />
+ <position>203 276 251 306</position>
+ </node>
+ <node id="E2">
+ <name>E2</name>
+ <interior color="e5f6f7" />
+ <outline color="000080" />
+ <font color="000000" name="Arial" size="8" />
+ <position>365 272 413 302</position>
+ </node>
+ <node id="E3">
+ <name>E3</name>
+ <interior color="e5f6f7" />
+ <outline color="000080" />
+ <font color="000000" name="Arial" size="8" />
+ <position>508 290 556 320</position>
+ </node>
+ <node id="C1">
+ <name>C1</name>
+ <interior color="e5f6f7" />
+ <outline color="000080" />
+ <font color="000000" name="Arial" size="8" />
+ <position>354 101 390 123</position>
+ </node>
+ </genie>
+ </extensions>
+</smile>
diff --git a/EjercitarServer/redes/red_base_curso_1.xdsl b/EjercitarServer/redes/red_base_curso_1.xdsl
index 76e2209..9e30f46 100644
--- a/EjercitarServer/redes/red_base_curso_1.xdsl
+++ b/EjercitarServer/redes/red_base_curso_1.xdsl
@@ -1,60 +1,60 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<smile version="1.0" id="Network1" numsamples="1000" discsamples="10000">
- <nodes>
- <cpt id="C1">
- <state id="State0" />
- <state id="State1" />
- <probabilities>0.5 0.5</probabilities>
- </cpt>
- <cpt id="E1">
- <state id="State0" />
- <state id="State1" />
- <parents>C1</parents>
- <probabilities>0.5 0.5 0.5 0.5</probabilities>
- </cpt>
- <cpt id="E2">
- <state id="State0" />
- <state id="State1" />
- <parents>C1</parents>
- <probabilities>0.5 0.5 0.5 0.5</probabilities>
- </cpt>
- <cpt id="E3">
- <state id="State0" />
- <state id="State1" />
- <parents>C1</parents>
- <probabilities>0.5 0.5 0.5 0.5</probabilities>
- </cpt>
- </nodes>
- <extensions>
- <genie version="1.0" app="GeNIe 2.0.4779.0" name="Network1" faultnameformat="nodestate">
- <node id="E1">
- <name>E1</name>
- <interior color="e5f6f7" />
- <outline color="000080" />
- <font color="000000" name="Arial" size="8" />
- <position>203 276 251 306</position>
- </node>
- <node id="E2">
- <name>E2</name>
- <interior color="e5f6f7" />
- <outline color="000080" />
- <font color="000000" name="Arial" size="8" />
- <position>365 272 413 302</position>
- </node>
- <node id="E3">
- <name>E3</name>
- <interior color="e5f6f7" />
- <outline color="000080" />
- <font color="000000" name="Arial" size="8" />
- <position>508 290 556 320</position>
- </node>
- <node id="C1">
- <name>C1</name>
- <interior color="e5f6f7" />
- <outline color="000080" />
- <font color="000000" name="Arial" size="8" />
- <position>354 101 390 123</position>
- </node>
- </genie>
- </extensions>
-</smile>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<smile version="1.0" id="Network1" numsamples="1000" discsamples="10000">
+ <nodes>
+ <cpt id="C1">
+ <state id="State0" />
+ <state id="State1" />
+ <probabilities>0.5 0.5</probabilities>
+ </cpt>
+ <cpt id="E1">
+ <state id="State0" />
+ <state id="State1" />
+ <parents>C1</parents>
+ <probabilities>0.5 0.5 0.5 0.5</probabilities>
+ </cpt>
+ <cpt id="E2">
+ <state id="State0" />
+ <state id="State1" />
+ <parents>C1</parents>
+ <probabilities>0.5 0.5 0.5 0.5</probabilities>
+ </cpt>
+ <cpt id="E3">
+ <state id="State0" />
+ <state id="State1" />
+ <parents>C1</parents>
+ <probabilities>0.5 0.5 0.5 0.5</probabilities>
+ </cpt>
+ </nodes>
+ <extensions>
+ <genie version="1.0" app="GeNIe 2.0.4779.0" name="Network1" faultnameformat="nodestate">
+ <node id="E1">
+ <name>E1</name>
+ <interior color="e5f6f7" />
+ <outline color="000080" />
+ <font color="000000" name="Arial" size="8" />
+ <position>203 276 251 306</position>
+ </node>
+ <node id="E2">
+ <name>E2</name>
+ <interior color="e5f6f7" />
+ <outline color="000080" />
+ <font color="000000" name="Arial" size="8" />
+ <position>365 272 413 302</position>
+ </node>
+ <node id="E3">
+ <name>E3</name>
+ <interior color="e5f6f7" />
+ <outline color="000080" />
+ <font color="000000" name="Arial" size="8" />
+ <position>508 290 556 320</position>
+ </node>
+ <node id="C1">
+ <name>C1</name>
+ <interior color="e5f6f7" />
+ <outline color="000080" />
+ <font color="000000" name="Arial" size="8" />
+ <position>354 101 390 123</position>
+ </node>
+ </genie>
+ </extensions>
+</smile>