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 @@ - + - + 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 @@ - + 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 @@ ChefCaserneServlet com.test.servlets.ChefCaserneServlet + + AuthentifServlet + com.test.servlets.AuthentifServlet + PompierServlet /PompierServlet @@ -16,6 +20,10 @@ ChefCaserneServlet /ChefCaserneServlet + + AuthentifServlet + /Authentification + 30