mcardle 2005/12/14 18:23:12 CET
Modified files:
WEB-INF web.xml
Log:
* reviewed log4j init
Revision Changes Path
1.3 +19 -3 esi_server/WEB-INF/web.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/esi_server/WEB-INF/web.xml.diff?r1=1.2&r2=1.3&f=h
Index: web.xml
===================================================================
RCS file: /home/cvs/repository/esi_server/WEB-INF/web.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- web.xml 26 Oct 2005 13:45:21 -0000 1.2
+++ web.xml 14 Dec 2005 17:23:11 -0000 1.3
@@ -34,6 +34,10 @@
<url-pattern>/*</url-pattern>
</filter-mapping-->
+ <!-- filter>
+ <filter-name>ResponseOverrideFilter</filter-name>
+
<filter-class>org.displaytag.filter.ResponseOverrideFilter</filter-class>
+ </filter -->
<filter>
<filter-name>Proxy</filter-name>
@@ -42,15 +46,27 @@
<param-name>dataUrl</param-name>
<param-value>/WEB-INF/config/data.xml</param-value>
</init-param>
+ <init-param>
+ <param-name>log4j-xml-init-file</param-name>
+ <param-value>/WEB-INF/log4j.xml</param-value>
+ </init-param>
</filter>
+ <!--filter-mapping>
+ <filter-name>ResponseOverrideFilter</filter-name>
+ <url-pattern>esiadmin/*.do</url-pattern>
+ </filter-mapping>
+ <filter-mapping>
+ <filter-name>ResponseOverrideFilter</filter-name>
+ <url-pattern>esiadmin/*.jsp</url-pattern>
+ </filter-mapping-->
+
<filter-mapping>
<filter-name>Proxy</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
-
<!--servlet-mapping>
<servlet-name>Proxy</servlet-name>
<url-pattern>/esi</url-pattern>
@@ -74,7 +90,7 @@
</servlet-->
- <servlet>
+ <!--servlet>
<servlet-name>log4j-init</servlet-name>
<servlet-class>org.jahia.esi.log.Log4jInitServlet</servlet-class>
@@ -84,7 +100,7 @@
</init-param>
<load-on-startup>1</load-on-startup>
- </servlet>
+ </servlet-->
<welcome-file-list>
<welcome-file>index.html</welcome-file>
