This commit is contained in:
parent
d489cc683f
commit
2508fb3386
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
/build/
|
@ -1,7 +1,7 @@
|
|||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
build.xml.data.CRC32=a917c93e
|
build.xml.data.CRC32=a917c93e
|
||||||
=======
|
=======
|
||||||
build.xml.data.CRC32=f1fb520c
|
build.xml.data.CRC32=4025e2d7
|
||||||
>>>>>>> origin/master
|
>>>>>>> origin/master
|
||||||
build.xml.script.CRC32=6d072c1a
|
build.xml.script.CRC32=6d072c1a
|
||||||
build.xml.stylesheet.CRC32=1707db4f@1.86.0.1
|
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.data.CRC32=a917c93e
|
||||||
nbproject/build-impl.xml.script.CRC32=33be3f4b
|
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
|
nbproject/build-impl.xml.script.CRC32=bba0324b
|
||||||
>>>>>>> origin/master
|
>>>>>>> origin/master
|
||||||
nbproject/build-impl.xml.stylesheet.CRC32=334708a0@1.86.0.1
|
nbproject/build-impl.xml.stylesheet.CRC32=334708a0@1.86.0.1
|
||||||
|
@ -84,7 +84,6 @@ javadoc.use=true
|
|||||||
javadoc.version=false
|
javadoc.version=false
|
||||||
javadoc.windowtitle=
|
javadoc.windowtitle=
|
||||||
lib.dir=${web.docbase.dir}/WEB-INF/lib
|
lib.dir=${web.docbase.dir}/WEB-INF/lib
|
||||||
no.dependencies=false
|
|
||||||
persistence.xml.dir=${conf.dir}
|
persistence.xml.dir=${conf.dir}
|
||||||
platform.active=default_platform
|
platform.active=default_platform
|
||||||
resource.dir=setup
|
resource.dir=setup
|
||||||
|
@ -24,10 +24,10 @@
|
|||||||
</web-module-libraries>
|
</web-module-libraries>
|
||||||
<web-module-additional-libraries/>
|
<web-module-additional-libraries/>
|
||||||
<source-roots>
|
<source-roots>
|
||||||
<root id="src.dir" name="Source Packages"/>
|
<root id="src.dir"/>
|
||||||
</source-roots>
|
</source-roots>
|
||||||
<test-roots>
|
<test-roots>
|
||||||
<root id="test.src.dir" name="Test Packages"/>
|
<root id="test.src.dir"/>
|
||||||
</test-roots>
|
</test-roots>
|
||||||
</data>
|
</data>
|
||||||
</configuration>
|
</configuration>
|
||||||
|
@ -1,2 +1,2 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<Context path="/ProjetSDIS29_2"/>
|
<Context path="/ProjetSDIS29_2/accueilJSP.jsp"/>
|
||||||
|
@ -8,6 +8,10 @@
|
|||||||
<servlet-name>ChefCaserneServlet</servlet-name>
|
<servlet-name>ChefCaserneServlet</servlet-name>
|
||||||
<servlet-class>com.test.servlets.ChefCaserneServlet</servlet-class>
|
<servlet-class>com.test.servlets.ChefCaserneServlet</servlet-class>
|
||||||
</servlet>
|
</servlet>
|
||||||
|
<servlet>
|
||||||
|
<servlet-name>AuthentifServlet</servlet-name>
|
||||||
|
<servlet-class>com.test.servlets.AuthentifServlet</servlet-class>
|
||||||
|
</servlet>
|
||||||
<servlet-mapping>
|
<servlet-mapping>
|
||||||
<servlet-name>PompierServlet</servlet-name>
|
<servlet-name>PompierServlet</servlet-name>
|
||||||
<url-pattern>/PompierServlet</url-pattern>
|
<url-pattern>/PompierServlet</url-pattern>
|
||||||
@ -16,6 +20,10 @@
|
|||||||
<servlet-name>ChefCaserneServlet</servlet-name>
|
<servlet-name>ChefCaserneServlet</servlet-name>
|
||||||
<url-pattern>/ChefCaserneServlet</url-pattern>
|
<url-pattern>/ChefCaserneServlet</url-pattern>
|
||||||
</servlet-mapping>
|
</servlet-mapping>
|
||||||
|
<servlet-mapping>
|
||||||
|
<servlet-name>AuthentifServlet</servlet-name>
|
||||||
|
<url-pattern>/Authentification</url-pattern>
|
||||||
|
</servlet-mapping>
|
||||||
<session-config>
|
<session-config>
|
||||||
<session-timeout>
|
<session-timeout>
|
||||||
30
|
30
|
||||||
|
Loading…
x
Reference in New Issue
Block a user