diff --git a/l2g4/build/web/WEB-INF/classes/controladores/conexionServidor.class b/l2g4/build/web/WEB-INF/classes/controladores/conexionServidor.class index c67788f6bf7ae13ff75def9bd3015da904ad0ca0..670d50c992790201c3a2a62e8b9f2395559f4cea 100644 Binary files a/l2g4/build/web/WEB-INF/classes/controladores/conexionServidor.class and b/l2g4/build/web/WEB-INF/classes/controladores/conexionServidor.class differ diff --git a/l2g4/build/web/WEB-INF/classes/controladores/propuesta.class b/l2g4/build/web/WEB-INF/classes/controladores/propuesta.class index 43d84ac4887d9b48d77c7d61a06289beff1e3fde..438564cc3caebd3c9e0607112986ab3553719260 100644 Binary files a/l2g4/build/web/WEB-INF/classes/controladores/propuesta.class and b/l2g4/build/web/WEB-INF/classes/controladores/propuesta.class differ diff --git a/l2g4/build/web/WEB-INF/lib/AbsoluteLayout.jar b/l2g4/build/web/WEB-INF/lib/AbsoluteLayout.jar index ee023b600c027c1ff7917e3df7a2edad2fec36aa..6106c0cd44d9b51cdbb9cda27898cefa2526f668 100644 Binary files a/l2g4/build/web/WEB-INF/lib/AbsoluteLayout.jar and b/l2g4/build/web/WEB-INF/lib/AbsoluteLayout.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 index 6853b2c1adcf1cc9afee5f6d3704488d5dcd63b1..8960badff2166325ccaeb6cd1adf83e9765841dc 100644 Binary files a/l2g4/build/web/WEB-INF/lib/g4-prog-app-lab1.jar and b/l2g4/build/web/WEB-INF/lib/g4-prog-app-lab1.jar differ diff --git a/l2g4/nbproject/build-impl.xml b/l2g4/nbproject/build-impl.xml index 9d8862b6d2c7d2674dc54ba3c90600886f05fbdc..7951dbfc740d4d24cf7fe94db0df5bb94ceb8416 100644 --- a/l2g4/nbproject/build-impl.xml +++ b/l2g4/nbproject/build-impl.xml @@ -1009,7 +1009,6 @@ exists or setup the property manually. For example like this: <copyfiles files="${file.reference.AbsoluteLayout.jar-1}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> <copyfiles files="${file.reference.eclipselink.jar-1}" 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-1}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> - <copyfiles files="${file.reference.javaee-endorsed-api-7.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> <copyfiles files="${file.reference.javax.persistence_2.1.0.v201304241213.jar-1}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> <copyfiles files="${file.reference.junit-4.12.jar-1}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> <copyfiles files="${file.reference.mysql-connector-java-5.1.23-bin.jar-1}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> @@ -1022,7 +1021,6 @@ exists or setup the property manually. For example like this: <copyfiles files="${file.reference.AbsoluteLayout.jar-1}" todir="${build.web.dir}/WEB-INF/lib"/> <copyfiles files="${file.reference.eclipselink.jar-1}" todir="${build.web.dir}/WEB-INF/lib"/> <copyfiles files="${file.reference.hibernate-jpa-2.1-api-1.0.0.Final.jar-1}" todir="${build.web.dir}/WEB-INF/lib"/> - <copyfiles files="${file.reference.javaee-endorsed-api-7.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/> <copyfiles files="${file.reference.javax.persistence_2.1.0.v201304241213.jar-1}" todir="${build.web.dir}/WEB-INF/lib"/> <copyfiles files="${file.reference.junit-4.12.jar-1}" todir="${build.web.dir}/WEB-INF/lib"/> <copyfiles files="${file.reference.mysql-connector-java-5.1.23-bin.jar-1}" todir="${build.web.dir}/WEB-INF/lib"/> diff --git a/l2g4/nbproject/genfiles.properties b/l2g4/nbproject/genfiles.properties index 3077fbea1ea7aff91a03aa3c70ea4a3a426d2363..dcc12339df78c379685d12184a98d8c3d18cf581 100644 --- a/l2g4/nbproject/genfiles.properties +++ b/l2g4/nbproject/genfiles.properties @@ -1,7 +1,7 @@ <<<<<<< HEAD build.xml.data.CRC32=dbc419d9 ======= -build.xml.data.CRC32=c33fd41a +build.xml.data.CRC32=59c50e8c >>>>>>> e55d2475b563ab87924b9d321e1a91c023dfa39a build.xml.script.CRC32=d5be6e33 build.xml.stylesheet.CRC32=651128d4@1.77.1.1 @@ -11,7 +11,7 @@ build.xml.stylesheet.CRC32=651128d4@1.77.1.1 nbproject/build-impl.xml.data.CRC32=dbc419d9 nbproject/build-impl.xml.script.CRC32=642d49ec ======= -nbproject/build-impl.xml.data.CRC32=c33fd41a -nbproject/build-impl.xml.script.CRC32=0cd0bab3 +nbproject/build-impl.xml.data.CRC32=59c50e8c +nbproject/build-impl.xml.script.CRC32=1ef82e0d >>>>>>> e55d2475b563ab87924b9d321e1a91c023dfa39a 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..79991a0f4f3746bbb6f4ebb35c4548761a58cc65 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 -j2ee.server.home=C:/tomcat -j2ee.server.instance=tomcat90:home=C:\\tomcat +deploy.ant.properties.file=C:\\Users\\Admin\\AppData\\Roaming\\NetBeans\\8.2\\tomcat90.properties +j2ee.server.home=C:/Users/Admin/Desktop/apache-tomcat-9.0.12 +j2ee.server.instance=tomcat90:home=C:\\Users\\Admin\\Desktop\\apache-tomcat-9.0.12 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\\Admin\\AppData\\Roaming\\NetBeans\\8.2\\build.properties diff --git a/l2g4/nbproject/private/private.xml b/l2g4/nbproject/private/private.xml index ac601bf8e903851210aa4272f4bdb045d7951c81..5dda32f7645ae77d9b4f39e143a15f02bf8aa3b8 100644 --- a/l2g4/nbproject/private/private.xml +++ b/l2g4/nbproject/private/private.xml @@ -3,14 +3,9 @@ <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/> <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2"> <group> - <file>file:/C:/tecnologo/Lab2/lab2-prog-app/l2g4/web/js/app-ajax.js</file> - <file>file:/C:/tecnologo/Lab2/lab2-prog-app/l2g4/web/page/nav.jspf</file> - <file>file:/C:/tecnologo/Lab2/lab2-prog-app/l2g4/src/java/controladores/colaboracion.java</file> - <file>file:/C:/tecnologo/Lab2/lab2-prog-app/l2g4/src/java/controladores/addUser.java</file> - <file>file:/C:/tecnologo/Lab2/lab2-prog-app/l2g4/web/page/user/registro-usuario.jsp</file> - <file>file:/C:/tecnologo/Lab2/lab2-prog-app/l2g4/src/java/controladores/user.java</file> - <file>file:/C:/tecnologo/Lab2/lab2-prog-app/l2g4/src/java/controladores/login.java</file> - <file>file:/C:/tecnologo/Lab2/lab2-prog-app/l2g4/src/java/controladores/propuesta.java</file> + <file>file:/C:/Users/Admin/Documents/GitHub/lab2-prog-app/l2g4/src/java/controladores/conexionServidor.java</file> + <file>file:/C:/Users/Admin/Documents/GitHub/lab2-prog-app/l2g4/src/java/controladores/propuesta.java</file> + <file>file:/C:/Users/Admin/Documents/GitHub/lab2-prog-app/l2g4/src/java/controladores/user.java</file> </group> </open-files> </project-private> diff --git a/l2g4/nbproject/project.properties b/l2g4/nbproject/project.properties index cc3265fcaafddefa74f5730d03043514dcf1e3aa..eead90b6849943358625070b73c93cc11a3ceddb 100644 --- a/l2g4/nbproject/project.properties +++ b/l2g4/nbproject/project.properties @@ -39,18 +39,17 @@ endorsed.classpath=\ excludes= <<<<<<< HEAD file.reference.AbsoluteLayout.jar=C:\\tecnologo\\lab1-prog-app\\g4-prog-app-lab1\\dist\\lib\\AbsoluteLayout.jar -file.reference.AbsoluteLayout.jar-1=C:\\tecnologo\\lab1-prog-app\\g4-prog-app-lab1\\dist\\lib\\AbsoluteLayout.jar +file.reference.AbsoluteLayout.jar-1=C:\\Users\\Admin\\Documents\\GitHub\\lab1-prog-app\\g4-prog-app-lab1\\dist\\lib\\AbsoluteLayout.jar file.reference.eclipselink.jar=C:\\tecnologo\\lab1-prog-app\\g4-prog-app-lab1\\dist\\lib\\eclipselink.jar -file.reference.eclipselink.jar-1=C:\\tecnologo\\lab1-prog-app\\g4-prog-app-lab1\\dist\\lib\\eclipselink.jar +file.reference.eclipselink.jar-1=C:\\Users\\Admin\\Documents\\GitHub\\lab1-prog-app\\g4-prog-app-lab1\\dist\\lib\\eclipselink.jar file.reference.hibernate-jpa-2.1-api-1.0.0.Final.jar=C:\\tecnologo\\lab1-prog-app\\g4-prog-app-lab1\\dist\\lib\\hibernate-jpa-2.1-api-1.0.0.Final.jar -file.reference.hibernate-jpa-2.1-api-1.0.0.Final.jar-1=C:\\tecnologo\\lab1-prog-app\\g4-prog-app-lab1\\dist\\lib\\hibernate-jpa-2.1-api-1.0.0.Final.jar -file.reference.javaee-endorsed-api-7.0.jar=C:\\tecnologo\\lab1-prog-app\\g4-prog-app-lab1\\dist\\lib\\javaee-endorsed-api-7.0.jar +file.reference.hibernate-jpa-2.1-api-1.0.0.Final.jar-1=C:\\Users\\Admin\\Documents\\GitHub\\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:\\tecnologo\\lab1-prog-app\\g4-prog-app-lab1\\dist\\lib\\javax.persistence_2.1.0.v201304241213.jar -file.reference.javax.persistence_2.1.0.v201304241213.jar-1=C:\\tecnologo\\lab1-prog-app\\g4-prog-app-lab1\\dist\\lib\\javax.persistence_2.1.0.v201304241213.jar +file.reference.javax.persistence_2.1.0.v201304241213.jar-1=C:\\Users\\Admin\\Documents\\GitHub\\lab1-prog-app\\g4-prog-app-lab1\\dist\\lib\\javax.persistence_2.1.0.v201304241213.jar file.reference.junit-4.12.jar=C:\\tecnologo\\lab1-prog-app\\g4-prog-app-lab1\\dist\\lib\\junit-4.12.jar -file.reference.junit-4.12.jar-1=C:\\tecnologo\\lab1-prog-app\\g4-prog-app-lab1\\dist\\lib\\junit-4.12.jar +file.reference.junit-4.12.jar-1=C:\\Users\\Admin\\Documents\\GitHub\\lab1-prog-app\\g4-prog-app-lab1\\dist\\lib\\junit-4.12.jar file.reference.mysql-connector-java-5.1.23-bin.jar=C:\\tecnologo\\lab1-prog-app\\g4-prog-app-lab1\\dist\\lib\\mysql-connector-java-5.1.23-bin.jar -file.reference.mysql-connector-java-5.1.23-bin.jar-1=C:\\tecnologo\\lab1-prog-app\\g4-prog-app-lab1\\dist\\lib\\mysql-connector-java-5.1.23-bin.jar +file.reference.mysql-connector-java-5.1.23-bin.jar-1=C:\\Users\\Admin\\Documents\\GitHub\\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:\\tecnologo\\lab1-prog-app\\g4-prog-app-lab1\\dist\\lib\\org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar ======= file.reference.AbsoluteLayout.jar=C:\\Users\\Mauro\\Desktop\\lab\\lab1-prog-app\\g4-prog-app-lab1\\dist\\lib\\AbsoluteLayout.jar @@ -61,13 +60,13 @@ file.reference.junit-4.12.jar=C:\\Users\\Mauro\\Desktop\\lab\\lab1-prog-app\\g4- 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 >>>>>>> e55d2475b563ab87924b9d321e1a91c023dfa39a -file.reference.org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar-1=C:\\tecnologo\\lab1-prog-app\\g4-prog-app-lab1\\dist\\lib\\org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar +file.reference.org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar-1=C:\\Users\\Admin\\Documents\\GitHub\\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/org-netbeans-modules-java-j2seproject-copylibstask.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-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.server.type=Tomcat jar.compress=false javac.classpath=\ @@ -75,7 +74,6 @@ javac.classpath=\ ${file.reference.AbsoluteLayout.jar-1}:\ ${file.reference.eclipselink.jar-1}:\ ${file.reference.hibernate-jpa-2.1-api-1.0.0.Final.jar-1}:\ - ${file.reference.javaee-endorsed-api-7.0.jar}:\ ${file.reference.javax.persistence_2.1.0.v201304241213.jar-1}:\ ${file.reference.junit-4.12.jar-1}:\ ${file.reference.mysql-connector-java-5.1.23-bin.jar-1}:\ @@ -124,7 +122,7 @@ 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 -project.g4-prog-app-lab1-1=../../../lab1-prog-app/g4-prog-app-lab1 +project.g4-prog-app-lab1-1=../../lab1-prog-app/g4-prog-app-lab1 reference.g4-prog-app-lab1-1.jar=${project.g4-prog-app-lab1-1}/dist/g4-prog-app-lab1.jar reference.g4-prog-app-lab1.jar=${project.g4-prog-app-lab1}/dist/g4-prog-app-lab1.jar resource.dir=setup diff --git a/l2g4/nbproject/project.xml b/l2g4/nbproject/project.xml index 19df443146aeaf4e5ce8fac88704581cddc3952a..7b00946aa792d7adc5146214f65a2478d1af716d 100644 --- a/l2g4/nbproject/project.xml +++ b/l2g4/nbproject/project.xml @@ -22,10 +22,6 @@ <file>${file.reference.hibernate-jpa-2.1-api-1.0.0.Final.jar-1}</file> <path-in-war>WEB-INF/lib</path-in-war> </library> - <library dirs="200"> - <file>${file.reference.javaee-endorsed-api-7.0.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-1}</file> <path-in-war>WEB-INF/lib</path-in-war> diff --git a/l2g4/src/java/controladores/conexionServidor.java b/l2g4/src/java/controladores/conexionServidor.java index c3ed226eaf740b3c4841c4f4a84912d5b5900010..378a1d2daaa4348e45a15406ce692b589fb14dfd 100644 --- a/l2g4/src/java/controladores/conexionServidor.java +++ b/l2g4/src/java/controladores/conexionServidor.java @@ -87,5 +87,14 @@ public class conexionServidor { } } + public static String cancelarPropuesta(String idPropuesta, String usr){ + sys = Factory.getInstance(); + return sys.CancelarPropuesta(idPropuesta, usr); + } + + public static String Comentario(String propuestaId,String user,String text){ + sys = Factory.getInstance(); + return sys.Comentario(propuestaId, user, text); + } } diff --git a/l2g4/src/java/controladores/propuesta.java b/l2g4/src/java/controladores/propuesta.java index 5c09279b30a77a383c3c0813e5a7ef9960c4a58f..026da16129f1562c995385c62e015f86ba462909 100644 --- a/l2g4/src/java/controladores/propuesta.java +++ b/l2g4/src/java/controladores/propuesta.java @@ -40,7 +40,12 @@ public class propuesta extends HttpServlet { * @parametro userId nick usuario */ propuestaId = getParameter(request, "propuestaId"); - //user; + if(user != null){ + respuesta= conexionServidor.cancelarPropuesta(propuestaId, user); + } + else{ + respuesta = "El usuario tinene que estar logeado."; + } break; case "Comentario": /* @@ -48,9 +53,13 @@ public class propuesta extends HttpServlet { * @parametro text msj a guardar */ propuestaId = getParameter(request, "propuestaId"); - //user; text = getParameter(request, "text"); - + if(user != null){ + respuesta= conexionServidor.Comentario(propuestaId, user, text); + } + else{ + respuesta = "El usuario tinene que estar logeado."; + } break; case "PropuestaCategorÃa": /*