<?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>
<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>
</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/log4j.properties</param-value>
+ <param-value>/WEB-INF/classes/log4j.properties</param-value>
</context-param>
<context-param>
<param-name>log4jRefreshInterval</param-name>