Skip to content

P
ProyectoFinal-Bootcamp
Commit 9da93b2f by Angel Zarate
Options

Merge branch 'develop' of… 

Merge branch 'develop' of https://phoebe.roshka.com/gitlab/jbaez/ProyectoFinal-Bootcamp into mejorasCss3
parents 8790f36b 3bd0957d
Showing with 62 additions and 18 deletions
src/main/java/com/roshka/proyectofinal/login/LoginServlet.java
...@@ -71,25 +71,22 @@ public class LoginServlet extends HttpServlet { ...@@ -71,25 +71,22 @@ public class LoginServlet extends HttpServlet {
String target = (String) session.getAttribute("login.target"); String target = (String) session.getAttribute("login.target");
//response.sendRedirect("loginSuccess.jsp"); //response.sendRedirect("loginSuccess.jsp");
//out.println(" \n Destino: " + target); //out.println(" \n Destino: " + target);
if (target != null) if (target != null){
response.sendRedirect(target); response.sendRedirect(target);}
//return; else{
// Si no es posible redireccionar a la pagina solicitada, llevar a la main page
response.sendRedirect("menu.jsp");
}
} }
catch (Exception ignored) { } catch (Exception ignored) { }
// Si no es posible redireccionar a la pagina solicitada, llevar a la main page
RequestDispatcher rd = request.getRequestDispatcher("menu.jsp");
rd.include(request,response);
} else { } else {
//si no es un user valido - mandar error y redireccionar al inicio de sesion //si no es un user valido - mandar error y redireccionar al inicio de sesion
RequestDispatcher rd = request.getRequestDispatcher("/login.jsp");
//out.print("<div br align = \"center\" class=\"messageError\" > Credenciales incorrectas! Reintente ... </div>");
rd.include(request,response);
} response.sendRedirect(request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + request.getContextPath() +"/login.jsp");
}
} }
......
src/main/java/com/roshka/proyectofinal/login/ProtectedResource.java
...@@ -31,9 +31,5 @@ public class ProtectedResource extends HttpServlet { ...@@ -31,9 +31,5 @@ public class ProtectedResource extends HttpServlet {
// El usuario se loggeo y puede ver el recurso // El usuario se loggeo y puede ver el recurso
out.println("PUEDES ACCEDER AL RECURSO - ESTAS LOGGEADO"); out.println("PUEDES ACCEDER AL RECURSO - ESTAS LOGGEADO");
} }
} }
\ No newline at end of file
src/main/webapp/formulario_bootcamp.jsp
<%@ page import="com.roshka.proyectofinal.entity.Lenguaje, com.roshka.proyectofinal.entity.Bootcamp, com.roshka.proyectofinal.lenguaje.LenguajeDao, com.roshka.proyectofinal.bootcamp.BootcampDao, com.roshka.proyectofinal.entity.Profesor, com.roshka.proyectofinal.profesor.ProfesorDao, java.util.List,java.util.Iterator, java.util.ArrayList" %> <%@ page import="com.roshka.proyectofinal.entity.Lenguaje, com.roshka.proyectofinal.entity.Bootcamp, com.roshka.proyectofinal.lenguaje.LenguajeDao, com.roshka.proyectofinal.bootcamp.BootcampDao, com.roshka.proyectofinal.entity.Profesor, com.roshka.proyectofinal.profesor.ProfesorDao, java.util.List,java.util.Iterator, java.util.ArrayList, jakarta.servlet.http.* , java.lang.Object" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %> <%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib uri = "http://java.sun.com/jsp/jstl/core" prefix = "c" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%HttpSession session1 = request.getSession(true);
Object done = session1.getAttribute("logon.isDone");
if (done == null) {
session1.setAttribute("login.target", HttpUtils.getRequestURL(request).toString());
response.sendRedirect(request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + request.getContextPath() +"/login.jsp");
return;
}%>
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
......
src/main/webapp/formulario_lenguaje.jsp
<%@ page import= "jakarta.servlet.http.* , java.lang.Object" %>
<%HttpSession session1 = request.getSession(true);
Object done = session1.getAttribute("logon.isDone");
if (done == null) {
session1.setAttribute("login.target", HttpUtils.getRequestURL(request).toString());
response.sendRedirect(request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + request.getContextPath() +"/login.jsp");
return;
}%>
<%@ page contentType="text/html;charset=UTF-8" language="java" %> <%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<!DOCTYPE html> <!DOCTYPE html>
......
src/main/webapp/formulario_profesor.jsp
<%@ page import= "jakarta.servlet.http.* , java.lang.Object" %>
<%HttpSession session1 = request.getSession(true);
Object done = session1.getAttribute("logon.isDone");
if (done == null) {
session1.setAttribute("login.target", HttpUtils.getRequestURL(request).toString());
response.sendRedirect(request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + request.getContextPath() +"/login.jsp");
return;
}%>
<%@ page contentType="text/html;charset=UTF-8" language="java" %> <%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<!DOCTYPE html> <!DOCTYPE html>
......
src/main/webapp/menu.jsp
<%@ page import= "jakarta.servlet.http.* , java.lang.Object" %>
<%HttpSession session1 = request.getSession(true);
Object done = session1.getAttribute("logon.isDone");
if (done == null) {
session1.setAttribute("login.target", HttpUtils.getRequestURL(request).toString());
response.sendRedirect(request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + request.getContextPath() +"/login.jsp");
return;
}%>
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment