Adapt for Tomcat and MySQL

[gpl/argeo-slc.git] / org.argeo.slc.webapp / src / main / webapp / WEB-INF / web.xml

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 abde0c29951b9b95d79a29c364e178f96ab98f05..58956dc75bdbcd865e86d7b34854a4260cf5a576 100644 (file)
--- 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>
 
@@ -64,6 +64,7 @@
        </context-param>
 
        <listener>
+               <display-name>Spring Context</display-name>
                <listener-class>
                        org.springframework.web.context.ContextLoaderListener
                </listener-class>
@@ -80,15 +81,24 @@
                </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>