X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.webapp%2Fsrc%2Fmain%2Fwebapp%2FWEB-INF%2Fweb.xml;h=58956dc75bdbcd865e86d7b34854a4260cf5a576;hb=c9ab36896bc1927119031c855e2409699f06bae0;hp=29499de2f343925a18cc74c87b0b194059c39fc1;hpb=4e94bc28de731b537f150dd0cb662b0d86b42d8e;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/web.xml b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/web.xml
index 29499de2f..58956dc75 100644
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/web.xml
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/web.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
 	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"
-	version="2.4">
+	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+	version="2.5">
 
 	<display-name>SLC Web Application</display-name>
 
@@ -42,12 +42,29 @@
 		<url-pattern>*.xslt</url-pattern>
 	</servlet-mapping>
 
+	<servlet>
+		<servlet-name>doc</servlet-name>
+		<servlet-class>
+			org.springframework.web.servlet.DispatcherServlet
+		</servlet-class>
+	</servlet>
+
+	<servlet-mapping>
+		<servlet-name>doc</servlet-name>
+		<url-pattern>*.xls</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>doc</servlet-name>
+		<url-pattern>*.pdf</url-pattern>
+	</servlet-mapping>
+
 	<context-param>
 		<param-name>contextConfigLocation</param-name>
 		<param-value>/WEB-INF/applicationContext.xml</param-value>
 	</context-param>
 
 	<listener>
+		<display-name>Spring Context</display-name>
 		<listener-class>
 			org.springframework.web.context.ContextLoaderListener
 		</listener-class>
@@ -57,8 +74,35 @@
 		<jsp-property-group>
 			<url-pattern>*.jsp</url-pattern>
 			<page-encoding>ISO-8859-1</page-encoding>
-			<include-prelude>/WEB-INF/specific/prelude.jspf</include-prelude>
+			<include-prelude>
+				/WEB-INF/specific/prelude.jspf
+			</include-prelude>
 			<include-coda>/WEB-INF/specific/coda.jspf</include-coda>
 		</jsp-property-group>
 	</jsp-config>
+
+	<!-- Env refs -->
+	<resource-env-ref>
+		<resource-env-ref-name>jdbc/mainDs</resource-env-ref-name>
+		<resource-env-ref-type>
+			javax.sql.DataSource
+		</resource-env-ref-type>
+	</resource-env-ref>
+
+	<!-- Log4j configContext loader config -->
+	<listener>
+		<display-name>Log4j</display-name>
+		<listener-class>
+			org.springframework.web.util.Log4jConfigListener
+		</listener-class>
+	</listener>
+	<context-param>
+		<param-name>log4jConfigLocation</param-name>
+		<param-value>/WEB-INF/classes/log4j.properties</param-value>
+	</context-param>
+	<context-param>
+		<param-name>log4jRefreshInterval</param-name>
+		<param-value>5000</param-value>
+	</context-param>
+
 </web-app>