Commit by: bcm Modified files: server/webapps/webdav/build.xml 1.6 1.7 server/webapps/webdav/etc/log4j.xml 1.3 1.4 server/webapps/webdav/web/WEB-INF/.cvsignore 1.2 1.3 server/webapps/webdav/web/WEB-INF/web.xml 1.5 1.6
Log message: move log4j.xml out of webdav webapp classpath and explicitly load log4j with spring's Log4jConfigListener, which allows us to place the application log in tomcat's log directory. ViewCVS links: http://cvs.osafoundation.org/index.cgi/server/webapps/webdav/build.xml.diff?r1=text&tr1=1.6&r2=text&tr2=1.7 http://cvs.osafoundation.org/index.cgi/server/webapps/webdav/etc/log4j.xml.diff?r1=text&tr1=1.3&r2=text&tr2=1.4 http://cvs.osafoundation.org/index.cgi/server/webapps/webdav/web/WEB-INF/.cvsignore.diff?r1=text&tr1=1.2&r2=text&tr2=1.3 http://cvs.osafoundation.org/index.cgi/server/webapps/webdav/web/WEB-INF/web.xml.diff?r1=text&tr1=1.5&r2=text&tr2=1.6 Index: server/webapps/webdav/etc/log4j.xml diff -u server/webapps/webdav/etc/log4j.xml:1.3 server/webapps/webdav/etc/log4j.xml:1.4 --- server/webapps/webdav/etc/log4j.xml:1.3 Fri Mar 18 15:56:22 2005 +++ server/webapps/webdav/etc/log4j.xml Mon Mar 21 10:33:38 2005 @@ -3,7 +3,10 @@ <log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/";> <appender name="FILE" class="org.apache.log4j.RollingFileAppender"> +<!-- <param name="File" value="/tmp/cosmo-webdav.log"/> +--> + <param name="File" value="${webapp.root}/../../logs/cosmo-webdav.log"/> <param name="MaxFileSize" value="1000KB"/> <param name="MaxBackupIndex" value="1"/> <param name="BufferedIO" value="false"/> @@ -13,6 +16,10 @@ </layout> </appender> + <logger name="net.sf"> + <level value="WARN"/> + </logger> + <logger name="org.apache"> <level value="WARN"/> </logger> Index: server/webapps/webdav/build.xml diff -u server/webapps/webdav/build.xml:1.6 server/webapps/webdav/build.xml:1.7 --- server/webapps/webdav/build.xml:1.6 Mon Mar 21 10:26:56 2005 +++ server/webapps/webdav/build.xml Mon Mar 21 10:33:37 2005 @@ -57,6 +57,7 @@ </fileset> <fileset dir="${webdav.etc}"> <include name="applicationContext-webdav.xml"/> + <include name="log4j.xml"/> </fileset> </copy> <copy todir="${webdav.web}/WEB-INF/lib" @@ -87,9 +88,6 @@ <copy todir="${webdav.web}/WEB-INF/lib" file="${oro.jar}"/> <copy todir="${webdav.web}/WEB-INF/lib" file="${spring.jar}"/> <copy todir="${webdav.web}/WEB-INF/classes"> - <fileset dir="${webdav.etc}"> - <include name="log4j.xml"/> - </fileset> <fileset dir="${core.build}/classes"> <include name="hibernate.cfg.xml"/> </fileset> Index: server/webapps/webdav/web/WEB-INF/.cvsignore diff -u server/webapps/webdav/web/WEB-INF/.cvsignore:1.2 server/webapps/webdav/web/WEB-INF/.cvsignore:1.3 --- server/webapps/webdav/web/WEB-INF/.cvsignore:1.2 Fri Mar 18 15:56:23 2005 +++ server/webapps/webdav/web/WEB-INF/.cvsignore Mon Mar 21 10:33:38 2005 @@ -1,3 +1,4 @@ classes lib applicationContext*.xml +log4j.xml Index: server/webapps/webdav/web/WEB-INF/web.xml diff -u server/webapps/webdav/web/WEB-INF/web.xml:1.5 server/webapps/webdav/web/WEB-INF/web.xml:1.6 --- server/webapps/webdav/web/WEB-INF/web.xml:1.5 Fri Mar 18 15:56:23 2005 +++ server/webapps/webdav/web/WEB-INF/web.xml Mon Mar 21 10:33:38 2005 @@ -6,7 +6,7 @@ <display-name>Cosmo WebDAV Server</display-name> <context-param> <param-name>log4jConfigLocation</param-name> - <param-value>/WEB-INF/classes/log4j.xml</param-value> + <param-value>/WEB-INF/log4j.xml</param-value> </context-param> <context-param> <param-name>contextConfigLocation</param-name> @@ -17,13 +17,11 @@ /WEB-INF/applicationContext-webdav.xml </param-value> </context-param> -<!-- <listener> <listener-class> org.springframework.web.util.Log4jConfigListener </listener-class> </listener> ---> <listener> <listener-class> org.springframework.web.context.ContextLoaderListener _______________________________________________ Commits mailing list Commits@osafoundation.org http://lists.osafoundation.org/mailman/listinfo/commits
