You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by gm...@apache.org on 2013/01/19 06:09:00 UTC
svn commit: r1435488 - in /incubator/jspwiki/trunk: build.properties
build.properties.win build.xml tests/etc/jspwiki.properties.tmpl
Author: gmazza
Date: Sat Jan 19 05:09:00 2013
New Revision: 1435488
URL: http://svn.apache.org/viewvc?rev=1435488&view=rev
Log:
Moved log4j.appender.TestContainerLog.File property from build.xml to build.properties to make it accessible to Maven pom file.
Modified:
incubator/jspwiki/trunk/build.properties
incubator/jspwiki/trunk/build.properties.win
incubator/jspwiki/trunk/build.xml
incubator/jspwiki/trunk/tests/etc/jspwiki.properties.tmpl
Modified: incubator/jspwiki/trunk/build.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.properties?rev=1435488&r1=1435487&r2=1435488&view=diff
==============================================================================
--- incubator/jspwiki/trunk/build.properties (original)
+++ incubator/jspwiki/trunk/build.properties Sat Jan 19 05:09:00 2013
@@ -31,6 +31,7 @@
@tests.pagedir@=/tmp/testrepository
@tests.workdir@=/tmp/testworkdir
@tests.logfile@=/tmp/jspwikitests.log
+@testcontainerlog@=tests/build/webtests/testcontainer.log
@tests.auth.filename=/tmp/testrepository/auth.txt
@tests.filter@=tests/etc/filters.xml
Modified: incubator/jspwiki/trunk/build.properties.win
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.properties.win?rev=1435488&r1=1435487&r2=1435488&view=diff
==============================================================================
--- incubator/jspwiki/trunk/build.properties.win (original)
+++ incubator/jspwiki/trunk/build.properties.win Sat Jan 19 05:09:00 2013
@@ -35,6 +35,7 @@
@tests.pagedir@=C:\\\\temp\\\\testrepository
@tests.workdir@=C:\\\\temp\\\\testworkdir
@tests.logfile@=C:\\\\temp\\\\jspwikitests.log
+@testcontainerlog@=tests\\\\build\\\\webtests\\\\testcontainer.log
@tests.auth.filename=C:\\\\temp\\\\testrepository\\\\auth.txt
@tests.filter@=tests/etc/filters.xml
Modified: incubator/jspwiki/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.xml?rev=1435488&r1=1435487&r2=1435488&view=diff
==============================================================================
--- incubator/jspwiki/trunk/build.xml (original)
+++ incubator/jspwiki/trunk/build.xml Sat Jan 19 05:09:00 2013
@@ -916,7 +916,6 @@
<entry key="jspwiki.groupdatabase" value="org.apache.wiki.auth.authorize.XMLGroupDatabase" />
<entry key="jspwiki.referenceStyle" value="relative" />
<entry key="jspwiki.userdatabase.hashPrefix" value="false" />
- <entry key="log4j.appender.TestContainerLog.File" value="${basedir}/${webtests.build}/testcontainer.log" />
<entry key="jspwiki-x.securityconfig.enable" value="true" />
<entry key="jspwiki.login.throttling" value="false" />
</propertyfile>
Modified: incubator/jspwiki/trunk/tests/etc/jspwiki.properties.tmpl
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/etc/jspwiki.properties.tmpl?rev=1435488&r1=1435487&r2=1435488&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/etc/jspwiki.properties.tmpl (original)
+++ incubator/jspwiki/trunk/tests/etc/jspwiki.properties.tmpl Sat Jan 19 05:09:00 2013
@@ -160,6 +160,8 @@ log4j.appender.TestContainerLog.MaxFileS
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
+log4j.appender.TestContainerLog.File= @testcontainerlog@
+
# JavaMail properties
mail.smtp.host = 127.0.0.1