Author: ajaquith
Date: Wed Jun 11 23:32:04 2008
New Revision: 666982
URL: http://svn.apache.org/viewvc?rev=666982&view=rev
Log:
Web unit tests refactored (yet again) to use an embedded Jetty server. This
replaces the need to use a separate Tomcat server, and *should* always work
without any configuration of any kind. Please tests this via the Ant 'webtests'
target! Note that this checkin introduces the TestContainer class, which with a
little modification (later, please!) could easily be used as a stand-alone
server. Refactorings are welcome; in the meantime, TestContainer should be
considered volatile. Note also that the Rename Profile web unit tests for the
container scenarios currently fails; all others run successfully.
Removed:
incubator/jspwiki/trunk/tests/etc/web unit tests
Modified:
incubator/jspwiki/trunk/tests/etc/jspwiki.properties.tmpl
Modified: incubator/jspwiki/trunk/tests/etc/jspwiki.properties.tmpl
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/etc/jspwiki.properties.tmpl?rev=666982&r1=666981&r2=666982&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/etc/jspwiki.properties.tmpl (original)
+++ incubator/jspwiki/trunk/tests/etc/jspwiki.properties.tmpl Wed Jun 11
23:32:04 2008
@@ -119,14 +119,17 @@
#
# Log everything into a file.
-#
+log4j.rootCategory=INFO,FileLog
+log4j.logger.com.ecyrd.jspwiki=INFO, FileLog
+log4j.logger.org.mortbay=INFO, TestContainerLog
+log4j.logger.SecurityLog=INFO, SecurityAppender
+
log4j.appender.FileLog = org.apache.log4j.RollingFileAppender
log4j.appender.FileLog.MaxFileSize = 10MB
log4j.appender.FileLog.MaxBackupIndex = 14
log4j.appender.FileLog.File = @tests.logfile@
log4j.appender.FileLog.layout = org.apache.log4j.PatternLayout
log4j.appender.FileLog.layout.ConversionPattern=%d [%t] %p %c %x - %m%n
-log4j.rootCategory=DEBUG,FileLog
log4j.appender.SecurityAppender = org.apache.log4j.RollingFileAppender
log4j.appender.SecurityAppender.MaxFileSize = 10MB
@@ -134,7 +137,12 @@
log4j.appender.SecurityAppender.File = @securitylog@
log4j.appender.SecurityAppender.layout = org.apache.log4j.PatternLayout
log4j.appender.SecurityAppender.layout.ConversionPattern=%d %p - %m%n
-log4j.logger.SecurityLog=INFO, SecurityAppender
+
+log4j.appender.TestContainerLog = org.apache.log4j.RollingFileAppender
+log4j.appender.TestContainerLog.MaxFileSize = 10MB
+log4j.appender.TestContainerLog.MaxBackupIndex = 14
+log4j.appender.TestContainerLog.layout = org.apache.log4j.PatternLayout
+log4j.appender.TestContainerLog.layout.ConversionPattern=%d [%t] %p %c %x -
%m%n
# JavaMail properties
mail.smtp.host = 127.0.0.1
