From caf65f4bfefce88572bba5283cb2d2f53bfd64e5 Mon Sep 17 00:00:00 2001 From: "thomas.millot" Date: Tue, 19 Oct 2021 08:51:43 +0200 Subject: [PATCH] Merge origin/master Conflicts: web/WEB-INF/AuthentificationJSP.jsp --- src/java/bdd/PompierMysql.java | 2 +- src/java/com/test/servlets/ProfilServlet.java | 7 +++--- web/WEB-INF/AuthentificationJSP.jsp | 9 ++++--- web/WEB-INF/ModifProfilJSP.jsp | 2 +- web/WEB-INF/ProfilJSP.jsp | 24 +------------------ 5 files changed, 11 insertions(+), 33 deletions(-) diff --git a/src/java/bdd/PompierMysql.java b/src/java/bdd/PompierMysql.java index 74381f4..52f1006 100644 --- a/src/java/bdd/PompierMysql.java +++ b/src/java/bdd/PompierMysql.java @@ -155,5 +155,5 @@ public class PompierMysql { } return id; } - + } diff --git a/src/java/com/test/servlets/ProfilServlet.java b/src/java/com/test/servlets/ProfilServlet.java index 93d91b2..5a37f1a 100644 --- a/src/java/com/test/servlets/ProfilServlet.java +++ b/src/java/com/test/servlets/ProfilServlet.java @@ -35,10 +35,10 @@ public class ProfilServlet extends HttpServlet { out.println(""); out.println(""); out.println(""); - out.println("Servlet ProfilServlet"); + out.println("Servlet ProfilServlets"); out.println(""); out.println(""); - out.println("

Servlet ProfilServlet at " + request.getContextPath() + "

"); + out.println("

Servlet ProfilServlets at " + request.getContextPath() + "

"); out.println(""); out.println(""); } @@ -71,7 +71,8 @@ public class ProfilServlet extends HttpServlet { @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - processRequest(request, response); + getServletContext().getRequestDispatcher("/WEB-INF/ProfilJSP.jsp") + .forward(request, response); } /** diff --git a/web/WEB-INF/AuthentificationJSP.jsp b/web/WEB-INF/AuthentificationJSP.jsp index 71b5650..c83f4d3 100644 --- a/web/WEB-INF/AuthentificationJSP.jsp +++ b/web/WEB-INF/AuthentificationJSP.jsp @@ -1,17 +1,16 @@ <%-- Document : authentificationJSP Created on : 18 oct. 2021, 11:09:26 - Author : Chelloug.Eliass + Author : Millot.Thomas --%> <%@include file="jspf/enteteJSPF.jspf" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@page import="com.test.forms.AuthentifForm" %> -

Merci de vous identifier pour acceder aux dossiers

-
+
Identification utilisateur @@ -38,4 +37,4 @@

- + diff --git a/web/WEB-INF/ModifProfilJSP.jsp b/web/WEB-INF/ModifProfilJSP.jsp index f85a6a3..b4df2f8 100644 --- a/web/WEB-INF/ModifProfilJSP.jsp +++ b/web/WEB-INF/ModifProfilJSP.jsp @@ -1,7 +1,7 @@ <%-- Document : ModifProfilJSP Created on : 18 oct. 2021, 11:10:01 - Author : Chelloug.Eliass + Author : Millot.thomas --%> <%@page contentType="text/html" pageEncoding="UTF-8"%> diff --git a/web/WEB-INF/ProfilJSP.jsp b/web/WEB-INF/ProfilJSP.jsp index 714de37..9d059b0 100644 --- a/web/WEB-INF/ProfilJSP.jsp +++ b/web/WEB-INF/ProfilJSP.jsp @@ -1,25 +1,3 @@ -<%-- - Document : authentificationJSP - Created on : 18 oct. 2021, 11:09:26 - Author : Chelloug.Eliass ---%> -<%@include file="jspf/enteteJSPF.jspf" %>
-

Merci de vous identifier pour acceder aux dossiers

-
-
Identification utilisateur -

- - -

-

- - -



- - -

-
-
-

+

Merci de vous identifier pour acceder aux dossiers