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/06/07 01:51:14 UTC
svn commit: r1490476 -
/incubator/jspwiki/trunk/jspwiki-war/src/main/filters/filters.properties
Author: juanpablo
Date: Thu Jun 6 23:51:14 2013
New Revision: 1490476
URL: http://svn.apache.org/r1490476
Log:
some more test-specific properties get generated under target/test-classes
Modified:
incubator/jspwiki/trunk/jspwiki-war/src/main/filters/filters.properties
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/filters/filters.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/filters/filters.properties?rev=1490476&r1=1490475&r2=1490476&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/filters/filters.properties (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/filters/filters.properties Thu Jun 6 23:51:14 2013
@@ -21,16 +21,16 @@
# delimiters that Ant requires.
#
appname=JSPWiki
-logfile=/tmp/jspwiki.log
-securitylog=/tmp/security.log
-spamlog=/tmp/spamlog.log
+logfile=target/test-classes/logs/jspwiki.log
+securitylog=target/test-classes/logs/security.log
+spamlog=target/test-classes/logs/spamlog.log
-tests.pagedir=/tmp/testrepository
-tests.workdir=/tmp/testworkdir
-tests.logfile=/tmp/jspwikitests.log
+tests.pagedir=target/test-classes/testrepository
+tests.workdir=target/test-classes/testworkdir
+tests.logfile=target/test-classes/jspwikitests.log
testcontainerlog=target/test-classes/webtests/testcontainer.log
-tests.auth.filename=/tmp/testrepository/auth.txt
+tests.auth.filename=target/test-classes/testrepository/auth.txt
tests.filter=/filters.xml
# JavaMail configuration
Re: svn commit: r1490476 - /incubator/jspwiki/trunk/jspwiki-war/src/main/filters/filters.properties
Posted by Juan Pablo Santos RodrÃguez <ju...@gmail.com>.
Hi Glen,
I think it's safe to move them to src/test/filters too, didn't find any
occurences of ${ inside src/main/resources
br,
juan pablo
On Fri, Jun 7, 2013 at 2:21 AM, Glen Mazza <gl...@gmail.com> wrote:
> Juan Pablo, I had made a mistake before, prior to you merging the two
> branches that filters.properties should really be in src/test/filters
> because AFAIK *all* of the filtering is being done in the test branch, not
> the main branch (keeping it in main is more appropriate if it's being used
> in main *or* (main and test). Question: are any of these new properties
> being used in main? If not, it may be less confusing if we move it to
> test/filters.
>
> Regards,
> Glen
>
>
> On 06/06/2013 07:51 PM, juanpablo@apache.org wrote:
>
>> Author: juanpablo
>> Date: Thu Jun 6 23:51:14 2013
>> New Revision: 1490476
>>
>> URL: http://svn.apache.org/r1490476
>> Log:
>> some more test-specific properties get generated under target/test-classes
>>
>> Modified:
>> incubator/jspwiki/trunk/**jspwiki-war/src/main/filters/**
>> filters.properties
>>
>> Modified: incubator/jspwiki/trunk/**jspwiki-war/src/main/filters/**
>> filters.properties
>> URL: http://svn.apache.org/viewvc/**incubator/jspwiki/trunk/**
>> jspwiki-war/src/main/filters/**filters.properties?rev=**
>> 1490476&r1=1490475&r2=1490476&**view=diff<http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/filters/filters.properties?rev=1490476&r1=1490475&r2=1490476&view=diff>
>> ==============================**==============================**
>> ==================
>> --- incubator/jspwiki/trunk/**jspwiki-war/src/main/filters/**filters.properties
>> (original)
>> +++ incubator/jspwiki/trunk/**jspwiki-war/src/main/filters/**filters.properties
>> Thu Jun 6 23:51:14 2013
>> @@ -21,16 +21,16 @@
>> # delimiters that Ant requires.
>> #
>> appname=JSPWiki
>> -logfile=/tmp/jspwiki.log
>> -securitylog=/tmp/security.log
>> -spamlog=/tmp/spamlog.log
>> +logfile=target/test-classes/**logs/jspwiki.log
>> +securitylog=target/test-**classes/logs/security.log
>> +spamlog=target/test-classes/**logs/spamlog.log
>> -tests.pagedir=/tmp/**testrepository
>> -tests.workdir=/tmp/**testworkdir
>> -tests.logfile=/tmp/**jspwikitests.log
>> +tests.pagedir=target/test-**classes/testrepository
>> +tests.workdir=target/test-**classes/testworkdir
>> +tests.logfile=target/test-**classes/jspwikitests.log
>> testcontainerlog=target/test-**classes/webtests/**testcontainer.log
>> -tests.auth.filename=/tmp/**testrepository/auth.txt
>> +tests.auth.filename=target/**test-classes/testrepository/**auth.txt
>> tests.filter=/filters.xml
>> # JavaMail configuration
>>
>>
>>
>
Re: svn commit: r1490476 - /incubator/jspwiki/trunk/jspwiki-war/src/main/filters/filters.properties
Posted by Glen Mazza <gl...@gmail.com>.
Juan Pablo, I had made a mistake before, prior to you merging the two
branches that filters.properties should really be in src/test/filters
because AFAIK *all* of the filtering is being done in the test branch,
not the main branch (keeping it in main is more appropriate if it's
being used in main *or* (main and test). Question: are any of these new
properties being used in main? If not, it may be less confusing if we
move it to test/filters.
Regards,
Glen
On 06/06/2013 07:51 PM, juanpablo@apache.org wrote:
> Author: juanpablo
> Date: Thu Jun 6 23:51:14 2013
> New Revision: 1490476
>
> URL: http://svn.apache.org/r1490476
> Log:
> some more test-specific properties get generated under target/test-classes
>
> Modified:
> incubator/jspwiki/trunk/jspwiki-war/src/main/filters/filters.properties
>
> Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/filters/filters.properties
> URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/filters/filters.properties?rev=1490476&r1=1490475&r2=1490476&view=diff
> ==============================================================================
> --- incubator/jspwiki/trunk/jspwiki-war/src/main/filters/filters.properties (original)
> +++ incubator/jspwiki/trunk/jspwiki-war/src/main/filters/filters.properties Thu Jun 6 23:51:14 2013
> @@ -21,16 +21,16 @@
> # delimiters that Ant requires.
> #
> appname=JSPWiki
> -logfile=/tmp/jspwiki.log
> -securitylog=/tmp/security.log
> -spamlog=/tmp/spamlog.log
> +logfile=target/test-classes/logs/jspwiki.log
> +securitylog=target/test-classes/logs/security.log
> +spamlog=target/test-classes/logs/spamlog.log
>
> -tests.pagedir=/tmp/testrepository
> -tests.workdir=/tmp/testworkdir
> -tests.logfile=/tmp/jspwikitests.log
> +tests.pagedir=target/test-classes/testrepository
> +tests.workdir=target/test-classes/testworkdir
> +tests.logfile=target/test-classes/jspwikitests.log
> testcontainerlog=target/test-classes/webtests/testcontainer.log
>
> -tests.auth.filename=/tmp/testrepository/auth.txt
> +tests.auth.filename=target/test-classes/testrepository/auth.txt
> tests.filter=/filters.xml
>
> # JavaMail configuration
>
>