diff --git a/l2g4/build/web/WEB-INF/classes/AbsoluteLayout.jar b/l2g4/build/web/WEB-INF/classes/AbsoluteLayout.jar
new file mode 100644
index 0000000000000000000000000000000000000000..ee023b600c027c1ff7917e3df7a2edad2fec36aa
Binary files /dev/null and b/l2g4/build/web/WEB-INF/classes/AbsoluteLayout.jar differ
diff --git a/l2g4/build/web/WEB-INF/classes/META-INF/persistence.xml b/l2g4/build/web/WEB-INF/classes/META-INF/persistence.xml
new file mode 100644
index 0000000000000000000000000000000000000000..fe0a7820956e63e8d285bcd01549009b04c14168
--- /dev/null
+++ b/l2g4/build/web/WEB-INF/classes/META-INF/persistence.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence version="2.1" xmlns="http://xmlns.jcp.org/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
+ <persistence-unit name="BData" transaction-type="RESOURCE_LOCAL">
+ <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
+ <class>Logica.Estado</class>
+ <class>Logica.Proponente</class>
+ <class>Logica.Categoria</class>
+ <class>Logica.Usuario</class>
+ <class>Logica.Colaboracion</class>
+ <class>Logica.Propuesta</class>
+ <class>Logica.Colaborador</class>
+ <class>Logica.NewEntity</class>
+ <class>Logica.datatype.Fecha</class>
+ <shared-cache-mode>NONE</shared-cache-mode>
+ <validation-mode>NONE</validation-mode>
+ <properties>
+ <property name="javax.persistence.jdbc.url" value="jdbc:mysql://localhost:3306/lab?zeroDateTimeBehavior=convertToNull"/>
+ <property name="javax.persistence.jdbc.user" value="root"/>
+ <property name="javax.persistence.jdbc.driver" value="com.mysql.jdbc.Driver"/>
+ <property name="javax.persistence.jdbc.password" value=""/>
+ <property name="javax.persistence.schema-generation.database.action" value="create"/>
+ </properties>
+ </persistence-unit>
+</persistence>
diff --git a/l2g4/build/web/WEB-INF/classes/controladores/login.class b/l2g4/build/web/WEB-INF/classes/controladores/login.class
index a7c430923773d4fecc7552d361b78125c7b66811..661942b62b4f591d57843a1c1a9cb563820f299b 100644
Binary files a/l2g4/build/web/WEB-INF/classes/controladores/login.class and b/l2g4/build/web/WEB-INF/classes/controladores/login.class differ
diff --git a/l2g4/build/web/WEB-INF/classes/eclipselink.jar b/l2g4/build/web/WEB-INF/classes/eclipselink.jar
new file mode 100644
index 0000000000000000000000000000000000000000..2b0a8104d5b584d63ab7880475671abfc13a7898
Binary files /dev/null and b/l2g4/build/web/WEB-INF/classes/eclipselink.jar differ
diff --git a/l2g4/build/web/WEB-INF/classes/hibernate-jpa-2.1-api-1.0.0.Final.jar b/l2g4/build/web/WEB-INF/classes/hibernate-jpa-2.1-api-1.0.0.Final.jar
new file mode 100644
index 0000000000000000000000000000000000000000..1bbbbb98061a577a2e64f39e06c26688c2220027
Binary files /dev/null and b/l2g4/build/web/WEB-INF/classes/hibernate-jpa-2.1-api-1.0.0.Final.jar differ
diff --git a/l2g4/build/web/WEB-INF/classes/javax.persistence_2.1.0.v201304241213.jar b/l2g4/build/web/WEB-INF/classes/javax.persistence_2.1.0.v201304241213.jar
new file mode 100644
index 0000000000000000000000000000000000000000..841d2e19b03423ad822c0a19b8838338559105bf
Binary files /dev/null and b/l2g4/build/web/WEB-INF/classes/javax.persistence_2.1.0.v201304241213.jar differ
diff --git a/l2g4/build/web/WEB-INF/classes/junit-4.12.jar b/l2g4/build/web/WEB-INF/classes/junit-4.12.jar
new file mode 100644
index 0000000000000000000000000000000000000000..e703cdea282c704bf2aa42dc2da5d832f4be9918
Binary files /dev/null and b/l2g4/build/web/WEB-INF/classes/junit-4.12.jar differ
diff --git a/l2g4/build/web/WEB-INF/classes/lib b/l2g4/build/web/WEB-INF/classes/lib
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/l2g4/build/web/WEB-INF/classes/mysql-connector-java-5.1.23-bin.jar b/l2g4/build/web/WEB-INF/classes/mysql-connector-java-5.1.23-bin.jar
new file mode 100644
index 0000000000000000000000000000000000000000..1f904143d35616209c204eda3f305f8115570ed4
Binary files /dev/null and b/l2g4/build/web/WEB-INF/classes/mysql-connector-java-5.1.23-bin.jar differ
diff --git a/l2g4/build/web/WEB-INF/classes/org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar b/l2g4/build/web/WEB-INF/classes/org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar
new file mode 100644
index 0000000000000000000000000000000000000000..001316b6b781d246fee4fbc48cfd70c62483d661
Binary files /dev/null and b/l2g4/build/web/WEB-INF/classes/org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar differ
diff --git a/l2g4/build/web/WEB-INF/lib/AbsoluteLayout.jar b/l2g4/build/web/WEB-INF/lib/AbsoluteLayout.jar
new file mode 100644
index 0000000000000000000000000000000000000000..ee023b600c027c1ff7917e3df7a2edad2fec36aa
Binary files /dev/null and b/l2g4/build/web/WEB-INF/lib/AbsoluteLayout.jar differ
diff --git a/l2g4/build/web/WEB-INF/lib/eclipselink.jar b/l2g4/build/web/WEB-INF/lib/eclipselink.jar
new file mode 100644
index 0000000000000000000000000000000000000000..2b0a8104d5b584d63ab7880475671abfc13a7898
Binary files /dev/null and b/l2g4/build/web/WEB-INF/lib/eclipselink.jar differ
diff --git a/l2g4/build/web/WEB-INF/lib/g4-prog-app-lab1.jar b/l2g4/build/web/WEB-INF/lib/g4-prog-app-lab1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..c0c6a6f0891f70f08d05f020453cb0e92317eeb7
Binary files /dev/null and b/l2g4/build/web/WEB-INF/lib/g4-prog-app-lab1.jar differ
diff --git a/l2g4/build/web/WEB-INF/lib/hibernate-jpa-2.1-api-1.0.0.Final.jar b/l2g4/build/web/WEB-INF/lib/hibernate-jpa-2.1-api-1.0.0.Final.jar
new file mode 100644
index 0000000000000000000000000000000000000000..1bbbbb98061a577a2e64f39e06c26688c2220027
Binary files /dev/null and b/l2g4/build/web/WEB-INF/lib/hibernate-jpa-2.1-api-1.0.0.Final.jar differ
diff --git a/l2g4/build/web/WEB-INF/lib/javax.persistence_2.1.0.v201304241213.jar b/l2g4/build/web/WEB-INF/lib/javax.persistence_2.1.0.v201304241213.jar
new file mode 100644
index 0000000000000000000000000000000000000000..841d2e19b03423ad822c0a19b8838338559105bf
Binary files /dev/null and b/l2g4/build/web/WEB-INF/lib/javax.persistence_2.1.0.v201304241213.jar differ
diff --git a/l2g4/build/web/WEB-INF/lib/junit-4.12.jar b/l2g4/build/web/WEB-INF/lib/junit-4.12.jar
new file mode 100644
index 0000000000000000000000000000000000000000..e703cdea282c704bf2aa42dc2da5d832f4be9918
Binary files /dev/null and b/l2g4/build/web/WEB-INF/lib/junit-4.12.jar differ
diff --git a/l2g4/build/web/WEB-INF/lib/mysql-connector-java-5.1.23-bin.jar b/l2g4/build/web/WEB-INF/lib/mysql-connector-java-5.1.23-bin.jar
new file mode 100644
index 0000000000000000000000000000000000000000..1f904143d35616209c204eda3f305f8115570ed4
Binary files /dev/null and b/l2g4/build/web/WEB-INF/lib/mysql-connector-java-5.1.23-bin.jar differ
diff --git a/l2g4/build/web/WEB-INF/lib/org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar b/l2g4/build/web/WEB-INF/lib/org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar
new file mode 100644
index 0000000000000000000000000000000000000000..001316b6b781d246fee4fbc48cfd70c62483d661
Binary files /dev/null and b/l2g4/build/web/WEB-INF/lib/org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar differ
diff --git a/l2g4/build/web/js/app-ajax.js b/l2g4/build/web/js/app-ajax.js
index 03d42570fe7ef1593144374d31f236016b4cf57b..c784ce499e5a1f5bc37d79acfa8e4c7091561e22 100644
--- a/l2g4/build/web/js/app-ajax.js
+++ b/l2g4/build/web/js/app-ajax.js
@@ -76,7 +76,7 @@ function funcionLogout() {
cargar(true);
},
success: function (responseText) {
- window.location.href = responseText;
+ window.location.href = window.location.origin + "/g4/login";
},
error: function (jqXHR, textStatus) {
alert(textStatus);
@@ -107,7 +107,7 @@ function funcionLogin() {
if (responseText == "exito") {
window.location.href = window.location.origin + "/g4";
} else {
- alert(textStatus);
+ alert(responseText);
cargar(false);
}
},
diff --git a/l2g4/nbproject/build-impl.xml b/l2g4/nbproject/build-impl.xml
index f4ee7678f0eb763d6ea91a5aa5e348c109de911c..97babc73ad134203b0f78cc15df4b35fe4bef04f 100644
--- a/l2g4/nbproject/build-impl.xml
+++ b/l2g4/nbproject/build-impl.xml
@@ -852,8 +852,16 @@ exists or setup the property manually. For example like this:
<!--
COMPILATION SECTION
-->
- <target depends="init" if="no.dist.ear.dir" name="deps-module-jar" unless="no.deps"/>
- <target depends="init" if="dist.ear.dir" name="deps-ear-jar" unless="no.deps"/>
+ <target depends="init" if="no.dist.ear.dir" name="deps-module-jar" unless="no.deps">
+ <ant antfile="${project.g4-prog-app-lab1}/build.xml" inheritall="false" target="jar">
+ <property name="deploy.on.save" value="false"/>
+ </ant>
+ </target>
+ <target depends="init" if="dist.ear.dir" name="deps-ear-jar" unless="no.deps">
+ <ant antfile="${project.g4-prog-app-lab1}/build.xml" inheritall="false" target="jar">
+ <property name="deploy.on.save" value="false"/>
+ </ant>
+ </target>
<target depends="init, deps-module-jar, deps-ear-jar" name="deps-jar" unless="no.deps"/>
<target depends="init,deps-jar" name="-pre-pre-compile">
<mkdir dir="${build.classes.dir}"/>
@@ -997,10 +1005,27 @@ exists or setup the property manually. For example like this:
</target>
<target depends="init,compile,compile-jsps,-pre-dist,-do-dist-with-manifest,-do-dist-without-manifest" name="do-dist"/>
<target depends="init" if="dist.ear.dir" name="library-inclusion-in-manifest">
+ <copyfiles files="${reference.g4-prog-app-lab1.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+ <copyfiles files="${file.reference.AbsoluteLayout.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+ <copyfiles files="${file.reference.eclipselink.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+ <copyfiles files="${file.reference.hibernate-jpa-2.1-api-1.0.0.Final.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+ <copyfiles files="${file.reference.javax.persistence_2.1.0.v201304241213.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+ <copyfiles files="${file.reference.junit-4.12.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+ <copyfiles files="${file.reference.mysql-connector-java-5.1.23-bin.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+ <copyfiles files="${file.reference.org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
<mkdir dir="${build.web.dir}/META-INF"/>
<manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update"/>
</target>
- <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir"/>
+ <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir">
+ <copyfiles files="${reference.g4-prog-app-lab1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+ <copyfiles files="${file.reference.AbsoluteLayout.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+ <copyfiles files="${file.reference.eclipselink.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+ <copyfiles files="${file.reference.hibernate-jpa-2.1-api-1.0.0.Final.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+ <copyfiles files="${file.reference.javax.persistence_2.1.0.v201304241213.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+ <copyfiles files="${file.reference.junit-4.12.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+ <copyfiles files="${file.reference.mysql-connector-java-5.1.23-bin.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+ <copyfiles files="${file.reference.org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+ </target>
<target depends="init" if="dist.ear.dir" name="-clean-webinf-lib">
<delete dir="${build.web.dir}/WEB-INF/lib"/>
</target>
@@ -1412,7 +1437,9 @@ exists or setup the property manually. For example like this:
CLEANUP SECTION
-->
- <target depends="init" name="deps-clean" unless="no.deps"/>
+ <target depends="init" name="deps-clean" unless="no.deps">
+ <ant antfile="${project.g4-prog-app-lab1}/build.xml" inheritall="false" target="clean"/>
+ </target>
<target depends="init" name="do-clean">
<condition property="build.dir.to.clean" value="${build.web.dir}">
<isset property="dist.ear.dir"/>
diff --git a/l2g4/nbproject/genfiles.properties b/l2g4/nbproject/genfiles.properties
index b2085be5b35981db22d146b6b2bfc58fd3fba0b6..a51bcf2a9b246004ba489c672f3b592236c83c0b 100644
--- a/l2g4/nbproject/genfiles.properties
+++ b/l2g4/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=d553fb62
+build.xml.data.CRC32=c00034bd
build.xml.script.CRC32=d5be6e33
build.xml.stylesheet.CRC32=651128d4@1.77.1.1
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=d553fb62
-nbproject/build-impl.xml.script.CRC32=5567c273
+nbproject/build-impl.xml.data.CRC32=c00034bd
+nbproject/build-impl.xml.script.CRC32=6a8530b8
nbproject/build-impl.xml.stylesheet.CRC32=99ea4b56@1.77.1.1
diff --git a/l2g4/nbproject/private/private.properties b/l2g4/nbproject/private/private.properties
index 777499a78595e9dbaa88d3f64fb92b933b6c410a..1c0ee1bb2d15c37546b38d249e369a40b78e4312 100644
--- a/l2g4/nbproject/private/private.properties
+++ b/l2g4/nbproject/private/private.properties
@@ -1,7 +1,7 @@
-deploy.ant.properties.file=C:\\Users\\pecaa\\AppData\\Roaming\\NetBeans\\8.2\\tomcat90.properties
+deploy.ant.properties.file=C:\\Users\\Mauro\\AppData\\Roaming\\NetBeans\\8.2\\tomcat90.properties
j2ee.server.home=C:/tomcat
j2ee.server.instance=tomcat90:home=C:\\tomcat
javac.debug=true
javadoc.preview=true
selected.browser=Chrome
-user.properties.file=C:\\Users\\pecaa\\AppData\\Roaming\\NetBeans\\8.2\\build.properties
+user.properties.file=C:\\Users\\Mauro\\AppData\\Roaming\\NetBeans\\8.2\\build.properties
diff --git a/l2g4/nbproject/project.properties b/l2g4/nbproject/project.properties
index 4a328e8832d2aac620ce6c01e9725d1117584542..d31f1e9f418f6ef3616a77bcf83b793a6e126aad 100644
--- a/l2g4/nbproject/project.properties
+++ b/l2g4/nbproject/project.properties
@@ -37,15 +37,30 @@ dist.war=${dist.dir}/${war.name}
endorsed.classpath=\
${libs.javaee-endorsed-api-7.0.classpath}
excludes=
+file.reference.AbsoluteLayout.jar=C:\\Users\\Mauro\\Desktop\\lab\\lab1-prog-app\\g4-prog-app-lab1\\dist\\lib\\AbsoluteLayout.jar
+file.reference.eclipselink.jar=C:\\Users\\Mauro\\Desktop\\lab\\lab1-prog-app\\g4-prog-app-lab1\\dist\\lib\\eclipselink.jar
+file.reference.hibernate-jpa-2.1-api-1.0.0.Final.jar=C:\\Users\\Mauro\\Desktop\\lab\\lab1-prog-app\\g4-prog-app-lab1\\dist\\lib\\hibernate-jpa-2.1-api-1.0.0.Final.jar
+file.reference.javax.persistence_2.1.0.v201304241213.jar=C:\\Users\\Mauro\\Desktop\\lab\\lab1-prog-app\\g4-prog-app-lab1\\dist\\lib\\javax.persistence_2.1.0.v201304241213.jar
+file.reference.junit-4.12.jar=C:\\Users\\Mauro\\Desktop\\lab\\lab1-prog-app\\g4-prog-app-lab1\\dist\\lib\\junit-4.12.jar
+file.reference.mysql-connector-java-5.1.23-bin.jar=C:\\Users\\Mauro\\Desktop\\lab\\lab1-prog-app\\g4-prog-app-lab1\\dist\\lib\\mysql-connector-java-5.1.23-bin.jar
+file.reference.org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar=C:\\Users\\Mauro\\Desktop\\lab\\lab1-prog-app\\g4-prog-app-lab1\\dist\\lib\\org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar
includes=**
j2ee.compile.on.save=true
j2ee.copy.static.files.on.save=true
j2ee.deploy.on.save=true
j2ee.platform=1.7-web
-j2ee.platform.classpath=${j2ee.server.home}/lib/annotations-api.jar:${j2ee.server.home}/lib/catalina-ant.jar:${j2ee.server.home}/lib/catalina-ha.jar:${j2ee.server.home}/lib/catalina-storeconfig.jar:${j2ee.server.home}/lib/catalina-tribes.jar:${j2ee.server.home}/lib/catalina.jar:${j2ee.server.home}/lib/ecj-4.7.3a.jar:${j2ee.server.home}/lib/el-api.jar:${j2ee.server.home}/lib/jasper-el.jar:${j2ee.server.home}/lib/jasper.jar:${j2ee.server.home}/lib/jaspic-api.jar:${j2ee.server.home}/lib/jsp-api.jar:${j2ee.server.home}/lib/servlet-api.jar:${j2ee.server.home}/lib/tomcat-api.jar:${j2ee.server.home}/lib/tomcat-coyote.jar:${j2ee.server.home}/lib/tomcat-dbcp.jar:${j2ee.server.home}/lib/tomcat-i18n-es.jar:${j2ee.server.home}/lib/tomcat-i18n-fr.jar:${j2ee.server.home}/lib/tomcat-i18n-ja.jar:${j2ee.server.home}/lib/tomcat-i18n-ru.jar:${j2ee.server.home}/lib/tomcat-jdbc.jar:${j2ee.server.home}/lib/tomcat-jni.jar:${j2ee.server.home}/lib/tomcat-util-scan.jar:${j2ee.server.home}/lib/tomcat-util.jar:${j2ee.server.home}/lib/tomcat-websocket.jar:${j2ee.server.home}/lib/websocket-api.jar
+j2ee.platform.classpath=${j2ee.server.home}/lib/annotations-api.jar:${j2ee.server.home}/lib/catalina-ant.jar:${j2ee.server.home}/lib/catalina-ha.jar:${j2ee.server.home}/lib/catalina-storeconfig.jar:${j2ee.server.home}/lib/catalina-tribes.jar:${j2ee.server.home}/lib/catalina.jar:${j2ee.server.home}/lib/ecj-4.7.3a.jar:${j2ee.server.home}/lib/el-api.jar:${j2ee.server.home}/lib/jasper-el.jar:${j2ee.server.home}/lib/jasper.jar:${j2ee.server.home}/lib/jaspic-api.jar:${j2ee.server.home}/lib/jsp-api.jar:${j2ee.server.home}/lib/servlet-api.jar:${j2ee.server.home}/lib/tomcat-api.jar:${j2ee.server.home}/lib/tomcat-coyote.jar:${j2ee.server.home}/lib/tomcat-dbcp.jar:${j2ee.server.home}/lib/tomcat-i18n-es.jar:${j2ee.server.home}/lib/tomcat-i18n-fr.jar:${j2ee.server.home}/lib/tomcat-i18n-ja.jar:${j2ee.server.home}/lib/tomcat-jdbc.jar:${j2ee.server.home}/lib/tomcat-jni.jar:${j2ee.server.home}/lib/tomcat-util-scan.jar:${j2ee.server.home}/lib/tomcat-util.jar:${j2ee.server.home}/lib/tomcat-websocket.jar:${j2ee.server.home}/lib/websocket-api.jar
j2ee.server.type=Tomcat
jar.compress=false
-javac.classpath=
+javac.classpath=\
+ ${reference.g4-prog-app-lab1.jar}:\
+ ${file.reference.AbsoluteLayout.jar}:\
+ ${file.reference.eclipselink.jar}:\
+ ${file.reference.hibernate-jpa-2.1-api-1.0.0.Final.jar}:\
+ ${file.reference.javax.persistence_2.1.0.v201304241213.jar}:\
+ ${file.reference.junit-4.12.jar}:\
+ ${file.reference.mysql-connector-java-5.1.23-bin.jar}:\
+ ${file.reference.org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar}
# Space-separated list of extra javac options
javac.compilerargs=
javac.debug=true
@@ -74,6 +89,8 @@ javadoc.windowtitle=
lib.dir=${web.docbase.dir}/WEB-INF/lib
persistence.xml.dir=${conf.dir}
platform.active=default_platform
+project.g4-prog-app-lab1=../../../lab/lab1-prog-app/g4-prog-app-lab1
+reference.g4-prog-app-lab1.jar=${project.g4-prog-app-lab1}/dist/g4-prog-app-lab1.jar
resource.dir=setup
run.test.classpath=\
${javac.test.classpath}:\
diff --git a/l2g4/nbproject/project.xml b/l2g4/nbproject/project.xml
index 7bc8ff5bbd61815b16677fab4dfaae9e62c3a31e..a122fb192136c4d555226e4905c66a65bd2bb6c7 100644
--- a/l2g4/nbproject/project.xml
+++ b/l2g4/nbproject/project.xml
@@ -5,7 +5,40 @@
<data xmlns="http://www.netbeans.org/ns/web-project/3">
<name>l2g4</name>
<minimum-ant-version>1.6.5</minimum-ant-version>
- <web-module-libraries/>
+ <web-module-libraries>
+ <library dirs="200">
+ <file>${reference.g4-prog-app-lab1.jar}</file>
+ <path-in-war>WEB-INF/lib</path-in-war>
+ </library>
+ <library dirs="200">
+ <file>${file.reference.AbsoluteLayout.jar}</file>
+ <path-in-war>WEB-INF/lib</path-in-war>
+ </library>
+ <library dirs="200">
+ <file>${file.reference.eclipselink.jar}</file>
+ <path-in-war>WEB-INF/lib</path-in-war>
+ </library>
+ <library dirs="200">
+ <file>${file.reference.hibernate-jpa-2.1-api-1.0.0.Final.jar}</file>
+ <path-in-war>WEB-INF/lib</path-in-war>
+ </library>
+ <library dirs="200">
+ <file>${file.reference.javax.persistence_2.1.0.v201304241213.jar}</file>
+ <path-in-war>WEB-INF/lib</path-in-war>
+ </library>
+ <library dirs="200">
+ <file>${file.reference.junit-4.12.jar}</file>
+ <path-in-war>WEB-INF/lib</path-in-war>
+ </library>
+ <library dirs="200">
+ <file>${file.reference.mysql-connector-java-5.1.23-bin.jar}</file>
+ <path-in-war>WEB-INF/lib</path-in-war>
+ </library>
+ <library dirs="200">
+ <file>${file.reference.org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar}</file>
+ <path-in-war>WEB-INF/lib</path-in-war>
+ </library>
+ </web-module-libraries>
<web-module-additional-libraries/>
<source-roots>
<root id="src.dir"/>
@@ -15,5 +48,15 @@
</test-roots>
</data>
<libraries xmlns="http://www.netbeans.org/ns/cdnjs-libraries/1"/>
+ <references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
+ <reference>
+ <foreign-project>g4-prog-app-lab1</foreign-project>
+ <artifact-type>jar</artifact-type>
+ <script>build.xml</script>
+ <target>jar</target>
+ <clean-target>clean</clean-target>
+ <id>jar</id>
+ </reference>
+ </references>
</configuration>
</project>
diff --git a/l2g4/src/java/META-INF/persistence.xml b/l2g4/src/java/META-INF/persistence.xml
new file mode 100644
index 0000000000000000000000000000000000000000..fe0a7820956e63e8d285bcd01549009b04c14168
--- /dev/null
+++ b/l2g4/src/java/META-INF/persistence.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence version="2.1" xmlns="http://xmlns.jcp.org/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
+ <persistence-unit name="BData" transaction-type="RESOURCE_LOCAL">
+ <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
+ <class>Logica.Estado</class>
+ <class>Logica.Proponente</class>
+ <class>Logica.Categoria</class>
+ <class>Logica.Usuario</class>
+ <class>Logica.Colaboracion</class>
+ <class>Logica.Propuesta</class>
+ <class>Logica.Colaborador</class>
+ <class>Logica.NewEntity</class>
+ <class>Logica.datatype.Fecha</class>
+ <shared-cache-mode>NONE</shared-cache-mode>
+ <validation-mode>NONE</validation-mode>
+ <properties>
+ <property name="javax.persistence.jdbc.url" value="jdbc:mysql://localhost:3306/lab?zeroDateTimeBehavior=convertToNull"/>
+ <property name="javax.persistence.jdbc.user" value="root"/>
+ <property name="javax.persistence.jdbc.driver" value="com.mysql.jdbc.Driver"/>
+ <property name="javax.persistence.jdbc.password" value=""/>
+ <property name="javax.persistence.schema-generation.database.action" value="create"/>
+ </properties>
+ </persistence-unit>
+</persistence>
diff --git a/l2g4/src/java/controladores/login.java b/l2g4/src/java/controladores/login.java
index 1ed6d75b2c415763f8f3a111a3a33bf5b0b8531a..3378e6930b0c678d072e23ffff398d1fa9523a79 100644
--- a/l2g4/src/java/controladores/login.java
+++ b/l2g4/src/java/controladores/login.java
@@ -5,6 +5,8 @@ package controladores;
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
+import Logica.Factory;
+import Logica.ISistema;
import java.io.IOException;
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletException;
@@ -130,14 +132,20 @@ public class login extends HttpServlet {
}else if ( userPass == null || "".equals(userPass)) {
return "Nick es nesecario";
} else {
- if (userName.equals("g4") && userPass.equals("123")){
- HttpSession s = request.getSession();
- s.setAttribute("userName", userName);
- s.setAttribute("userId", 1);
- s.setAttribute("imgUser", "avatar.png");
- return "exito";
+ ISistema sys = null;
+ sys = Factory.getInstance();
+ if (sys.existeUser(userName)){
+ if ( userPass.equals("123")){
+ HttpSession s = request.getSession();
+ s.setAttribute("userName", userName);
+ s.setAttribute("userId", 1);
+ s.setAttribute("imgUser", "avatar.png");
+ return "exito";
+ }else{
+ return "El passwerd no es valido.";
+ }
}else{
- return "Credenciales no validas.";
+ return "El usuario no existe";
}
}
}
diff --git a/l2g4/web/js/app-ajax.js b/l2g4/web/js/app-ajax.js
index 03d42570fe7ef1593144374d31f236016b4cf57b..c784ce499e5a1f5bc37d79acfa8e4c7091561e22 100644
--- a/l2g4/web/js/app-ajax.js
+++ b/l2g4/web/js/app-ajax.js
@@ -76,7 +76,7 @@ function funcionLogout() {
cargar(true);
},
success: function (responseText) {
- window.location.href = responseText;
+ window.location.href = window.location.origin + "/g4/login";
},
error: function (jqXHR, textStatus) {
alert(textStatus);
@@ -107,7 +107,7 @@ function funcionLogin() {
if (responseText == "exito") {
window.location.href = window.location.origin + "/g4";
} else {
- alert(textStatus);
+ alert(responseText);
cargar(false);
}
},