Merge branch 'master' of https://source.jalview.org/git/proteocache into PROT-9-webse...

[proteocache.git] / WEB-INF / web.xml

diff --git a/WEB-INF/web.xml b/WEB-INF/web.xml
index 937633c..f084afd 100644 (file)
--- a/WEB-INF/web.xml
+++ b/WEB-INF/web.xml
@@ -14,6 +14,10 @@
        <!-- Spring Security -->\r
 \r
        <listener>\r
+               <listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>\r
+       </listener>\r
+\r
+       <listener>\r
                <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>\r
        </listener>\r
 \r
@@ -23,6 +27,11 @@
                        /WEB-INF/spring-security.xml\r
                </param-value>\r
        </context-param>\r
+       \r
+       <context-param>\r
+               <param-name>log4jConfigLocation</param-name>\r
+               <param-value>/WEB-INF/classes/log4j.properties</param-value>\r
+       </context-param>\r
 \r
        <filter>\r
                <filter-name>springSecurityFilterChain</filter-name>\r