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

diff --combined WEB-INF/web.xml
index 937633c,9f2caa5..f084afd
--- 1/WEB-INF/web.xml
--- 2/WEB-INF/web.xml
+++ b/WEB-INF/web.xml
@@@ -14,6 -14,10 +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 +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
@@@ -58,18 -67,6 +67,18 @@@
        <listener>\r
                <listener-class>compbio.listeners.ContextListener</listener-class>\r
        </listener>\r
 +      <listener>\r
 +              <listener-class>com.sun.xml.ws.transport.http.servlet.WSServletContextListener</listener-class>\r
 +      </listener>\r
 +      <servlet>\r
 +              <servlet-name>JpredWS</servlet-name>\r
 +              <servlet-class>com.sun.xml.ws.transport.http.servlet.WSServlet</servlet-class>\r
 +              <load-on-startup>1</load-on-startup>\r
 +      </servlet>\r
 +      <servlet-mapping>\r
 +              <servlet-name>JpredWS</servlet-name>\r
 +              <url-pattern>/JpredWS</url-pattern>\r
 +      </servlet-mapping>\r
  \r
        <!-- Session timeout in minutes -->\r
        <session-config>\r