From 2508fb33868f9c8b6b90071e54027f3ff845988f Mon Sep 17 00:00:00 2001
From: "clementine.desrucques" <clementine.desrucques@sio211-11.sio.lan>
Date: Mon, 18 Oct 2021 15:10:00 +0200
Subject: [PATCH]

---
 .gitignore                    | 1 +
 nbproject/genfiles.properties | 4 ++--
 nbproject/project.properties  | 1 -
 nbproject/project.xml         | 4 ++--
 web/META-INF/context.xml      | 2 +-
 web/WEB-INF/web.xml           | 8 ++++++++
 6 files changed, 14 insertions(+), 6 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..84c048a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/build/
diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index 41c7c81..32d51f8 100644
--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -1,7 +1,7 @@
 <<<<<<< HEAD
 build.xml.data.CRC32=a917c93e
 =======
-build.xml.data.CRC32=f1fb520c
+build.xml.data.CRC32=4025e2d7
 >>>>>>> origin/master
 build.xml.script.CRC32=6d072c1a
 build.xml.stylesheet.CRC32=1707db4f@1.86.0.1
@@ -11,7 +11,7 @@ build.xml.stylesheet.CRC32=1707db4f@1.86.0.1
 nbproject/build-impl.xml.data.CRC32=a917c93e
 nbproject/build-impl.xml.script.CRC32=33be3f4b
 =======
-nbproject/build-impl.xml.data.CRC32=f1fb520c
+nbproject/build-impl.xml.data.CRC32=4025e2d7
 nbproject/build-impl.xml.script.CRC32=bba0324b
 >>>>>>> origin/master
 nbproject/build-impl.xml.stylesheet.CRC32=334708a0@1.86.0.1
diff --git a/nbproject/project.properties b/nbproject/project.properties
index f5868ff..c95a01c 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -84,7 +84,6 @@ javadoc.use=true
 javadoc.version=false
 javadoc.windowtitle=
 lib.dir=${web.docbase.dir}/WEB-INF/lib
-no.dependencies=false
 persistence.xml.dir=${conf.dir}
 platform.active=default_platform
 resource.dir=setup
diff --git a/nbproject/project.xml b/nbproject/project.xml
index 1ad5dcc..663d093 100644
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -24,10 +24,10 @@
             </web-module-libraries>
             <web-module-additional-libraries/>
             <source-roots>
-                <root id="src.dir" name="Source Packages"/>
+                <root id="src.dir"/>
             </source-roots>
             <test-roots>
-                <root id="test.src.dir" name="Test Packages"/>
+                <root id="test.src.dir"/>
             </test-roots>
         </data>
     </configuration>
diff --git a/web/META-INF/context.xml b/web/META-INF/context.xml
index 17dcef4..f4d40e4 100644
--- a/web/META-INF/context.xml
+++ b/web/META-INF/context.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Context path="/ProjetSDIS29_2"/>
+<Context path="/ProjetSDIS29_2/accueilJSP.jsp"/>
diff --git a/web/WEB-INF/web.xml b/web/WEB-INF/web.xml
index 6a5025e..c140cc0 100644
--- a/web/WEB-INF/web.xml
+++ b/web/WEB-INF/web.xml
@@ -8,6 +8,10 @@
         <servlet-name>ChefCaserneServlet</servlet-name>
         <servlet-class>com.test.servlets.ChefCaserneServlet</servlet-class>
     </servlet>
+    <servlet>
+        <servlet-name>AuthentifServlet</servlet-name>
+        <servlet-class>com.test.servlets.AuthentifServlet</servlet-class>
+    </servlet>
     <servlet-mapping>
         <servlet-name>PompierServlet</servlet-name>
         <url-pattern>/PompierServlet</url-pattern>
@@ -16,6 +20,10 @@
         <servlet-name>ChefCaserneServlet</servlet-name>
         <url-pattern>/ChefCaserneServlet</url-pattern>
     </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>AuthentifServlet</servlet-name>
+        <url-pattern>/Authentification</url-pattern>
+    </servlet-mapping>
     <session-config>
         <session-timeout>
             30