Mise à jour (enfin!) du dernier semestre de cours

cours/P51/BlankoNet/WebContent/WEB-INF/web.xml

@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-	<display-name>
-	BlankoNet</display-name>
+	<display-name>BlankoNet</display-name>
 	<servlet>
 		<description>
 		</description>
 		<display-name>
 		Profile</display-name>
-		<servlet-name>First Servlet</servlet-name>
+		<servlet-name>GeneralDispatcher</servlet-name>
 		<servlet-class>Octopus</servlet-class>
 	</servlet>
 	<servlet>
@@ -17,19 +16,13 @@
 		<load-on-startup>1</load-on-startup>
 	</servlet>
 	<servlet-mapping>
-		<servlet-name>First Servlet</servlet-name>
-		<url-pattern>/core</url-pattern>
+		<servlet-name>GeneralDispatcher</servlet-name>
+		<url-pattern>/contacts/*</url-pattern>
 	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>Faces Servlet</servlet-name>
-		<url-pattern>/faces/*</url-pattern>
+		<servlet-mapping>
+		<servlet-name>GeneralDispatcher</servlet-name>
+		<url-pattern>/login/*</url-pattern>
 	</servlet-mapping>
-	<jsp-config>
-		<taglib>
-		    <taglib-uri>http://java.sun.com/jstl/core</taglib-uri>
-			<taglib-location>/WEB-INF/tld/c.tld</taglib-location> 
-		</taglib>
-    </jsp-config>
 	<welcome-file-list>
 		<welcome-file>index.html</welcome-file>
 		<welcome-file>index.htm</welcome-file>
@@ -42,4 +35,13 @@
 		<extension>jpg</extension>
 		<mime-type>image/jpeg</mime-type>
 	</mime-mapping>
+	<jsp-config>
+		<jsp-property-group>
+       		<description>Toutes les pages</description>
+       		<url-pattern>*.jsp</url-pattern>
+       		<page-encoding>UTF-8</page-encoding>
+			<include-prelude>/includes/header.jsp</include-prelude>
+			<include-coda>/includes/footer.jsp</include-coda>
+		</jsp-property-group>
+	</jsp-config>
 </web-app>