You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2013/05/10 00:17:58 UTC
svn commit: r1480812 -
/incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/WEB-INF/jspwiki.properties
Author: juanpablo
Date: Thu May 9 22:17:57 2013
New Revision: 1480812
URL: http://svn.apache.org/r1480812
Log:
JSPWIKI-770: parameterized jspwiki.baseUrl + workdirs are generated inside proper submodule, which fixes quite some it-tests.
If the system locale isn't english the tests keep failing, though.
Modified:
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/WEB-INF/jspwiki.properties
Modified: incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/WEB-INF/jspwiki.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/WEB-INF/jspwiki.properties?rev=1480812&r1=1480811&r2=1480812&view=diff
==============================================================================
--- incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/WEB-INF/jspwiki.properties (original)
+++ incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/WEB-INF/jspwiki.properties Thu May 9 22:17:57 2013
@@ -36,12 +36,13 @@ jspwiki.userdatabase = ${it-j
jspwiki.userdatabase.hashPrefix = ${it-jspwiki.userdatabase.hashPrefix}
jspwiki-x.securityconfig.enable = ${it-jspwiki-x.securityconfig.enable}
-jspwiki.fileSystemProvider.pageDir = target/test-classes/test-repo
-jspwiki.basicAttachmentProvider.storageDir = target/test-classes/test-repo/attachments
-jspwiki.workDir = target/test-classes/workdir
-log4j.appender.FileLog.File = target/test-classes/jspwiki.log
-log4j.appender.TestContainerLog.File = target/test-classes/container.log
-log4j.appender.SecurityAppender.File = target/test-classes/security.log
+jspwiki.baseURL = http://localhost:8080/${project.artifactId}/
+jspwiki.fileSystemProvider.pageDir = ./${project.artifactId}/target/test-classes/test-repo
+jspwiki.basicAttachmentProvider.storageDir = ./${project.artifactId}/target/test-classes/test-repo/attachments
+jspwiki.workDir = ./${project.artifactId}/target/test-classes/workdir-${project.artifactId}
+log4j.appender.FileLog.File = ./${project.artifactId}/target/test-classes/jspwiki-${project.artifactId}.log
+log4j.appender.TestContainerLog.File = ./${project.artifactId}/target/test-classes/container-${project.artifactId}.log
+log4j.appender.SecurityAppender.File = ./${project.artifactId}/target/test-classes/security-${project.artifactId}.log
#
# CONSTANT PROPERTY VALUES
@@ -66,7 +67,6 @@ jspwiki.encoding = ISO-8859-1
# jspwiki.filterConfig = @tests.filter@
-jspwiki.baseURL = http://localhost/
jspwiki.searchProvider = BasicSearchProvider
#