Return-Path: Delivered-To: apmail-incubator-jspwiki-commits-archive@locus.apache.org Received: (qmail 44598 invoked from network); 12 Jun 2008 06:32:26 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 12 Jun 2008 06:32:26 -0000 Received: (qmail 30037 invoked by uid 500); 12 Jun 2008 06:32:29 -0000 Delivered-To: apmail-incubator-jspwiki-commits-archive@incubator.apache.org Received: (qmail 30018 invoked by uid 500); 12 Jun 2008 06:32:29 -0000 Mailing-List: contact jspwiki-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: jspwiki-dev@incubator.apache.org Delivered-To: mailing list jspwiki-commits@incubator.apache.org Received: (qmail 30009 invoked by uid 99); 12 Jun 2008 06:32:29 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Jun 2008 23:32:29 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Jun 2008 06:31:48 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0982223889F1; Wed, 11 Jun 2008 23:32:06 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r666982 - in /incubator/jspwiki/trunk/tests/etc: jspwiki.properties.tmpl web unit tests Date: Thu, 12 Jun 2008 06:32:05 -0000 To: jspwiki-commits@incubator.apache.org From: ajaquith@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080612063206.0982223889F1@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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